nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3696 from nabinhait/fix1

Browse Source 
[fix][report] Show only active employee in Employee leave balance report
This commit is contained in:
Anand Doshi
2015-07-20 13:27:47 +05:30
parent 83694fd180 c9e4fbeda0
commit d0d1af2072
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
View File

@@ -9,8 +9,13 @@ from frappe.desk.reportview import execute as runreport
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
employee_filters = filters.get("company") and \ employee_filters = {
[["Employee", "company", "=", filters.get("company")]] or None "status": "Active"
}
if filters.get("company"):
filters["company"] = filters.company
employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"], employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"],
filters=employee_filters, limit_page_length=None) filters=employee_filters, limit_page_length=None)