From 8e66fe7f89937d2e346303304c9541248dfebd00 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Thu, 22 Dec 2011 23:10:31 +0100
Subject: [PATCH] [IMP] employee view

bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
---
 addons/hr/hr.py                         | 1 +
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_holidays/hr_holidays.py       | 3 ++-
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e903f03d974..76f9295a829 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -174,6 +174,7 @@ class hr_employee(osv.osv):
         'passport_id':fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
+        'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 00429955807..b1c01f8bd0a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -140,7 +140,7 @@
                                 <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
-                                <h4><a type="edit"><field name="name"/> (<field name="user_id"/>)</a></h4>
+                                <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
                                     <li t-if="record.department_id.raw_value"><field name="department_id"/></li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d97552a3dbc..34f30e9a5d6 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -417,7 +417,8 @@ class hr_employee(osv.osv):
         'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection",
             selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
-        'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status')
+        'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
+        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
     }
 
 hr_employee()
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 0a484ebf4b4..b2b5e308be2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -494,7 +494,7 @@
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
                     <field name="current_leave_id"/>
-                    <field name="current_leave_state"/>
+                    <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
                 </field>
             </field>
         </record>