[FIX] Hr_holidays : Workflow actions validations corrected
lp bug: https://launchpad.net/bugs/430098 fixed bzr revid: jvo@tinyerp.com-20090916150735-2d3cb8a1ybqt164r
This commit is contained in:
committed by
Jay (Open ERP)
parent
5f2ab89a72
commit
03a072b4b7
@@ -187,8 +187,11 @@ class hr_holidays(osv.osv):
|
||||
'state':'validate',
|
||||
}
|
||||
ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
|
||||
|
||||
if ids2:
|
||||
vals['manager_id'] = ids2[0]
|
||||
else:
|
||||
raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
|
||||
self.write(cr, uid, ids, vals)
|
||||
self._create_holiday(cr, uid, ids)
|
||||
return True
|
||||
@@ -207,6 +210,8 @@ class hr_holidays(osv.osv):
|
||||
|
||||
def holidays_refuse(self, cr, uid, ids, *args):
|
||||
ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
|
||||
if not ids2:
|
||||
raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
|
||||
self.write(cr, uid, ids, {
|
||||
'state':'refuse',
|
||||
'manager_id':ids2[0]
|
||||
|
||||
Reference in New Issue
Block a user