chore: fixed conflicts

This commit is contained in:
rohitwaghchaure
2026-06-01 22:10:06 +05:30
committed by GitHub
parent 8d12a89558
commit 980cefa169

View File

@@ -2112,7 +2112,7 @@ def repost_required_for_queue(doc: StockController) -> bool:
@frappe.whitelist() @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): if isinstance(items, str):
items = json.loads(items) items = json.loads(items)