mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 18:59:08 +00:00
chore: improve code clarity per reviewer feedback
- Rename stock_qty variable to reserved_qty for clarity
- Update get_pos_reserved_qty_from_table to return float
- Simplify aggregation logic in get_pos_reserved_qty
- Ensure return values match docstring specifications
(cherry picked from commit 54d3e5675f)
This commit is contained in:
@@ -813,8 +813,7 @@ def get_pos_reserved_qty(item_code, warehouse):
|
|||||||
pinv_item_reserved_qty = get_pos_reserved_qty_from_table("POS Invoice Item", item_code, warehouse)
|
pinv_item_reserved_qty = get_pos_reserved_qty_from_table("POS Invoice Item", item_code, warehouse)
|
||||||
packed_item_reserved_qty = get_pos_reserved_qty_from_table("Packed Item", item_code, warehouse)
|
packed_item_reserved_qty = get_pos_reserved_qty_from_table("Packed Item", item_code, warehouse)
|
||||||
|
|
||||||
reserved_qty = flt(pinv_item_reserved_qty[0].stock_qty) if pinv_item_reserved_qty else 0
|
reserved_qty = pinv_item_reserved_qty + packed_item_reserved_qty
|
||||||
reserved_qty += flt(packed_item_reserved_qty[0].stock_qty) if packed_item_reserved_qty else 0
|
|
||||||
|
|
||||||
return reserved_qty
|
return reserved_qty
|
||||||
|
|
||||||
@@ -839,7 +838,7 @@ def get_pos_reserved_qty_from_table(child_table, item_code, warehouse):
|
|||||||
|
|
||||||
qty_column = "qty" if child_table == "Packed Item" else "stock_qty"
|
qty_column = "qty" if child_table == "Packed Item" else "stock_qty"
|
||||||
|
|
||||||
stock_qty = (
|
reserved_qty = (
|
||||||
frappe.qb.from_(p_inv)
|
frappe.qb.from_(p_inv)
|
||||||
.from_(p_item)
|
.from_(p_item)
|
||||||
.select(Sum(p_item[qty_column]).as_("stock_qty"))
|
.select(Sum(p_item[qty_column]).as_("stock_qty"))
|
||||||
@@ -852,7 +851,7 @@ def get_pos_reserved_qty_from_table(child_table, item_code, warehouse):
|
|||||||
)
|
)
|
||||||
).run(as_dict=True)
|
).run(as_dict=True)
|
||||||
|
|
||||||
return stock_qty
|
return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
|
||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
|
|||||||
Reference in New Issue
Block a user