nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-29 11:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-04-08 13:32:49 +05:30
committed by GitHub
parent 48822f6fee
commit b824038d37
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -1496,16 +1496,8 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
fields = ["name", "item_name", "item_group", "description"]
fields.extend([field for field in searchfields if field not in ["name", "item_group", "description"]])
<<<<<<< HEAD
searchfields = searchfields + [
field
for field in [searchfield or "name", "item_code", "item_group", "item_name"]
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())}