Check rule only if _check_access is set and enforce companies rule
issue4080 review343891009
This commit is contained in:
+5
-5
@@ -50,16 +50,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<field name="perm_delete" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_statement_journal">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_statement_journal_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'account.statement.journal')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_statement_journal1">
|
||||
<record model="ir.rule" id="rule_statement_journal_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_statement_journal"/>
|
||||
<field name="rule_group" ref="rule_group_statement_journal_companies"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
|
||||
+5
-5
@@ -82,16 +82,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="10"
|
||||
id="menu_statement_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_statement">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_statement_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'account.statement')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_statement1">
|
||||
<record model="ir.rule" id="rule_statement_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_statement"/>
|
||||
<field name="rule_group" ref="rule_group_statement_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.action.report" id="report_statement">
|
||||
|
||||
@@ -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 AccountStatementTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
|
||||
class AccountStatementTestCase(CompanyTestMixin, ModuleTestCase):
|
||||
'Test AccountStatement module'
|
||||
module = 'account_statement'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user