nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 04:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add filter labels and required filters for financial report validation

Browse Source 
(cherry picked from commit 4274c2aba3)
This commit is contained in:
Abdeali Chharchhoda
2026-04-23 16:29:38 +05:30
committed by Mergify
parent 6570796fba
commit e6f0bb66e2
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/accounts/doctype/financial_report_template/financial_report_engine.py
View File

@@ -207,6 +207,21 @@ class FormattingRule:
# ============================================================================ # ============================================================================
FILTER_LABELS = {
"report_template": _("Report Template"),
"filter_based_on": _("Filter Based On"),
"period_start_date": _("Start Date"),
"period_end_date": _("End Date"),
"from_fiscal_year": _("Start Year"),
"to_fiscal_year": _("End Year"),
}
REQUIRED_FILTERS_BY_BASIS = {
"Date Range": ("period_start_date", "period_end_date"),
"Fiscal Year": ("from_fiscal_year", "to_fiscal_year"),
}
class FinancialReportEngine: class FinancialReportEngine:
def execute(self, filters: dict[str, Any]) -> tuple[list[dict], list[dict]]: def execute(self, filters: dict[str, Any]) -> tuple[list[dict], list[dict]]:
"""Execute the complete report generation""" """Execute the complete report generation"""
@@ -226,14 +241,24 @@ class FinancialReportEngine:
return context.get_result() return context.get_result()
def _validate_filters(self, filters: dict[str, Any]) -> None: def _validate_filters(self, filters: dict[str, Any]) -> None:
required_filters = ["report_template", "period_start_date", "period_end_date"] required_filters = ["report_template", "filter_based_on"]
required_filters.extend(REQUIRED_FILTERS_BY_BASIS.get(filters.get("filter_based_on"), ()))
for filter_key in required_filters: for filter_key in required_filters:
if not filters.get(filter_key): if not filters.get(filter_key):
frappe.throw(_("Missing required filter: {0}").format(filter_key)) frappe.throw(
title=_("Missing Required Filter"),
msg=_("Missing required filter: {0}").format(
frappe.bold(FILTER_LABELS.get(filter_key, filter_key))
),
)
if filters.get("presentation_currency"): if filters.get("presentation_currency"):
frappe.msgprint(_("Currency filters are currently unsupported in Custom Financial Report.")) frappe.msgprint(
title=_("Unsupported Feature"),
msg=_("Currency filters are currently unsupported in Custom Financial Report."),
indicator="orange",
)
# Margin view is dependent on first row being an income account. Hence not supported. # Margin view is dependent on first row being an income account. Hence not supported.
# Way to implement this would be using calculated rows with formulas. # Way to implement this would be using calculated rows with formulas.