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

allow users without employee with hr permission to view all calendars

Browse Source
This commit is contained in:
RobertSchouten 2016-09-09 10:15:56 +08:00 committed by GitHub
parent e4d3809c87
commit 93c095bf16
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,10 +364,11 @@ def get_events(start, end):
employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user}, ["name", "company"], employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user}, ["name", "company"],
as_dict=True) as_dict=True)
if not employee: if employee:
return events
employee, company = employee.name, employee.company 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 from frappe.desk.reportview import build_match_conditions
match_conditions = build_match_conditions("Leave Application") match_conditions = build_match_conditions("Leave Application")