From 5bdd2989c67293ed0e5d786637f4373ef7bb7c97 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:02:01 +0530
Subject: [PATCH 1/2] feat: added finance book filter in depreciation and
 balances report

(cherry picked from commit 45804c68f0d52281b233f91279abdc86644bac10)
---
 .../asset_depreciations_and_balances.js                    | 6 ++++++
 .../asset_depreciations_and_balances.py                    | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
index 49771d7ebe9..0f74df6f909 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
@@ -46,5 +46,11 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
 			options: "Asset",
 			depends_on: "eval: doc.group_by == 'Asset'",
 		},
+		{
+			fieldname: "finance_book",
+			label: __("Finance Book"),
+			fieldtype: "Link",
+			options: "Finance Book",
+		},
 	],
 };
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
index f9a008ade7f..4a6318382cc 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -69,6 +69,9 @@ def get_asset_categories_for_grouped_by_category(filters):
 	condition = ""
 	if filters.get("asset_category"):
 		condition += " and asset_category = %(asset_category)s"
+	if filters.get("finance_book"):
+		condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)"
+
 	# nosemgrep
 	return frappe.db.sql(
 		f"""
@@ -119,6 +122,7 @@ def get_asset_categories_for_grouped_by_category(filters):
 			"from_date": filters.from_date,
 			"company": filters.company,
 			"asset_category": filters.get("asset_category"),
+			"finance_book": filters.get("finance_book"),
 		},
 		as_dict=1,
 	)
@@ -128,6 +132,8 @@ def get_asset_details_for_grouped_by_category(filters):
 	condition = ""
 	if filters.get("asset"):
 		condition += " and name = %(asset)s"
+	if filters.get("finance_book"):
+		condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = `tabAsset`.name and ads.finance_book = %(finance_book)s)"
 	return frappe.db.sql(
 		f"""
 		SELECT name,
@@ -176,6 +182,7 @@ def get_asset_details_for_grouped_by_category(filters):
 			"from_date": filters.from_date,
 			"company": filters.company,
 			"asset": filters.get("asset"),
+			"finance_book": filters.get("finance_book"),
 		},
 		as_dict=1,
 	)

From 9fc0ac1a926a7977cc840b1116a7e007f93e42be Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:27:37 +0530
Subject: [PATCH 2/2] chore: resolved linter warnings with #nosemgrep

(cherry picked from commit adf1e487e1ecb9ae1e85cb08654eeb105f982ac8)
---
 .../asset_depreciations_and_balances.py                         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
index 4a6318382cc..34cced2ca17 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -134,6 +134,8 @@ def get_asset_details_for_grouped_by_category(filters):
 		condition += " and name = %(asset)s"
 	if filters.get("finance_book"):
 		condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = `tabAsset`.name and ads.finance_book = %(finance_book)s)"
+
+	# nosemgrep
 	return frappe.db.sql(
 		f"""
 		SELECT name,