nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47395 from rohitwaghchaure/fixed-serial-no-reservation-validation

Browse Source 
fix: reserved serial nos validation
This commit is contained in:
rohitwaghchaure
2025-05-05 14:10:13 +05:30
committed by GitHub
parent bd4d1cd0d3 a20951e1cd
commit f370b36b62
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -231,6 +231,9 @@ class SerialandBatchBundle(Document):
"warehouse": self.warehouse, "warehouse": self.warehouse,
"check_serial_nos": True, "check_serial_nos": True,
"serial_nos": serial_nos, "serial_nos": serial_nos,
"sabb_voucher_type": self.voucher_type,
"sabb_voucher_no": self.voucher_no,
"sabb_voucher_detail_no": self.voucher_detail_no,
} }
if self.voucher_type == "POS Invoice": if self.voucher_type == "POS Invoice":
kwargs["ignore_voucher_nos"] = [self.voucher_no] kwargs["ignore_voucher_nos"] = [self.voucher_no]
@@ -1874,9 +1877,16 @@ def get_reserved_serial_nos(kwargs) -> list:
ignore_serial_nos.extend(get_reserved_serial_nos_for_pos(kwargs)) ignore_serial_nos.extend(get_reserved_serial_nos_for_pos(kwargs))
reserved_entries = get_reserved_serial_nos_for_sre(kwargs) reserved_entries = get_reserved_serial_nos_for_sre(kwargs)
if not reserved_entries:
return ignore_serial_nos
reserved_voucher_details = get_reserved_voucher_details(kwargs)
serial_nos = [] serial_nos = []
for entry in reserved_entries: for entry in reserved_entries:
if entry.voucher_no in reserved_voucher_details:
continue
if kwargs.get("serial_nos") and entry.serial_no in kwargs.get("serial_nos"): if kwargs.get("serial_nos") and entry.serial_no in kwargs.get("serial_nos"):
frappe.throw( frappe.throw(
_( _(
@@ -1893,6 +1903,29 @@ def get_reserved_serial_nos(kwargs) -> list:
return ignore_serial_nos return ignore_serial_nos
def get_reserved_voucher_details(kwargs):
reserved_voucher_details = []
value = {
"Delivery Note": ["Delivery Note Item", "against_sales_order"],
}.get(kwargs.get("voucher_type"))
if not value or not kwargs.get("sabb_voucher_no"):
return reserved_voucher_details
reserved_voucher_details = frappe.get_all(
value[0],
pluck=value[1],
filters={
"name": kwargs.get("sabb_voucher_detail_no"),
"parent": kwargs.get("sabb_voucher_no"),
"docstatus": 1,
},
)
return reserved_voucher_details
def get_reserved_serial_nos_for_pos(kwargs): def get_reserved_serial_nos_for_pos(kwargs):
from erpnext.controllers.sales_and_purchase_return import get_returned_serial_nos from erpnext.controllers.sales_and_purchase_return import get_returned_serial_nos
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos

23
erpnext/stock/stock_ledger.py
View File

@@ -2109,29 +2109,6 @@ def get_future_sle_with_negative_batch_qty(sle_args):
def validate_reserved_stock(kwargs): def validate_reserved_stock(kwargs):
if kwargs.serial_no:
serial_nos = kwargs.serial_no.split("\n")
validate_reserved_serial_nos(kwargs.item_code, kwargs.warehouse, serial_nos)
elif kwargs.batch_no:
validate_reserved_batch_nos(kwargs.item_code, kwargs.warehouse, [kwargs.batch_no])
elif kwargs.serial_and_batch_bundle:
sbb_entries = frappe.db.get_all(
"Serial and Batch Entry",
{
"parenttype": "Serial and Batch Bundle",
"parent": kwargs.serial_and_batch_bundle,
"docstatus": 1,
},
["batch_no", "serial_no"],
)
if serial_nos := [entry.serial_no for entry in sbb_entries if entry.serial_no]:
validate_reserved_serial_nos(kwargs.item_code, kwargs.warehouse, serial_nos)
elif batch_nos := [entry.batch_no for entry in sbb_entries if entry.batch_no]:
validate_reserved_batch_nos(kwargs.item_code, kwargs.warehouse, batch_nos)
# Qty based validation for non-serial-batch items OR SRE with Reservation Based On Qty. # Qty based validation for non-serial-batch items OR SRE with Reservation Based On Qty.
precision = cint(frappe.db.get_default("float_precision")) or 2 precision = cint(frappe.db.get_default("float_precision")) or 2
balance_qty = get_stock_balance(kwargs.item_code, kwargs.warehouse) balance_qty = get_stock_balance(kwargs.item_code, kwargs.warehouse)