From e74e02b7654dadd3090aa868a95692a3b3cca09f Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 6 Mar 2023 13:12:34 +0530 Subject: [PATCH] fix: consider leaves taken while calculating expired carry-forwarded leaves --- erpnext/hr/doctype/leave_application/leave_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index fff0967f25a..903a413d6bb 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -941,7 +941,7 @@ def get_remaining_leaves( if cf_expiry and allocation.unused_leaves: if getdate(date) > getdate(cf_expiry): # carry forwarded leave expiry date passed - cf_leaves = remaining_cf_leaves = 0 + cf_leaves = remaining_cf_leaves = flt(leaves_taken) else: cf_leaves = flt(allocation.unused_leaves) + flt(leaves_taken) remaining_cf_leaves = _get_remaining_leaves(cf_leaves, cf_expiry)