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, 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)