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

[FIX] stock: fixes of bugs introduced in previous merge 

bzr revid: qdp-launchpad@openerp.com-20140325160323-hlbh33xojle1qtnc
This commit is contained in:
Quentin (OpenERP) 2014-03-25 17:03:23 +01:00
parent 909e21b64b
commit 7988c4f5b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/stock.py
View File

@ -1015,7 +1015,7 @@ class stock_picking(osv.osv):
top_lvl_packages = self._get_top_level_packages(cr, uid, quants_suggested_locations, context=context)
# and then create pack operations for the top-level packages found
for pack in top_lvl_packages:
pack_quants_ids = pack_obj.get_content(cr, uid, [pack.id], context=context)
pack_quant_ids = pack_obj.get_content(cr, uid, [pack.id], context=context)
pack_quants = quant_obj.browse(cr, uid, pack_quant_ids, context=context)
vals.append({
'picking_id': picking.id,
@ -2152,7 +2152,7 @@ class stock_move(osv.osv):
quant_obj.quants_move(cr, uid, quants, move, ops.location_dest_id, lot_id=ops.lot_id.id, owner_id=ops.owner_id.id, src_package_id=ops.package_id.id, dest_package_id=quant_dest_package_id, context=context)
# Handle pack in pack
if not ops.product_id and ops.package_id and ops.result_package_id.id != ops.package_id.parent_id.id:
pack_obj.write(cr, SUPERUSER_ID, [ops.package_id.id], {'result_package_id': ops.result_package_id.id}, context=context)
pack_obj.write(cr, SUPERUSER_ID, [ops.package_id.id], {'parent_id': ops.result_package_id.id}, context=context)
move_qty[move.id] -= record.qty
#Check for remaining qtys and unreserve/check move_dest_id in
for move in self.browse(cr, uid, ids, context=context):