From 9eb2868bf13632980788a0e64eb4601980e33d75 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Jul 2013 13:07:30 +0530 Subject: [PATCH] [fix] [minor] remove end of life condition from item query --- controllers/queries.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/controllers/queries.py b/controllers/queries.py index 478971a148..219fc743d1 100644 --- a/controllers/queries.py +++ b/controllers/queries.py @@ -169,15 +169,13 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): if(length(tabItem.description) > 40, \ concat(substr(tabItem.description, 1, 40), "..."), description) as decription from tabItem - where tabItem.docstatus!=2 - and (ifnull(`tabItem`.`end_of_life`,"") in ("", "0000-00-00") - or `tabItem`.`end_of_life` > NOW()) + where tabItem.docstatus<2 and (tabItem.%(key)s LIKE "%(txt)s" or tabItem.item_name 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}) + 'mcond': get_match_cond(doctype, searchfield), 'start': start, 'page_len': page_len}) def bom(doctype, txt, searchfield, start, page_len, filters): conditions = []