From 4e17fcb8e8dc3073f116c21f3fba3aec813c1ced Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 3 May 2010 16:15:06 +0530
Subject: [PATCH] [IMP] mrp_procurement: Changed workflow for mrp. Moved into
 mrp file.

bzr revid: uco@tinyerp.com-20100503104506-a9mlyw9husj4tn9e
---
 addons/mrp/mrp_workflow.xml                   | 34 ++++++++++-
 .../mrp_procurement_workflow.xml              | 58 +++++++++----------
 2 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 6f7ef00b3d2..4349c3e8cad 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -122,9 +122,41 @@
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
+        
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="mrp_procurement.act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
+        
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+        </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
+            <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 5ab36dd4cb8..46c4a10fffc 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -48,16 +48,16 @@
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_procurement"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_procurement"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
+<!--        <record id="act_produce_check" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_check</field>-->
+<!--        </record>-->
+<!--        <record id="act_produce_service" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_service</field>-->
+<!--            <field name="kind">function</field>-->
+<!--            <field name="action">action_produce_assign_service()</field>-->
+<!--        </record>-->
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -155,16 +155,16 @@
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
+<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_confirm_mto"/>-->
+<!--            <field name="act_to" ref="act_produce_check"/>-->
+<!--            <field name="condition">check_produce()</field>-->
+<!--        </record>-->
+<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_check"/>-->
+<!--            <field name="act_to" ref="act_produce_service"/>-->
+<!--            <field name="condition">not check_product()</field>-->
+<!--        </record>-->
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
@@ -172,15 +172,15 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_make_done"/>
-        </record>
+<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_cancel"/>-->
+<!--            <field name="signal">subflow.cancel</field>-->
+<!--        </record>-->
+<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_make_done"/>-->
+<!--        </record>-->
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>