Ver a proveniência

Merge pull request #3965 from mbauskar/get-filter-condition

[hotfix] check if the operator is passed in filters for get-filter-conditions
version-14
Rushabh Mehta há 8 anos
committed by GitHub
ascendente
cometimento
ca5ce399f0
2 ficheiros alterados com 5 adições e 1 eliminações
  1. +4
    -0
      frappe/desk/reportview.py
  2. +1
    -1
      frappe/public/js/frappe/form/multi_select_dialog.js

+ 4
- 0
frappe/desk/reportview.py Ver ficheiro

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



+ 1
- 1
frappe/public/js/frappe/form/multi_select_dialog.js Ver ficheiro

@@ -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 = {


Carregando…
Cancelar
Guardar