nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23131 from Anurag810/leave_application_form_dashboard_fixes

Browse Source 
fix: Form dashboard showing wrong balance
This commit is contained in:
rohitwaghchaure
2020-09-08 16:58:11 +05:30
committed by GitHub
parent 245cd21c31 e5fbebf946
commit dad5bbdaa2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,8 @@ def get_leave_details(employee, date):
'from_date': ('<=', date), 'from_date': ('<=', date),
'to_date': ('>=', date), 'to_date': ('>=', date),
'leave_type': allocation.leave_type, 'leave_type': allocation.leave_type,
'employee': employee,
'docstatus': 1
}, 'SUM(total_leaves_allocated)') or 0 }, 'SUM(total_leaves_allocated)') or 0
remaining_leaves = get_leave_balance_on(employee, d, date, to_date = allocation.to_date, remaining_leaves = get_leave_balance_on(employee, d, date, to_date = allocation.to_date,