nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] remove end of life condition from item query

Browse Source
This commit is contained in:
Anand Doshi
2013-07-29 13:07:30 +05:30
parent ef0ab5d9aa
commit 9eb2868bf1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/queries.py
View File

@@ -169,15 +169,13 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
if(length(tabItem.description) > 40, \ if(length(tabItem.description) > 40, \
concat(substr(tabItem.description, 1, 40), "..."), description) as decription concat(substr(tabItem.description, 1, 40), "..."), description) as decription
from tabItem from tabItem
where tabItem.docstatus!=2 where tabItem.docstatus<2
and (ifnull(`tabItem`.`end_of_life`,"") in ("", "0000-00-00")
or `tabItem`.`end_of_life` > NOW())
and (tabItem.%(key)s LIKE "%(txt)s" and (tabItem.%(key)s LIKE "%(txt)s"
or tabItem.item_name LIKE "%(txt)s") or tabItem.item_name LIKE "%(txt)s")
%(fcond)s %(mcond)s %(fcond)s %(mcond)s
limit %(start)s,%(page_len)s """ % {'key': searchfield, 'txt': "%%%s%%" % txt, limit %(start)s,%(page_len)s """ % {'key': searchfield, 'txt': "%%%s%%" % txt,
'fcond': get_filters_cond(doctype, filters, conditions), '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): def bom(doctype, txt, searchfield, start, page_len, filters):
conditions = [] conditions = []