[fix] don't show expired items in website item list. Fixes #4210.

This commit is contained in:
Anand Doshi
2015-10-29 11:35:16 +05:30
parent 283b55f88c
commit 6d69ca6bac
4 changed files with 14 additions and 8 deletions

View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cstr
from frappe.utils import cstr, nowdate
from erpnext.setup.doctype.item_group.item_group import get_item_for_list_in_html
no_cache = 1
@@ -14,7 +14,10 @@ def get_product_list(search=None, start=0, limit=10):
# base query
query = """select name, item_name, page_name, website_image, thumbnail, item_group,
web_long_description as website_description, parent_website_route
from `tabItem` where show_in_website = 1 and (variant_of is null or variant_of = '')"""
from `tabItem`
where show_in_website = 1
and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %(today)s)
and (variant_of is null or variant_of = '')"""
# search term condition
if search:
@@ -29,6 +32,7 @@ def get_product_list(search=None, start=0, limit=10):
data = frappe.db.sql(query, {
"search": search,
"today": nowdate()
}, as_dict=1)
for d in data: