From 61d6e3369be78251a6c58aa330e939f072d8d23e Mon Sep 17 00:00:00 2001
From: Nihantra Patel <nihantra@frappe.io>
Date: Tue, 1 Oct 2024 10:50:43 +0530
Subject: [PATCH] fix: add company filter in Warehouse wise Item Balance Age
 and Value

---
 ...rehouse_wise_item_balance_age_and_value.js | 107 ++++++++++--------
 ...rehouse_wise_item_balance_age_and_value.py |   2 -
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
index 8d6b283a156..c5558a67c14 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
@@ -3,49 +3,64 @@
 
 
 frappe.query_reports["Warehouse wise Item Balance Age and Value"] = {
-        "filters": [
-{
-                        "fieldname":"from_date",
-                        "label": __("From Date"),
-                        "fieldtype": "Date",
-                        "width": "80",
-                        "reqd": 1,
-                        "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
-                },
-                {
-                        "fieldname":"to_date",
-                        "label": __("To Date"),
-                        "fieldtype": "Date",
-                        "width": "80",
-                        "reqd": 1,
-                        "default": frappe.datetime.get_today()
-                },
-                {
-                        "fieldname": "item_group",
-                        "label": __("Item Group"),
-                        "fieldtype": "Link",
-                        "width": "80",
-                        "options": "Item Group"
-                },
-                {
-                        "fieldname": "item_code",
-                        "label": __("Item"),
-                        "fieldtype": "Link",
-                        "width": "80",
-                        "options": "Item"
-                },
-                {
-                        "fieldname": "warehouse",
-                        "label": __("Warehouse"),
-                        "fieldtype": "Link",
-                        "width": "80",
-                        "options": "Warehouse"
-                },
-                {
-                        "fieldname": "filter_total_zero_qty",
-                        "label": __("Filter Total Zero Qty"),
-                        "fieldtype": "Check",
-                        "default": 1
-                },
-        ]
-}
+	filters: [
+		{
+			fieldname: "company",
+			label: __("Company"),
+			fieldtype: "Link",
+			width: "80",
+			options: "Company",
+			reqd: 1,
+			default: frappe.defaults.get_user_default("Company"),
+		},
+		{
+			fieldname: "from_date",
+			label: __("From Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+		},
+		{
+			fieldname: "to_date",
+			label: __("To Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.get_today(),
+		},
+		{
+			fieldname: "item_group",
+			label: __("Item Group"),
+			fieldtype: "Link",
+			width: "80",
+			options: "Item Group",
+		},
+		{
+			fieldname: "item_code",
+			label: __("Item"),
+			fieldtype: "Link",
+			width: "80",
+			options: "Item",
+		},
+		{
+			fieldname: "warehouse",
+			label: __("Warehouse"),
+			fieldtype: "Link",
+			width: "80",
+			options: "Warehouse",
+			get_query: function () {
+				const company = frappe.query_report.get_filter_value("company");
+				return {
+					filters: { company: company },
+				};
+			},
+		},
+		{
+			fieldname: "filter_total_zero_qty",
+			label: __("Filter Total Zero Qty"),
+			fieldtype: "Check",
+			default: 1,
+		},
+	],
+};
diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
index 2e0a91b8cee..f928370a3ba 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
@@ -117,8 +117,6 @@ def validate_filters(filters):
 		sle_count = flt(frappe.qb.from_("Stock Ledger Entry").select(Count("name")).run()[0][0])
 		if sle_count > 500000:
 			frappe.throw(_("Please set filter based on Item or Warehouse"))
-	if not filters.get("company"):
-		filters["company"] = frappe.defaults.get_user_default("Company")
 
 
 def get_warehouse_list(filters):
-- 
GitLab