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

[MERGE] lp798739: no translation of warning message in holidays confirmation. Note that this will only work once the server will propagate the context through the workflow triggers 

bzr revid: qdp-launchpad@openerp.com-20111007104149-j4m9i68ysi4bf14z
This commit is contained in:
Quentin (OpenERP) 2011-10-07 12:41:49 +02:00
parent 3aa47b7075 03f9522bca
commit 9d9762042a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addons/hr_holidays/hr_holidays.py
View File

@ -216,7 +216,7 @@ class hr_holidays(osv.osv):
}
return {'warning': warning, 'value': {'double_validation': double_validation}}
def set_to_draft(self, cr, uid, ids, *args):
def set_to_draft(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {
'state': 'draft',
'manager_id': False,
@ -228,15 +228,15 @@ class hr_holidays(osv.osv):
wf_service.trg_create(uid, 'hr.holidays', id, cr)
return True
def holidays_validate(self, cr, uid, ids, *args):
self.check_holidays(cr, uid, ids)
def holidays_validate(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
def holidays_validate2(self, cr, uid, ids, *args):
self.check_holidays(cr, uid, ids)
def holidays_validate2(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
@ -286,23 +286,22 @@ class hr_holidays(osv.osv):
self.write(cr, uid, holiday_ids, {'manager_id2': manager})
return True
def holidays_confirm(self, cr, uid, ids, *args):
self.check_holidays(cr, uid, ids)
def holidays_confirm(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})
def holidays_refuse(self, cr, uid, ids, approval, *args):
def holidays_refuse(self, cr, uid, ids, approval, context=None):
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
if approval == 'first_approval':
self.write(cr, uid, ids, {'manager_id': manager})
self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
else:
self.write(cr, uid, ids, {'manager_id2': manager})
self.write(cr, uid, ids, {'state': 'refuse'})
self.holidays_cancel(cr, uid, ids)
self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
self.holidays_cancel(cr, uid, ids, context=context)
return True
def holidays_cancel(self, cr, uid, ids, *args):
def holidays_cancel(self, cr, uid, ids, context=None):
obj_crm_meeting = self.pool.get('crm.meeting')
for record in self.browse(cr, uid, ids):
# Delete the meeting
@ -316,7 +315,7 @@ class hr_holidays(osv.osv):
return True
def check_holidays(self, cr, uid, ids):
def check_holidays(self, cr, uid, ids, context=None):
holi_status_obj = self.pool.get('hr.holidays.status')
for record in self.browse(cr, uid, ids):
if record.holiday_type == 'employee' and record.type == 'remove':