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

Merge pull request #46918 from frappe/mergify/bp/version-15-hotfix/pr-46893

Browse Source 
fix: inventory dimensions columns visibility depends on filter (backport #46893)
This commit is contained in:
rohitwaghchaure
2025-04-08 11:48:20 +05:30
committed by GitHub
parent 6ba4c092ba fe0e5c2d48
commit 1e4918fb17
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);
}, },

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

@@ -406,6 +406,7 @@ class StockBalanceReport:
}, },
] ]
if self.filters.get("show_dimension_wise_stock"):
for dimension in get_inventory_dimensions(): for dimension in get_inventory_dimensions():
columns.append( columns.append(
{ {