audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Bug #353 crash when selecting a payment mode that has a variable link to a bank account

Browse Source
This commit is contained in:
Alexis de Lattre
2017-04-04 23:26:32 +02:00
committed by Enric Tobella
parent 52a34546d8
commit 67ef09a048
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
account_payment_order/models/account_payment_order.py
View File

@@ -39,9 +39,6 @@ class AccountPaymentOrder(models.Model):
'account.journal', string='Bank Journal', ondelete='restrict',
readonly=True, states={'draft': [('readonly', False)]},
track_visibility='onchange')
allowed_journal_ids = fields.Many2many(
'account.journal', compute='_compute_allowed_journals', readonly=True,
string='Selectable Bank Journals')
# The journal_id field is only required at confirm step, to
# allow auto-creation of payment order from invoice
company_partner_bank_id = fields.Many2one(
@@ -133,19 +130,6 @@ class AccountPaymentOrder(models.Model):
for order in self:
order.bank_line_count = len(order.bank_line_ids)
@api.multi
@api.depends('payment_mode_id')
def _compute_allowed_journals(self):
for order in self:
allowed_journal_ids = False
if order.payment_mode_id:
mode = order.payment_mode_id
if mode.bank_account_link == 'fixed':
allowed_journal_ids = mode.fixed_journal_id
else:
allowed_journal_ids = mode.variable_journal_ids
order.allowed_journal_ids = allowed_journal_ids
@api.model
def create(self, vals):
if vals.get('name', 'New') == 'New':
@@ -162,10 +146,18 @@ class AccountPaymentOrder(models.Model):
@api.onchange('payment_mode_id')
def payment_mode_id_change(self):
journal_id = False
res = {'domain': {
'journal_id': "[('id', '=', False)]",
}}
if self.payment_mode_id:
if self.payment_mode_id.bank_account_link == 'fixed':
journal_id = self.payment_mode_id.fixed_journal_id
journal_id = self.payment_mode_id.fixed_journal_id.id
res['domain']['journal_id'] = "[('id', '=', %d)]" % journal_id
elif self.payment_mode_id.bank_account_link == 'variable':
jrl_ids = self.payment_mode_id.variable_journal_ids.ids
res['domain']['journal_id'] = "[('id', 'in', %s)]" % jrl_ids
self.journal_id = journal_id
return res
@api.multi
def action_done(self):

4
account_payment_order/views/account_payment_order.xml
View File

@@ -33,9 +33,7 @@
<field name="payment_mode_id"
domain="[('payment_order_ok', '=', True), ('payment_type', '=', payment_type)]"
widget="selection"/>
<field name="journal_id" widget="selection"
domain="[('id', 'in', allowed_journal_ids and allowed_journal_ids[0] and allowed_journal_ids[0][2] or [])]"/>
<field name="allowed_journal_ids" invisible="1"/>
<field name="journal_id" widget="selection"/>
<field name="bank_account_link" invisible="1"/>
<field name="company_partner_bank_id"/>
<field name="company_id" groups="base.group_multi_company"/>