From 69bb85d1d09ec71997aebfaf19bf025b45b2b98d Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Tue, 25 Aug 2020 06:55:02 +0530 Subject: [PATCH 1/2] fix: Form dashboard showing wrong balance --- erpnext/hr/doctype/leave_application/leave_application.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 1622fb38eec..95fedde420f 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -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 From e5fbebf94658971549eae600ba503ae775a616a7 Mon Sep 17 00:00:00 2001 From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:55:07 +0530 Subject: [PATCH 2/2] fix: update filters --- erpnext/hr/doctype/leave_application/leave_application.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 95fedde420f..6c42c4752b7 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -433,7 +433,8 @@ def get_leave_details(employee, date): 'from_date': ('<=', date), 'to_date': ('>=', date), 'leave_type': allocation.leave_type, - 'employee': employee + 'employee': employee, + 'docstatus': 1 }, 'SUM(total_leaves_allocated)') or 0 remaining_leaves = get_leave_balance_on(employee, d, date, to_date = allocation.to_date, @@ -791,4 +792,4 @@ def get_leave_approver(employee): leave_approver = frappe.db.get_value('Department Approver', {'parent': department, 'parentfield': 'leave_approvers', 'idx': 1}, 'approver') - return leave_approver \ No newline at end of file + return leave_approver