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

fix(stock): document-level permission check on the legacy bundle path

Browse Source 
The legacy item_code path now resolves the active bundle's name via
get_active_product_bundle (same filters as the old joined query) so
frappe.has_permission can validate the specific document on both
branches. The orphaned get_product_bundle_items helper is removed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mihir Kandoi
2026-06-10 21:51:49 +05:30
parent 0c6f7fed55
commit 81a1c2c8ce
1 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/stock/doctype/packed_item/packed_item.py
View File

@@ -175,31 +175,6 @@ def reset_packing_list(doc):
return reset_table return reset_table
def get_product_bundle_items(item_code):
product_bundle = frappe.qb.DocType("Product Bundle")
product_bundle_item = frappe.qb.DocType("Product Bundle Item")
query = (
frappe.qb.from_(product_bundle_item)
.join(product_bundle)
.on(product_bundle_item.parent == product_bundle.name)
.select(
product_bundle_item.item_code,
product_bundle_item.qty,
product_bundle_item.uom,
product_bundle_item.description,
)
.where(
(product_bundle.new_item_code == item_code)
& (product_bundle.is_active == 1)
& (product_bundle.docstatus == 1)
& (product_bundle.disabled == 0)
)
.orderby(product_bundle_item.idx)
)
return query.run(as_dict=True)
def get_product_bundle_items_by_name(bundle_name): def get_product_bundle_items_by_name(bundle_name):
"Component rows of a specific Product Bundle version." "Component rows of a specific Product Bundle version."
product_bundle_item = frappe.qb.DocType("Product Bundle Item") product_bundle_item = frappe.qb.DocType("Product Bundle Item")
@@ -464,10 +439,12 @@ def get_items_from_product_bundle(row: str):
dialog passes this); ``row.item_code`` is the legacy contract, resolving the dialog passes this); ``row.item_code`` is the legacy contract, resolving the
parent item's active version. parent item's active version.
""" """
from erpnext.selling.doctype.product_bundle.product_bundle import get_active_product_bundle
row, items = ItemDetailsCtx(json.loads(row)), [] row, items = ItemDetailsCtx(json.loads(row)), []
frappe.has_permission("Product Bundle", "read", row.get("product_bundle"), throw=True)
if bundle_name := row.get("product_bundle"): if bundle_name := row.get("product_bundle"):
frappe.has_permission("Product Bundle", "read", bundle_name, throw=True)
bundle = frappe.db.get_value("Product Bundle", bundle_name, ["docstatus", "disabled"], as_dict=True) bundle = frappe.db.get_value("Product Bundle", bundle_name, ["docstatus", "disabled"], as_dict=True)
if not bundle or bundle.docstatus != 1: if not bundle or bundle.docstatus != 1:
frappe.throw(_("Product Bundle {0} is not submitted").format(frappe.bold(bundle_name))) frappe.throw(_("Product Bundle {0} is not submitted").format(frappe.bold(bundle_name)))
@@ -477,9 +454,10 @@ def get_items_from_product_bundle(row: str):
frappe.bold(bundle_name) frappe.bold(bundle_name)
) )
) )
bundled_items = get_product_bundle_items_by_name(bundle_name) elif bundle_name := get_active_product_bundle(row["item_code"]):
else: frappe.has_permission("Product Bundle", "read", bundle_name, throw=True)
bundled_items = get_product_bundle_items(row["item_code"])
bundled_items = get_product_bundle_items_by_name(bundle_name) if bundle_name else []
for item in bundled_items: for item in bundled_items:
row.update( row.update(
{ {