schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38544)

Browse Source 
* fix(ux): stock-item filter for Item Code field

(cherry picked from commit ccdcb7dfcc)

* fix: don't show non-stock items in Stock Analytics report

(cherry picked from commit 01aadbef85)

* fix: `linter`

(cherry picked from commit 15fff84bb5)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
This commit is contained in:
mergify[bot]
2023-12-04 12:18:31 +05:30
committed by GitHub
parent 5a8bf7bf7d
commit 2e333e6802
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -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:

1
erpnext/stock/report/stock_analytics/stock_analytics.js
View File

@@ -17,6 +17,7 @@ frappe.query_reports["Stock Analytics"] = {
fieldtype: "Link",
options:"Item",
default: "",
get_query: () => ({filters: { 'is_stock_item': 1 }}),
},
{
fieldname: "value_quantity",

2
erpnext/stock/report/stock_analytics/stock_analytics.py
View File

@@ -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])