added company filter in employee leave balance report

This commit is contained in:
Anand Doshi 2013-02-27 19:08:01 +05:30
parent 46d437e2ef
commit 5c6fc62b9e
2 changed files with 13 additions and 4 deletions

View File

@ -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")
}
]
}

View File

@ -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`