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

[FIX] hr_holidays: Reverse previous patch with the warning 

bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth
This commit is contained in:
Stephane Wirtel 2014-01-14 12:45:59 +01:00
parent fb7a497ff0
commit 0aadcf42c9
1 changed files with 3 additions and 5 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,6 +26,7 @@ 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 _
@ -436,11 +437,8 @@ 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 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.')
)
raise Warning(_('The number of remaining leaves is not sufficient for this leave type.\n'
'Please verify also the leaves waiting for validation.'))
return True
# -----------------------------