From 77f22635f25236deb6d46fc66e44707b7e1f2e3d Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Fri, 27 Sep 2019 17:50:52 +0530 Subject: [PATCH 1/2] fix(stock-ageing): filter none values from the fifo queue --- erpnext/stock/report/stock_ageing/stock_ageing.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index f0579bf8d6..d2d8210bfc 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -15,6 +15,8 @@ def execute(filters=None): to_date = filters["to_date"] data = [] for item, item_dict in iteritems(item_details): + + item_dict['fifo_queue'] = [item for item in item_dict if item[1]] fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) details = item_dict["details"] if not fifo_queue or (not item_dict.get("total_qty")): continue From ea70c6f696cb6982474dba55d82091a84cc99093 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 3 Oct 2019 19:19:42 +0530 Subject: [PATCH 2/2] fix: dynamically filter fifo queue --- erpnext/stock/report/stock_ageing/stock_ageing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index d2d8210bfc..803a5c81a3 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -13,11 +13,12 @@ def execute(filters=None): columns = get_columns(filters) item_details = get_fifo_queue(filters) to_date = filters["to_date"] + _func = lambda x: x[1] + data = [] for item, item_dict in iteritems(item_details): - item_dict['fifo_queue'] = [item for item in item_dict if item[1]] - fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) + fifo_queue = sorted(filter(_func, item_dict["fifo_queue"]), key=_func) details = item_dict["details"] if not fifo_queue or (not item_dict.get("total_qty")): continue