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

…leaves
frappe · Mar 10, 2023 · e74e02b · e74e02b
1 parent b70a37f
commit e74e02b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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(remaining_leaves, end_date):
 	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)