From 095a0569f8bced160e2b86fc8dfabec27c479ca7 Mon Sep 17 00:00:00 2001 From: Meera Trambadia Date: Mon, 30 Jul 2012 16:01:39 +0530 Subject: [PATCH] [IMP]:can now delete a leave which are in 'draft', 'cancel' and 'confirm' state bzr revid: mtr@tinyerp.com-20120730103139-n1ni944evcny3dic --- addons/hr_holidays/hr_holidays.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 54ab5f31a29..0fcb8f41335 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -200,8 +200,8 @@ class hr_holidays(osv.osv): def unlink(self, cr, uid, ids, context=None): for rec in self.browse(cr, uid, ids, context=context): - if rec.state<>'draft': - raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft status !')) + if rec.state not in ['draft', 'cancel', 'confirm']: + raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state)) return super(hr_holidays, self).unlink(cr, uid, ids, context) def onchange_date_from(self, cr, uid, ids, date_to, date_from):