From 5c6fc62b9eb6275d2d7539ccab70dddf2114202d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 27 Feb 2013 19:08:01 +0530 Subject: [PATCH] added company filter in employee leave balance report --- .../employee_leave_balance/employee_leave_balance.js | 7 +++++++ .../employee_leave_balance/employee_leave_balance.py | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hr/report/employee_leave_balance/employee_leave_balance.js b/hr/report/employee_leave_balance/employee_leave_balance.js index 9f63e04c1a2..d19b48f4972 100644 --- a/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/hr/report/employee_leave_balance/employee_leave_balance.js @@ -6,6 +6,13 @@ wn.query_reports["Employee Leave Balance"] = { "fieldtype": "Link", "options": "Fiscal Year", "default": wn.defaults.get_user_default("fiscal_year") + }, + { + "fieldname":"company", + "label": "Company", + "fieldtype": "Link", + "options": "Company", + "default": wn.defaults.get_user_default("company") } ] } \ No newline at end of file diff --git a/hr/report/employee_leave_balance/employee_leave_balance.py b/hr/report/employee_leave_balance/employee_leave_balance.py index d7ad4725685..6d34c8a8e99 100644 --- a/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/hr/report/employee_leave_balance/employee_leave_balance.py @@ -4,17 +4,19 @@ from webnotes.widgets.reportview import execute as runreport def execute(filters=None): if not filters: filters = {} - employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"]) + + employee_filters = filters.get("company") and \ + [["Employee", "company", "=", filters.get("company")]] or None + employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"], + filters=employee_filters) leave_types = webnotes.conn.sql_list("select name from `tabLeave Type`") if filters.get("fiscal_year"): fiscal_years = [filters["fiscal_year"]] else: fiscal_years = webnotes.conn.sql_list("select name from `tabFiscal Year` order by name desc") - - employee_in = '", "'.join([e.name for e in employees]) - + employee_in = '", "'.join([e.name for e in employees]) allocations = webnotes.conn.sql("""select employee, fiscal_year, leave_type, total_leaves_allocated from `tabLeave Allocation`