nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(HR): skip earned leaves check for max leaves set to zero or less (#20535)

Browse Source 
* fix: skip earned leaves check for max leaves set to zero or less

* test: earned leaves creation
This commit is contained in:
Mangesh-Khairnar
2020-02-20 13:25:55 +05:30
committed by GitHub
parent a871d30a7d
commit 5d5f5b4f8e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/utils.py
View File

@@ -316,7 +316,9 @@ def allocate_earned_leaves():
allocation = frappe.get_doc('Leave Allocation', allocation.name)
new_allocation = flt(allocation.total_leaves_allocated) + flt(earned_leaves)
new_allocation = new_allocation if new_allocation <= e_leave_type.max_leaves_allowed else e_leave_type.max_leaves_allowed
if new_allocation > e_leave_type.max_leaves_allowed and e_leave_type.max_leaves_allowed > 0:
new_allocation = e_leave_type.max_leaves_allowed
if new_allocation == allocation.total_leaves_allocated:
continue