Check rule only if _check_access is set and enforce companies rule
issue4080 review343891009
This commit is contained in:
@@ -69,7 +69,10 @@ class GiftCard(ModelSQL, ModelView):
|
||||
domain=[
|
||||
('gift_card', '=', True),
|
||||
],
|
||||
states=_states, depends=_depends)
|
||||
context={
|
||||
'company': Eval('company', -1),
|
||||
},
|
||||
states=_states, depends=_depends + ['company'])
|
||||
value = fields.Numeric(
|
||||
"Value", digits=(16, Eval('currency_digits', 2)), required=True,
|
||||
states=_states, depends=_depends + ['currency_digits'])
|
||||
|
||||
@@ -93,6 +93,18 @@ 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_gift_card_companies">
|
||||
<field name="name">User in companies</field>
|
||||
<field name="model" search="[('model', '=', 'sale.gift_card')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_gift_card_companies">
|
||||
<field name="domain"
|
||||
eval="[('company', 'in', Eval('companies', []))]"
|
||||
pyson="1"/>
|
||||
<field name="rule_group" ref="rule_group_gift_card_companies"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.action.report" id="report_gift_card_email">
|
||||
<field name="name">Gift Card</field>
|
||||
<field name="model">sale.gift_card</field>
|
||||
|
||||
@@ -10,8 +10,10 @@ from trytond.tests.test_tryton import suite as test_suite
|
||||
from trytond.tests.test_tryton import doctest_teardown
|
||||
from trytond.tests.test_tryton import doctest_checker
|
||||
|
||||
from trytond.modules.company.tests import CompanyTestMixin
|
||||
|
||||
class SaleGiftCardTestCase(ModuleTestCase):
|
||||
|
||||
class SaleGiftCardTestCase(CompanyTestMixin, ModuleTestCase):
|
||||
'Test Sale Gift Card module'
|
||||
module = 'sale_gift_card'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user