From c5f36facbf6364a7c975b7240b847e5ec06b4d06 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 6 Sep 2010 15:41:32 +0530
Subject: [PATCH] [MOD]hr : usability improvement

bzr revid: dbr@tinyerp.com-20100906101132-di6cf9pb1cbsko5v
---
 addons/hr/hr.py       | 25 +++++++++++++++++++------
 addons/hr/hr_view.xml | 12 +++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 95355d7c303..b192c6417fe 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -107,7 +107,7 @@ class hr_employee(osv.osv):
     _inherits = {'resource.resource': "resource_id"}
     _columns = {
         'country_id': fields.many2one('res.country', 'Nationality'),
-        'birthday': fields.date("Birthday"),
+        'birthday': fields.date("Date of Birth"),
         'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
         'sinid': fields.char('SIN No', size=32, help="Social Insurance Number"),
         'otherid': fields.char('Other ID', size=32),
@@ -119,10 +119,10 @@ class hr_employee(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
-        'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True),
+        'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True),
+        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True,help='It is linked to Department',readonly=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', required=True),
@@ -130,15 +130,28 @@ class hr_employee(osv.osv):
         'job_id': fields.many2one('hr.job', 'Job'),
         'photo': fields.binary('Photo')
     }
-
+    def onchange_company(self, cr, uid, ids, company, context=None):    
+        return {'value': {'address_id': company}}   
+        
+    def onchange_department(self, cr, uid, ids, department_id, context=None):  
+        return {'value': {'parent_id':department_id}}         
+        
+    def onchange_user(self, cr, uid, ids, user_id, context=None):  
+        user_obj = self.pool.get('res.users')
+        t = user_obj.browse(cr,uid,user_id)
+        print t['user_email']
+        print "t.email",t.user_email
+        return {'value': {'work_email':t.user_email}}             
+        
     def _get_photo(self, cr, uid, context=None):
         return open(os.path.join(
             tools.config['addons_path'], 'hr/image', 'photo.png'),
                     'rb') .read().encode('base64')
-
+               
     _defaults = {
         'active': 1,
         'photo': _get_photo,
+        'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -174,4 +187,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_view.xml b/addons/hr/hr_view.xml
index 250f47b2055..492510178b3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,8 +22,8 @@
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
                         <field colspan="6" name="name" />
-                        <field name="user_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="user_id" on_change="onchange_user(user_id)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/>
                         <field name="active" groups="base.group_extended"/>
                         <newline/>
                         <field name="parent_id" />
@@ -59,8 +59,8 @@
                             </group>
                             <group col="2" colspan="2">
                             <separator string="Position" colspan="2"/>
-                            <field name="job_id" widget="selection" domain="[('state','!=','old')]"/>
-                            <field name="department_id" widget="selection"/>
+                            <field name="job_id" domain="[('state','!=','old')]"/>
+                            <field name="department_id" widget="selection" on_change="onchange_department(department_id)"/>
                             </group>
                         </page>
                         <page string="Categories">
@@ -83,7 +83,8 @@
                 <tree string="Employees">
                     <field name="name"/>
                     <field name="work_phone"/>
-                    <field name="work_email"/>
+                    <field name="company_id"/>                                        
+                    <field name="work_email" invisible="1"/>
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="parent_id"/>
@@ -113,6 +114,7 @@
                     <separator orientation="vertical" />
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Company" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
              </field>