From 4a7a79779d3b3c0f9f2f984c9237b5fc03db6dc8 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 29 Jan 2014 14:10:46 +0100
Subject: [PATCH] [IMP] Consume only products when already assigned and

bzr revid: jco@openerp.com-20140129131046-r8yv3h8l679c3m3s
---
 addons/mrp/mrp.py       | 8 ++++----
 addons/mrp/mrp_view.xml | 2 +-
 addons/mrp/stock.py     | 6 +-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 4da68d522c2..db06e5be301 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -515,13 +515,13 @@ class mrp_production(osv.osv):
         'move_lines': fields.one2many('stock.move', 'raw_material_production_id', 'Products to Consume',
             domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines2': fields.one2many('stock.move', 'raw_material_production_id', 'Consumed Products',
-            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+            domain=[('state','in', ('done', 'cancel'))], readonly=True),
         'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce',
-            domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+            domain=[('state','not in', ('done', 'cancel'))], readonly=True),
         'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products',
-            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+            domain=[('state','in', ('done', 'cancel'))], readonly=True),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods',
-            readonly=True, states={'draft':[('readonly',False)]}),
+            readonly=True),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation',
             readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection(
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1ad47a02784..354a6bf9506 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -729,7 +729,7 @@
                                             <button name="%(mrp.move_consume)d"
                                                 string="Consume Products" type="action"
                                                 icon="gtk-go-forward" context="{'consume': True}"
-                                                states="draft,waiting,confirmed,assigned"
+                                                states="assigned"
                                                  />
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 9fe8ba7cb9c..e296d7901d8 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -26,7 +26,7 @@ from openerp.tools.translate import _
 
 class StockMove(osv.osv):
     _inherit = 'stock.move'
-    
+
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production Order for Produced Products', select=True),
         'raw_material_production_id': fields.many2one('mrp.production', 'Production Order for Raw Materials', select=True),
@@ -141,11 +141,7 @@ class StockMove(osv.osv):
                                                     'restrict_partner_id': restrict_partner_id, 
                                                     'consumed_for': consumed_for}, context=context)
             self.action_done(cr, uid, res, context=context)
-            
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for prod in production_obj.browse(cr, uid, production_ids, context=context):
-                if prod.state == 'confirmed':
-                    production_obj.force_production(cr, uid, [prod.id])
             production_obj.signal_button_produce(cr, uid, production_ids)
             for new_move in res:
                 if new_move != move.id: