Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: department filters in employee leave balance

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-05-30 13:38:35 +05:30
parent 2124d9884b
commit 91e62f575e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
View File

@ -30,7 +30,6 @@ frappe.query_reports["Employee Leave Balance"] = {
"label": __("Department"), "label": __("Department"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Department", "options": "Department",
"reqd": 1,
} }
] ]
} }

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

@ -32,14 +32,15 @@ def get_columns(leave_types):
return columns return columns
def get_conditions(filters): def get_conditions(filters):
filters = { conditions = {
"status": "Active", "status": "Active",
"company": filters.company, "company": filters.company,
} }
if filters.get("Department"): if filters.get("department"):
filters.update(filters.get("Department")) conditions.update({
"department": filters.get("department")
return filters })
return conditions
def get_data(filters, leave_types): def get_data(filters, leave_types):
user = frappe.session.user user = frappe.session.user