CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 22:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude cancelled leave ledger entries

Browse Source
This commit is contained in:
Rucha Mahabal
2023-03-10 15:48:51 +05:30
parent 7b9784ce10
commit 91cad9e985
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ class LeaveAllocation(Document):
# run required validations again since total leaves are being updated # run required validations again since total leaves are being updated
self.validate_leave_days_and_dates() self.validate_leave_days_and_dates()
leaves_to_be_added = ( leaves_to_be_added = flt(
frappe.db.get_value("Leave Allocation", self.name, "new_leaves_allocated") frappe.db.get_value("Leave Allocation", self.name, "new_leaves_allocated")
- self.get_existing_leave_count() - self.get_existing_leave_count()
) )
@@ -123,14 +123,12 @@ class LeaveAllocation(Document):
"company": self.company, "company": self.company,
"leave_type": self.leave_type, "leave_type": self.leave_type,
"is_carry_forward": 0, "is_carry_forward": 0,
"docstatus": 1,
}, },
pluck="leaves", fields=["SUM(leaves) as total_leaves"],
) )
total_existing_leaves = 0
for entry in ledger_entries:
total_existing_leaves += entry
return total_existing_leaves return ledger_entries[0].total_leaves if ledger_entries else 0
def validate_against_leave_applications(self): def validate_against_leave_applications(self):
leaves_taken = get_approved_leaves_for_period( leaves_taken = get_approved_leaves_for_period(