Add company to context and global rule
This commit is contained in:
parent
dcbb62a768
commit
4ad8e3ecb0
13
gateway.py
13
gateway.py
|
@ -29,9 +29,14 @@ class AccountPaymentGateway(DeactivableMixin, ModelSQL, ModelView):
|
|||
('live', 'Live'),
|
||||
('sandbox', 'Sandbox'),
|
||||
], 'Mode', required=True)
|
||||
journal = fields.Many2One('account.journal', 'Journal', required=True)
|
||||
journal = fields.Many2One('account.journal', 'Journal', required=True,
|
||||
context={
|
||||
'company': Eval('company'),
|
||||
}, depends=['company'])
|
||||
journal_writeoff = fields.Many2One('account.journal', 'Write Off Journal',
|
||||
required=True)
|
||||
required=True, context={
|
||||
'company': Eval('company'),
|
||||
}, depends=['company'])
|
||||
writeoff_amount_percent = fields.Numeric('Write Off (%)', digits=(8, 4),
|
||||
required=True)
|
||||
from_transactions = fields.DateTime('From Transactions',
|
||||
|
@ -112,7 +117,9 @@ class AccountPaymentGatewayTransaction(Workflow, ModelSQL, ModelView):
|
|||
Eval('context', {}).get('company', -1)),
|
||||
], depends=['state'])
|
||||
party = fields.Many2One('party.party', 'Party', ondelete='RESTRICT',
|
||||
depends=['state'], states=READONLY_IF_NOT_DRAFT)
|
||||
context={
|
||||
'company': Eval('company'),
|
||||
}, depends=['state', 'company'], states=READONLY_IF_NOT_DRAFT)
|
||||
amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
|
||||
required=True, depends=['state', 'currency_digits'],
|
||||
states=READONLY_IF_NOT_DRAFT)
|
||||
|
|
23
gateway.xml
23
gateway.xml
|
@ -244,5 +244,28 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="model" search="[('model', '=', 'account.payment.gateway.transaction')]"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_account_payment_gateway">
|
||||
<field name="name">User in company</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment.gateway')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_account_payment_gateway1">
|
||||
<field name="domain"
|
||||
eval="[('company', 'in', Eval('companies', []))]"
|
||||
pyson="1"/>
|
||||
<field name="rule_group" ref="rule_group_account_payment_gateway"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_account_payment_gateway_transaction">
|
||||
<field name="name">User in company</field>
|
||||
<field name="model" search="[('model', '=', 'account.payment.gateway.transaction')]"/>
|
||||
<field name="global_p" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.rule" id="rule_account_payment_gateway_transaction1">
|
||||
<field name="domain"
|
||||
eval="[('company', 'in', Eval('companies', []))]"
|
||||
pyson="1"/>
|
||||
<field name="rule_group" ref="rule_group_account_payment_gateway_transaction"/>
|
||||
</record>
|
||||
</data>
|
||||
</tryton>
|
||||
|
|
Loading…
Reference in New Issue