From c3fca3cfcb89a373bd8bac7d0bde4739dee28f4d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 15 Dec 2022 17:05:53 +0530 Subject: [PATCH] fix: disabled items showing in the report 'Itemwise Recommended Reorder Level ' (cherry picked from commit ae31ff1c48cb4a9baab98f61bfe9ed85914a9034) # Conflicts: # erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py --- .../itemwise_recommended_reorder_level.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py index f308e9e41f1..42f15263b77 100644 --- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py @@ -71,6 +71,7 @@ def get_columns(): def get_item_info(filters): from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition +<<<<<<< HEAD conditions = [get_item_group_condition(filters.get("item_group"))] if filters.get("brand"): conditions.append("item.brand=%(brand)s") @@ -83,6 +84,21 @@ def get_item_info(filters): ), filters, as_dict=1, +======= + item = frappe.qb.DocType("Item") + query = ( + frappe.qb.from_(item) + .select( + item.name, + item.item_name, + item.description, + item.brand, + item.item_group, + item.safety_stock, + item.lead_time_days, + ) + .where((item.is_stock_item == 1) & (item.disabled == 0)) +>>>>>>> ae31ff1c48 (fix: disabled items showing in the report 'Itemwise Recommended Reorder Level) )