nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-03-03 20:44:40 +05:30
committed by GitHub
parent 417e8a4371
commit 3e8ebf8c14
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/stock_controller.py
View File

@@ -2128,13 +2128,9 @@ def check_item_quality_inspection(doctype, items):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def make_quality_inspections(doctype, docname, items, inspection_type):
=======
def make_quality_inspections( def make_quality_inspections(
company: str, doctype: str, docname: str, items: str | list, inspection_type: str company: str, doctype: str, docname: str, items: str | list, inspection_type: str
): ):
>>>>>>> 74def423ed (fix(stock): pass company to avoid document naming rule issue in QI)
if isinstance(items, str): if isinstance(items, str):
items = json.loads(items) items = json.loads(items)