mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-15 04:45:09 +00:00
fix: removed hardcoded search fields to fix performance issue
(cherry picked from commit 216bf2456e)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.py
This commit is contained in:
committed by
Mergify
parent
8276e8e8b3
commit
48822f6fee
@@ -1496,11 +1496,16 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
|
|||||||
fields = ["name", "item_name", "item_group", "description"]
|
fields = ["name", "item_name", "item_group", "description"]
|
||||||
fields.extend([field for field in searchfields if field not in ["name", "item_group", "description"]])
|
fields.extend([field for field in searchfields if field not in ["name", "item_group", "description"]])
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
searchfields = searchfields + [
|
searchfields = searchfields + [
|
||||||
field
|
field
|
||||||
for field in [searchfield or "name", "item_code", "item_group", "item_name"]
|
for field in [searchfield or "name", "item_code", "item_group", "item_name"]
|
||||||
if field not in searchfields
|
if field not in searchfields
|
||||||
]
|
]
|
||||||
|
=======
|
||||||
|
if not searchfields:
|
||||||
|
searchfields = ["name"]
|
||||||
|
>>>>>>> 216bf2456e (fix: removed hardcoded search fields to fix performance issue)
|
||||||
|
|
||||||
query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())}
|
query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user