From 52f7fad109ece219294e9d016c70921141fac8b0 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 29 Dec 2014 11:20:02 +0100 Subject: [PATCH] [FIX] Factor should be compared with factor, not id --- addons/stock/stock.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5044339061a..581b8c5c78f 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1028,9 +1028,9 @@ class stock_picking(osv.osv): product_uom = {} # Determines UoM used in pack operations for move in picking.move_lines: if not product_uom.get(move.product_id.id): - product_uom[move.product_id.id] = move.product_id.uom_id.id - if move.product_uom.id != move.product_id.uom_id.id and move.product_uom.factor > product_uom[move.product_id.id]: - product_uom[move.product_id.id] = move.product_uom.id + product_uom[move.product_id.id] = move.product_id.uom_id + if move.product_uom.id != move.product_id.uom_id.id and move.product_uom.factor > product_uom[move.product_id.id].factor: + product_uom[move.product_id.id] = move.product_uom pack_obj = self.pool.get("stock.quant.package") quant_obj = self.pool.get("stock.quant") @@ -1088,7 +1088,7 @@ class stock_picking(osv.osv): uom_id = product.uom_id.id qty_uom = qty if product_uom.get(key[0]): - uom_id = product_uom[key[0]] + uom_id = product_uom[key[0]].id qty_uom = uom_obj._compute_qty(cr, uid, product.uom_id.id, qty, uom_id) vals.append({ 'picking_id': picking.id,