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

[Fix] Calendar view not working for leave application (#9963)

Browse Source
This commit is contained in:
rohitwaghchaure 2017-07-19 17:09:30 +05:30 committed by Makarand Bauskar
parent 3951f6971e
commit f86100a734
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,7 @@ def get_events(start, end, filters=None):
company=frappe.db.get_value("Global Defaults", None, "default_company") company=frappe.db.get_value("Global Defaults", None, "default_company")
from frappe.desk.reportview import get_filters_cond from frappe.desk.reportview import get_filters_cond
conditions = get_filters_cond("Leave Application") conditions = get_filters_cond("Leave Application", filters, [])
# show department leaves for employee # show department leaves for employee
if "Employee" in frappe.get_roles(): if "Employee" in frappe.get_roles():
@ -435,7 +435,7 @@ def add_department_leaves(events, start, end, employee, company):
department_employees = frappe.db.sql_list("""select name from tabEmployee where department=%s department_employees = frappe.db.sql_list("""select name from tabEmployee where department=%s
and company=%s""", (department, company)) and company=%s""", (department, company))
match_conditions = "employee in (\"%s\")" % '", "'.join(department_employees) match_conditions = "and employee in (\"%s\")" % '", "'.join(department_employees)
add_leaves(events, start, end, match_conditions=match_conditions) add_leaves(events, start, end, match_conditions=match_conditions)
def add_leaves(events, start, end, match_conditions=None): def add_leaves(events, start, end, match_conditions=None):
@ -446,7 +446,7 @@ def add_leaves(events, start, end, match_conditions=None):
and docstatus < 2 and docstatus < 2
and status!="Rejected" """ and status!="Rejected" """
if match_conditions: if match_conditions:
query += " and " + match_conditions query += match_conditions
for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True): for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True):
e = { e = {