Merge lp:~openerp-dev/openobject-addons/6.1-opw-584402-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

I have fixed the issue of duplicating move "Product to Consumed" when related picking list of MO is cancelled and recreated again.

Steps.

Create a MO with say product A(BOM: with component product B), Confirm Production, move will be created in Product to consume.

Also related internal picking will be created for the component, cancel this picking, Reload MO, 'Recreated Picking' button will be enable to recreate the picking when click on this button "Product to Consumed" is duplicated.

Kindly review it and share your thoughts on this.

Unmerged revisions

7170. By Hardik Ansodariya (OpenERP) on 2013-04-02

[FIXED] mrp: Fixed the issue of duplicating product to consume, if related picking list is canceled and recreated from MO

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-10-05 10:44:47 +0000
+++ mrp/mrp.py	2013-04-02 08:51:31 +0000
@@ -965,8 +965,11 @@
             'state': 'waiting',
             'company_id': production.company_id.id,
         }
-        move_id = stock_move.create(cr, uid, data, context=context)
-        production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
+        if not production.move_created_ids:
+            move_id = stock_move.create(cr, uid, data, context=context)
+            production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
+        else:
+            move_id = {}
         return move_id
 
     def _make_production_consume_line(self, cr, uid, production_line, parent_move_id, source_location_id=False, context=None):
@@ -979,21 +982,24 @@
         destination_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         if not source_location_id:
             source_location_id = production.location_src_id.id
-        move_id = stock_move.create(cr, uid, {
-            'name': move_name,
-            'date': production.date_planned,
-            'product_id': production_line.product_id.id,
-            'product_qty': production_line.product_qty,
-            'product_uom': production_line.product_uom.id,
-            'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
-            'product_uos': production_line.product_uos and production_line.product_uos.id or False,
-            'location_id': source_location_id,
-            'location_dest_id': destination_location_id,
-            'move_dest_id': parent_move_id,
-            'state': 'waiting',
-            'company_id': production.company_id.id,
-        })
-        production.write({'move_lines': [(4, move_id)]}, context=context)
+        if not production.move_lines:
+            move_id = stock_move.create(cr, uid, {
+                'name': move_name,
+                'date': production.date_planned,
+                'product_id': production_line.product_id.id,
+                'product_qty': production_line.product_qty,
+                'product_uom': production_line.product_uom.id,
+                'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+                'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+                'location_id': source_location_id,
+                'location_dest_id': destination_location_id,
+                'move_dest_id': parent_move_id,
+                'state': 'waiting',
+                'company_id': production.company_id.id,
+            })
+            production.write({'move_lines': [(4, move_id)]}, context=context)
+        else:
+            move_id = {}
         return move_id
 
     def action_confirm(self, cr, uid, ids, context=None):