From 2e333e6802ad880700920e5df70b87495a67a657 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 12:18:31 +0530 Subject: [PATCH] fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38544) * fix(ux): stock-item filter for Item Code field (cherry picked from commit ccdcb7dfcc29eb68d1cad38f3426e6fb575528eb) * fix: don't show non-stock items in Stock Analytics report (cherry picked from commit 01aadbef85e2570399f054027e57d6bb01af9433) * fix: `linter` (cherry picked from commit 15fff84bb5cc78507aa24771fde3e9a9fbb926bc) --------- Co-authored-by: s-aga-r --- .../accounts/report/accounts_receivable/accounts_receivable.py | 2 +- erpnext/stock/report/stock_analytics/stock_analytics.js | 1 + erpnext/stock/report/stock_analytics/stock_analytics.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index ae3fa875e84..f1abc1d4ddb 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -1085,7 +1085,7 @@ class ReceivablePayableReport(object): ) if self.filters.show_remarks: - self.add_column(label=_("Remarks"), fieldname="remarks", fieldtype="Text", width=200), + self.add_column(label=_("Remarks"), fieldname="remarks", fieldtype="Text", width=200) def add_column(self, label, fieldname=None, fieldtype="Currency", options=None, width=120): if not fieldname: diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.js b/erpnext/stock/report/stock_analytics/stock_analytics.js index 78afe6d2642..071bfa22959 100644 --- a/erpnext/stock/report/stock_analytics/stock_analytics.js +++ b/erpnext/stock/report/stock_analytics/stock_analytics.js @@ -17,6 +17,7 @@ frappe.query_reports["Stock Analytics"] = { fieldtype: "Link", options:"Item", default: "", + get_query: () => ({filters: { 'is_stock_item': 1 }}), }, { fieldname: "value_quantity", diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.py b/erpnext/stock/report/stock_analytics/stock_analytics.py index 6c5b58c6e45..ab48181c48d 100644 --- a/erpnext/stock/report/stock_analytics/stock_analytics.py +++ b/erpnext/stock/report/stock_analytics/stock_analytics.py @@ -270,7 +270,7 @@ def get_items(filters): if item_code := filters.get("item_code"): return [item_code] else: - item_filters = {} + item_filters = {"is_stock_item": 1} if item_group := filters.get("item_group"): children = get_descendants_of("Item Group", item_group, ignore_permissions=True) item_filters["item_group"] = ("in", children + [item_group])