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] account_payment_order: Fix compute dependency chain

Browse Source 
Detected doing a migration 8.0 > 9.0. The `amount_company_currency` field computation
was not depending on `currency_id` field, and thus that one was being computed before
populating the other one.

Also having both fields in the same compute method makes them less efficient, as they
don't depend on the same source fields.
This commit is contained in:
Pedro M. Baeza
2019-05-25 19:43:30 +02:00
parent 6ae742484b
commit 4bec0018c4
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
account_payment_order/models/bank_payment_line.py
View File

@@ -33,11 +33,11 @@ class BankPaymentLine(models.Model):
# But is it still true in v9 ?
amount_currency = fields.Monetary(
string='Amount', currency_field='currency_id',
compute='_compute_amount', store=True, readonly=True)
compute='_compute_amount_currency', store=True)
amount_company_currency = fields.Monetary(
string='Amount in Company Currency',
currency_field='company_currency_id',
compute='_compute_amount', store=True, readonly=True)
compute='_compute_amount_company_currency', store=True)
currency_id = fields.Many2one(
'res.currency', required=True, readonly=True,
related='payment_line_ids.currency_id') # v8 field: currency
@@ -73,15 +73,20 @@ class BankPaymentLine(models.Model):
@api.multi
@api.depends('payment_line_ids', 'payment_line_ids.amount_currency')
def _compute_amount(self):
def _compute_amount_currency(self):
for bline in self:
amount_currency = sum(
bline.amount_currency = sum(
bline.mapped('payment_line_ids.amount_currency'))
amount_company_currency = bline.currency_id.with_context(
date=bline.date).compute(
amount_currency, bline.company_currency_id)
bline.amount_currency = amount_currency
bline.amount_company_currency = amount_company_currency
@api.multi
@api.depends('currency_id', 'amount_currency', 'company_id')
def _compute_amount_company_currency(self):
for bline in self:
bline.amount_company_currency = bline.currency_id.with_context(
date=bline.date,
).compute(
bline.amount_currency, bline.company_currency_id,
)
@api.model
@api.returns('self')