diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.js b/accounts/doctype/mode_of_payment/mode_of_payment.js index e3625e6100..e9e5738509 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.js +++ b/accounts/doctype/mode_of_payment/mode_of_payment.js @@ -16,9 +16,9 @@ cur_frm.set_query("default_account", function(doc) { return{ - query: "controllers.queries.account_query", filters: { 'account_type': "Bank or Cash", + "group_or_ledger": "Ledger", 'company': doc.company } } diff --git a/controllers/queries.py b/controllers/queries.py index 8a990771ba..478971a148 100644 --- a/controllers/queries.py +++ b/controllers/queries.py @@ -144,24 +144,6 @@ def supplier_query(doctype, txt, searchfield, start, page_len, filters): limit %(start)s, %(page_len)s """ % {'field': fields,'key': searchfield, 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield), 'start': start, 'page_len': page_len}) - -def account_query(doctype, txt, searchfield, start, page_len, filters): - conditions = [] - if not filters: - filters = {} - if not filters.group_or_ledger: - filters.group_or_ledger = "Ledger" - - return webnotes.conn.sql(""" - select tabAccount.name, tabAccount.parent_account, tabAccount.debit_or_credit - from tabAccount - where tabAccount.docstatus!=2 - and - and tabAccount.%(key)s LIKE "%(txt)s" - %(fcond)s %(mcond)s - limit %(start)s, %(page_len)s""" % {'key': searchfield, - 'txt': "%%%s%%" % txt, 'fcond': get_filters_cond(doctype, filters, conditions), - 'mcond':get_match_cond(doctype, searchfield), 'start': start, 'page_len': page_len}) def tax_account_query(doctype, txt, searchfield, start, page_len, filters): return webnotes.conn.sql("""select name, parent_account, debit_or_credit