From def6d45e4425eceedfc2d789dad20bbc87746ba9 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 9 Aug 2010 18:26:45 +0200
Subject: [PATCH] [IMP] hr: improved demo data and replaced parent_id field on
 hr.employee with a fields.related

bzr revid: qdp-launchpad@tinyerp.com-20100809162645-dxq60m4ldlc8g75v
---
 addons/hr/hr.py                  |  6 ++---
 addons/hr/hr_demo.xml            | 45 ++++++++++++++++++++++++--------
 addons/hr/hr_department_demo.xml |  8 ++++++
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a10c7cc29b1..995f1c05621 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -125,9 +125,7 @@ class hr_employee(osv.osv):
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-#        'parent_id': fields.related('department_id', 'manager_id',  string='Manager', type='many2one'),
-#        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True),
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
@@ -179,4 +177,4 @@ class hr_department(osv.osv):
 hr_department()
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 28be1d987f4..ad637250ed7 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Employee Category -->
 
+        <record id="category_experience" model="hr.employee.category">
+            <field name="name">Experience</field>
+        </record>
+
+        <record id="category_ranking" model="hr.employee.category">
+            <field name="name">Ranking</field>
+        </record>
+
         <record id="category_ceo" model="hr.employee.category">
             <field name="name">CEO</field>
+            <field name="parent_id" ref="category_ranking"/>
         </record>
 
         <record id="category_cto" model="hr.employee.category">
@@ -14,7 +23,7 @@
         </record>
 
         <record id="category_managers" model="hr.employee.category">
-            <field name="name">Managers(Tech. Heads)</field>
+            <field name="name">Managers (Tech. Heads)</field>
             <field name="parent_id" ref="category_cto"/>
         </record>
 
@@ -23,19 +32,24 @@
             <field name="parent_id" ref="category_managers"/>
         </record>
 
-        <record id="category_sr_exec" model="hr.employee.category">
-            <field name="name">Sr. Executives(Team Leads)</field>
+        <record id="category_employee" model="hr.employee.category">
+            <field name="name">Employees</field>
             <field name="parent_id" ref="category_project_managers"/>
         </record>
 
+        <record id="category_sr_exec" model="hr.employee.category">
+            <field name="name">Sr. Executives (5 years)</field>
+            <field name="parent_id" ref="category_experience"/>
+        </record>
+
         <record id="category_jr_exec" model="hr.employee.category">
-            <field name="name">Jr. Executives(Developers)</field>
-            <field name="parent_id" ref="category_sr_exec"/>
+            <field name="name">Jr. Executives (6 months)</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
         <record id="category_trainee" model="hr.employee.category">
-            <field name="name">Trainee(Intership)</field>
-            <field name="parent_id" ref="category_jr_exec"/>
+            <field name="name">Trainee</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
 
@@ -44,12 +58,21 @@
         <record id="employee1" model="hr.employee">
             <field name="name">Fabien Pinckaers</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <!--<field name="regime">45</field>-->
             <field name="user_id" ref="base.user_root"/>
-            <field name="category_id" ref="hr.category_ceo"/>
-            <!--<field name="holiday_max">25</field>-->
+            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
         </record>
 
+        <record id="employee2" model="hr.employee">
+            <field name="name">Quentin Paolino</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="name">Antoine Philippe</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 2fb859a804e..082aa010e76 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -104,6 +104,14 @@
             <field name="department_id" ref="dep_it"/>
         </record>
 
+        <!-- assign department on employee -->
+        <record id="employee2" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
 
     </data>
 </openerp>