← Back to team overview

openerp-community team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-1124989-jitendra into lp:openobject-addons

 

Jitendra Prajapati(OpenERP Trainee) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1124989-jitendra into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1124989 in OpenERP Addons: "[Trunk/7.0] Warehouse: Merged inventories should be cancelled"
  https://bugs.launchpad.net/openobject-addons/+bug/1124989

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1124989-jitendra/+merge/151743

Hello,

 Merged inventories should be cancelled 

Thanks,
Jitendra.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1124989-jitendra/+merge/151743
Your team OpenERP Community is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1124989-jitendra.
=== modified file 'stock/wizard/stock_inventory_merge.py'
--- stock/wizard/stock_inventory_merge.py	2012-12-06 14:56:32 +0000
+++ stock/wizard/stock_inventory_merge.py	2013-03-05 13:06:28 +0000
@@ -69,6 +69,7 @@
                     invent_lines[key] += line.product_qty
                 else:
                     invent_lines[key] = line.product_qty
+            invent_obj.write(cr, uid, inventory.id, {'state': 'cancel'}, context=context)
 
 
         new_invent = invent_obj.create(cr, uid, {