nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-13 14:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: field validation and perm checks on get_stock_reservation_entries_for_voucher (#57968)

Browse Source
This commit is contained in:
Diptanil Saha
2026-08-10 14:48:53 +05:30
committed by GitHub
parent a25decfa50
commit ef1d83c298
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1093,7 +1093,7 @@ def get_ssb_bundle_for_voucher(sre_list) -> object:
def has_reserved_stock(voucher_type: str, voucher_no: str, voucher_detail_no: str | None = None) -> bool:
"""Returns True if there is any Stock Reservation Entry for the given voucher."""
if get_stock_reservation_entries_for_voucher(
if _get_stock_reservation_entries_for_voucher(
voucher_type, voucher_no, voucher_detail_no, fields=["name"], ignore_status=True
):
return True
@@ -1833,7 +1833,7 @@ def cancel_stock_reservation_entries(
sre_list = {}
if voucher_type and voucher_no:
sre_list = get_stock_reservation_entries_for_voucher(
sre_list = _get_stock_reservation_entries_for_voucher(
voucher_type, voucher_no, voucher_detail_no, fields=["name"]
)
elif from_voucher_type and from_voucher_no:
@@ -1876,6 +1876,21 @@ def get_stock_reservation_entries_for_voucher(
) -> list[dict]:
"""Returns list of Stock Reservation Entries against a Voucher."""
return _get_stock_reservation_entries_for_voucher(
voucher_type, voucher_no, voucher_detail_no, fields, ignore_status, ignore_permissions=False
)
def _get_stock_reservation_entries_for_voucher(
voucher_type: str,
voucher_no: str,
voucher_detail_no: str | None = None,
fields: list[str] | None = None,
ignore_status: bool = False,
ignore_permissions: bool = True,
) -> list[dict]:
"""Returns list of Stock Reservation Entries against a Voucher."""
if not fields or not isinstance(fields, list):
fields = [
"name",
@@ -1889,14 +1904,11 @@ def get_stock_reservation_entries_for_voucher(
sre = frappe.qb.DocType("Stock Reservation Entry")
query = (
frappe.qb.from_(sre)
frappe.get_query(sre, fields=fields, ignore_permissions=ignore_permissions)
.where((sre.docstatus == 1) & (sre.voucher_type == voucher_type) & (sre.voucher_no == voucher_no))
.orderby(sre.creation)
)
for field in fields:
query = query.select(sre[field])
if voucher_detail_no:
query = query.where(sre.voucher_detail_no == voucher_detail_no)

16
erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
View File

@@ -12,9 +12,9 @@ from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.stock_entry.stock_entry import StockEntry
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
_get_stock_reservation_entries_for_voucher,
cancel_stock_reservation_entries,
get_sre_reserved_qty_details_for_voucher,
get_stock_reservation_entries_for_voucher,
has_reserved_stock,
)
from erpnext.stock.utils import get_stock_balance
@@ -215,7 +215,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
self.assertTrue(has_reserved_stock("Sales Order", so.name))
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order", so.name, item.name, fields=["reserved_qty", "status"]
)[0]
self.assertEqual(item.stock_reserved_qty, sre_details.reserved_qty)
@@ -285,7 +285,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
dn1.submit()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order", so.name, item.name, fields=["delivered_qty", "status"]
)[0]
self.assertGreater(sre_details.delivered_qty, 0)
@@ -302,7 +302,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
dn2.submit()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order",
so.name,
item.name,
@@ -630,7 +630,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
so.load_from_db()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order", so.name, item.name, fields=["status", "reserved_qty"]
)[0]
@@ -645,7 +645,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
dn.submit()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order", so.name, item.name, fields=["status", "delivered_qty", "reserved_qty"]
)[0]
@@ -693,7 +693,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
so.load_from_db()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order",
so.name,
item.name,
@@ -754,7 +754,7 @@ class TestStockReservationEntry(ERPNextTestSuite):
so.load_from_db()
for item in so.items:
sre_details = get_stock_reservation_entries_for_voucher(
sre_details = _get_stock_reservation_entries_for_voucher(
"Sales Order", so.name, item.name, fields=["reserved_qty"]
)[0]