From d8546c4316f74e7aadff6ae39a6f3d250debeb2e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 30 Jul 2015 14:48:31 +0530 Subject: [PATCH] Fixed include holiday logic in leave calculation --- .../hr/doctype/leave_application/leave_application.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index d1ec4b187a..228f2bde11 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -239,14 +239,15 @@ def get_total_leave_days(leave_app): if not leave_app.half_day: tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1 if frappe.db.get_value("Leave Type", leave_app.leave_type, "include_holiday"): + ret = { + 'total_leave_days' : flt(tot_days) + } + else: holidays = leave_app.get_holidays() ret = { 'total_leave_days' : flt(tot_days)-flt(holidays) } - else: - ret = { - 'total_leave_days' : flt(tot_days) - } + return ret @frappe.whitelist()