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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-07-09 17:33:57 +05:30
committed by GitHub
parent deca550f6a
commit 5481d07200
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -2152,20 +2152,14 @@ def get_reference_serial_and_batch_bundle(child_row):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def add_serial_batch_ledgers(entries, child_row, doc, warehouse, do_not_save=False) -> object:
if isinstance(child_row, str):
child_row = frappe._dict(parse_json(child_row))
=======
def add_serial_batch_ledgers( def add_serial_batch_ledgers(
entries: list | str, entries: list | str,
child_row: PurchaseReceiptItem | dict | str, child_row: dict | str,
doc: Document | dict | str, doc: Document | dict | str,
warehouse: str | None = None, warehouse: str | None = None,
do_not_save: bool = False, do_not_save: bool = False,
): ):
child_row = parse_json(child_row) child_row = parse_json(child_row)
>>>>>>> 8b3caeb578 (fix(stock): pick list serial batch posting date (#56957))
if isinstance(entries, str): if isinstance(entries, str):
entries = parse_json(entries) entries = parse_json(entries)