summaryrefslogtreecommitdiff
path: root/addons/hr
diff options
context:
space:
mode:
authorDenis Vermylen (dve) <dve@odoo.com>2016-07-04 10:16:13 +0200
committerDenis Vermylen (dve) <dve@odoo.com>2016-07-04 17:19:23 +0200
commit0ea478652a7633dbf000f0ddd33ea744fde15ad7 (patch)
tree96f7dd426ba336ac199e2fba4085246bd8441098 /addons/hr
parent91a2881ca115489891c3ad8dd98860aa459c6895 (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')
-rw-r--r--addons/hr/data/hr_data.xml6
-rw-r--r--addons/hr/data/hr_demo.xml12
2 files changed, 10 insertions, 8 deletions
diff --git a/addons/hr/data/hr_data.xml b/addons/hr/data/hr_data.xml
index cab45c06385..bb2cf4b5a08 100644
--- a/addons/hr/data/hr_data.xml
+++ b/addons/hr/data/hr_data.xml
@@ -21,12 +21,12 @@ Leave Management (keep track of employee leaves), Expense Management (manage emp
<field name="name">Sales</field>
</record>
- <record id="employee_fp" model="hr.employee">
- <field name="name">Pieter Parker</field>
+ <record id="employee_root" model="hr.employee">
+ <field name="name" eval="obj(ref('base.partner_root')).name" model="res.partner"/>
<field name="user_id" ref="base.user_root"/>
<field name="address_id" ref="base.partner_root"/>
<field name="address_home_id" ref="base.partner_root"/>
- <field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
+ <field name="image" eval="obj(ref('base.partner_root')).image" model="res.partner"/>
</record>
</data>
diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml
index 46edbcbb889..f1853e5b6c1 100644
--- a/addons/hr/data/hr_demo.xml
+++ b/addons/hr/data/hr_demo.xml
@@ -135,7 +135,8 @@ If you have development competencies, we can propose you specific traineeships</
<!--Employees-->
- <record id="employee_fp" model="hr.employee">
+ <record id="employee_root" model="hr.employee">
+ <field name="name">Pieter Parker</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
@@ -143,6 +144,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
<field name="job_id" ref="hr.job_ceo"/>
<field name="department_id" ref="dep_management"/>
+ <field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
</record>
<record id="employee_al" model="hr.employee">
@@ -233,7 +235,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_fpi" model="hr.employee">
<field name="name">Martin Lawrence</field>
<field name="department_id" ref="dep_ps"/>
- <field name="parent_id" ref="employee_fp"/>
+ <field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_consultant"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -245,7 +247,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_jth" model="hr.employee">
<field name="name">Jimmy Kosikin</field>
<field name="department_id" ref="dep_ps"/>
- <field name="parent_id" ref="employee_fp"/>
+ <field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_consultant"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -257,7 +259,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_ngh" model="hr.employee">
<field name="name">Famke Jenssens</field>
<field name="department_id" ref="dep_sales"/>
- <field name="parent_id" ref="employee_fp"/>
+ <field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_marketing"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_2')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -269,7 +271,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_vad" model="hr.employee">
<field name="name">Ashley Presley</field>
<field name="department_id" ref="dep_administration"/>
- <field name="parent_id" ref="employee_fp"/>
+ <field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_hrm"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>