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

[fix] Leave Application Calendar

Browse Source
This commit is contained in:
Anand Doshi 2014-08-18 17:03:35 +05:30
parent 1f3310e0d1
commit e4c434ab6f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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