From 5cc4ab09c3a561da68e2be3429e55289d2f322c8 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 12 Aug 2025 16:51:06 +0530 Subject: [PATCH] fix: check for auto reserve serial/batch before auto reserving (cherry picked from commit 2c64b76392f55bed91dbae78b31a7de57e39fa9b) # Conflicts: # erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py --- .../stock_reservation_entry/stock_reservation_entry.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py index 5d6aa9f68f8..cfaee25d084 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -160,7 +160,12 @@ class StockReservationEntry(Document): not self.from_voucher_type and (self.get("_action") == "submit") and (self.has_serial_no or self.has_batch_no) +<<<<<<< HEAD and cint(frappe.db.get_single_value("Stock Settings", "auto_reserve_serial_and_batch")) +======= + and frappe.get_single_value("Stock Settings", "auto_reserve_serial_and_batch") + and not self.get("bypass_auto_reserve_serial_and_batch") +>>>>>>> 2c64b76392 (fix: check for auto reserve serial/batch before auto reserving) ): from erpnext.stock.doctype.batch.batch import get_available_batches from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos_for_outward