Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -442,4 +442,4 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
and tabAccount.company = '%(company)s' and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s' and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield, %(mcond)s""" % {'company': filters['company'], 'key': searchfield,
'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield)}) 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype)})

10
erpnext/controllers/queries.py
View File

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