From c7e28c7e5d89564bee89ec0021860fa9297fd0c1 Mon Sep 17 00:00:00 2001 From: mayur-patel Date: Tue, 5 Mar 2013 20:14:05 +1100 Subject: [PATCH] changed the logic to be more elegant. --- hr/doctype/leave_application/leave_application.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py index 80504d09c8..f2a58c8dd8 100755 --- a/hr/doctype/leave_application/leave_application.py +++ b/hr/doctype/leave_application/leave_application.py @@ -126,14 +126,11 @@ class DocType(DocListController): self.doc.leave_type, self.doc.fiscal_year)["leave_balance"] if self.doc.leave_balance - self.doc.total_leave_days < 0: - - # check if this leave type allow the remaining balance to be in negative. If yes then warn the user and continue to save else warn the user and don't save. - if webnotes.conn.get_value("Leave Type", self.doc.leave_type,"allow_negative"): - msgprint("There is not enough leave balance for Leave Type - new: %s" %(self.doc.leave_type,)) - # warn the user but don't save the form. - else: - msgprint("There is not enough leave balance for Leave Type - new: %s" %(self.doc.leave_type,), raise_exception=1) - + #check if this leave type allow the remaining balance to be in negative. If yes then warn the user and continue to save else warn the user and don't save. + msgprint("There is not enough leave balance for Leave Type: %s" % \ + (self.doc.leave_type,), + raise_exception=not(webnotes.conn.get_value("Leave Type", self.doc.leave_type,"allow_negative") or None)) + def validate_leave_overlap(self): if not self.doc.name: self.doc.name = "New Leave Application"