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

[MERGE] lp:845333 

bzr revid: qdp-launchpad@openerp.com-20111010132637-4yjmoq1uzun3kdwh
This commit is contained in:
Quentin (OpenERP) 2011-10-10 15:26:37 +02:00
parent d618938b1d 655baa4fae
commit f86c9276d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/stock/wizard/stock_fill_inventory.py
View File

@ -70,6 +70,7 @@ class stock_fill_inventory(osv.osv_memory):
product_obj = self.pool.get('product.product')
stock_location_obj = self.pool.get('stock.location')
move_obj = self.pool.get('stock.move')
uom_obj = self.pool.get('product.uom')
if ids and len(ids):
ids = ids[0]
else:
@ -96,7 +97,7 @@ class stock_fill_inventory(osv.osv_memory):
for move in move_obj.browse(cr, uid, move_ids, context=context):
lot_id = move.prodlot_id.id
prod_id = move.product_id.id
qty = move.product_qty
qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
if datas.get((prod_id, lot_id)):
qty += datas[(prod_id, lot_id)]['product_qty']