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

[IMP] hr_holidays: use the new signal_xxx methods instead of trg_validate. 

bzr revid: vmt@openerp.com-20130128141623-4rxcgqx7t33yydbp
This commit is contained in:
Vo Minh Thu 2013-01-28 15:16:23 +01:00
parent 781e6737ac
commit 8d50446d27
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/hr_holidays/hr_holidays.py
View File

@ -24,7 +24,7 @@
import datetime import datetime
import time import time
from itertools import groupby from itertools import groupby
from operator import itemgetter from operator import attrgetter, itemgetter
import math import math
from openerp import netsvc from openerp import netsvc
@ -370,11 +370,11 @@ class hr_holidays(osv.osv):
'employee_id': emp.id 'employee_id': emp.id
} }
leave_ids.append(self.create(cr, uid, vals, context=None)) leave_ids.append(self.create(cr, uid, vals, context=None))
wf_service = netsvc.LocalService("workflow")
for leave_id in leave_ids: for leave_id in leave_ids:
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr) # TODO is it necessary to interleave the calls?
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr) self.signal_confirm(cr, uid, [leave_id])
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr) self.signal_validate(cr, uid, [leave_id])
self.signal_second_validate(cr, uid, [leave_id])
return True return True
def holidays_confirm(self, cr, uid, ids, context=None): def holidays_confirm(self, cr, uid, ids, context=None):
@ -404,9 +404,7 @@ class hr_holidays(osv.osv):
meeting_obj.unlink(cr, uid, [record.meeting_id.id]) meeting_obj.unlink(cr, uid, [record.meeting_id.id])
# If a category that created several holidays, cancel all related # If a category that created several holidays, cancel all related
wf_service = netsvc.LocalService("workflow") self.signal_refuse(cr, uid, map(attrgetter('id'), record.linked_request_ids or []))
for request in record.linked_request_ids or []:
wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
self._remove_resource_leave(cr, uid, ids, context=context) self._remove_resource_leave(cr, uid, ids, context=context)
return True return True
@ -478,10 +476,9 @@ class hr_employee(osv.osv):
leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context) leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context)
else: else:
return False return False
wf_service = netsvc.LocalService("workflow") holidays_obj.signal_confirm(cr, uid, [leave_id])
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr) holidays_obj.signal_validate(cr, uid, [leave_id])
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr) holidays_obj.signal_second_validate(cr, uid, [leave_id])
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
return True return True
def _get_remaining_days(self, cr, uid, ids, name, args, context=None): def _get_remaining_days(self, cr, uid, ids, name, args, context=None):

3
addons/hr_holidays/test/test_hr_holiday.yml
View File

@ -19,9 +19,8 @@
- -
!python {model: hr.holidays}: | !python {model: hr.holidays}: |
import netsvc import netsvc
wf_service = netsvc.LocalService("workflow")
self.set_to_draft(cr, uid, [ref('hr_holidays_employee1_cl')]) self.set_to_draft(cr, uid, [ref('hr_holidays_employee1_cl')])
wf_service.trg_validate(uid, 'hr.holidays', ref('hr_holidays_employee1_cl'), 'confirm', cr) self.signal_confirm(cr, uid, [ref('hr_holidays_employee1_cl')])
- -
I validate the holiday request by clicking on "To Approve" button. I validate the holiday request by clicking on "To Approve" button.
- -