From 580129522f4c0e53dbdaee38c51537413dfa3020 Mon Sep 17 00:00:00 2001
From: "Denis Vermylen (dve)" <dve@odoo.com>
Date: Fri, 1 Jul 2016 14:40:01 +0200
Subject: [PATCH] [FIX] hr: data remove duplicate root user employee

Replace employee linked to base.user_root (administator) in data
by employee_fp (Pieter Parker) from demo data in order to avoid having 2
employees linked to the root user.
---
 addons/hr/data/hr_data.xml |  7 +++----
 addons/hr/data/hr_demo.xml | 11 ++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/hr/data/hr_data.xml b/addons/hr/data/hr_data.xml
index 22ecf490e8b..cab45c06385 100644
--- a/addons/hr/data/hr_data.xml
+++ b/addons/hr/data/hr_data.xml
@@ -21,14 +21,13 @@ Leave Management (keep track of employee leaves), Expense Management (manage emp
           <field name="name">Sales</field>
         </record>
 
-        <record id="employee" model="hr.employee">
-            <field name="name" eval="obj(ref('base.partner_root')).name" model="res.partner"/>
+        <record id="employee_fp" model="hr.employee">
+            <field name="name">Pieter Parker</field>
             <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-image.png"/>
+            <field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
         </record>
 
-
     </data>
 </odoo>
diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml
index 4557af3354b..46edbcbb889 100644
--- a/addons/hr/data/hr_demo.xml
+++ b/addons/hr/data/hr_demo.xml
@@ -136,16 +136,13 @@ If you have development competencies, we can propose you specific traineeships</
     <!--Employees-->
 
       <record id="employee_fp" model="hr.employee">
-          <field name="name">Pieter Parker</field>
-          <field name="user_id" ref="base.user_root"/>
-          <field name="department_id" ref="dep_management"/>
-          <field name="job_id" ref="hr.job_ceo"/>
-          <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
+          <field name="calendar_id" ref="resource.timesheet_group1"/>
           <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">pieter@openerp.com</field>
-          <field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
-          <field name="calendar_id" ref="resource.timesheet_group1"/>
+          <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"/>
       </record>
 
       <record id="employee_al" model="hr.employee">