From 3fcaa21110fd77876692f230a508370ab5b737d4 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Wed, 29 Mar 2023 11:34:31 +0530 Subject: [PATCH] refactor(minor): `stock_reservation_entry.py` --- .../stock_reservation_entry.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py index 06e14da0fe..b79e8105c0 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -183,20 +183,27 @@ def get_stock_reservation_entries_for_items( return sre_details -def get_sre_reserved_qty_details(item_code_list: list, warehouse_list: list) -> dict: +def get_sre_reserved_qty_details(item_code: str | list, warehouse: str | list) -> dict: sre_details = {} - if item_code_list and warehouse_list: + if item_code and warehouse: + if isinstance(item_code, str): + item_code = [item_code] + if isinstance(warehouse, str): + warehouse = [warehouse] + sre = frappe.qb.DocType("Stock Reservation Entry") sre_data = ( frappe.qb.from_(sre) .select( - sre.item_code, sre.warehouse, Sum(sre.reserved_qty - sre.delivered_qty).as_("reserved_qty") + sre.item_code, + sre.warehouse, + Sum(sre.reserved_qty - sre.delivered_qty).as_("reserved_qty"), ) .where( (sre.docstatus == 1) - & (sre.item_code.isin(item_code_list)) - & (sre.warehouse.isin(warehouse_list)) + & (sre.item_code.isin(item_code)) + & (sre.warehouse.isin(warehouse)) & (sre.status.notin(["Delivered", "Cancelled"])) ) .groupby(sre.item_code, sre.warehouse)