diff --git a/addons/hr_payroll_account/hr_payroll_account_workflow.xml b/addons/hr_payroll_account/hr_payroll_account_workflow.xml
deleted file mode 100644
index ff627f2619d..00000000000
--- a/addons/hr_payroll_account/hr_payroll_account_workflow.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="act_account_check" model="workflow.activity">
-            <field name="wkf_id" ref="hr_payroll.wkf"/>
-            <field name="name">account_check</field>
-            <field name="action">account_check_sheet()</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="hr_payroll.t4" model="workflow.transition">
-            <field name="act_from" ref="hr_payroll.act_confirm"/>
-            <field name="act_to" ref="act_account_check"/>
-            <field name="condition">True</field>
-            <field name="signal">account_verify_sheet</field>
-        </record>
-        
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
-            <field name="act_to" ref="hr_payroll.act_done"/>
-            <field name="condition">True</field>
-            <field name="signal">final_verify_sheet</field>
-        </record>
-        
-        <record id="hr_payroll.t9" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
-            <field name="act_to" ref="hr_payroll.act_cancel"/>
-            <field name="signal">cancel_sheet</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 365c1195c44..a1fe71fd750 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -136,14 +136,16 @@
             <field name="signal">subflow.cancel</field>
         </record>
         
-        <record id="procurement.trans_produce_make_done" model="workflow.transition">
+        <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="procurement.act_make_done"/>
             <field name="signal">subflow.done</field>
         </record>
         
-        <record id="procurement.trans_confirm_confirm_wait" model="workflow.transition">
-            <field name="condition">not test_cancel() and not get_phantom_bom_id()</field>
+        <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>
         </record>
         
     </data>
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 99f74a19517..688f43e8bdb 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -2,8 +2,10 @@
 <openerp>
 <data>
 
-    <record model="workflow.transition" id="procurement.trans_confirm_confirm_wait">
-        <field name="signal" eval="False"/>
+    <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="condition">not test_cancel()</field>
     </record>
 
 </data>
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 53b6608fa6f..4215f9b0ac5 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -31,6 +31,12 @@
             <field name="name">confirm_wait</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'exception'})</field>
+            <field name="join_mode">AND</field>
+        </record>
+        <record id="act_confirm_temp" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_temp</field>
+            <field name="slip_mode">OR</field>
         </record>
         <record id="act_confirm_mts" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
@@ -40,6 +46,16 @@
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">confirm_mto</field>
         </record>
+        <record id="act_buy" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">buy</field>
+            <field name="split_mode">OR</field>
+        </record>
+        <record id="act_buy_end" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">buy_end</field>
+            <field name="join_mode">AND</field>
+        </record>
         <record id="act_make_to_stock" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">make_to_stock</field>
@@ -106,10 +122,14 @@
         </record>
         <record id="trans_confirm_confirm_wait" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_confirm_wait"/>
+            <field name="act_to" ref="act_confirm_temp"/>
             <field name="signal">button_check</field>
             <field name="condition">not test_cancel()</field>
         </record>
+        <record id="trans_confirm_temp_confirm_wait" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_temp"/>
+            <field name="act_to" ref="act_confirm_wait"/>
+        </record>
         <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
             <field name="act_from" ref="act_confirm_wait"/>
             <field name="act_to" ref="act_confirm_mto"/>
@@ -142,9 +162,17 @@
         </record>
         <record id="trans_confirm_mto_purchase" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_make_done"/>
+            <field name="act_to" ref="act_buy"/>
             <field name="condition">check_buy()</field>
         </record>
+        <record id="trans_buy_buy_end" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="act_buy_end"/>
+        </record>
+        <record id="trans_buy_done" model="workflow.transition">
+            <field name="act_from" ref="act_buy_end"/>
+            <field name="act_to" ref="act_make_done"/>
+        </record>
         <record id="trans_confirm_mto_confirm" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
             <field name="act_to" ref="act_confirm"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 212ce304e07..2ddc96b800e 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -201,28 +201,27 @@
         </record>
     
     <!-- Procurement -->
-        <record id="act_buy" model="workflow.activity">
+        <record id="act_buy_sub" model="workflow.activity">
             <field name="wkf_id" ref="procurement.wkf_procurement"/>
-            <field name="name">buy</field>
+            <field name="name">buy_subflows</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
             <field name="action">action_po_assign()</field>
         </record>
         
-        <record id="procurement.trans_confirm_mto_purchase" model="workflow.transition">
-            <field name="act_from" ref="procurement.act_confirm_mto"/>
-            <field name="act_to" ref="act_buy"/>
-            <field name="condition">check_buy()</field>
+        <record id="trans_buy_buy_sub" model="workflow.transition">
+            <field name="act_from" ref="procurement.act_buy"/>
+            <field name="act_to" ref="act_buy_sub"/>
         </record>
         
         <record id="trans_buy_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="procurement.act_make_done"/>
+            <field name="act_from" ref="act_buy_sub"/>
+            <field name="act_to" ref="procurement.act_buy_end"/>
             <field name="signal">subflow.delivery_done</field>
         </record>
         
         <record id="trans_buy_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
+            <field name="act_from" ref="act_buy_sub"/>
             <field name="act_to" ref="procurement.act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>