[FIX] Corrected code style.
bzr revid: tta@openerp.com-20121121134349-fsko8x6t97d1hzdz
This commit is contained in:
parent
8c5fd9de81
commit
414920b52f
|
@ -188,14 +188,14 @@ class hr_evaluation(osv.osv):
|
|||
|
||||
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
|
||||
vals = {}
|
||||
vals['plan_id']=False
|
||||
vals['date']=False
|
||||
vals['plan_id'] = False
|
||||
vals['date'] = False
|
||||
if employee_id:
|
||||
employee_obj=self.pool.get('hr.employee')
|
||||
employee_obj = self.pool.get('hr.employee')
|
||||
for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
|
||||
if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
|
||||
vals.update({'plan_id':employee.evaluation_plan_id.id})
|
||||
if employee.evaluation_date :
|
||||
vals.update({'plan_id': employee.evaluation_plan_id.id})
|
||||
if employee.evaluation_date:
|
||||
vals.update({'date': employee.evaluation_date})
|
||||
return {'value': vals}
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ class hr_timesheet_sheet(osv.osv):
|
|||
if (abs(sheet.total_difference) < di) or not di:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
|
||||
self.confirm_send_note(cr, uid, ids, context)
|
||||
self.confirm_send_note(cr, uid, ids, context=context)
|
||||
else:
|
||||
raise osv.except_osv(_('Warning!'), _('Please verify that the total difference of the sheet is lower than %.2f.') %(di,))
|
||||
return True
|
||||
|
|
Loading…
Reference in New Issue