From 02c3b41dc27f4826b63b5694862af7c0ce9dc7e1 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 24 Apr 2023 14:50:27 +0530 Subject: [PATCH 1/2] fix: item not showing in the BOM --- erpnext/manufacturing/doctype/bom/bom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index a085af859a4..b53149affd3 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -1317,7 +1317,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): if not field in searchfields ] - query_filters = {"disabled": 0, "end_of_life": (">", today())} + query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())} or_cond_filters = {} if txt: From 379b215aeafe0d6fe01952cd31ab536ef4959974 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 24 Apr 2023 17:32:32 +0530 Subject: [PATCH 2/2] fix: incorrect OR condition causing timeout error --- erpnext/stock/stock_ledger.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 0f12987fbb6..6234f95e876 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1441,13 +1441,13 @@ def get_next_stock_reco(kwargs): ( CombineDatetime(sle.posting_date, sle.posting_time) > CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time")) - | ( - ( - CombineDatetime(sle.posting_date, sle.posting_time) - == CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time")) - ) - & (sle.creation > kwargs.get("creation")) + ) + | ( + ( + CombineDatetime(sle.posting_date, sle.posting_time) + == CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time")) ) + & (sle.creation > kwargs.get("creation")) ) ) )