nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update filters

Browse Source
This commit is contained in:
Anurag Mishra
2020-09-08 15:55:07 +05:30
committed by GitHub
parent 69bb85d1d0
commit e5fbebf946
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,7 +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 '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,
@@ -791,4 +792,4 @@ def get_leave_approver(employee):
leave_approver = frappe.db.get_value('Department Approver', {'parent': department, leave_approver = frappe.db.get_value('Department Approver', {'parent': department,
'parentfield': 'leave_approvers', 'idx': 1}, 'approver') 'parentfield': 'leave_approvers', 'idx': 1}, 'approver')
return leave_approver return leave_approver