From 6c98483d6fdd809c767b94924d043f83330ef441 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 17 Dec 2012 15:41:36 +0100
Subject: [PATCH] [FIX] mrp, mrp_jit, procurement: fix of the procurement order
 workflow

bzr revid: qdp-launchpad@openerp.com-20121217144136-hen0i0op21f4z1y1
---
 addons/mrp/mrp_workflow.xml                 | 5 -----
 addons/mrp/procurement.py                   | 7 ++++++-
 addons/mrp_jit/mrp_jit.xml                  | 2 +-
 addons/procurement/procurement.py           | 4 ++++
 addons/procurement/procurement_workflow.xml | 3 +--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index fd4327815ac..a0943628fc8 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -136,11 +136,6 @@
             <field name="signal">subflow.done</field>
         </record>
 
-        <record id="trans_conf_conf_wait" model="workflow.transition">
-            <field name="act_from" ref="procurement.act_confirm"/>
-            <field name="act_to" ref="procurement.act_confirm_temp"/>
-            <field name="condition">not test_cancel() and not get_phantom_bom_id()</field>
-        </record>
         <record id="trans_produce_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="procurement.act_cancel"/>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 7064589b1ee..b2277374f5a 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -53,7 +53,12 @@ class procurement_order(osv.osv):
                     self.message_post(cr, uid, [procurement.id], body=message, context=context)
                 return False
         return True
-    
+
+    def check_conditions_confirm2wait(self, cr, uid, ids):
+        """ condition on the transition to go from 'confirm' activity to 'confirm_wait' activity """
+        res = super(procurement_order, self).check_conditions_confirm2wait(cr, uid, ids)
+        return res and not self.get_phantom_bom_id(cr, uid, ids)
+
     def get_phantom_bom_id(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.move_id and procurement.move_id.product_id.supply_method=='produce' \
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index aae3f44ff23..c00393ac04d 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -7,7 +7,7 @@
              but, this time, without the signal -->
         <field name="act_from" ref="procurement.act_confirm"/>
         <field name="act_to" ref="procurement.act_confirm_wait"/>
-        <field name="condition">not test_cancel()</field>
+        <field name="condition">check_conditions_confirm2wait()</field>
     </record>
 
 </data>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 29fe7881db2..e28cb007e65 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -281,6 +281,10 @@ class procurement_order(osv.osv):
         """
         return False
 
+    def check_conditions_confirm2wait(self, cr, uid, ids):
+        """ condition on the transition to go from 'confirm' activity to 'confirm_wait' activity """
+        return not self.test_cancel(cr, uid, ids)
+
     def test_cancel(self, cr, uid, ids):
         """ Tests whether state of move is cancelled or not.
         @return: True or False
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index ba960c55ee7..76b54370ef2 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -25,7 +25,6 @@
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">action_confirm()</field>
-            <field name="slip_mode">OR</field>
         </record>
         <record id="act_confirm_wait" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
@@ -98,7 +97,7 @@
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_confirm_wait"/>
             <field name="signal">button_check</field>
-            <field name="condition">not test_cancel()</field>
+            <field name="condition">check_conditions_confirm2wait()</field>
         </record>
         <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
             <field name="act_from" ref="act_confirm_wait"/>