odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Factor should be compared with factor, not id

This commit is contained in:
Josse Colpaert 2014-12-29 11:20:02 +01:00
parent aab3d9f4b4
commit 52f7fad109
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/stock/stock.py
View File

@ -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,