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

[FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because 

Warning does not inherit from osv.except_osv and this exception is not catched
by the system.

bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
This commit is contained in:
Stephane Wirtel 2014-01-13 17:27:27 +01:00
parent 9c92ed7afb
commit e091efecb8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/hr_holidays/hr_holidays.py
View File

@ -26,7 +26,6 @@ import math
import time
from operator import attrgetter
from openerp.exceptions import Warning
from openerp import tools
from openerp.osv import fields, osv
from openerp.tools.translate import _
@ -437,8 +436,11 @@ class hr_holidays(osv.osv):
leave_days = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, context=context)[record.holiday_status_id.id]
if leave_days['remaining_leaves'] < 0 or leave_days['virtual_remaining_leaves'] < 0:
# Raising a warning gives a more user-friendly feedback than the default constraint error
raise Warning(_('The number of remaining leaves is not sufficient for this leave type.\n'
'Please verify also the leaves waiting for validation.'))
raise osv.except_osv(
_('Warning!'),
_('The number of remaining leaves is not sufficient for this leave type.\n'
'Please verify also the leaves waiting for validation.')
)
return True
# -----------------------------