Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 44fb6fd..226e959 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -238,10 +238,15 @@
ret = {'total_leave_days' : 0.5}
if not leave_app.half_day:
tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
- holidays = leave_app.get_holidays()
- ret = {
- 'total_leave_days' : flt(tot_days)-flt(holidays)
- }
+ if frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"):
+ 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()
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index 8cf0c80..9e21708 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -246,4 +246,4 @@
frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
"_T-Employee-0001")
- frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)
+ frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index f644c69..4493af5 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -59,6 +59,12 @@
"fieldtype": "Check",
"label": "Allow Negative Balance",
"permlevel": 0
+ },
+ {
+ "fieldname": "include_holiday",
+ "fieldtype": "Check",
+ "label": "Include holidays within leaves as leaves",
+ "permlevel": 0
}
],
"icon": "icon-flag",