odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]hr_holidays: Iprove the search for get perfect days 

bzr revid: dbr@tinyerp.com-20120517105902-9wxxvlxd9csy80pb
This commit is contained in:
DBR (OpenERP) 2012-05-17 16:29:02 +05:30
parent c8f335a355
commit 1b09de07e8
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/hr_holidays/hr_holidays.py
View File

@ -22,6 +22,7 @@
##############################################################################
import datetime, time
from datetime import datetime
from itertools import groupby
from operator import itemgetter
@ -484,18 +485,23 @@ 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')),
('type','=','remove'),('state','not in',('cancel','refuse'))],
def _get_leave_status(self, cr, uid, ids, name, args, context=None):
holidays_obj = self.pool.get('hr.holidays')
holidays_id = holidays_obj.search(cr, uid,
[('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d')),
('date_to','>=',time.strftime('%Y-%m-%d')),('type','=','remove'),('state','not in',('cancel','refuse'))],
context=context)
result = {}
for id in ids:
result[id] = {
'current_leave_state': False,
'current_leave_id': False,
'date_from':False,
'date_to':False,
}
for holiday in self.pool.get('hr.holidays').browse(cr, uid, holidays_id, context=context):
result[holiday.employee_id.id]['date_from'] = holiday.date_from
result[holiday.employee_id.id]['date_to'] = holiday.date_to
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
@ -506,6 +512,8 @@ class hr_employee(osv.osv):
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'),
'date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
'date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
}

6
addons/hr_holidays/hr_holidays_view.xml
View File

@ -498,7 +498,7 @@
<field name="arch" type="xml">
<field name="coach_id" position="after">
<field name="remaining_leaves"/>
<field name="current_leave_id"/>
<field name="current_leave_id"/>
<field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
</field>
</field>
@ -512,11 +512,13 @@
<xpath expr="//templates" position="before">
<field name="current_leave_state"/>
<field name="last_login"/>
<field name="date_from"/>
<field name="date_to"/>
</xpath>
<xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
<li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
<span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
<span class="oe_kanban_button" style="font-size: 100%%">
<span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.date_to.raw_value" >
<field name="current_leave_id"/>
</span>
</span>