[MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch

[odoo/odoo.git] / addons / hr_holidays / hr_holidays_workflow.xml

diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index de2bd9f..7013d62 100644 (file)
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,12 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Roles definition -->
-
-    <record model="res.roles" id="HR_holidays">
-        <field name="name">Leaves Manager</field>
-    </record>
-
     <!-- Workflow definition -->
 
     <record model="workflow" id="wkf_holidays">
@@ -48,18 +42,8 @@
     <record model="workflow.activity" id="act_refuse">
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
-        <field name="kind">function</field>
-        <field name="action">holidays_refuse()</field>
-
-    </record>
-
-    <record model="workflow.activity" id="act_cancel">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">cancel</field>
         <field name="flow_stop">True</field>
         <field name="kind">stopall</field>
-        <field name="action">holidays_cancel()</field>
-        <field name="join_mode">XOR</field>
     </record>
 
     <!--
@@ -76,50 +60,38 @@
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
-        <field name="condition">(holiday_status_id.double_validation == False)</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t3">
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
+        <field name="condition">holidays_refuse('first_approval')</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t4">
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_cancel" />
-        <field name="signal">cancel</field>
-    </record>
-
-    <record model="workflow.transition" id="t5">
-        <field name="act_from" ref="act_refuse" />
-        <field name="act_to" ref="act_cancel" />
-        <field name="signal">cancel</field>
-    </record>
-
-    <record model="workflow.transition" id="t7">
-        <field name="act_from" ref="act_cancel" />
-        <field name="act_to" ref="act_draft" />
-        <field name="signal">set_to_draft</field>
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t8">
-        <field name="act_from" ref="act_validate1" />
-        <field name="act_to" ref="act_validate" />
+        <field name="act_from" ref="act_validate" />
+        <field name="act_to" ref="act_validate1" />
         <field name="signal">second_validate</field>
-    </record>
-
-    <record model="workflow.transition" id="t10">
-        <field name="act_from" ref="act_validate1" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
+        <field name="group_id" ref="base.group_hr_manager" />
     </record>
 
     <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_confirm" />
+        <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_validate1" />
-        <field name="condition">(holiday_status_id.double_validation == True)</field>
-        <field name="signal">validate</field>
+        <field name="condition">not holiday_status_id.double_validation</field>
+        <field name="signal" eval="False"/>
     </record>
 
 </data>