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

[FIX] Hr_attendance : Sign out entries were not possible when we 'change work'

Browse Source 
lp bug: https://launchpad.net/bugs/493369 fixed

bzr revid: jvo@tinyerp.com-20091215075330-kiokplayp0sq8ca8
This commit is contained in:
RGA(OpenERP)
2009-12-15 13:23:30 +05:30
committed by Jay (Open ERP)
parent ac5237cd3f
commit 306804e289
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_attendance/wizard/sign_in_out.py
+17 -4
View File
@@ -87,7 +87,7 @@ def _sign_out(self, cr, uid, data, context):
service = netsvc.LocalService('object_proxy')
emp_id = data['form']['emp_id']
if 'last_time' in data['form'] :
if data['form']['last_time'] > time.strftime('%Y-%m-%d'):
if data['form']['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
raise wizard.except_wizard(_('UserError'), _('The Sign-in date must be in the past'))
return {'success': False}
service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['form']['last_time'], 'action':'sign_in', 'employee_id':emp_id})
@@ -100,7 +100,7 @@ def _sign_out(self, cr, uid, data, context):
so_ask_form ='''<?xml version="1.0"?>
<form string="Sign in / Sign out">
<separator string="You did not signed out the last time. Please enter the date and time you signed out." colspan="4" />
<separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
<field name="name" readonly="True" />
<field name="last_time" />
</form>'''
@@ -123,7 +123,7 @@ def _si_check(self, cr, uid, data, context):
si_ask_form ='''<?xml version="1.0"?>
<form string="Sign in / Sign out">
<separator string="You did not signed in the last time. Please enter the date and time you signed in." colspan="4" />
<separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
<field name="name" readonly="True" />
<field name="last_time" />
</form>'''
@@ -133,14 +133,23 @@ si_ask_fields = {
'last_time' : {'string' : "Your last sign in", 'type' : 'datetime', 'required' : True},
}
so_wo_si_form = '''<?xml version="1.0"?>
<form string="Warning">
<label string="Sign-Out Entry must follow Sign-In." colspan="4" />
</form>'''
def _so_check(self, cr, uid, data, context):
states = {True : 'so', False: 'so_ask_si'}
service = netsvc.LocalService('object_proxy')
emp_id = data['form']['emp_id']
att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
if last_att:
last_att = last_att[0]
if not att_id and not last_att:
return 'so_wo_si'
cond = last_att and last_att['action'] == 'sign_in'
return states[cond]
@@ -174,6 +183,10 @@ class wiz_si_so(wizard.interface):
'actions' : [_sign_out],
'result' : {'type' : 'state', 'state':'end'}
},
'so_wo_si' : {
'actions' : [],
'result' : {'type' : 'form', 'arch' : so_wo_si_form, 'fields' : {}, 'state' : [('end', 'Ok')] }
},
}
wiz_si_so('hr.si_so')