nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-22 19:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: inventory dimensions columns visibility depends on filter

Browse Source 
(cherry picked from commit 2b411fb7f5)
This commit is contained in:
Rohit Waghchaure
2025-04-07 11:47:27 +05:30
committed by Mergify
parent 8276e8e8b3
commit fe0e5c2d48
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/utils.js
View File

@@ -263,6 +263,10 @@ $.extend(erpnext.utils, {
fieldname: dimension["fieldname"], fieldname: dimension["fieldname"],
label: __(dimension["doctype"]), label: __(dimension["doctype"]),
fieldtype: "MultiSelectList", fieldtype: "MultiSelectList",
depends_on:
report_name === "Stock Balance"
? "eval:doc.show_dimension_wise_stock === 1"
: "",
get_data: function (txt) { get_data: function (txt) {
return frappe.db.get_link_options(dimension["doctype"], txt); return frappe.db.get_link_options(dimension["doctype"], txt);
}, },

21
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -406,16 +406,17 @@ class StockBalanceReport:
}, },
] ]
for dimension in get_inventory_dimensions(): if self.filters.get("show_dimension_wise_stock"):
columns.append( for dimension in get_inventory_dimensions():
{ columns.append(
"label": _(dimension.doctype), {
"fieldname": dimension.fieldname, "label": _(dimension.doctype),
"fieldtype": "Link", "fieldname": dimension.fieldname,
"options": dimension.doctype, "fieldtype": "Link",
"width": 110, "options": dimension.doctype,
} "width": 110,
) }
)
columns.extend( columns.extend(
[ [