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

Fixed item query

Browse Source
This commit is contained in:
Anand Doshi 2014-06-16 13:50:11 +05:30
parent 0521814dea
commit ccf370f813
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/queries.py
View File

@ -141,7 +141,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
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, '0000-00-00') = '0000-00-00' or tabItem.end_of_life > %(today)s) and (tabItem.end_of_life is null or tabItem.end_of_life > %(today)s)
and (tabItem.`{key}` LIKE %(txt)s and (tabItem.`{key}` LIKE %(txt)s
or tabItem.item_name LIKE %(txt)s) or tabItem.item_name LIKE %(txt)s)
{fcond} {mcond} {fcond} {mcond}

1
erpnext/patches.txt
View File

@ -60,3 +60,4 @@ erpnext.patches.v4_0.save_default_letterhead
erpnext.patches.v4_0.update_custom_print_formats_for_renamed_fields erpnext.patches.v4_0.update_custom_print_formats_for_renamed_fields
erpnext.patches.v4_0.update_other_charges_in_custom_purchase_print_formats erpnext.patches.v4_0.update_other_charges_in_custom_purchase_print_formats
erpnext.patches.v4_0.create_price_list_if_missing erpnext.patches.v4_0.create_price_list_if_missing
execute:frappe.db.sql("update `tabItem` set end_of_life=null where end_of_life='0000-00-00'") #2014-06-16