CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: added finance book filter in depreciation and balances report

Browse Source 
(cherry picked from commit 45804c68f0)
This commit is contained in:
Khushi Rawat
2024-08-27 15:02:01 +05:30
committed by Mergify
parent 42dccadff1
commit 5bdd2989c6
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
View File

@@ -46,5 +46,11 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
options: "Asset", options: "Asset",
depends_on: "eval: doc.group_by == 'Asset'", depends_on: "eval: doc.group_by == 'Asset'",
}, },
{
fieldname: "finance_book",
label: __("Finance Book"),
fieldtype: "Link",
options: "Finance Book",
},
], ],
}; };

7
erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
View File

@@ -69,6 +69,9 @@ def get_asset_categories_for_grouped_by_category(filters):
condition = "" condition = ""
if filters.get("asset_category"): if filters.get("asset_category"):
condition += " and asset_category = %(asset_category)s" 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 # nosemgrep
return frappe.db.sql( return frappe.db.sql(
f""" f"""
@@ -119,6 +122,7 @@ def get_asset_categories_for_grouped_by_category(filters):
"from_date": filters.from_date, "from_date": filters.from_date,
"company": filters.company, "company": filters.company,
"asset_category": filters.get("asset_category"), "asset_category": filters.get("asset_category"),
"finance_book": filters.get("finance_book"),
}, },
as_dict=1, as_dict=1,
) )
@@ -128,6 +132,8 @@ def get_asset_details_for_grouped_by_category(filters):
condition = "" condition = ""
if filters.get("asset"): if filters.get("asset"):
condition += " and name = %(asset)s" 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( return frappe.db.sql(
f""" f"""
SELECT name, SELECT name,
@@ -176,6 +182,7 @@ def get_asset_details_for_grouped_by_category(filters):
"from_date": filters.from_date, "from_date": filters.from_date,
"company": filters.company, "company": filters.company,
"asset": filters.get("asset"), "asset": filters.get("asset"),
"finance_book": filters.get("finance_book"),
}, },
as_dict=1, as_dict=1,
) )