Fixed conflict

2016-04-14 18:25:53 +05:30
parent 15a7f215b9 9f553e7206
commit 972c25f78d
50 changed files with 355 additions and 266 deletions
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -184,8 +184,8 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 			idx desc,
 			name, item_name
 		limit %(start)s, %(page_len)s """.format(key=searchfield,
-			fcond=get_filters_cond(doctype, filters, conditions),
-			mcond=get_match_cond(doctype)),
+			fcond=get_filters_cond(doctype, filters, conditions).replace('%', '%%'),
+			mcond=get_match_cond(doctype).replace('%', '%%')),
 			{
 				"today": nowdate(),
 				"txt": "%%%s%%" % txt,