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

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

diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 819ed67..c5045d7 100644 (file)
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -1,22 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
-  <data>
+  <data noupdate="1">
 
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
-      <field name="name">Casual Leave</field>
+      <field name="name" eval="'Legal Leaves '+time.strftime('%Y')"/>
       <field name="color_name">black</field>
     </record>
 
-    <!-- Legal Holidays -->
-    <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Legal Holidays</field>
-      <field name="color_name">blue</field>
-    </record>
-
     <!-- Sick leave -->
     <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Sick Leave</field>
+      <field name="name">Sick Leaves</field>
       <field name="limit">True</field>
       <field name="color_name">red</field>
     </record>
@@ -25,10 +19,16 @@
     <!-- Compensatory Days -->
     <record model="hr.holidays.status" id="holiday_status_comp">
       <field name="name">Compensatory Days</field>
-      <field name="limit">False</field>
-      <field name="color_name">brown</field>
+      <field name="limit">True</field>
+      <field name="color_name">lavender</field>
     </record>
 
+    <!--Unpaid Leave -->
+    <record model="hr.holidays.status" id="holiday_status_unpaid">
+      <field name="name">Unpaid</field>
+      <field name="limit">True</field>
+      <field name="color_name">brown</field>
+    </record>
 
   </data>
 </openerp>