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

fix: skip fixed assets in parent

Browse Source 
(cherry picked from commit f9713eeb5690f9e71e01c6c570012f561a633c73)
This commit is contained in:
Gursheen Anand 2023-11-22 15:22:42 +05:30 committed by Mergify
parent 99c1fbf9fc
commit 314a91ac4d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/selling/doctype/product_bundle/product_bundle.py
View File

@ -59,6 +59,8 @@ class ProductBundle(Document):
"""Validates, main Item is not a stock item""" """Validates, main Item is not a stock item"""
if frappe.db.get_value("Item", self.new_item_code, "is_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)) 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): def validate_child_items(self):
for item in self.items: for item in self.items:
@ -73,12 +75,17 @@ class ProductBundle(Document):
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
def get_new_item_code(doctype, txt, searchfield, start, page_len, filters): def get_new_item_code(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond product_bundles = frappe.db.get_list("Product Bundle", pluck="name")
item = frappe.qb.DocType("Item")
return frappe.db.sql( return (
"""select name, item_name, description from tabItem frappe.qb.from_(item)
where is_stock_item=0 and name not in (select name from `tabProduct Bundle`) .select("*")
and %s like %s %s limit %s offset %s""" .where(
% (searchfield, "%s", get_match_cond(doctype), "%s", "%s"), (item.is_stock_item == 0)
("%%%s%%" % txt, page_len, start), & (item.is_fixed_asset == 0)
) & (item.name.notin(product_bundles))
& (item[searchfield].like(f"%{txt}%"))
)
.limit(page_len)
.offset(start)
).run()