nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter issue on timesheet calendar view (#8730)

Browse Source
This commit is contained in:
Nabin Hait
2017-05-08 17:34:07 +05:30
committed by GitHub
parent 9df45bbc42
commit 226ea7db88
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -382,9 +382,13 @@ def get_events(start, end, filters=None):
def get_conditions(filters): def get_conditions(filters):
conditions = [] conditions = []
abbr = {'employee': 'tabTimesheet', 'project': 'tabTimesheet Detail'}
for key in filters: for key in filters:
if filters.get(key): if filters.get(key):
conditions.append("`%s`.%s = '%s'"%(abbr.get(key), key, filters.get(key))) if frappe.get_meta("Timesheet").has_field(key):
dt = 'tabTimesheet'
elif frappe.get_meta("Timesheet Detail").has_field(key):
dt = 'tabTimesheet Detail'
conditions.append("`%s`.%s = '%s'"%(dt, key, filters.get(key)))
return " and {}".format(" and ".join(conditions)) if conditions else "" return " and {}".format(" and ".join(conditions)) if conditions else ""