From b4dbebadf6f335195a6c0eef335c4d9b810d66a8 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Wed, 5 Dec 2012 16:08:44 +0100
Subject: [FIX] Purchase Double Validation workflow

bzr revid: api@openerp.com-20121205150844-wooa4k7gzx4tr72s
---
 .../purchase_double_validation_workflow.xml          | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'addons/purchase_double_validation/purchase_double_validation_workflow.xml')

diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 61503564246..1db3d3d61e7 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -1,18 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="act_double_app" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">doubleApproval</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">function</field>
+            <field name="action">wkf_approve_order()</field>
+        </record>
 
-         <record id="purchase.trans_confirmed_router" model="workflow.transition">
+         <record id="trans_confirmed_double_app" model="workflow.transition">
+            <field name="act_from" ref="purchase.act_confirmed"/>
+            <field name="act_to" ref="act_double_app"/>
             <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
 
-        <record id="trans_waiting_confirmed" model="workflow.transition">
+        <record id="trans_confirmed_double_app_lt" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="purchase.act_router"/>
+            <field name="act_to" ref="act_double_app"/>
             <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
+        <record id="trans_double_app_conf" model="workflow.transition">
+            <field name="act_from" ref="act_double_app"/>
+            <field name="act_to" ref="purchase.act_router"/>
+        </record>
+
     </data>
 </openerp>
-- 
cgit v1.2.3


From e7477373e9bf1a621d6b93dc2e0f46908ad40d17 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Thu, 6 Dec 2012 10:24:12 +0100
Subject: [FIX] purchase double validation unistall fixed

bzr revid: api@openerp.com-20121206092412-1eki0578ggcjoioz
---
 .../purchase_double_validation_workflow.xml        | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'addons/purchase_double_validation/purchase_double_validation_workflow.xml')

diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 1db3d3d61e7..673063ff049 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -1,30 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="act_double_app" model="workflow.activity">
+
+        <record id="act_double_wait" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">WaitForApproval</field>
+            <field name="kind">dummy</field>
+        </record>
+
+        <record id="act_double_check" model="workflow.activity">
             <field name="wkf_id" ref="purchase.purchase_order"/>
-            <field name="name">doubleApproval</field>
+            <field name="name">CheckForApproval</field>
             <field name="split_mode">OR</field>
-            <field name="kind">function</field>
-            <field name="action">wkf_approve_order()</field>
+            <field name="kind">dummy</field>
         </record>
 
-         <record id="trans_confirmed_double_app" model="workflow.transition">
+         <record id="trans_confirmed_double_check" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="act_double_app"/>
+            <field name="act_to" ref="act_double_check"/>
+        </record>
+        
+        <record id="trans_confirmed_double_gt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
 
-        <record id="trans_confirmed_double_app_lt" model="workflow.transition">
-            <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="act_double_app"/>
+        <record id="trans_confirmed_double_lt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
         <record id="trans_double_app_conf" model="workflow.transition">
-            <field name="act_from" ref="act_double_app"/>
+            <field name="act_from" ref="act_double_wait"/>
             <field name="act_to" ref="purchase.act_router"/>
         </record>
 
-- 
cgit v1.2.3