[FIX] procurement, mrp_jit: removed useless workflow activities to manage the 'just...

bzr revid: qdp-launchpad@openerp.com-20121217104613-x3wpr2e4vg4itczl

diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 32e0917..aae3f44 100644 (file)
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -2,9 +2,11 @@
 <openerp>
 <data>
 
-    <record model="workflow.transition" id="trans_confirm_to_confirm_wait">
+    <record model="workflow.transition" id="trans_direct_confirm_to_wait">
+        <!-- Duplicates the transition between the act_confirm and act_confirm_wait activites
+             but, this time, without the signal -->
         <field name="act_from" ref="procurement.act_confirm"/>
-        <field name="act_to" ref="procurement.act_confirm_temp"/>
+        <field name="act_to" ref="procurement.act_confirm_wait"/>
         <field name="condition">not test_cancel()</field>
     </record>
 

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index d5708e2..ba960c5 100644 (file)
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -32,13 +32,6 @@
             <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>
-        <!-- to check... what's the use? mrp_jit, i guess -->
-        <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"/>
@@ -103,15 +96,10 @@
         </record>
         <record id="trans_confirm_confirm_wait" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_confirm_temp"/>
+            <field name="act_to" ref="act_confirm_wait"/>
             <field name="signal">button_check</field>
             <field name="condition">not test_cancel()</field>
         </record>
-        <!-- to check... what's the use? mrp_jit, i guess -->
-        <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"/>