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

fix: Form dashboard showing wrong balance

Browse Source
This commit is contained in:
Anurag Mishra
2020-08-25 06:55:02 +05:30
parent 51c29cafee
commit 69bb85d1d0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,7 @@ def get_leave_details(employee, date):
'from_date': ('<=', date),
'to_date': ('>=', date),
'leave_type': allocation.leave_type,
'employee': employee
}, 'SUM(total_leaves_allocated)') or 0
remaining_leaves = get_leave_balance_on(employee, d, date, to_date = allocation.to_date,
@@ -597,7 +598,7 @@ def get_leave_entries(employee, leave_type, from_date, to_date):
is_carry_forward, is_expired
FROM `tabLeave Ledger Entry`
WHERE employee=%(employee)s AND leave_type=%(leave_type)s
AND docstatus=1
AND docstatus=1
AND (leaves<0
OR is_expired=1)
AND (from_date between %(from_date)s AND %(to_date)s