diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 144db242f86..bdb604d1c08 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -14,9 +14,9 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record id="prod_act_picking" model="workflow.activity">
+        <record id="prod_act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
-            <field name="name">picking</field>
+            <field name="name">confirmed</field>
             <field name="action">action_confirm()</field>
         </record>
         <record id="prod_act_ready" model="workflow.activity">
@@ -25,12 +25,6 @@
             <field name="kind">function</field>
             <field name="action">action_ready()</field>
         </record>
-        <record id="prod_act_picking_exception" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_prod"/>
-            <field name="name">picking_exception</field>
-            <field name="kind">function</field>
-            <field name="action">action_picking_except()</field>
-        </record>
         <record id="prod_act_in_production" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="name">in_production</field>
@@ -52,24 +46,17 @@
             <field name="action">action_cancel()</field>
         </record>
 
-        <record id="prod_trans_draft_ready" model="workflow.transition">
-            <field name="act_from" ref="prod_act_draft"/>
-            <field name="act_to" ref="prod_act_ready"/>
-            <field name="signal">button_confirm</field>
-            <field name="condition">not test_if_product()</field>
-        </record>
         <record id="prod_trans_draft_picking" model="workflow.transition">
             <field name="act_from" ref="prod_act_draft"/>
-            <field name="act_to" ref="prod_act_picking"/>
+            <field name="act_to" ref="prod_act_confirmed"/>
             <field name="signal">button_confirm</field>
-            <field name="condition">test_if_product()</field>
         </record>
         <record id="prod_trans_picking_ready" model="workflow.transition">
-            <field name="act_from" ref="prod_act_picking"/>
+            <field name="act_from" ref="prod_act_confirmed"/>
             <field name="act_to" ref="prod_act_ready"/>
             <field name="trigger_model">stock.move</field>
             <field name="trigger_expr_id">consume_lines_get()</field>
-            <field name="condition">test_ready2()</field>
+            <field name="condition">test_ready()</field>
         </record>
         <record id="prod_trans_ready_in_production" model="workflow.transition">
             <field name="act_from" ref="prod_act_ready"/>
@@ -82,21 +69,6 @@
             <field name="signal">button_produce_done</field>
             <field name="condition">test_production_done()</field>
         </record>
-        <!--<record id="prod_trans_picking_picking_exception" model="workflow.transition">
-            <field name="act_from" ref="prod_act_picking"/>
-            <field name="act_to" ref="prod_act_picking_exception"/>
-            <field name="condition">False</field>
-        </record>-->
-        <record id="prod_trans_picking_exception_cancel" model="workflow.transition">
-            <field name="act_from" ref="prod_act_picking_exception"/>
-            <field name="act_to" ref="prod_act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="prod_trans_picking_exception_picking" model="workflow.transition">
-            <field name="act_from" ref="prod_act_picking_exception"/>
-            <field name="act_to" ref="prod_act_picking"/>
-            <field name="signal">button_recreate</field>
-        </record>
         <record id="prod_trans_ready_cancel" model="workflow.transition">
             <field name="act_from" ref="prod_act_ready"/>
             <field name="act_to" ref="prod_act_cancel"/>
@@ -113,33 +85,5 @@
             <field name="signal">button_cancel</field>
         </record>
 
-        <!-- Procurement -->
-        <!-- TODO csn : check if fix is needed since no more workflow in procurement -->
-        <!-- <record id="act_produce" model="workflow.activity">
-            <field name="wkf_id" ref="procurement.wkf_procurement"/>
-            <field name="name">produce</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
-            <field name="action">action_produce_assign_product()</field>
-        </record>
-
-        <record id="trans_confirm_mto_need_production" model="workflow.transition">
-            <field name="act_from" ref="procurement.act_confirm_mto"/>
-            <field name="act_to" ref="act_produce"/>
-            <field name="condition">check_produce() and is_product() and check_bom_exists()</field>
-        </record>
-
-        <record id="trans_produce_finished_prod" 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="trans_produce_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="procurement.act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record> -->
-
     </data>
 </openerp>