Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16851 from JoyceBabu/develop

Browse Source 
fix: Add 'Half-Yearly' option to Earned Leave Frequency
This commit is contained in:
Rushabh Mehta 2019-03-15 09:02:43 +05:30 committed by GitHub
commit b7abdf1222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/leave_type/leave_type.json
View File

@ -561,7 +561,7 @@
"label": "Earned Leave Frequency", "label": "Earned Leave Frequency",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Monthly\nQuarterly\nYearly", "options": "Monthly\nQuarterly\nHalf-Yearly\nYearly",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,

5
erpnext/hr/utils.py
View File

@ -260,7 +260,7 @@ def allocate_earned_leaves():
fields=["name", "max_leaves_allowed", "earned_leave_frequency", "rounding"], fields=["name", "max_leaves_allowed", "earned_leave_frequency", "rounding"],
filters={'is_earned_leave' : 1}) filters={'is_earned_leave' : 1})
today = getdate() 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: if e_leave_types:
for e_leave_type in 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}' leave_allocations = frappe.db.sql("""select name, employee, from_date, to_date from `tabLeave Allocation` where '{0}'
@ -297,6 +297,9 @@ def check_frequency_hit(from_date, to_date, frequency):
if frequency == "Quarterly": if frequency == "Quarterly":
if not months % 3: if not months % 3:
return True return True
elif frequency == "Half-Yearly":
if not months % 6:
return True
elif frequency == "Yearly": elif frequency == "Yearly":
if not months % 12: if not months % 12:
return True return True