Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: expired leaves not calculated properly because of newly created expiry ledger entries

Browse Source
This commit is contained in:
Rucha Mahabal 2022-02-03 23:34:46 +05:30
parent 538b64b1fa
commit 1ea749cf1a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
View File

@ -230,14 +230,14 @@ def get_allocated_and_expired_leaves(from_date, to_date, employee, leave_type):
records = get_leave_ledger_entries(from_date, to_date, employee, leave_type) records = get_leave_ledger_entries(from_date, to_date, employee, leave_type)
for record in records: for record in records:
if record.to_date < getdate(to_date):
expired_leaves += record.leaves
# new allocation records with `is_expired=1` are created when leave expires # new allocation records with `is_expired=1` are created when leave expires
# these new records should not be considered, else it leads to negative leave balance # these new records should not be considered, else it leads to negative leave balance
if record.is_expired: if record.is_expired:
continue continue
if record.to_date < getdate(to_date):
expired_leaves += record.leaves
if record.from_date >= getdate(from_date): if record.from_date >= getdate(from_date):
if record.is_carry_forward: if record.is_carry_forward:
carry_forwarded_leaves += record.leaves carry_forwarded_leaves += record.leaves