diff options
| author | Denis Vermylen (dve) <dve@odoo.com> | 2016-07-04 10:16:13 +0200 |
|---|---|---|
| committer | Denis Vermylen (dve) <dve@odoo.com> | 2016-07-04 17:19:23 +0200 |
| commit | 0ea478652a7633dbf000f0ddd33ea744fde15ad7 (patch) | |
| tree | 96f7dd426ba336ac199e2fba4085246bd8441098 /addons/hr_holidays | |
| parent | 91a2881ca115489891c3ad8dd98860aa459c6895 (diff) | |
[FIX] hr: employee data and demo data
addendum to commit da6b9d1be443999028f021ff81b4cf128a4eaaa2
- better employee name and image for default employee in data (xml-id: hr.employee_root)
- in demo data hr.employee_fp renamed to hr.employee_root to not have 2 employees linked to the root user
- renamed all occurences of employee_fp to employee_root
Diffstat (limited to 'addons/hr_holidays')
| -rw-r--r-- | addons/hr_holidays/data/hr_holidays_demo.xml | 10 | ||||
| -rw-r--r-- | addons/hr_holidays/tests/test_holidays_flow.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/addons/hr_holidays/data/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml index 6a1d201e274..555150a5d12 100644 --- a/addons/hr_holidays/data/hr_holidays_demo.xml +++ b/addons/hr_holidays/data/hr_holidays_demo.xml @@ -7,7 +7,7 @@ <field name="holiday_status_id" ref="holiday_status_cl"/> <field name="type">add</field> <field name="number_of_days_temp">20</field> - <field name="employee_id" ref="hr.employee_fp"/> + <field name="employee_id" ref="hr.employee_root"/> </record> <record id="hr_holidays_employee1_int_tour" model="hr.holidays"> @@ -17,7 +17,7 @@ <field eval="time.strftime('%Y-%m-28')" name="date_to"/> <field name="type">add</field> <field name="number_of_days_temp">7</field> - <field name="employee_id" ref="hr.employee_fp"/> + <field name="employee_id" ref="hr.employee_root"/> </record> <record id="hr_holidays_employee1_vc" model="hr.holidays"> @@ -28,7 +28,7 @@ <field name="type">add</field> <field name="state">draft</field> <field name="number_of_days_temp">7</field> - <field name="employee_id" ref="hr.employee_fp"/> + <field name="employee_id" ref="hr.employee_root"/> </record> <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/> @@ -41,7 +41,7 @@ <field eval="time.strftime('%Y-%m-03')" name="date_to"/> <field name="type">remove</field> <field name="number_of_days_temp">3</field> - <field name="employee_id" ref="hr.employee_fp"/> + <field name="employee_id" ref="hr.employee_root"/> </record> <record id="hr_holidays_employee1_sl" model="hr.holidays"> @@ -52,7 +52,7 @@ <field name="type">remove</field> <field name="state">draft</field> <field name="number_of_days_temp">3</field> - <field name="employee_id" ref="hr.employee_fp"/> + <field name="employee_id" ref="hr.employee_root"/> </record> <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/> diff --git a/addons/hr_holidays/tests/test_holidays_flow.py b/addons/hr_holidays/tests/test_holidays_flow.py index b89631d3db6..9d1bc610932 100644 --- a/addons/hr_holidays/tests/test_holidays_flow.py +++ b/addons/hr_holidays/tests/test_holidays_flow.py @@ -184,8 +184,8 @@ class TestHolidaysFlow(TestHrHolidaysBase): with self.assertRaises(ValidationError): hol2_manager_group.signal_workflow('confirm') - employee_id = self.ref('hr.employee_fp') - # cl can be of maximum 20 days for employee_fp + employee_id = self.ref('hr.employee_root') + # cl can be of maximum 20 days for employee_root hol3_status = self.env.ref('hr_holidays.holiday_status_cl').with_context(employee_id=employee_id) # I assign the dates in the holiday request for 1 day hol3 = Holidays.create({ @@ -215,7 +215,7 @@ class TestHolidaysFlow(TestHrHolidaysBase): # Print the HR Holidays(Summary Department) Report through the wizard ctx = { 'model': 'hr.department', - 'active_ids': [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')] + 'active_ids': [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')] } data_dict = { 'date_from': datetime.today().strftime('%Y-%m-01'), @@ -227,11 +227,11 @@ class TestHolidaysFlow(TestHrHolidaysBase): # Print the HR Holidays(Summary Employee) Report through the wizard ctx = { 'model': 'hr.employee', - 'active_ids': [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')] + 'active_ids': [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')] } data_dict = { 'date_from': datetime.today().strftime('%Y-%m-01'), - 'emp': [(6, 0, [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')])], + 'emp': [(6, 0, [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')])], 'holiday_type': 'Approved' } test_reports.try_report_action(self.env.cr, self.env.uid, 'action_hr_holidays_summary_employee', wiz_data=data_dict, context=ctx, our_module='hr_holidays') |
