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

[FIX] hr_attendance : timesheet - sign in - out : must not allow overlaps 

lp bug: https://launchpad.net/bugs/885387 fixed

bzr revid: mdi@tinyerp.com-20111220094552-jfwpgzy7f0lmig44
This commit is contained in:
Divyesh Makwana (Open ERP) 2011-12-20 15:15:52 +05:30
parent dde556db2e
commit 5732272096
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/hr_attendance/hr_attendance.py
View File

@ -63,6 +63,14 @@ class hr_attendance(osv.osv):
'employee_id': _employee_get, 'employee_id': _employee_get,
} }
def write(self, cr, uid, ids, vals, context=None):
current_attendance_data = self.browse(cr, uid, ids, context=context)[0]
obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context)
if obj_attendance_ids[0] != ids[0]:
if ('name' in vals) or ('action' in vals):
raise osv.except_osv(_('Warning !'), _('You can not modify existing entries. To modify the entry , remove the prior entries.'))
return super(hr_attendance, self).write(cr, uid, ids, vals, context=context)
def _altern_si_so(self, cr, uid, ids, context=None): def _altern_si_so(self, cr, uid, ids, context=None):
current_attendance_data = self.browse(cr, uid, ids, context=context)[0] current_attendance_data = self.browse(cr, uid, ids, context=context)[0]
obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context)
@ -70,13 +78,13 @@ class hr_attendance(osv.osv):
hr_attendance_data = self.browse(cr, uid, obj_attendance_ids, context=context) hr_attendance_data = self.browse(cr, uid, obj_attendance_ids, context=context)
for old_attendance in hr_attendance_data: for old_attendance in hr_attendance_data:
if old_attendance.employee_id.id == current_attendance_data['employee_id'].id: if old_attendance.action == current_attendance_data['action']:
if old_attendance.action == current_attendance_data['action']: return False
return False elif old_attendance.name >= current_attendance_data['name']:
elif old_attendance.name >= current_attendance_data['name']: return False
return False else:
else: return True
return True # First entry in the system must not be 'sign_out'
if current_attendance_data['action'] == 'sign_out': if current_attendance_data['action'] == 'sign_out':
return False return False
return True return True