Filter issue on timesheet calendar view (#8730)
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 490a707..154f0d0 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -382,9 +382,13 @@
def get_conditions(filters):
conditions = []
- abbr = {'employee': 'tabTimesheet', 'project': 'tabTimesheet Detail'}
for key in filters:
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 ""