changeset 11ace4c117bd in modules/sale_promotion:default
details:
https://hg.tryton.org/modules/sale_promotion?cmd=changeset&node=11ace4c117bd
description:
Check rule only if _check_access is set and enforce companies rule
issue4080
review343891009
diffstat:
sale.xml | 10 +++++-----
tests/test_sale_promotion.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r c3476da72e5c -r 11ace4c117bd sale.xml
--- a/sale.xml Fri Mar 05 15:49:20 2021 +0100
+++ b/sale.xml Sat Apr 10 23:46:24 2021 +0200
@@ -53,16 +53,16 @@
<field name="action" ref="act_promotion_relate"/>
</record>
- <record model="ir.rule.group" id="rule_group_promotion">
- <field name="name">User in company</field>
+ <record model="ir.rule.group" id="rule_group_promotion_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=', 'sale.promotion')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_promotion1">
+ <record model="ir.rule" id="rule_promotion_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_promotion"/>
+ <field name="rule_group" ref="rule_group_promotion_companies"/>
</record>
<record model="ir.model.access" id="access_promotion">
diff -r c3476da72e5c -r 11ace4c117bd tests/test_sale_promotion.py
--- a/tests/test_sale_promotion.py Fri Mar 05 15:49:20 2021 +0100
+++ b/tests/test_sale_promotion.py Sat Apr 10 23:46:24 2021 +0200
@@ -7,10 +7,10 @@
from trytond.tests.test_tryton import doctest_teardown
from trytond.tests.test_tryton import doctest_checker
-from trytond.modules.company.tests import CompanyMultiValueTestMixin
+from trytond.modules.company.tests import CompanyTestMixin
-class SalePromotionTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class SalePromotionTestCase(CompanyTestMixin, ModuleTestCase):
'Test Sale Promotion module'
module = 'sale_promotion'
