From 2ef48916952a5cfe4aa5f8ced422cf9578fc6c3e Mon Sep 17 00:00:00 2001 From: qdp Date: Mon, 26 Jan 2009 16:39:56 +0100 Subject: [PATCH] [FIX] bugfixes bzr revid: qdp@tinyerp.com-20090126153956-upukltqmz02jbopb --- addons/account/invoice.py | 4 ++-- addons/account/partner.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 0dab9f2b50a..b4590068e35 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -987,11 +987,11 @@ class account_invoice_line(osv.osv): taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid,a).tax_ids or False) tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes) else: - taxes = res.supplier_taxes_id and res.supplier_taxes_id or a.tax_ids + taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid,a).tax_ids or False) tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context) - result.update(to_update['value']) + result.update(to_update) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) diff --git a/addons/account/partner.py b/addons/account/partner.py index 8c722e96f8e..81b7b28680f 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -34,6 +34,8 @@ class account_fiscal_position(osv.osv): } def map_tax(self, cr, uid, fposition_id, taxes, context={}): + if not taxes: + return [] if not fposition_id: return map(lambda x: x.id, taxes) result = []