Check rule only if _check_access is set and enforce companies rule
issue4080 review343891009
This commit is contained in:
1 parent
5b76109ac4
commit
be4747d05b
2 files changed
+17
-18
No files matched your search
+15
-15
@@ -67,16 +67,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="10"
|
||||
id="menu_payment_journal_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_payment_journal">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_payment_journal_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment.journal')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_payment_journal1">
|
||||
<record model="ir.rule" id="rule_payment_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_payment_journal"/>
|
||||
<field name="rule_group" ref="rule_group_payment_journal_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.model.access" id="access_payment_journal">
|
||||
@@ -135,16 +135,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="30"
|
||||
id="menu_payment_group_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_payment_group">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_payment_group_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment.group')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_payment_group1">
|
||||
<record model="ir.rule" id="rule_payment_group_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_payment_group"/>
|
||||
<field name="rule_group" ref="rule_group_payment_group_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.model.access" id="access_payment_group">
|
||||
@@ -265,16 +265,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="20"
|
||||
id="menu_payment_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_payment">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_payment_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_payment1">
|
||||
<record model="ir.rule" id="rule_payment_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_payment"/>
|
||||
<field name="rule_group" ref="rule_group_payment_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.action.act_window" id="act_payment_form_line_relate">
|
||||
|
||||
@@ -8,12 +8,11 @@ from trytond.tests.test_tryton import doctest_teardown
|
||||
from trytond.tests.test_tryton import doctest_checker
|
||||
|
||||
from trytond.modules.company.tests import (
|
||||
PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin)
|
||||
PartyCompanyCheckEraseMixin, CompanyTestMixin)
|
||||
|
||||
|
||||
class AccountPaymentTestCase(
|
||||
PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin,
|
||||
ModuleTestCase):
|
||||
PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
|
||||
'Test Account Payment module'
|
||||
module = 'account_payment'
|
||||
extras = ['account_invoice']
|
||||
|
||||
Reference in new issue
Block a user