Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[accounts] [minor] [fix] fixed set_query for Mode of Payment

Browse Source
This commit is contained in:
Rushabh Mehta 2013-07-25 10:49:59 +05:30
parent 148cbaeafe
commit a877053d90
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/mode_of_payment/mode_of_payment.js
View File

@ -16,9 +16,9 @@
cur_frm.set_query("default_account", function(doc) { cur_frm.set_query("default_account", function(doc) {
return{ return{
query: "controllers.queries.account_query",
filters: { filters: {
'account_type': "Bank or Cash", 'account_type': "Bank or Cash",
"group_or_ledger": "Ledger",
'company': doc.company 'company': doc.company
} }
} }

18
controllers/queries.py
View File

@ -145,24 +145,6 @@ def supplier_query(doctype, txt, searchfield, start, page_len, filters):
'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield), 'start': start, 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield), 'start': start,
'page_len': page_len}) '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): def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
return webnotes.conn.sql("""select name, parent_account, debit_or_credit return webnotes.conn.sql("""select name, parent_account, debit_or_credit
from tabAccount from tabAccount