nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect stock balance for inventory dimension (backport #43284) (#43289)

Browse Source 
* fix: incorrect stock balance for inventory dimension (#43284)

(cherry picked from commit 3e7a7a54bf)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.js

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-09-19 10:20:58 +05:30
committed by GitHub
parent 8abc1f4da9
commit 1bdbcc6703
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/report/stock_balance/stock_balance.js
View File

@@ -101,6 +101,12 @@ frappe.query_reports["Stock Balance"] = {
fieldtype: "Check", fieldtype: "Check",
default: 0, default: 0,
}, },
{
fieldname: "show_dimension_wise_stock",
label: __("Show Dimension Wise Stock"),
fieldtype: "Check",
default: 0,
},
], ],
formatter: function (value, row, column, data, default_formatter) { formatter: function (value, row, column, data, default_formatter) {

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

@@ -226,7 +226,10 @@ class StockBalanceReport:
group_by_key = [row.company, row.item_code, row.warehouse] group_by_key = [row.company, row.item_code, row.warehouse]
for fieldname in self.inventory_dimensions: for fieldname in self.inventory_dimensions:
if self.filters.get(fieldname): if not row.get(fieldname):
continue
if self.filters.get(fieldname) or self.filters.get("show_dimension_wise_stock"):
group_by_key.append(row.get(fieldname)) group_by_key.append(row.get(fieldname))
return tuple(group_by_key) return tuple(group_by_key)