nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:dash board for pre-release test (#23426)

Browse Source
This commit is contained in:
Anurag Mishra
2020-09-24 15:43:18 +05:30
committed by GitHub
parent b61361f942
commit 1caab44c29
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,7 +446,7 @@ def get_leave_details(employee, date):
leave_allocation[d] = { leave_allocation[d] = {
"total_leaves": total_allocated_leaves, "total_leaves": total_allocated_leaves,
"expired_leaves": total_allocated_leaves - (remaining_leaves + leaves_taken), "expired_leaves": max(total_allocated_leaves - (remaining_leaves + leaves_taken), 0),
"leaves_taken": leaves_taken, "leaves_taken": leaves_taken,
"pending_leaves": leaves_pending, "pending_leaves": leaves_pending,
"remaining_leaves": remaining_leaves} "remaining_leaves": remaining_leaves}