Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

7.0 - Add public holidays to the leave types #78

Merged
merged 1 commit into from
Apr 6, 2015
Merged

7.0 - Add public holidays to the leave types #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions hr_activity_on_timesheet/data/account_analytic_account_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 7 additions & 0 deletions hr_worked_days_activity/data/hr_activity_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
11 changes: 9 additions & 2 deletions hr_worked_days_activity/data/hr_holiday_status_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions hr_worked_days_activity/i18n/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions hr_worked_days_activity/i18n/hr_worked_days_activity.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down