Add 'Half-Yearly' option to Earned Leave Frequency
in addition to the current values of Monthly, Quarterly and Yearly
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index 8f7b5a8..6a7a80a 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -561,7 +561,7 @@
"label": "Earned Leave Frequency",
"length": 0,
"no_copy": 0,
- "options": "Monthly\nQuarterly\nYearly",
+ "options": "Monthly\nQuarterly\nHalf-Yearly\nYearly",
"permlevel": 0,
"precision": "",
"print_hide": 0,
diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py
index 0226201..e0b6a51 100644
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -260,7 +260,7 @@
fields=["name", "max_leaves_allowed", "earned_leave_frequency", "rounding"],
filters={'is_earned_leave' : 1})
today = getdate()
- divide_by_frequency = {"Yearly": 1, "Quarterly": 4, "Monthly": 12}
+ divide_by_frequency = {"Yearly": 1, "Half-Yearly": 6, "Quarterly": 4, "Monthly": 12}
if e_leave_types:
for e_leave_type in e_leave_types:
leave_allocations = frappe.db.sql("""select name, employee, from_date, to_date from `tabLeave Allocation` where '{0}'
@@ -297,6 +297,9 @@
if frequency == "Quarterly":
if not months % 3:
return True
+ elif frequency == "Half-Yearly":
+ if not months % 6:
+ return True
elif frequency == "Yearly":
if not months % 12:
return True