From 54b7724a52c6b5416ea84e31a5d8ef23b8f0793a Mon Sep 17 00:00:00 2001 From: Damien Bouvy Date: Tue, 1 Sep 2015 10:53:44 +0200 Subject: [PATCH] [IMP] sale: when encoding analytic lines, do not enforce uom category equality; convert when possible and if not simply encode the entered amount --- addons/sale/sale_analytic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale_analytic.py b/addons/sale/sale_analytic.py index 1910320ca8f..dd18c7f5a8c 100644 --- a/addons/sale/sale_analytic.py +++ b/addons/sale/sale_analytic.py @@ -22,8 +22,10 @@ class SaleOrderLine(models.Model): line = self.browse(d['so_line'][0]) lines.setdefault(line, 0.0) uom = self.env['product.uom'].browse(d['product_uom_id'][0]) - - qty = self.env['product.uom']._compute_qty_obj(uom, d['unit_amount'], line.product_uom) + if line.product_uom.category_id == uom.category_id: + qty = self.env['product.uom']._compute_qty_obj(uom, d['unit_amount'], line.product_uom) + else: + qty = d['unit_amount'] lines[line] += qty for line, qty in lines.items():