From 0aadcf42c90106db9d316674eb4872a38cce5b74 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 14 Jan 2014 12:45:59 +0100 Subject: [PATCH] [FIX] hr_holidays: Reverse previous patch with the warning bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth --- addons/hr_holidays/hr_holidays.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index c6133cd4165..a30b874bd8a 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -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 # -----------------------------