schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: consider leaves taken while calculating expired carry-forwarded leaves

Browse Source
This commit is contained in:
Rucha Mahabal
2023-03-06 13:12:34 +05:30
parent b70a37f6fa
commit e74e02b765
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -941,7 +941,7 @@ def get_remaining_leaves(
if cf_expiry and allocation.unused_leaves: if cf_expiry and allocation.unused_leaves:
if getdate(date) > getdate(cf_expiry): if getdate(date) > getdate(cf_expiry):
# carry forwarded leave expiry date passed # carry forwarded leave expiry date passed
cf_leaves = remaining_cf_leaves = 0 cf_leaves = remaining_cf_leaves = flt(leaves_taken)
else: else:
cf_leaves = flt(allocation.unused_leaves) + flt(leaves_taken) cf_leaves = flt(allocation.unused_leaves) + flt(leaves_taken)
remaining_cf_leaves = _get_remaining_leaves(cf_leaves, cf_expiry) remaining_cf_leaves = _get_remaining_leaves(cf_leaves, cf_expiry)