|
@@ -1008,15 +1008,12 @@ def _filter(data, filters, limit=None): |
|
|
_filters[f] = fval |
|
|
_filters[f] = fval |
|
|
|
|
|
|
|
|
for d in data: |
|
|
for d in data: |
|
|
add = True |
|
|
|
|
|
for f, fval in _filters.items(): |
|
|
for f, fval in _filters.items(): |
|
|
if not frappe.compare(getattr(d, f, None), fval[0], fval[1]): |
|
|
if not frappe.compare(getattr(d, f, None), fval[0], fval[1]): |
|
|
add = False |
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
if add: |
|
|
|
|
|
|
|
|
else: |
|
|
out.append(d) |
|
|
out.append(d) |
|
|
if limit and (len(out)-1)==limit: |
|
|
|
|
|
|
|
|
if limit and len(out) >= limit: |
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
return out |
|
|
return out |