From 54fda6e08a086029a9e0f28bf71fefcce2275e3a Mon Sep 17 00:00:00 2001
From: dufresnedavid <david.dufresne@savoirfairelinux.com>
Date: Mon, 2 Mar 2015 14:04:07 -0500
Subject: [PATCH] Add public holidays to the leave types

---
 .../data/account_analytic_account_data.xml            |  7 -------
 hr_worked_days_activity/data/hr_activity_data.xml     |  7 +++++++
 .../data/hr_holiday_status_data.xml                   | 11 +++++++++--
 hr_worked_days_activity/i18n/fr.po                    |  5 +++++
 .../i18n/hr_worked_days_activity.pot                  |  5 +++++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/hr_activity_on_timesheet/data/account_analytic_account_data.xml b/hr_activity_on_timesheet/data/account_analytic_account_data.xml
index 7b3d4199960..0ac1beda500 100644
--- a/hr_activity_on_timesheet/data/account_analytic_account_data.xml
+++ b/hr_activity_on_timesheet/data/account_analytic_account_data.xml
@@ -6,13 +6,6 @@
             <field name="name">Leaves</field>
             <field name="type">normal</field>
             <field name="use_timesheets">1</field>
-            <field name="authorized_activity_ids" eval="[(6, 0, [
-                ref('hr_worked_days_activity.activity_holiday_status_cl'),
-                ref('hr_worked_days_activity.activity_holiday_status_sl'),
-                ref('hr_worked_days_activity.activity_holiday_status_comp'),
-                ref('hr_worked_days_activity.activity_holiday_status_unpaid'),
-                ref('hr_worked_days_activity.activity_holiday_status_vacation'),
-            ])]"/>
         </record>
     </data>
 </openerp>
diff --git a/hr_worked_days_activity/data/hr_activity_data.xml b/hr_worked_days_activity/data/hr_activity_data.xml
index 38393173a68..868510dabf6 100644
--- a/hr_worked_days_activity/data/hr_activity_data.xml
+++ b/hr_worked_days_activity/data/hr_activity_data.xml
@@ -30,5 +30,12 @@
             <field name="code">VAC</field>
             <field name="leave_id" ref="holiday_status_vacation"/>
         </record>
+
+        <record id="activity_holiday_status_public" model="hr.activity">
+            <field name="type">leave</field>
+            <field name="code">PUBLIC</field>
+            <field name="leave_id" ref="holiday_status_vacation"/>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/hr_worked_days_activity/data/hr_holiday_status_data.xml b/hr_worked_days_activity/data/hr_holiday_status_data.xml
index 180d549c88c..e8e6067818a 100644
--- a/hr_worked_days_activity/data/hr_holiday_status_data.xml
+++ b/hr_worked_days_activity/data/hr_holiday_status_data.xml
@@ -5,11 +5,11 @@
             Vacation leave
 
             Module hr_holidays implements
-             - legal_leaves (public holidays)
+             - legal_leaves
              - compensatory days
              - sick leaves
         
-            But it does not implement vacations.
+            But it does not implement vacations nor public holidays
             It is pretty important in most countries though.
         -->
         <record id="holiday_status_vacation" model="hr.holidays.status">
@@ -19,6 +19,13 @@
             <field name="activity_ids" eval="[(6, 0, [])]"/>
         </record>
 
+        <record id="holiday_status_public" model="hr.holidays.status">
+            <field name="name">Public Holidays</field>
+            <field name="color_name">black</field>
+            <field name="paid_leave">1</field>
+            <field name="activity_ids" eval="[(6, 0, [])]"/>
+        </record>
+
         <record id="hr_holidays.holiday_status_comp" model="hr.holidays.status">
             <field name="paid_leave">1</field>
         </record>
diff --git a/hr_worked_days_activity/i18n/fr.po b/hr_worked_days_activity/i18n/fr.po
index 6e3021da330..94726821816 100644
--- a/hr_worked_days_activity/i18n/fr.po
+++ b/hr_worked_days_activity/i18n/fr.po
@@ -59,6 +59,11 @@ msgstr "Type de congé"
 msgid "Vacation"
 msgstr "Vacances"
 
+#. module: hr_worked_days_activity
+#: model:hr.holidays.status,name:hr_worked_days_activity.holiday_status_public
+msgid "Public Holidays"
+msgstr "Congés Fériés"
+
 #. module: hr_worked_days_activity
 #: model:ir.model,name:hr_worked_days_activity.model_hr_job
 msgid "Job Description"
diff --git a/hr_worked_days_activity/i18n/hr_worked_days_activity.pot b/hr_worked_days_activity/i18n/hr_worked_days_activity.pot
index cefa79a979f..dfdeba9aabc 100644
--- a/hr_worked_days_activity/i18n/hr_worked_days_activity.pot
+++ b/hr_worked_days_activity/i18n/hr_worked_days_activity.pot
@@ -58,6 +58,11 @@ msgstr ""
 msgid "Vacation"
 msgstr ""
 
+#. module: hr_worked_days_activity
+#: model:hr.holidays.status,name:hr_worked_days_activity.holiday_status_public
+msgid "Public Holidays"
+msgstr ""
+
 #. module: hr_worked_days_activity
 #: model:ir.model,name:hr_worked_days_activity.model_hr_job
 msgid "Job Description"