diff options
| author | RomainLibert <rli@odoo.com> | 2017-12-28 11:30:57 +0100 |
|---|---|---|
| committer | RomainLibert <rli@odoo.com> | 2018-01-15 10:38:31 +0100 |
| commit | f61687a4cdb0e22df19568c9b4ac3dbb579ca062 (patch) | |
| tree | 996357a067e14cb7e56e068b84195498adf07508 /addons/hr_holidays/data/hr_holidays_data.xml | |
| parent | 1103dda8ae660d70c6fa0ac70e0f62f3b2bdf1dd (diff) | |
[IMP] hr_holidays : split hr.holidays into hr.leave and hr.leave.allocation
Purpose
=======
Have a clear distinction between leave and allocation requests instead of
using the same model to mix 2 different concepts.
Splitting the model will allow different business code to be run on each
model as allocations and leaves are not exactly the same thing; this
will add some code but simplify future improvements
Specification
=============
1/ Completely separate the models
Model hr.holidays has been split into leave.request and
leave.allocation.
2/ Make reporting working again by using an SQL view aggregating data
from leaves and allocations
A new report has been added in order to aggregate
datas from both allocations and requests. The views have been modified
accordingly.
Diffstat (limited to 'addons/hr_holidays/data/hr_holidays_data.xml')
| -rw-r--r-- | addons/hr_holidays/data/hr_holidays_data.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/hr_holidays/data/hr_holidays_data.xml b/addons/hr_holidays/data/hr_holidays_data.xml index 285afe48442..c6c155a385f 100644 --- a/addons/hr_holidays/data/hr_holidays_data.xml +++ b/addons/hr_holidays/data/hr_holidays_data.xml @@ -3,28 +3,28 @@ <data noupdate="1"> <!-- Casual leave --> - <record id="holiday_status_cl" model="hr.holidays.status"> + <record id="holiday_status_cl" model="hr.leave.type"> <field name="name" eval="'Legal Leaves '+time.strftime('%Y')"/> <field name="limit" eval="False"/> <field name="color_name">black</field> </record> <!-- Sick leave --> - <record id="holiday_status_sl" model="hr.holidays.status"> + <record id="holiday_status_sl" model="hr.leave.type"> <field name="name">Sick Leaves</field> <field name="limit" eval="True"/> <field name="color_name">red</field> </record> <!-- Compensatory Days --> - <record id="holiday_status_comp" model="hr.holidays.status"> + <record id="holiday_status_comp" model="hr.leave.type"> <field name="name">Compensatory Days</field> <field name="limit" eval="False"/> <field name="color_name">lavender</field> </record> <!--Unpaid Leave --> - <record id="holiday_status_unpaid" model="hr.holidays.status"> + <record id="holiday_status_unpaid" model="hr.leave.type"> <field name="name">Unpaid</field> <field name="limit" eval="True"/> <field name="color_name">brown</field> @@ -33,26 +33,26 @@ <!-- Holidays-related subtypes for messaging / Chatter --> <record id="mt_holidays_confirmed" model="mail.message.subtype"> <field name="name">Confirmed</field> - <field name="res_model">hr.holidays</field> + <field name="res_model">hr.leave</field> <field name="description">Request created and waiting confirmation</field> </record> <record id="mt_holidays_first_validated" model="mail.message.subtype"> <field name="name">Waiting Second Validation</field> - <field name="res_model">hr.holidays</field> + <field name="res_model">hr.leave</field> <field name="default" eval="False"/> <field name="description">Request validated, waiting second validation</field> </record> <record id="mt_holidays_approved" model="mail.message.subtype"> <field name="name">Approved</field> - <field name="res_model">hr.holidays</field> + <field name="res_model">hr.leave</field> <field name="description">Request approved</field> </record> <record id="mt_holidays_refused" model="mail.message.subtype"> <field name="name">Refused</field> - <field name="res_model">hr.holidays</field> + <field name="res_model">hr.leave</field> <field name="default" eval="False"/> <field name="description">Request refused</field> </record> |
