changeset ac5618be7876 in modules/sale_opportunity:default
details:
https://hg.tryton.org/modules/sale_opportunity?cmd=changeset&node=ac5618be7876
description:
Check rule only if _check_access is set and enforce companies rule
issue4080
review343891009
diffstat:
opportunity.xml | 40 ++++++++++++++++++++--------------------
tests/test_sale_opportunity.py | 4 ++--
2 files changed, 22 insertions(+), 22 deletions(-)
diffs (107 lines):
diff -r bbd25a079f89 -r ac5618be7876 opportunity.xml
--- a/opportunity.xml Fri Apr 09 10:52:03 2021 +0200
+++ b/opportunity.xml Sat Apr 10 23:46:24 2021 +0200
@@ -206,16 +206,16 @@
<field name="group" ref="group_opportunity"/>
</record>
- <record model="ir.rule.group" id="rule_group_opportunity">
- <field name="name">User in company of opportunity</field>
+ <record model="ir.rule.group" id="rule_group_opportunity_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=', 'sale.opportunity')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_group_opportunity1">
+ <record model="ir.rule" id="rule_opportunity_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_opportunity"/>
+ <field name="rule_group" ref="rule_group_opportunity_companies"/>
</record>
<record model="ir.action.act_window" id="act_open_sale_form">
@@ -290,16 +290,16 @@
<field name="act_window" ref="act_opportunity_employee_form"/>
</record>
- <record model="ir.rule.group" id="rule_group_opportunity_employee">
- <field name="name">User in company</field>
+ <record model="ir.rule.group"
id="rule_group_opportunity_employee_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'sale.opportunity_employee')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_group_opportunity_employee1">
+ <record model="ir.rule" id="rule_opportunity_employee_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_opportunity_employee"/>
+ <field name="rule_group"
ref="rule_group_opportunity_employee_companies"/>
</record>
<menuitem
@@ -355,16 +355,16 @@
sequence="50"
id="menu_opportunity_monthly_form"/>
- <record model="ir.rule.group" id="rule_group_opportunity_monthly">
- <field name="name">User in company</field>
+ <record model="ir.rule.group"
id="rule_group_opportunity_monthly_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'sale.opportunity_monthly')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_group_opportunity_monthly1">
+ <record model="ir.rule" id="rule_opportunity_monthly_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_opportunity_monthly"/>
+ <field name="rule_group"
ref="rule_group_opportunity_monthly_companies"/>
</record>
<record model="ir.ui.view" id="opportunity_employee_monthly_view_tree">
@@ -390,16 +390,16 @@
sequence="50"
id="menu_opportunity_employee_monthly_form"/>
- <record model="ir.rule.group"
id="rule_group_opportunity_employee_monthly">
- <field name="name">User in company</field>
+ <record model="ir.rule.group"
id="rule_group_opportunity_employee_monthly_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'sale.opportunity_employee_monthly')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_group_opportunity_employee_monthly1">
+ <record model="ir.rule"
id="rule_opportunity_employee_monthly_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_opportunity_employee_monthly"/>
+ <field name="rule_group"
ref="rule_group_opportunity_employee_monthly_companies"/>
</record>
</data>
diff -r bbd25a079f89 -r ac5618be7876 tests/test_sale_opportunity.py
--- a/tests/test_sale_opportunity.py Fri Apr 09 10:52:03 2021 +0200
+++ b/tests/test_sale_opportunity.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 SaleOpportunityTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class SaleOpportunityTestCase(CompanyTestMixin, ModuleTestCase):
'Test SaleOpportunity module'
module = 'sale_opportunity'
