[FIX] Factor should be compared with factor, not id
This commit is contained in:
parent
aab3d9f4b4
commit
52f7fad109
|
@ -1028,9 +1028,9 @@ class stock_picking(osv.osv):
|
||||||
product_uom = {} # Determines UoM used in pack operations
|
product_uom = {} # Determines UoM used in pack operations
|
||||||
for move in picking.move_lines:
|
for move in picking.move_lines:
|
||||||
if not product_uom.get(move.product_id.id):
|
if not product_uom.get(move.product_id.id):
|
||||||
product_uom[move.product_id.id] = move.product_id.uom_id.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]:
|
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.id
|
product_uom[move.product_id.id] = move.product_uom
|
||||||
|
|
||||||
pack_obj = self.pool.get("stock.quant.package")
|
pack_obj = self.pool.get("stock.quant.package")
|
||||||
quant_obj = self.pool.get("stock.quant")
|
quant_obj = self.pool.get("stock.quant")
|
||||||
|
@ -1088,7 +1088,7 @@ class stock_picking(osv.osv):
|
||||||
uom_id = product.uom_id.id
|
uom_id = product.uom_id.id
|
||||||
qty_uom = qty
|
qty_uom = qty
|
||||||
if product_uom.get(key[0]):
|
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)
|
qty_uom = uom_obj._compute_qty(cr, uid, product.uom_id.id, qty, uom_id)
|
||||||
vals.append({
|
vals.append({
|
||||||
'picking_id': picking.id,
|
'picking_id': picking.id,
|
||||||
|
|
Loading…
Reference in New Issue