Merge pull request #47997 from frappe/version-14-hotfix

chore: release v14

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -1115,6 +1115,7 @@ def get_subitems(
 			item_default.default_warehouse,
 			item.purchase_uom,
 			item_uom.conversion_factor,
+			bom.item.as_("main_bom_item"),
 		)
 		.where(
 			(bom.name == bom_no)
@@ -1228,6 +1229,7 @@ def get_material_request_items(
 			"sales_order": sales_order,
 			"description": row.get("description"),
 			"uom": row.get("purchase_uom") or row.get("stock_uom"),
+			"main_bom_item": row.get("main_bom_item"),
 		}
 
 

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -1322,20 +1322,20 @@ def stop_unstop(work_order, status):
 
 
 @frappe.whitelist()
-def query_sales_order(production_item):
+def query_sales_order(production_item: str) -> list[str]:
-	out = frappe.db.sql_list(
+	return frappe.get_list(
-		"""
+		"Sales Order",
-		select distinct so.name from `tabSales Order` so, `tabSales Order Item` so_item
+		filters=[
-		where so_item.parent=so.name and so_item.item_code=%s and so.docstatus=1
+			["Sales Order", "docstatus", "=", 1],
-	union
+		],
-		select distinct so.name from `tabSales Order` so, `tabPacked Item` pi_item
+		or_filters=[
-		where pi_item.parent=so.name and pi_item.item_code=%s and so.docstatus=1
+			["Sales Order Item", "item_code", "=", production_item],
-	""",
+			["Packed Item", "item_code", "=", production_item],
-		(production_item, production_item),
+		],
+		pluck="name",
+		distinct=True,
 	)
 
-	return out
-
 
 @frappe.whitelist()
 def make_job_card(work_order, operations):

erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py

@@ -79,7 +79,7 @@ def get_bom_stock(filters):
 			BOM_ITEM.stock_qty,
 			BOM_ITEM.stock_uom,
 			BOM_ITEM.stock_qty * qty_to_produce / BOM.quantity,
-			Sum(BIN.actual_qty).as_("actual_qty"),
+			BIN.actual_qty.as_("actual_qty"),
 			Sum(Floor(BIN.actual_qty / (BOM_ITEM.stock_qty * qty_to_produce / BOM.quantity))),
 		)
 		.where((BOM_ITEM.parent == filters.get("bom")) & (BOM_ITEM.parenttype == "BOM"))

erpnext/selling/doctype/sales_order/sales_order.py

@@ -1266,6 +1266,11 @@ def make_raw_material_request(items, company, sales_order, project=None):
 
 	items.update({"company": company, "sales_order": sales_order})
 
+	item_wh = {}
+	for item in items.get("items"):
+		if item.get("warehouse"):
+			item_wh[item.get("item_code")] = item.get("warehouse")
+
 	raw_materials = get_items_for_material_requests(items)
 	if not raw_materials:
 		frappe.msgprint(_("Material Request not created, as quantity for Raw Materials already available."))
@@ -1290,7 +1295,7 @@ def make_raw_material_request(items, company, sales_order, project=None):
 				"item_code": item.get("item_code"),
 				"qty": item.get("quantity"),
 				"schedule_date": schedule_date,
-				"warehouse": item.get("warehouse"),
+				"warehouse": item_wh.get(item.get("main_bom_item")) or item.get("warehouse"),
 				"sales_order": sales_order,
 				"project": project,
 			},

erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

@@ -489,6 +489,10 @@ class StockReconciliation(StockController):
 
 		self.update_inventory_dimensions(row, data)
 
+		if self.docstatus == 1 and has_dimensions and not row.batch_no:
+			data.qty_after_transaction = data.actual_qty
+			data.actual_qty = 0.0
+
 		return data
 
 	def make_sle_on_cancel(self):

erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py

@@ -159,10 +159,11 @@ def assign_item_groups_to_svd_list(svd_list: SVDList) -> None:
 
 def get_item_groups_map(svd_list: SVDList) -> dict[str, str]:
 	item_codes = set(i["item_code"] for i in svd_list)
-	ig_list = frappe.get_list(
+	return frappe._dict(
-		"Item", fields=["item_code", "item_group"], filters=[("item_code", "in", item_codes)]
+		frappe.get_all(
+			"Item", fields=["name", "item_group"], filters=[("name", "in", item_codes)], as_list=True
+		)
 	)
-	return {i["item_code"]: i["item_group"] for i in ig_list}
 
 
 def get_item_groups_dict() -> ItemGroupsDict:

erpnext/stock/stock_ledger.py

@@ -655,8 +655,11 @@ class update_entries_after:
 		if not sle.is_adjustment_entry:
 			sle.stock_value_difference = stock_value_difference
 		elif sle.is_adjustment_entry and not self.args.get("sle_id"):
-			sle.stock_value_difference = get_stock_value_difference(
+			sle.stock_value_difference = (
-				sle.item_code, sle.warehouse, sle.posting_date, sle.posting_time, sle.voucher_no
+				get_stock_value_difference(
+					sle.item_code, sle.warehouse, sle.posting_date, sle.posting_time, sle.voucher_no
+				)
+				* -1
 			)
 
 		sle.doctype = "Stock Ledger Entry"

erpnext/stock/utils.py

@@ -109,6 +109,8 @@ def get_stock_balance(
 
 	from erpnext.stock.stock_ledger import get_previous_sle
 
+	frappe.has_permission("Item", "read", throw=True)
+
 	if posting_date is None:
 		posting_date = nowdate()
 	if posting_time is None: