[IMP] sale: when encoding analytic lines, do not enforce uom category equality; convert when possible and if not simply encode the entered amount

2015-09-02 11:14:28 +02:00
parent 1388db411b
commit 54b7724a52
1 changed files with 4 additions and 2 deletions
@@ -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():