fix(ux): added exception of template item in filters (#27560)

(cherry picked from commit 5c249decbb)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.55.2"
+__version__ = "13.54.4"
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -704,7 +704,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 	reserved_qty = (
 		frappe.qb.from_(p_inv)
 		.from_(p_item)
-		.select(Sum(p_item.qty).as_("qty"))
+		.select(Sum(p_item.stock_qty).as_("stock_qty"))
 		.where(
 			(p_inv.name == p_item.parent)
 			& (IfNull(p_inv.consolidated_invoice, "") == "")
@@ -715,7 +715,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 		)
 	).run(as_dict=True)
 
-	return reserved_qty[0].qty or 0 if reserved_qty else 0
+	return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
 
 
 @frappe.whitelist()

erpnext/manufacturing/doctype/bom/bom.py

@@ -1346,6 +1346,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
 		if not has_variants:
 			query_filters["has_variants"] = 0
 
+<<<<<<< HEAD
 	if filters:
 		for fieldname, value in filters.items():
 			query_filters[fieldname] = value
@@ -1360,6 +1361,11 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
 		limit_page_length=page_len,
 		as_list=1,
 	)
+=======
+	if filters and filters.get("is_stock_item"):
+		or_cond_filters["is_stock_item"] = 1
+		or_cond_filters["has_variants"] = 1
+>>>>>>> 5c249decbb (fix(ux): added exception of template item in filters (#27560))
 
 
 @frappe.whitelist()