Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait
2013-02-06 17:40:46 +05:30
7 changed files with 136 additions and 51 deletions

View File

@@ -18,8 +18,6 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import flt, fmt_money
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes import msgprint
sql = webnotes.conn.sql
@@ -209,4 +207,4 @@ def get_master_name(doctype, txt, searchfield, start, page_len, args):
def get_parent_account(doctype, txt, searchfield, start, page_len, args):
return webnotes.conn.sql("""select name from tabAccount
where group_or_ledger = 'Group' and docstatus != 2 and company = '%s'
and name like '%%%s%%'""" % (args["company"], txt))
and name like '%%%s%%'""" % (args["company"], txt))