Check rule only if _check_access is set and enforce companies rule
issue4080 review343891009
This commit is contained in:
1 parent
cb85dc9080
commit
b97054ff3b
2 files changed
+11
-11
No files matched your search
+9
-9
@@ -85,16 +85,16 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="30"
|
||||
id="menu_mandate_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_mandate">
|
||||
<record model="ir.rule.group" id="rule_group_mandate_companies">
|
||||
<field name="name">User in company</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment.sepa.mandate')]"/>
|
||||
<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_mandate"/>
|
||||
<field name="rule_group" ref="rule_group_mandate_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.model.access" id="access_mandate">
|
||||
@@ -229,17 +229,17 @@ this repository contains the full copyright notices and license terms. -->
|
||||
sequence="50"
|
||||
id="menu_message_form"/>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_message">
|
||||
<field name="name">User in company</field>
|
||||
<record model="ir.rule.group" id="rule_group_message_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model"
|
||||
search="[('model', '=', 'account.payment.sepa.message')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_message1">
|
||||
<record model="ir.rule" id="rule_message_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_message"/>
|
||||
<field name="rule_group" ref="rule_group_message_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.model.access" id="access_message">
|
||||
|
||||
@@ -16,7 +16,7 @@ from trytond.pool import Pool
|
||||
|
||||
from trytond.modules.currency.tests import create_currency
|
||||
from trytond.modules.company.tests import (
|
||||
create_company, set_company, CompanyMultiValueTestMixin)
|
||||
create_company, set_company, CompanyTestMixin)
|
||||
from trytond.modules.account.tests import create_chart
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ def validate_file(flavor, kind, xsd=None):
|
||||
schema.assertValid(sepa_xml)
|
||||
|
||||
|
||||
class AccountPaymentSepaTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
|
||||
class AccountPaymentSepaTestCase(CompanyTestMixin, ModuleTestCase):
|
||||
'Test Account Payment SEPA module'
|
||||
module = 'account_payment_sepa'
|
||||
|
||||
|
||||
Reference in new issue
Block a user