From aed8082a437aa52c0a298dfb6bb4773aea4d736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 12 Oct 2009 15:11:01 +0200 Subject: [PATCH] Fix test for value from _parent_invoice if they are set to False --- invoice.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/invoice.py b/invoice.py index bb58f8ced4..dac94ad358 100644 --- a/invoice.py +++ b/invoice.py @@ -1436,7 +1436,7 @@ class InvoiceLine(ModelSQL, ModelView): def on_change_with_amount(self, cursor, user, ids, vals, context=None): currency_obj = self.pool.get('currency.currency') if vals.get('type') == 'line': - currency = vals.get('_parent_invoice.currency', vals.get('currency')) + currency = vals.get('_parent_invoice.currency') or vals.get('currency') if isinstance(currency, (int, long)): currency = currency_obj.browse(cursor, user, currency, context=context) @@ -1565,9 +1565,9 @@ class InvoiceLine(ModelSQL, ModelView): ctx = context.copy() party = None - if vals.get('_parent_invoice.party', vals.get('party')): - party = party_obj.browse(cursor, user, vals.get('_parent_invoice.party', - vals.get('party')), + if vals.get('_parent_invoice.party') or vals.get('party'): + party = party_obj.browse(cursor, user, vals.get('_parent_invoice.party') + or vals.get('party'), context=context) if party.lang: ctx['language'] = party.lang.code @@ -1580,13 +1580,13 @@ class InvoiceLine(ModelSQL, ModelView): company = company_obj.browse(cursor, user, context['company'], context=context) currency = None - if vals.get('_parent_invoice.currency', vals.get('currency')): + if vals.get('_parent_invoice.currency') or vals.get('currency'): #TODO check if today date is correct currency = currency_obj.browse(cursor, user, - vals.get('_parent_invoice.currency', vals.get('currency')), + vals.get('_parent_invoice.currency') or vals.get('currency'), context=context) - if vals.get('_parent_invoice.type', vals.get('invoice_type')) \ + if (vals.get('_parent_invoice.type') or vals.get('invoice_type')) \ in ('in_invoice', 'in_credit_note'): if company and currency: res['unit_price'] = currency_obj.compute(cursor, user,