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

[MERGE] branch merged with trunk-bug-798739

Browse Source 
bzr revid: mtr@mtr-20110705065414-mlhnyibc5apj9zst
This commit is contained in:
mtr
2011-07-05 12:24:14 +05:30
parent c2ba873ab8 a7e16487e4
commit 2f948381cc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/hr_holidays.py
+7 -6
View File
@@ -223,9 +223,12 @@ class hr_holidays(osv.osv):
wf_service.trg_create(uid, 'hr.holidays', id, cr)
return True
def holidays_validate(self, cr, uid, ids, *args):
def get_user_lang(self, cr, uid, ids):
lang = self.pool.get('res.users').browse(cr, uid, uid).context_lang
context = {'lang': lang}
return {'lang': lang}
def holidays_validate(self, cr, uid, ids, *args):
context = self.get_user_lang(cr, uid, ids)
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
@@ -233,8 +236,7 @@ class hr_holidays(osv.osv):
return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
def holidays_validate2(self, cr, uid, ids, *args):
lang = self.pool.get('res.users').browse(cr, uid, uid).context_lang
context = {'lang': lang}
context = self.get_user_lang(cr, uid, ids)
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
@@ -281,8 +283,7 @@ class hr_holidays(osv.osv):
return True
def holidays_confirm(self, cr, uid, ids, *args):
lang = self.pool.get('res.users').browse(cr, uid, uid).context_lang
context = {'lang': lang}
context = self.get_user_lang(cr, uid, ids)
self.check_holidays(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})