CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pos): include Product Bundle components in reserved qty to prevent overselling

Browse Source 
- Add `get_bundle_pos_reserved_qty` to account for component items in submitted POS Invoices
- Update `get_pos_reserved_qty` to sum direct and bundle reservations
- Remove double subtraction in `get_bundle_availability` to avoid underestimating bundle availability
- Prevents overselling when multiple POS sessions sell bundles with shared components
- Fixes #49021

(cherry picked from commit 984d744ac2)
This commit is contained in:
Lewis
2025-08-11 15:27:18 -04:00
committed by Mergify
parent ad052d72d7
commit 5ce0dc2a7a
1 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View File

@@ -775,9 +775,8 @@ def get_bundle_availability(bundle_item_code, warehouse):
for item in product_bundle.items:
item_bin_qty = get_bin_qty(item.item_code, warehouse)
item_pos_reserved_qty = get_pos_reserved_qty(item.item_code, warehouse)
available_qty = item_bin_qty - item_pos_reserved_qty
max_available_bundles = available_qty / item.qty
max_available_bundles = item_bin_qty / item.qty
if bundle_bin_qty > max_available_bundles and frappe.get_value(
"Item", item.item_code, "is_stock_item"
):
@@ -800,9 +799,27 @@ def get_bin_qty(item_code, warehouse):
def get_pos_reserved_qty(item_code, warehouse):
"""
Calculate total quantity reserved for the given item and warehouse.
Includes:
- Direct sales of the item in submitted POS Invoices
- Sales of the item as a component of a Product Bundle
Excludes consolidated invoices (already merged into Sales Invoices via
POS Closing Entry). Used to reflect near real-time availability in the
POS UI and to prevent overselling while multiple sessions may be active.
"""
direct_reserved = get_direct_pos_reserved_qty(item_code, warehouse)
bundle_reserved = get_bundle_pos_reserved_qty(item_code, warehouse)
return direct_reserved + bundle_reserved
def get_direct_pos_reserved_qty(item_code, warehouse):
"""Reserved qty for the item from direct lines in submitted POS Invoices (matching warehouse)."""
p_inv = frappe.qb.DocType("POS Invoice")
p_item = frappe.qb.DocType("POS Invoice Item")
reserved_qty = (
frappe.qb.from_(p_inv)
.from_(p_item)
@@ -815,9 +832,33 @@ def get_pos_reserved_qty(item_code, warehouse):
& (p_item.warehouse == warehouse)
)
).run(as_dict=True)
return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
def get_bundle_pos_reserved_qty(item_code, warehouse):
"""Reserved qty for the item as a component of Product Bundles in submitted POS Invoices (matching warehouse)."""
p_inv = frappe.qb.DocType("POS Invoice")
p_item = frappe.qb.DocType("POS Invoice Item")
pb = frappe.qb.DocType("Product Bundle")
pb_item = frappe.qb.DocType("Product Bundle Item")
bundle_reserved = (
frappe.qb.from_(p_inv)
.from_(p_item)
.from_(pb)
.from_(pb_item)
.select(Sum(p_item.stock_qty * pb_item.qty).as_("stock_qty"))
.where(
(p_inv.name == p_item.parent)
& (IfNull(p_inv.consolidated_invoice, "") == "")
& (p_item.docstatus == 1)
& (p_item.warehouse == warehouse)
& (pb.name == p_item.item_code) # POS item is a bundle
& (pb_item.parent == pb.name) # Bundle items
& (pb_item.item_code == item_code) # This specific item
)
).run(as_dict=True)
return flt(bundle_reserved[0].stock_qty) if bundle_reserved else 0
@frappe.whitelist()
def make_sales_return(source_name, target_doc=None):