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

fix for queries

Browse Source
This commit is contained in:
Rushabh Mehta
2014-03-06 12:28:47 +05:30
parent 4541875c81
commit 2e7ad8980c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/queries.py
View File

@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe.widgets.reportview import get_match_cond
from frappe.model.db_query import DatabaseQuery
def get_filters_cond(doctype, filters, conditions):
if filters:
@@ -16,9 +17,12 @@ def get_filters_cond(doctype, filters, conditions):
else:
flt.append([doctype, f[0], '=', f[1]])
from frappe.widgets.reportview import build_filter_conditions
build_filter_conditions(flt, conditions)
cond = ' and ' + ' and '.join(conditions)
query = DatabaseQuery(doctype)
query.filters = flt
query.conditions = conditions
query.build_filter_conditions()
cond = ' and ' + ' and '.join(query.conditions)
else:
cond = ''
return cond