nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 20:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fixed conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-06-01 22:07:42 +05:30
committed by GitHub
parent 1679680d8e
commit 8d12a89558
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/stock_controller.py
View File

@@ -2112,11 +2112,7 @@ def repost_required_for_queue(doc: StockController) -> bool:
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD def check_item_quality_inspection(doctype: str, items: str | list[dict]):
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): if isinstance(items, str):
items = json.loads(items) items = json.loads(items)