From 5481d072003bc74dd7ac7876b37e6426bbc7e6c7 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 9 Jul 2026 17:33:57 +0530 Subject: [PATCH] chore: fix conflicts --- .../serial_and_batch_bundle/serial_and_batch_bundle.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index 2d475a7022e..2389a1b06b8 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -2152,20 +2152,14 @@ def get_reference_serial_and_batch_bundle(child_row): @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( entries: list | str, - child_row: PurchaseReceiptItem | dict | str, + child_row: dict | str, doc: Document | dict | str, warehouse: str | None = None, do_not_save: bool = False, ): child_row = parse_json(child_row) ->>>>>>> 8b3caeb578 (fix(stock): pick list serial batch posting date (#56957)) if isinstance(entries, str): entries = parse_json(entries)