diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index a1fe71fd750..6bde1143993 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -143,9 +143,9 @@
         </record>
         
         <record id="trans_conf_conf_wait" model="workflow.transition">
-            <field name="act_from" ref="procurement.act_confirm_temp"/>
-            <field name="act_to" ref="procurement.act_confirm_wait"/>
-            <field name="condition">not get_phantom_bom_id()</field>
+            <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>
         
     </data>
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 688f43e8bdb..32e09175da2 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -4,7 +4,7 @@
 
     <record model="workflow.transition" id="trans_confirm_to_confirm_wait">
         <field name="act_from" ref="procurement.act_confirm"/>
-        <field name="act_to" ref="procurement.act_confirm_wait"/>
+        <field name="act_to" ref="procurement.act_confirm_temp"/>
         <field name="condition">not test_cancel()</field>
     </record>
 
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 4215f9b0ac5..1e2f58a0236 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -25,6 +25,7 @@
             <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"/>