From 799f89703636bc554e0dab98e8fc42de71e83267 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sun, 19 Apr 2026 19:34:19 +0530 Subject: [PATCH] =?UTF-8?q?fix(dashboard-trends):=20set=20default=20fiscal?= =?UTF-8?q?=20year=20and=20company=20before=20val=E2=80=A6=20(backport=20#?= =?UTF-8?q?54339)=20(#54399)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(dashboard-trends): set default fiscal year and company before val… (#54339) * fix(dashboard-trends): set default fiscal year and company before validating filters Ensure and are populated with default values * fix(dashboard-trends): ensure fiscal_year and company are properly set before validation to avoid empty filter issues * Update erpnext/controllers/trends.py --------- Co-authored-by: Mihir Kandoi (cherry picked from commit d61b5fd5f61dfdcf210600a2d72671ccfd5e406e) # Conflicts: # erpnext/controllers/trends.py * chore: resolve conflicts --------- Co-authored-by: Ahmed AbuKhatwa <82771130+AhmedAbokhatwa@users.noreply.github.com> Co-authored-by: Mihir Kandoi --- erpnext/controllers/trends.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py index bc4e2b346d4..f8e152f5299 100644 --- a/erpnext/controllers/trends.py +++ b/erpnext/controllers/trends.py @@ -4,7 +4,9 @@ import frappe from frappe import _ -from frappe.utils import getdate +from frappe.utils import DateTimeLikeObject, getdate, today + +from erpnext.accounts.utils import get_fiscal_year def get_columns(filters, trans): @@ -45,6 +47,10 @@ def get_columns(filters, trans): def validate_filters(filters): + if not filters.get("fiscal_year"): + filters["fiscal_year"] = get_fiscal_year(today())[0] + if not filters.get("company"): + filters["company"] = frappe.defaults.get_user_default("Company") for f in ["Fiscal Year", "Based On", "Period", "Company"]: if not filters.get(f.lower().replace(" ", "_")): frappe.throw(_("{0} is mandatory").format(_(f)))