[MERGE] MErged from main branch

[odoo/odoo.git] / addons / mrp_procurement / mrp_procurement_workflow.xml

diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 46c4a10..599d11c 100644 (file)
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-               <!-- Procurement -->
-
         <record id="wkf_procurement" model="workflow">
             <field name="name">mrp.procurement.basic</field>
             <field name="osv">mrp.procurement</field>
@@ -48,16 +46,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 +153,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 +170,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"/>