fix: Zero division error while fetching unconsumed materials (#27293)

`

(cherry picked from commit 9506c14d35)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.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/stock/doctype/stock_entry/stock_entry.py

@@ -2166,7 +2166,11 @@ class StockEntry(StockController):
 
 			if material_request and material_request not in material_requests:
 				material_requests.append(material_request)
+<<<<<<< HEAD
 				frappe.db.set_value("Material Request", material_request, "transfer_status", status)
+=======
+				frappe.db.set_value('Material Request', material_request, 'transfer_status', status)
+>>>>>>> 9506c14d35 (fix: Zero division error while fetching unconsumed materials (#27293))
 
 	def update_items_for_process_loss(self):
 		process_loss_dict = {}