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

show leave application of other employees in deparment if user has Employee role, but also show leave applications based on permissions - show unique of both

Browse Source
This commit is contained in:
Anand Doshi 2013-02-27 18:46:21 +05:30
parent d4d0288540
commit 89e70d77ca
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hr/doctype/leave_application/leave_application.py
View File

@ -236,14 +236,11 @@ def get_events(start, end):
match_conditions = build_match_conditions("Leave Application") match_conditions = build_match_conditions("Leave Application")
# show department leaves for employee # show department leaves for employee
show_department_leaves = match_conditions and \ if "Employee" in webnotes.get_roles():
len(match_conditions.split("or"))==1 and "employee" in match_conditions
if show_department_leaves:
add_department_leaves(events, start, end, employee, company) add_department_leaves(events, start, end, employee, company)
else:
add_leaves(events, start, end, employee, company, match_conditions) add_leaves(events, start, end, employee, company, match_conditions)
add_block_dates(events, start, end, employee, company) add_block_dates(events, start, end, employee, company)
add_holidays(events, start, end, employee, company) add_holidays(events, start, end, employee, company)
@ -273,7 +270,7 @@ def add_leaves(events, start, end, employee, company, match_conditions=None):
query += " and " + match_conditions query += " and " + match_conditions
for d in webnotes.conn.sql(query, (start, end, start, end), as_dict=True): for d in webnotes.conn.sql(query, (start, end, start, end), as_dict=True):
events.append({ e = {
"name": d.name, "name": d.name,
"doctype": "Leave Application", "doctype": "Leave Application",
"from_date": d.from_date, "from_date": d.from_date,
@ -282,7 +279,9 @@ def add_leaves(events, start, end, employee, company, match_conditions=None):
"title": _("Leave by") + " " + cstr(d.employee_name) + \ "title": _("Leave by") + " " + cstr(d.employee_name) + \
(d.half_day and _(" (Half Day)") or ""), (d.half_day and _(" (Half Day)") or ""),
"docstatus": d.docstatus "docstatus": d.docstatus
}) }
if e not in events:
events.append(e)
def add_block_dates(events, start, end, employee, company): def add_block_dates(events, start, end, employee, company):
# block days # block days