From 9d2c456668ebe269629f6b3598628f5407235001 Mon Sep 17 00:00:00 2001
From: Kavin <78342682+kavin0411@users.noreply.github.com>
Date: Mon, 10 Nov 2025 14:28:37 +0530
Subject: [PATCH 1/2] fix(stock): ignore current voucher in reserved stock
 validation

(cherry picked from commit 0e7f9711e12923fda462099d52e441b0546dc23d)
---
 erpnext/stock/stock_ledger.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 34b442572a0..47cb41852c2 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -2235,6 +2235,10 @@ def get_future_sle_with_negative_batch_qty(sle_args):
 
 
 def validate_reserved_stock(kwargs):
+	# ignore current voucher when validating the reserved stock
+	if not kwargs.ignore_voucher_nos and kwargs.voucher_no:
+		kwargs.ignore_voucher_nos = [kwargs.voucher_no]
+
 	if kwargs.serial_no:
 		validate_reserved_serial_nos(kwargs)
 

From cf66b5aa3403b0732b4ae55df8bcc7c37c093600 Mon Sep 17 00:00:00 2001
From: Kavin <78342682+kavin0411@users.noreply.github.com>
Date: Mon, 10 Nov 2025 14:51:24 +0530
Subject: [PATCH 2/2] fix: Nonetype error if reserved stock is not present

(cherry picked from commit b8ec3ae23aab5ad5a15a4ac61352695a3041c537)
---
 erpnext/stock/doctype/delivery_note/delivery_note.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 263d45599ed..4a0d4048b78 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -523,7 +523,7 @@ class DeliveryNote(SellingController):
 		reserved_stocks = self.get_reserved_stock_details()
 
 		for row in self.items:
-			if reserved_stocks.get((row.item_code, row.warehouse)) > 0:
+			if flt(reserved_stocks.get((row.item_code, row.warehouse))) > 0:
 				args = frappe._dict(
 					{
 						"item_code": row.item_code,