From 7c5bf67a5f9378fe4ae01eeffff24889f7bdcdc5 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 31 Jul 2014 18:15:41 +0200 Subject: [PATCH] [FIX] account: unit arg of on_change_unit_amount can be False --- addons/account/account_analytic_line.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 077a4090769..e620359959c 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -79,11 +79,13 @@ class account_analytic_line(osv.osv): prod = product_obj.browse(cr, uid, prod_id, context=context) result = 0.0 if prod_id: - unit_obj = product_uom_obj.browse(cr, uid, unit, context=context) - if prod.uom_id.category_id.id != unit_obj.category_id.id: + unit_obj = False + if unit: + unit_obj = product_uom_obj.browse(cr, uid, unit, context=context) + if not unit_obj or prod.uom_id.category_id.id != unit_obj.category_id.id: unit = prod.uom_id.id if j_id.type == 'purchase': - if prod.uom_po_id.category_id.id != unit_obj.category_id.id: + if not unit_obj or prod.uom_po_id.category_id.id != unit_obj.category_id.id: unit = prod.uom_po_id.id if j_id.type <> 'sale': a = prod.property_account_expense.id