From 591b929f5d41bb3b8170e40839d09a06929ffac1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 22 Dec 2011 15:24:02 +0100
Subject: [PATCH] [IMP] employee leave status info

bzr revid: fp@tinyerp.com-20111222142402-bwxyy2xihu76d4p7
---
 addons/hr_holidays/hr_holidays.py       | 22 +++++++++++++++++++++-
 addons/hr_holidays/hr_holidays_view.xml |  4 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 22e0df5f6b0..d97552a3dbc 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-import datetime
+import datetime, time
 from itertools import groupby
 from operator import itemgetter
 
@@ -396,8 +396,28 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
+   def _get_leave_status(self, cr, uid, ids, name, args, context=None):
+        holidays_id = self.pool.get('hr.holidays').search(cr, uid, 
+           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')), 
+            ('date_to','>=',time.strftime('%Y-%m-%d %H:%M:%S')),('type','=','remove')],
+           context=context)
+        result = {}
+        for id in ids:
+            result[id] = {
+                'current_leave_state': False,
+                'current_leave_id': False
+            }
+        for holiday in self.pool.get('hr.holidays').browse(cr, uid, holidays_id, context=context):
+            result[holiday.employee_id.id]['current_leave_state'] = holiday.state
+            result[holiday.employee_id.id]['current_leave_id'] = holiday.holiday_status_id.id
+        return result
+
    _columns = {
         'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.'),
+        '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')
     }
 
 hr_employee()
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a989ea50222..0a484ebf4b4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -492,7 +492,9 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
-                    <field name="remaining_leaves" string="Remaining Legal Leaves" readonly="1"/>
+                    <field name="remaining_leaves"/>
+                    <field name="current_leave_id"/>
+                    <field name="current_leave_state"/>
                 </field>
             </field>
         </record>