Fixed include holiday logic in leave calculation

9 years ago · d8546c4316
1 changed files with 4 additions and 3 deletions
--- 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"):
-			holidays = leave_app.get_holidays()
 			ret = {
-				'total_leave_days' : flt(tot_days)-flt(holidays)
+				'total_leave_days' : flt(tot_days)
 			}
 		else:
+			holidays = leave_app.get_holidays()
 			ret = {
-				'total_leave_days' : flt(tot_days)
+				'total_leave_days' : flt(tot_days)-flt(holidays)
 			}
+
 	return ret

@frappe.whitelist()