From e4c434ab6ff1067e3e981972cb4de6c2768c1502 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 18 Aug 2014 17:03:35 +0530 Subject: [PATCH] [fix] Leave Application Calendar --- .../hr/doctype/leave_application/leave_application.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 124e309c4c..3222a0c216 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -242,8 +242,13 @@ def is_lwp(leave_type): @frappe.whitelist() def get_events(start, end): events = [] - employee = frappe.db.get_default("employee", frappe.session.user) - company = frappe.db.get_default("company", frappe.session.user) + + employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user}, ["name", "company"], + as_dict=True) + if not employee: + return events + + employee, company = employee.name, employee.company from frappe.widgets.reportview import build_match_conditions match_conditions = build_match_conditions("Leave Application")