[IMP] Small code cleaning.

[odoo/odoo.git] / addons / hr_payroll / hr_payroll_workflow.xml

diff --git a/addons/hr_payroll/hr_payroll_workflow.xml b/addons/hr_payroll/hr_payroll_workflow.xml
index f494975..8ec3229 100644 (file)
--- a/addons/hr_payroll/hr_payroll_workflow.xml
+++ b/addons/hr_payroll/hr_payroll_workflow.xml
@@ -6,42 +6,30 @@
             <field name="osv">hr.payslip</field>
             <field name="on_create">True</field>
         </record>
-        
-        <record id="act_new" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">new</field>
-        </record>
-        
+
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">draft</field>
-            <field name="action">compute_sheet()</field>
-            <field name="split_mode">OR</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_hr_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">hr_check</field>
-            <field name="action">hr_check_sheet()</field>
+            <field name="flow_start">True</field>
             <field name="kind">function</field>
+            <field name="action">write({'state': 'draft'})</field>
+            <field name="split_mode">OR</field>
         </record>
-        
-        <record id="act_confirm" model="workflow.activity">
+
+        <record id="act_verify" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm</field>
-            <field name="action">verify_sheet()</field>
+            <field name="name">verify</field>
+            <field name="action">hr_verify_sheet()</field>
             <field name="kind">function</field>
         </record>
-        
+
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">cancel</field>
             <field name="action">cancel_sheet()</field>
             <field name="kind">function</field>
         </record>
-        
+
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">done</field>
@@ -49,59 +37,36 @@
             <field name="kind">function</field>
             <field name="flow_stop">True</field>
         </record>
-        
+
         <record id="t1" model="workflow.transition">
-            <field name="act_from" ref="act_new"/>
-            <field name="act_to" ref="act_draft"/>
-            <field name="signal">compute_sheet</field>
-        </record>
-        
-        <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_hr_check"/>
-            <field name="signal">verify_sheet</field>
+            <field name="act_to" ref="act_verify"/>
+            <field name="signal">hr_verify_sheet</field>
         </record>
-        
-        <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_hr_check"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">verify_twice_sheet</field>
-        </record>
-        
-         <record id="t6" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="signal">process_sheet</field>
-        </record>
-        
-        <record id="t7" model="workflow.transition">
+
+        <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel_sheet</field>
         </record>
         
-        <record id="t8" model="workflow.transition">
-            <field name="act_from" ref="act_hr_check"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_sheet</field>
+         <record id="t3" model="workflow.transition">
+            <field name="act_from" ref="act_cancel"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">draft</field>
         </record>
         
-        <record id="t10" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
+         <record id="t4" model="workflow.transition">
+            <field name="act_from" ref="act_verify"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel_sheet</field>
         </record>
         
-        <record id="t11" model="workflow.transition">
-            <field name="act_from" ref="act_done"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_sheet</field>
+        <record id="t5" model="workflow.transition">
+            <field name="act_from" ref="act_verify"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">check_done()</field>
         </record>
         
-        <record id="t12" model="workflow.transition">
-            <field name="act_from" ref="act_cancel"/>
-            <field name="act_to" ref="act_draft"/>
-            <field name="signal">set_to_draft</field>
-        </record>
     </data>
 </openerp>