nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: check for auto reserve serial/batch before auto reserving

Browse Source 
(cherry picked from commit 2c64b76392)

# Conflicts:
#	erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
This commit is contained in:
Mihir Kandoi
2025-08-12 16:51:06 +05:30
committed by Mergify
parent 6b436e1e71
commit 5cc4ab09c3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
View File

@@ -160,7 +160,12 @@ class StockReservationEntry(Document):
not self.from_voucher_type not self.from_voucher_type
and (self.get("_action") == "submit") and (self.get("_action") == "submit")
and (self.has_serial_no or self.has_batch_no) 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 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.batch.batch import get_available_batches
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos_for_outward from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos_for_outward