From 10664b7b9539f822e126014c9e8dae418ce818d6 Mon Sep 17 00:00:00 2001
From: Sudharsanan11 <sudharsananashok1975@gmail.com>
Date: Fri, 29 May 2026 16:56:29 +0530
Subject: [PATCH] fix(stock): allow to create quality inspection after
 purchase/delivery

(cherry picked from commit c6a88ab1d21d11663a991322dbbff6a7b7d61d85)

# Conflicts:
#	erpnext/controllers/stock_controller.py
#	erpnext/public/js/controllers/transaction.js
---
 erpnext/controllers/stock_controller.py      | 33 ++++++++++++++++----
 erpnext/public/js/controllers/transaction.js |  5 +++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index a4ee4daadb9..bc393452483 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -1680,7 +1680,11 @@ def repost_required_for_queue(doc: StockController) -> bool:
 
 
 @frappe.whitelist()
+<<<<<<< HEAD
 def check_item_quality_inspection(doctype, items):
+=======
+def check_item_quality_inspection(doctype: str, docstatus: str | int, items: str | list[dict]):
+>>>>>>> c6a88ab1d2 (fix(stock): allow to create quality inspection after purchase/delivery)
 	if isinstance(items, str):
 		items = json.loads(items)
 
@@ -1692,13 +1696,30 @@ def check_item_quality_inspection(doctype, items):
 		"Delivery Note": "inspection_required_before_delivery",
 	}
 
-	items_to_remove = []
-	for item in items:
-		if not frappe.db.get_value("Item", item.get("item_code"), inspection_fieldname_map.get(doctype)):
-			items_to_remove.append(item)
-	items = [item for item in items if item not in items_to_remove]
+	inspection_fieldname = inspection_fieldname_map.get(doctype)
+	if inspection_fieldname is None:
+		return []
 
-	return items
+	allow_after_transaction = cint(docstatus) == 1 and frappe.get_single_value(
+		"Stock Settings", "allow_to_make_quality_inspection_after_purchase_or_delivery"
+	)
+
+	if allow_after_transaction:
+		return items
+
+	item_codes = list({item.get("item_code") for item in items})
+
+	Item = frappe.qb.DocType("Item")
+	results = (
+		frappe.qb.from_(Item)
+		.select(Item.name)
+		.where((Item.name.isin(item_codes)) & (Item[inspection_fieldname] == 1))
+		.run(as_dict=True)
+	)
+
+	inspection_required_items = {row.name for row in results}
+
+	return [item for item in items if item.get("item_code") in inspection_required_items]
 
 
 @frappe.whitelist()
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 7c1981973a9..649ed24b789 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -2506,7 +2506,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 			method: "erpnext.controllers.stock_controller.check_item_quality_inspection",
 			args: {
 				doctype: this.frm.doc.doctype,
+<<<<<<< HEAD
 				items: this.frm.doc.items
+=======
+				docstatus: this.frm.doc.docstatus,
+				items: this.frm.doc.items,
+>>>>>>> c6a88ab1d2 (fix(stock): allow to create quality inspection after purchase/delivery)
 			},
 			freeze: true,
 			callback: function (r) {