Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38543 from s-aga-r/FIX-6734

Browse Source 
fix: don't show non-stock items in Stock Analytics report
This commit is contained in:
s-aga-r 2023-12-04 12:08:07 +05:30 committed by GitHub
commit fc12238fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,7 +1087,7 @@ class ReceivablePayableReport(object):
) )
if self.filters.show_remarks: 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): def add_column(self, label, fieldname=None, fieldtype="Currency", options=None, width=120):
if not fieldname: 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", fieldtype: "Link",
options:"Item", options:"Item",
default: "", default: "",
get_query: () => ({filters: { 'is_stock_item': 1 }}),
}, },
{ {
fieldname: "value_quantity", 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"): if item_code := filters.get("item_code"):
return [item_code] return [item_code]
else: else:
item_filters = {} item_filters = {"is_stock_item": 1}
if item_group := filters.get("item_group"): if item_group := filters.get("item_group"):
children = get_descendants_of("Item Group", item_group, ignore_permissions=True) children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
item_filters["item_group"] = ("in", children + [item_group]) item_filters["item_group"] = ("in", children + [item_group])