From 36e9aae9d05770598ecb839b259a94e1fcad04d0 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 18 Nov 2025 18:04:29 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_entry/stock_entry.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 8d72aae7506..0ead7461d67 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -1135,17 +1135,9 @@ class StockEntry(StockController): "ignore_serial_nos": already_picked_serial_nos, "qty": row.transfer_qty * -1, } -<<<<<<< HEAD - ).update_serial_and_batch_entries() - elif not row.serial_and_batch_bundle: -======= - ).update_serial_and_batch_entries( - serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) - ) elif not row.serial_and_batch_bundle and frappe.get_single_value( "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" ): ->>>>>>> 3ca1940881 (fix: validate sabb autocreation when disabled) bundle_doc = SerialBatchCreation( { "item_code": row.item_code,