From c7c1defe648310bb1971735f71a8fc9e5a24aa75 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Sat, 27 Jan 2018 06:30:56 +0100 Subject: [PATCH] after adjusting stock_qty for expired, set in_stock flag --- erpnext/utilities/product.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py index f088e3267d..5a9322bb38 100644 --- a/erpnext/utilities/product.py +++ b/erpnext/utilities/product.py @@ -21,8 +21,6 @@ def get_qty_in_stock(item_code, item_warehouse_field, warehouse=None): if warehouse: stock_qty = frappe.db.sql("""select GREATEST(actual_qty - reserved_qty, 0) from tabBin where item_code=%s and warehouse=%s""", (item_code, warehouse)) - if stock_qty: - in_stock = stock_qty[0][0] > 0 and 1 or 0 if stock_qty[0][0]: stock_qty = adjust_for_expired_items(item_code, stock_qty, warehouse) @@ -30,6 +28,9 @@ def get_qty_in_stock(item_code, item_warehouse_field, warehouse=None): if stock_qty[0][0]: in_stock = stock_qty[0][0] > 0 and 1 or 0 + if stock_qty: + in_stock = stock_qty[0][0] > 0 and 1 or 0 + return frappe._dict({"in_stock": in_stock, "stock_qty": stock_qty, "is_stock_item": is_stock_item})