diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml
index a42f208acc5..70b1f8b60e3 100644
--- a/addons/hr/data/hr_demo.xml
+++ b/addons/hr/data/hr_demo.xml
@@ -2,31 +2,46 @@
 <odoo>
     <data noupdate="1">
 
-        <record id="dep_sales" model="hr.department">
-            <field name="name">Sales</field>
-        </record>
-
         <!--Department-->
         <record id="dep_management" model="hr.department">
             <field name="name">Management</field>
+            <field name="color" eval="5"/>
+        </record>
+
+        <record id="dep_administration" model="hr.department">
+            <field name="parent_id" ref="dep_management"/>
+            <field name="manager_id" ref="employee_admin"/>
+            <field name="color" eval="8"/>
+        </record>
+
+        <record id="dep_sales" model="hr.department">
+            <field name="name">Sales</field>
+            <field name="parent_id" ref="dep_management"/>
+            <field name="color" eval="9"/>
         </record>
 
         <record id="dep_rd" model="hr.department">
             <field name="name">Research &amp; Development</field>
+            <field name="parent_id" ref="dep_management"/>
+            <field name="color" eval="10"/>
         </record>
 
         <record id="dep_rd_be" model="hr.department">
             <field name="name">R&amp;D USA</field>
             <field name="parent_id" ref="dep_rd"/>
+            <field name="color" eval="10"/>
         </record>
 
         <record id="dep_rd_ltp" model="hr.department">
             <field name="name">Long Term Projects</field>
             <field name="parent_id" ref="dep_rd_be"/>
+            <field name="color" eval="10"/>
         </record>
 
         <record id="dep_ps" model="hr.department">
             <field name="name">Professional Services</field>
+            <field name="parent_id" ref="dep_management"/>
+            <field name="color" eval="3"/>
         </record>
 
         <!-- Contract Types -->
@@ -185,113 +200,30 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="work_location_id" ref="work_location_1"/>
             <field name="work_phone">(237)-125-2389</field>
             <field name="work_email">admin@yourcompany.example.com</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_3')])]"/>
             <field name="job_id" ref="hr.job_ceo"/>
             <field name="job_title">Chief Executive Officer</field>
             <field name="department_id" ref="dep_management"/>
             <field name="create_date">2010-01-01 00:00:00</field>
         </record>
 
-        <record id="work_contact_al" model="res.partner">
-            <field name="name">Ronnie Hart</field>
-            <field name="email">ronnie.hart87@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_al-image.jpg"/>
+        <record id="work_contact_ngh" model="res.partner">
+            <field name="name">Jeffrey Kelly</field>
+            <field name="email">jeffrey.kelly72@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
         </record>
 
-        <record id="employee_al" model="hr.employee">
-            <field name="name">Ronnie Hart</field>
-            <field name="department_id" ref="dep_rd"/>
-            <field name="job_id" ref="hr.job_cto"/>
-            <field name="job_title">Chief Technical Officer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
+        <record id="employee_ngh" model="hr.employee">
+            <field name="name">Jeffrey Kelly</field>
+            <field name="department_id" ref="dep_sales"/>
+            <field name="parent_id" ref="employee_admin"/>
+            <field name="job_id" ref="hr.job_marketing"/>
+            <field name="job_title">Marketing and Community Manager</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_2')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(376)-310-7863</field>
-            <field name="work_contact_id" ref="hr.work_contact_al"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_al-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_mit" model="res.partner">
-            <field name="name">Anita Oliver</field>
-            <field name="mobile">(538)-672-3185</field>
-            <field name="email">anita.oliver32@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
-        </record>
-
-        <record id="employee_mit" model="hr.employee">
-            <field name="name">Anita Oliver</field>
-            <field name="department_id" ref="dep_rd_be"/>
-            <field name="parent_id" ref="employee_al"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-            <field name="private_country_id" ref="base.us"/>
-            <field name="private_phone">(538)-672-3185</field>
-            <field name="private_email">anita.oliver00@example.com</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(538)-497-4804</field>
-            <field name="work_contact_id" ref="hr.work_contact_mit"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_niv" model="res.partner">
-            <field name="name">Sharlene Rhodes</field>
-            <field name="email">sharlene.rhodes49@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
-        </record>
-
-        <record id="employee_niv" model="hr.employee">
-            <field name="name">Sharlene Rhodes</field>
-            <field name="department_id" ref="dep_management"/>
-            <field name="parent_id" ref="employee_al"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(450)-719-4182</field>
-            <field name="work_contact_id" ref="hr.work_contact_niv"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_stw" model="res.partner">
-            <field name="name">Randall Lewis</field>
-            <field name="email">randall.lewis74@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
-        </record>
-
-        <record id="employee_stw" model="hr.employee">
-            <field name="name">Randall Lewis</field>
-            <field name="department_id" ref="dep_rd"/>
-            <field name="parent_id" ref="employee_al"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(332)-775-6660</field>
-            <field name="work_contact_id" ref="hr.work_contact_stw"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_chs" model="res.partner">
-            <field name="name">Jennie Fletcher</field>
-            <field name="email">jennie.fletcher76@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
-        </record>
-
-        <record id="employee_chs" model="hr.employee">
-            <field name="name">Jennie Fletcher</field>
-            <field name="department_id" ref="dep_rd"/>
-            <field name="parent_id" ref="employee_al"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(157)-363-8229</field>
-            <field name="work_contact_id" ref="hr.work_contact_chs"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
+            <field name="work_phone">(916)-264-7362</field>
+            <field name="work_contact_id" ref="hr.work_contact_ngh"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
         </record>
 
@@ -313,92 +245,30 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_email">demo@yourcompany.example.com</field>
             <field name="job_id" ref="hr.job_developer"/>
             <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
             <field name="work_phone">+3281813700</field>
             <field name="work_contact_id" ref="hr.work_contact_qdp"/>
             <field name="create_date">2010-01-01 00:00:00</field>
         </record>
 
-        <record id="work_contact_fme" model="res.partner">
-            <field name="name">Keith Byrd</field>
-            <field name="email">keith.byrd52@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
+        <record id="work_contact_al" model="res.partner">
+            <field name="name">Ronnie Hart</field>
+            <field name="email">ronnie.hart87@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_al-image.jpg"/>
         </record>
 
-        <record id="employee_fme" model="hr.employee">
-            <field name="name">Keith Byrd</field>
+        <record id="employee_al" model="hr.employee">
+            <field name="name">Ronnie Hart</field>
             <field name="department_id" ref="dep_rd"/>
-            <field name="parent_id" ref="employee_al"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
+            <field name="parent_id" ref="employee_qdp"/>
+            <field name="job_id" ref="hr.job_cto"/>
+            <field name="job_title">Team Leader</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_3')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(449)-505-5146</field>
-            <field name="work_contact_id" ref="hr.work_contact_fme"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_fpi" model="res.partner">
-            <field name="name">Audrey Peterson</field>
-            <field name="email">audrey.peterson25@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
-        </record>
-
-        <record id="employee_fpi" model="hr.employee">
-            <field name="name">Audrey Peterson</field>
-            <field name="department_id" ref="dep_ps"/>
-            <field name="parent_id" ref="employee_admin"/>
-            <field name="job_id" ref="hr.job_consultant"/>
-            <field name="job_title">Consultant</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
-            <field name="private_country_id" ref="base.us"/>
-            <field name="private_email">Audrey.peterson2020@example.com</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(203)-276-7903</field>
-            <field name="work_contact_id" ref="hr.work_contact_fpi"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_jth" model="res.partner">
-            <field name="name">Toni Jimenez</field>
-            <field name="email">toni.jimenez23@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jth-image.jpg"/>
-        </record>
-
-        <record id="employee_jth" model="hr.employee">
-            <field name="name">Toni Jimenez</field>
-            <field name="department_id" ref="dep_ps"/>
-            <field name="parent_id" ref="employee_admin"/>
-            <field name="job_id" ref="hr.job_consultant"/>
-            <field name="job_title">Consultant</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(663)-707-8451</field>
-            <field name="work_contact_id" ref="hr.work_contact_jth"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jth-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_ngh" model="res.partner">
-            <field name="name">Jeffrey Kelly</field>
-            <field name="email">jeffrey.kelly72@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
-        </record>
-
-        <record id="employee_ngh" model="hr.employee">
-            <field name="name">Jeffrey Kelly</field>
-            <field name="department_id" ref="dep_sales"/>
-            <field name="parent_id" ref="employee_admin"/>
-            <field name="job_id" ref="hr.job_marketing"/>
-            <field name="job_title">Marketing and Community Manager</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_2')])]"/>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(916)-264-7362</field>
-            <field name="work_contact_id" ref="hr.work_contact_ngh"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
+            <field name="work_phone">(376)-310-7863</field>
+            <field name="work_contact_id" ref="hr.work_contact_al"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_al-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
         </record>
 
@@ -414,7 +284,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="parent_id" ref="employee_admin"/>
             <field name="job_id" ref="hr.job_hrm"/>
             <field name="job_title">Human Resources Manager</field>
-            <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
             <field name="work_phone">(360)-694-7266</field>
             <field name="work_contact_id" ref="hr.work_contact_vad"/>
@@ -422,135 +292,6 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="create_date">2010-01-01 00:00:00</field>
         </record>
 
-        <record id="work_contact_han" model="res.partner">
-            <field name="name">Walter Horton</field>
-            <field name="email">walter.horton80@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_han-image.jpg"/>
-        </record>
-
-        <record id="employee_han" model="hr.employee">
-            <field name="name">Walter Horton</field>
-            <field name="department_id" ref="dep_rd"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(350)-912-1201</field>
-            <field name="work_contact_id" ref="hr.work_contact_han"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_han-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_jve" model="res.partner">
-            <field name="name">Paul Williams</field>
-            <field name="email">paul.williams59@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
-        </record>
-
-        <record id="employee_jve" model="hr.employee">
-            <field name="name">Paul Williams</field>
-            <field name="department_id" ref="dep_rd_ltp"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(114)-262-1607</field>
-            <field name="work_contact_id" ref="hr.work_contact_jve"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-        <record id="work_contact_jep" model="res.partner">
-            <field name="name">Doris Cole</field>
-            <field name="email">doris.cole31@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
-        </record>
-
-        <record id="employee_jep" model="hr.employee">
-            <field name="name">Doris Cole</field>
-            <field name="department_id" ref="dep_ps"/>
-            <field name="job_id" ref="hr.job_consultant"/>
-            <field name="job_title">Consultant</field>
-            <field name="private_country_id" ref="base.us"/>
-            <field name="private_email">Doris.cole.LoveSong@example.com</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(883)-331-5378</field>
-            <field name="work_contact_id" ref="hr.work_contact_jep"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_jod" model="res.partner">
-            <field name="name">Rachel Perry</field>
-            <field name="email">jod@odoo.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
-        </record>
-
-        <record id="employee_jod" model="hr.employee">
-            <field name="name">Rachel Perry</field>
-            <field name="department_id" ref="dep_sales"/>
-            <field name="job_id" ref="hr.job_marketing"/>
-            <field name="job_title">Marketing and Community Manager</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(206)-267-3735</field>
-            <field name="work_contact_id" ref="hr.work_contact_jod"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_jog" model="res.partner">
-            <field name="name">Beth Evans</field>
-            <field name="email">beth.evans77@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
-        </record>
-
-        <record id="employee_jog" model="hr.employee">
-            <field name="name">Beth Evans</field>
-            <field name="department_id" ref="dep_rd"/>
-            <field name="job_id" ref="hr.job_developer"/>
-            <field name="job_title">Experienced Developer</field>
-            <field name="private_country_id" ref="base.us"/>
-            <field name="private_email">beth.evans@example.com</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(754)-532-3841</field>
-            <field name="work_contact_id" ref="hr.work_contact_jog"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_jgo" model="res.partner">
-            <field name="name">Ernest Reed</field>
-            <field name="email">ernest.reed47@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
-        </record>
-
-        <record id="employee_jgo" model="hr.employee">
-            <field name="name">Ernest Reed</field>
-            <field name="department_id" ref="dep_ps"/>
-            <field name="job_id" ref="hr.job_consultant"/>
-            <field name="job_title">Consultant</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(944)-518-8232</field>
-            <field name="work_contact_id" ref="hr.work_contact_jgo"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
-        <record id="work_contact_lur" model="res.partner">
-            <field name="name">Eli Lambert</field>
-            <field name="email">eli.lambert22@example.com</field>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_lur-image.jpg"/>
-        </record>
-
-        <record id="employee_lur" model="hr.employee">
-            <field name="name">Eli Lambert</field>
-            <field name="department_id" ref="dep_sales"/>
-            <field name="job_id" ref="hr.job_marketing"/>
-            <field name="job_title">Marketing and Community Manager</field>
-            <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(644)-169-1352</field>
-            <field name="work_contact_id" ref="hr.work_contact_lur"/>
-            <field name="image_1920" type="base64" file="hr/static/img/employee_lur-image.jpg"/>
-            <field name="create_date">2010-01-01 00:00:00</field>
-        </record>
-
         <record id="work_contact_hne" model="res.partner">
             <field name="name">Abigail Peterson</field>
             <field name="email">abigail.peterson39@example.com</field>
@@ -560,6 +301,7 @@ If you have development competencies, we can propose you specific traineeships</
         <record id="employee_hne" model="hr.employee">
             <field name="name">Abigail Peterson</field>
             <field name="department_id" ref="dep_ps"/>
+            <field name="parent_id" ref="employee_ngh"/>
             <field name="job_id" ref="hr.job_consultant"/>
             <field name="job_title">Consultant</field>
             <field name="private_country_id" ref="base.us"/>
@@ -571,5 +313,313 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="create_date">2010-01-01 00:00:00</field>
             <field name="marital">married</field>
         </record>
+
+        <record id="work_contact_fpi" model="res.partner">
+            <field name="name">Audrey Peterson</field>
+            <field name="email">audrey.peterson25@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
+        </record>
+
+        <record id="employee_fpi" model="hr.employee">
+            <field name="name">Audrey Peterson</field>
+            <field name="department_id" ref="dep_ps"/>
+            <field name="parent_id" ref="employee_ngh"/>
+            <field name="job_id" ref="hr.job_consultant"/>
+            <field name="job_title">Consultant</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_5')])]"/>
+            <field name="private_country_id" ref="base.us"/>
+            <field name="private_email">Audrey.peterson2020@example.com</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(203)-276-7903</field>
+            <field name="work_contact_id" ref="hr.work_contact_fpi"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_lur" model="res.partner">
+            <field name="name">Eli Lambert</field>
+            <field name="email">eli.lambert22@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_lur-image.jpg"/>
+        </record>
+
+        <record id="employee_lur" model="hr.employee">
+            <field name="name">Eli Lambert</field>
+            <field name="department_id" ref="dep_sales"/>
+            <field name="parent_id" ref="employee_ngh"/>
+            <field name="job_id" ref="hr.job_marketing"/>
+            <field name="job_title">Marketing and Community Manager</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(644)-169-1352</field>
+            <field name="work_contact_id" ref="hr.work_contact_lur"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_lur-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jod" model="res.partner">
+            <field name="name">Rachel Perry</field>
+            <field name="email">jod@odoo.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
+        </record>
+
+        <record id="employee_jod" model="hr.employee">
+            <field name="name">Rachel Perry</field>
+            <field name="department_id" ref="dep_sales"/>
+            <field name="parent_id" ref="employee_ngh"/>
+            <field name="job_id" ref="hr.job_marketing"/>
+            <field name="job_title">Marketing and Community Manager</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(206)-267-3735</field>
+            <field name="work_contact_id" ref="hr.work_contact_jod"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_fme" model="res.partner">
+            <field name="name">Keith Byrd</field>
+            <field name="email">keith.byrd52@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
+        </record>
+
+        <record id="employee_fme" model="hr.employee">
+            <field name="name">Keith Byrd</field>
+            <field name="department_id" ref="dep_rd"/>
+            <field name="parent_id" ref="employee_al"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(449)-505-5146</field>
+            <field name="work_contact_id" ref="hr.work_contact_fme"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jep" model="res.partner">
+            <field name="name">Doris Cole</field>
+            <field name="email">doris.cole31@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
+        </record>
+
+        <record id="employee_jep" model="hr.employee">
+            <field name="name">Doris Cole</field>
+            <field name="department_id" ref="dep_ps"/>
+            <field name="parent_id" ref="employee_vad"/>
+            <field name="job_id" ref="hr.job_consultant"/>
+            <field name="job_title">Consultant</field>
+            <field name="private_country_id" ref="base.us"/>
+            <field name="private_email">Doris.cole.LoveSong@example.com</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(883)-331-5378</field>
+            <field name="work_contact_id" ref="hr.work_contact_jep"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jgo" model="res.partner">
+            <field name="name">Ernest Reed</field>
+            <field name="email">ernest.reed47@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
+        </record>
+
+        <record id="employee_jgo" model="hr.employee">
+            <field name="name">Ernest Reed</field>
+            <field name="department_id" ref="dep_ps"/>
+            <field name="parent_id" ref="employee_vad"/>
+            <field name="job_id" ref="hr.job_consultant"/>
+            <field name="job_title">Consultant</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(944)-518-8232</field>
+            <field name="work_contact_id" ref="hr.work_contact_jgo"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jth" model="res.partner">
+            <field name="name">Toni Jimenez</field>
+            <field name="email">toni.jimenez23@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jth-image.jpg"/>
+        </record>
+
+        <record id="employee_jth" model="hr.employee">
+            <field name="name">Toni Jimenez</field>
+            <field name="department_id" ref="dep_ps"/>
+            <field name="parent_id" ref="employee_vad"/>
+            <field name="job_id" ref="hr.job_consultant"/>
+            <field name="job_title">Consultant</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_5')])]"/>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(663)-707-8451</field>
+            <field name="work_contact_id" ref="hr.work_contact_jth"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jth-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_mit" model="res.partner">
+            <field name="name">Anita Oliver</field>
+            <field name="mobile">(538)-672-3185</field>
+            <field name="email">anita.oliver32@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
+        </record>
+
+        <record id="employee_mit" model="hr.employee">
+            <field name="name">Anita Oliver</field>
+            <field name="department_id" ref="dep_rd_be"/>
+            <field name="parent_id" ref="employee_fme"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
+            <field name="private_country_id" ref="base.us"/>
+            <field name="private_phone">(538)-672-3185</field>
+            <field name="private_email">anita.oliver00@example.com</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(538)-497-4804</field>
+            <field name="work_contact_id" ref="hr.work_contact_mit"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_niv" model="res.partner">
+            <field name="name">Sharlene Rhodes</field>
+            <field name="email">sharlene.rhodes49@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
+        </record>
+
+        <record id="employee_niv" model="hr.employee">
+            <field name="name">Sharlene Rhodes</field>
+            <field name="department_id" ref="dep_management"/>
+            <field name="parent_id" ref="employee_qdp"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(450)-719-4182</field>
+            <field name="work_contact_id" ref="hr.work_contact_niv"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_stw" model="res.partner">
+            <field name="name">Randall Lewis</field>
+            <field name="email">randall.lewis74@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
+        </record>
+
+        <record id="employee_stw" model="hr.employee">
+            <field name="name">Randall Lewis</field>
+            <field name="department_id" ref="dep_rd"/>
+            <field name="parent_id" ref="employee_qdp"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(332)-775-6660</field>
+            <field name="work_contact_id" ref="hr.work_contact_stw"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_chs" model="res.partner">
+            <field name="name">Jennie Fletcher</field>
+            <field name="email">jennie.fletcher76@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
+        </record>
+
+        <record id="employee_chs" model="hr.employee">
+            <field name="name">Jennie Fletcher</field>
+            <field name="department_id" ref="dep_rd"/>
+            <field name="parent_id" ref="employee_fme"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(157)-363-8229</field>
+            <field name="work_contact_id" ref="hr.work_contact_chs"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jve" model="res.partner">
+            <field name="name">Paul Williams</field>
+            <field name="email">paul.williams59@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
+        </record>
+
+        <record id="employee_jve" model="hr.employee">
+            <field name="name">Paul Williams</field>
+            <field name="department_id" ref="dep_rd_ltp"/>
+            <field name="parent_id" ref="employee_qdp"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(114)-262-1607</field>
+            <field name="work_contact_id" ref="hr.work_contact_jve"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_han" model="res.partner">
+            <field name="name">Walter Horton</field>
+            <field name="email">walter.horton80@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_han-image.jpg"/>
+        </record>
+
+        <record id="employee_han" model="hr.employee">
+            <field name="name">Walter Horton</field>
+            <field name="department_id" ref="dep_rd"/>
+            <field name="parent_id" ref="employee_jve"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(350)-912-1201</field>
+            <field name="work_contact_id" ref="hr.work_contact_han"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_han-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <record id="work_contact_jog" model="res.partner">
+            <field name="name">Beth Evans</field>
+            <field name="email">beth.evans77@example.com</field>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
+        </record>
+
+        <record id="employee_jog" model="hr.employee">
+            <field name="name">Beth Evans</field>
+            <field name="department_id" ref="dep_rd"/>
+            <field name="parent_id" ref="employee_jve"/>
+            <field name="job_id" ref="hr.job_developer"/>
+            <field name="job_title">Experienced Developer</field>
+            <field name="private_country_id" ref="base.us"/>
+            <field name="private_email">beth.evans@example.com</field>
+            <field name="work_location_id" ref="work_location_1"/>
+            <field name="work_phone">(754)-532-3841</field>
+            <field name="work_contact_id" ref="hr.work_contact_jog"/>
+            <field name="image_1920" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
+            <field name="create_date">2010-01-01 00:00:00</field>
+        </record>
+
+        <!-- Assign manager for each department -->
+        <record id="dep_management" model="hr.department">
+            <field name="manager_id" ref="employee_admin"/>
+        </record>
+
+        <record id="dep_sales" model="hr.department">
+            <field name="manager_id" ref="employee_ngh"/>
+        </record>
+
+        <record id="dep_rd" model="hr.department">
+            <field name="manager_id" ref="employee_qdp"/>
+        </record>
+
+        <record id="dep_rd_be" model="hr.department">
+            <field name="manager_id" ref="employee_al"/>
+        </record>
+
+        <record id="dep_rd_ltp" model="hr.department">
+            <field name="manager_id" ref="employee_jve"/>
+        </record>
+
+        <record id="dep_ps" model="hr.department">
+            <field name="manager_id" ref="employee_vad"/>
+        </record>
     </data>
 </odoo>
diff --git a/addons/hr_hourly_cost/data/hr_hourly_cost_demo.xml b/addons/hr_hourly_cost/data/hr_hourly_cost_demo.xml
index b5acd41536d..c95923035ce 100644
--- a/addons/hr_hourly_cost/data/hr_hourly_cost_demo.xml
+++ b/addons/hr_hourly_cost/data/hr_hourly_cost_demo.xml
@@ -67,7 +67,6 @@
 
     <record id="hr.employee_qdp" model="hr.employee">
         <field name="hourly_cost">75</field>
-        <field name="parent_id" ref="hr.employee_admin"/>
     </record>
 
     <record id="hr.employee_stw" model="hr.employee">