From e4d3809c87ae913f14cacc0fe64bb497ba1e509b Mon Sep 17 00:00:00 2001 From: RobertSchouten Date: Fri, 9 Sep 2016 10:14:07 +0800 Subject: [PATCH 1/2] allow users without employee with hr permission to view all calendars --- erpnext/hr/doctype/employee/employee.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index c6b3633c65..2e5fb26093 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -219,7 +219,11 @@ def get_employees_who_are_born_today(): and status = 'Active'""", {"date": today()}, as_dict=True) def get_holiday_list_for_employee(employee, raise_exception=True): - holiday_list, company = frappe.db.get_value("Employee", employee, ["holiday_list", "company"]) + if employee: + holiday_list, company = frappe.db.get_value("Employee", employee, ["holiday_list", "company"]) + else: + holiday_list='' + company=frappe.db.get_value("Global Defaults", None, "default_company") if not holiday_list: holiday_list = frappe.db.get_value("Company", company, "default_holiday_list") From 93c095bf167f8a30e5cedd450c066d1f7949c0a0 Mon Sep 17 00:00:00 2001 From: RobertSchouten Date: Fri, 9 Sep 2016 10:15:56 +0800 Subject: [PATCH 2/2] allow users without employee with hr permission to view all calendars --- .../hr/doctype/leave_application/leave_application.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 838d8f7513..0aabd27d34 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -364,10 +364,11 @@ def get_events(start, end): 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 + if employee: + employee, company = employee.name, employee.company + else: + employee='' + company=frappe.db.get_value("Global Defaults", None, "default_company") from frappe.desk.reportview import build_match_conditions match_conditions = build_match_conditions("Leave Application")