pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] current status value.

Browse Source 
bzr revid: nco@tinyerp.com-20130528102950-txs9fjuodrzrv0ue
This commit is contained in:
Mahendra Barad (OpenERP Trainee)
2013-05-28 15:59:50 +05:30
committed by Nimesh Contractor (OpenERP)
parent 2208354292
commit 2114adf97e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_attendance/hr_attendance.py
+3 -3
View File
@@ -108,7 +108,7 @@ class hr_employee(osv.osv):
AND hr_attendance.name = foo.name) \
WHERE hr_attendance.employee_id IN %s',(tuple(ids),))
for res in cr.fetchall():
result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
result[res[1]] = res[0] == 'sign_in' and 'Present' or 'Absent'
return result
def _last_sign(self, cr, uid, ids, name, args, context=None):
@@ -152,8 +152,8 @@ class hr_employee(osv.osv):
warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
for employee in self.browse(cr, uid, ids, context=context):
if not action:
if employee.state == 'present': action = 'sign_out'
if employee.state == 'absent': action = 'sign_in'
if employee.state == 'Present': action = 'sign_out'
if employee.state == 'Absent': action = 'sign_in'
if not self._action_check(cr, uid, employee.id, action_date, context):
raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))