From e85cbb60f254f81e0472bfa3c8cca11663db427f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 19 Sep 2024 08:47:27 +0530 Subject: [PATCH 1/2] fix: incorrect stock balance for inventory dimension (#43284) (cherry picked from commit 3e7a7a54bf0cda871e0814deb8776238270769b2) # Conflicts: # erpnext/stock/report/stock_balance/stock_balance.js --- .../stock/report/stock_balance/stock_balance.js | 15 +++++++++++++++ .../stock/report/stock_balance/stock_balance.py | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js index ca2c053fdb14..7579aa2d548d 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.js +++ b/erpnext/stock/report/stock_balance/stock_balance.js @@ -101,6 +101,21 @@ frappe.query_reports["Stock Balance"] = { fieldtype: "Check", default: 0, }, +<<<<<<< HEAD +======= + { + fieldname: "include_zero_stock_items", + label: __("Include Zero Stock Items"), + fieldtype: "Check", + default: 0, + }, + { + fieldname: "show_dimension_wise_stock", + label: __("Show Dimension Wise Stock"), + fieldtype: "Check", + default: 0, + }, +>>>>>>> 3e7a7a54bf (fix: incorrect stock balance for inventory dimension (#43284)) ], formatter: function (value, row, column, data, default_formatter) { diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 5a79cdf1827a..eee582ac0547 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -226,7 +226,10 @@ def get_group_by_key(self, row) -> tuple: group_by_key = [row.company, row.item_code, row.warehouse] 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)) return tuple(group_by_key) From 5cb3a8e622f6c5c04772f158a1e6e796e84e82af Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 19 Sep 2024 09:36:33 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/stock/report/stock_balance/stock_balance.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js index 7579aa2d548d..21d5d8f84dca 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.js +++ b/erpnext/stock/report/stock_balance/stock_balance.js @@ -101,21 +101,12 @@ frappe.query_reports["Stock Balance"] = { fieldtype: "Check", default: 0, }, -<<<<<<< HEAD -======= - { - fieldname: "include_zero_stock_items", - label: __("Include Zero Stock Items"), - fieldtype: "Check", - default: 0, - }, { fieldname: "show_dimension_wise_stock", label: __("Show Dimension Wise Stock"), fieldtype: "Check", default: 0, }, ->>>>>>> 3e7a7a54bf (fix: incorrect stock balance for inventory dimension (#43284)) ], formatter: function (value, row, column, data, default_formatter) {