diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 7c51feb2c7..19ecf3a4e5 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -352,6 +352,10 @@ def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with for f in filters: if isinstance(f[1], basestring) and f[1][0] == '!': flt.append([doctype, f[0], '!=', f[1][1:]]) + elif isinstance(f[1], list) and \ + f[1][0] in (">", "<", ">=", "<=", "like", "not like", "in", "not in", "between"): + + flt.append([doctype, f[0], f[1][0], f[1][1]]) else: flt.append([doctype, f[0], '=', f[1]]) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index 337e209739..1cdb7922af 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -200,7 +200,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({ let date_val = this.dialog.fields_dict["date_range"].get_value(); if(date_val) { - filters[this.date_field] = ['Between', me.dialog.fields_dict["date_range"].parse(date_val)]; + filters[this.date_field] = ['between', date_val]; } let args = {