nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-02-05 12:00:01 +05:30
committed by GitHub
parent 401fd7fca7
commit 3689a2deae
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/stock_controller.py
View File

@@ -1564,10 +1564,6 @@ def repost_required_for_queue(doc: StockController) -> bool:
return False return False
@frappe.whitelist()
<<<<<<< HEAD
def make_quality_inspections(doctype, docname, items):
=======
def check_item_quality_inspection(doctype, items): def check_item_quality_inspection(doctype, items):
if isinstance(items, str): if isinstance(items, str):
items = json.loads(items) items = json.loads(items)
@@ -1590,8 +1586,7 @@ def check_item_quality_inspection(doctype, items):
@frappe.whitelist() @frappe.whitelist()
def make_quality_inspections(doctype, docname, items, inspection_type): def make_quality_inspections(doctype, docname, items):
>>>>>>> c92ec312b9 (fix: show only items with inspection enabled on create QI dialog)
if isinstance(items, str): if isinstance(items, str):
items = json.loads(items) items = json.loads(items)