fix: skip fixed assets in parent
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.py b/erpnext/selling/doctype/product_bundle/product_bundle.py
index ac83c0f..4b401e7 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.py
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.py
@@ -59,6 +59,8 @@
"""Validates, main Item is not a stock item"""
if frappe.db.get_value("Item", self.new_item_code, "is_stock_item"):
frappe.throw(_("Parent Item {0} must not be a Stock Item").format(self.new_item_code))
+ if frappe.db.get_value("Item", self.new_item_code, "is_fixed_asset"):
+ frappe.throw(_("Parent Item {0} must not be a Fixed Asset").format(self.new_item_code))
def validate_child_items(self):
for item in self.items:
@@ -73,12 +75,17 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_new_item_code(doctype, txt, searchfield, start, page_len, filters):
- from erpnext.controllers.queries import get_match_cond
-
- return frappe.db.sql(
- """select name, item_name, description from tabItem
- where is_stock_item=0 and name not in (select name from `tabProduct Bundle`)
- and %s like %s %s limit %s offset %s"""
- % (searchfield, "%s", get_match_cond(doctype), "%s", "%s"),
- ("%%%s%%" % txt, page_len, start),
- )
+ product_bundles = frappe.db.get_list("Product Bundle", pluck="name")
+ item = frappe.qb.DocType("Item")
+ return (
+ frappe.qb.from_(item)
+ .select("*")
+ .where(
+ (item.is_stock_item == 0)
+ & (item.is_fixed_asset == 0)
+ & (item.name.notin(product_bundles))
+ & (item[searchfield].like(f"%{txt}%"))
+ )
+ .limit(page_len)
+ .offset(start)
+ ).run()