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

fix: consider leaves taken within carry-forwarded period separately while calculating balance

Browse Source
This commit is contained in:
Rucha Mahabal
2023-03-06 14:27:34 +05:30
parent e74e02b765
commit 52108d52e2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -856,6 +856,7 @@ def get_leave_allocation_records(employee, date, leave_type=None):
Min(Ledger.from_date).as_("from_date"), Min(Ledger.from_date).as_("from_date"),
Max(Ledger.to_date).as_("to_date"), Max(Ledger.to_date).as_("to_date"),
Ledger.leave_type, Ledger.leave_type,
Ledger.employee,
) )
.where( .where(
(Ledger.from_date <= date) (Ledger.from_date <= date)
@@ -895,6 +896,7 @@ def get_leave_allocation_records(employee, date, leave_type=None):
"unused_leaves": d.cf_leaves, "unused_leaves": d.cf_leaves,
"new_leaves_allocated": d.new_leaves, "new_leaves_allocated": d.new_leaves,
"leave_type": d.leave_type, "leave_type": d.leave_type,
"employee": d.employee,
} }
), ),
) )
@@ -939,11 +941,15 @@ def get_remaining_leaves(
# balance for carry forwarded leaves # balance for carry forwarded leaves
if cf_expiry and allocation.unused_leaves: if cf_expiry and allocation.unused_leaves:
cf_leaves_taken = get_leaves_for_period(
allocation.employee, allocation.leave_type, allocation.from_date, cf_expiry
)
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 = flt(leaves_taken) cf_leaves = remaining_cf_leaves = flt(cf_leaves_taken)
else: else:
cf_leaves = flt(allocation.unused_leaves) + flt(leaves_taken) cf_leaves = flt(allocation.unused_leaves) + flt(cf_leaves_taken)
remaining_cf_leaves = _get_remaining_leaves(cf_leaves, cf_expiry) remaining_cf_leaves = _get_remaining_leaves(cf_leaves, cf_expiry)
leave_balance = flt(allocation.new_leaves_allocated) + flt(cf_leaves) leave_balance = flt(allocation.new_leaves_allocated) + flt(cf_leaves)