From 8d12a895583e159373b9c90c1e392274cdb94d2b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 1 Jun 2026 22:07:42 +0530 Subject: [PATCH] chore: fixed conflicts --- erpnext/controllers/stock_controller.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index e24503f4408..484377a5dcc 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -2112,11 +2112,7 @@ 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) +def check_item_quality_inspection(doctype: str, items: str | list[dict]): if isinstance(items, str): items = json.loads(items)