merge

bzr revid: sbh@tinyerp.com-20100125051410-akoeusvwbjbx0fm6

1 files changed, 49 insertions, 47 deletions

diff --git a/addons/document_change/document_change_workflow.xml b/addons/document_change/document_change_workflow.xml
index 0c74d95d254..7a3793248c7 100644
--- a/addons/document_change/document_change_workflow.xml
+++ b/addons/document_change/document_change_workflow.xml
@@ -8,72 +8,74 @@
         </record>
         
 		<!-- States -->
-        <record id="act_request" model="workflow.activity">
+        <record id="act_document_production" model="workflow.activity">
             <field name="wkf_id" ref="wkf_attachment"/>
             <field name="flow_start">True</field>
-            <field name="name">state_set_request</field>
+            <field name="name">in_production</field>
+            <field name="action">do_production()</field>
+            <field name="kind">function</field>            
         </record>
-        <record id="act_propose" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_attachment"/>
-            <field name="name">change_proposed</field>
-            <field name="action">state_set_proposed()</field>
+        <record id="act_document_request" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>            
+            <field name="name">change_request</field>
+            <field name="action">do_change_request()</field>
             <field name="kind">function</field>
         </record>
-        <record id="act_update" model="workflow.activity">
+        <record id="act_document_propose" model="workflow.activity">
             <field name="wkf_id" ref="wkf_attachment"/>
-            <field name="name">to_update</field>
-            <field name="action">state_set_update()</field>
+            <field name="name">change_propose</field>
+            <field name="action">do_change_propose()</field>
             <field name="kind">function</field>
         </record>
-        <record id="act_production" model="workflow.activity">
+        <record id="act_document_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf_attachment"/>
-            <field name="name">in_production</field>
-            <field name="action">state_set_in_production()</field>
+            <field name="name">to_update</field>
+            <field name="action">do_to_update()</field>
             <field name="kind">function</field>
-        </record>
-        <record id="act_cancel" model="workflow.activity">
+        </record>        
+        <record id="act_document_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_attachment"/>
-            <field name="name">cancel</field>
-            <field name="action">state_set_cancel()</field>
-            <field name="kind">function</field>
-        </record>
+            <field name="name">cancel</field>            
+            <field name="action">do_cancel()</field>
+            <field name="kind">function</field>            
+        </record>        
         
 		<!-- Transitions -->
-        <record id="request_to_propose" model="workflow.transition">
-            <field name="act_from" ref="act_request"/>
-            <field name="act_to" ref="act_propose"/>
-            <field name="signal">button_change_proposed</field>
+        <record id="tran_document_production_to_request" model="workflow.transition">
+            <field name="act_from" ref="act_document_production"/>
+            <field name="act_to" ref="act_document_request"/>
+            <field name="signal">button_request</field>
+        </record>
+        <record id="tran_document_request_to_propose" model="workflow.transition">
+            <field name="act_from" ref="act_document_request"/>
+            <field name="act_to" ref="act_document_propose"/>
+            <field name="signal">button_propose</field>
             <field name="condition">(target_document_id != False)</field>
         </record>
-        <record id="request_to_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_request"/>
-            <field name="act_to" ref="act_cancel"/>
+        <record id="tran_document_request_to_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_document_request"/>
+            <field name="act_to" ref="act_document_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record id="propose_to_update" model="workflow.transition">
-            <field name="act_from" ref="act_propose"/>
-            <field name="act_to" ref="act_update"/>
-            <field name="signal">button_change_validated</field>
+        <record id="tran_document_propose_to_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_document_propose"/>
+            <field name="act_to" ref="act_document_confirm"/>
+            <field name="signal">button_confirm</field>
         </record>
-        <record id="propose_to_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_propose"/>
-            <field name="act_to" ref="act_cancel"/>
+        <record id="tran_document_propose_to_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_document_propose"/>
+            <field name="act_to" ref="act_document_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record id="cancel_to_request" model="workflow.transition">
-            <field name="act_from" ref="act_cancel"/>
-            <field name="act_to" ref="act_request"/>
-            <field name="signal">button_change_request</field>
-        </record>
-        <record id="update_to_production" model="workflow.transition">
-            <field name="act_from" ref="act_update"/>
-            <field name="act_to" ref="act_production"/>
-            <field name="signal">button_update</field>
-        </record>
-        <record id="production_to_request" model="workflow.transition">
-            <field name="act_from" ref="act_production"/>
-            <field name="act_to" ref="act_request"/>
-            <field name="signal">button_change_request</field>
+        <record id="tran_document_cancel_to_request" model="workflow.transition">
+            <field name="act_from" ref="act_document_cancel"/>
+            <field name="act_to" ref="act_document_request"/>
+            <field name="signal">button_request</field>
         </record>
+        <record id="tran_document_confirm_to_production" model="workflow.transition">
+            <field name="act_from" ref="act_document_confirm"/>
+            <field name="act_to" ref="act_document_production"/>  
+            <field name="signal">button_validate</field>         
+        </record>        
     </data>
-</openerp>
\ No newline at end of file
+</openerp>