Check rule only if _check_access is set and enforce companies rule

issue4080
review343891009
This commit is contained in:
Cédric Krier committed 2021-04-10 23:46:24 +02:00
1 parent a94845ff98
commit e1d2f74786
2 files changed
+22 -22

No files matched your search

+20 -20
View File
@@ -206,16 +206,16 @@ this repository contains the full copyright notices and license terms. -->
<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 @@ this repository contains the full copyright notices and license terms. -->
<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 @@ this repository contains the full copyright notices and license terms. -->
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 @@ this repository contains the full copyright notices and license terms. -->
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>
+2 -2
View File
@@ -7,10 +7,10 @@ from trytond.tests.test_tryton import ModuleTestCase
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'