changeset 68b83b3eba68 in modules/purchase:default
details: https://hg.tryton.org/modules/purchase?cmd=changeset&node=68b83b3eba68
description:
Check rule only if _check_access is set and enforce companies rule
issue4080
review343891009
diffstat:
purchase.xml | 20 ++++++++++----------
tests/test_purchase.py | 6 ++----
2 files changed, 12 insertions(+), 14 deletions(-)
diffs (67 lines):
diff -r d04a7d920667 -r 68b83b3eba68 purchase.xml
--- a/purchase.xml Fri Apr 09 10:52:03 2021 +0200
+++ b/purchase.xml Sat Apr 10 23:46:24 2021 +0200
@@ -429,16 +429,16 @@
action="act_product_supplier_form"
id="menu_product_supplier"/>
- <record model="ir.rule.group" id="rule_group_product_supplier">
- <field name="name">User in company</field>
+ <record model="ir.rule.group"
id="rule_group_product_supplier_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'purchase.product_supplier')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_product_supplier">
+ <record model="ir.rule" id="rule_product_supplier_companies">
<field name="domain"
- eval="[('company', '=', Eval('user', {}).get('company',
None))]"
+ eval="[('company', 'in', Eval('companies', []))]"
pyson="1"/>
- <field name="rule_group" ref="rule_group_product_supplier"/>
+ <field name="rule_group"
ref="rule_group_product_supplier_companies"/>
</record>
<record model="ir.ui.view" id="product_supplier_price_view_form">
@@ -525,16 +525,16 @@
pyson="1"/>
</record>
- <record model="ir.rule.group" id="rule_group_purchase">
- <field name="name">User in company</field>
+ <record model="ir.rule.group" id="rule_group_purchase_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'purchase.purchase')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_purchase1">
+ <record model="ir.rule" id="rule_purchase_companies">
<field name="domain"
- eval="[('company', '=', Eval('user', {}).get('company',
None))]"
+ eval="[('company', 'in', Eval('companies', []))]"
pyson="1"/>
- <field name="rule_group" ref="rule_group_purchase"/>
+ <field name="rule_group" ref="rule_group_purchase_companies"/>
</record>
<record model="ir.model.access" id="access_invoice_purchase">
diff -r d04a7d920667 -r 68b83b3eba68 tests/test_purchase.py
--- a/tests/test_purchase.py Fri Apr 09 10:52:03 2021 +0200
+++ b/tests/test_purchase.py Sat Apr 10 23:46:24 2021 +0200
@@ -11,14 +11,12 @@
from trytond.pool import Pool
from trytond.modules.company.tests import (
- create_company, set_company, PartyCompanyCheckEraseMixin,
- CompanyMultiValueTestMixin)
+ create_company, set_company, PartyCompanyCheckEraseMixin, CompanyTestMixin)
from trytond.modules.account.tests import create_chart
class PurchaseTestCase(
- PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin,
- ModuleTestCase):
+ PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
'Test Purchase module'
module = 'purchase'
