From 980cefa16991fee85dc9dd20261c07703cddc6e1 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 1 Jun 2026 22:10:06 +0530 Subject: [PATCH] chore: fixed conflicts --- erpnext/controllers/stock_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 484377a5dcc..9762623d97e 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -2112,7 +2112,7 @@ def repost_required_for_queue(doc: StockController) -> bool: @frappe.whitelist() -def check_item_quality_inspection(doctype: str, items: str | list[dict]): +def check_item_quality_inspection(doctype: str, docstatus: str | int, items: str | list[dict]): if isinstance(items, str): items = json.loads(items)