From c87f2d2f7c049f06039a2baa80b76ed846bd053b Mon Sep 17 00:00:00 2001 From: vishnu Date: Wed, 28 Aug 2024 15:10:08 +0000 Subject: [PATCH 1/2] fix: retain date filter when redirecting in Profit and Loss report (cherry picked from commit bb29fc4c3d9e55a5dff14529b37d1bc78b0fb3cc) --- erpnext/public/js/financial_statements.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js index d489c91c305..8cea4dc91b9 100644 --- a/erpnext/public/js/financial_statements.js +++ b/erpnext/public/js/financial_statements.js @@ -113,16 +113,17 @@ erpnext.financial_statements = { onload: function (report) { // dropdown for links to other financial statements erpnext.financial_statements.filters = get_filters(); + var filters = report.get_values(); - let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today()); - - frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) { - var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); - frappe.query_report.set_filter_value({ - period_start_date: fy.year_start_date, - period_end_date: fy.year_end_date, + if (!filters.period_start_date || !filters.period_end_date) { + frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) { + var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); + frappe.query_report.set_filter_value({ + period_start_date: fy.year_start_date, + period_end_date: fy.year_end_date, + }); }); - }); + } const views_menu = report.page.add_custom_button_group(__("Financial Statements")); From e8cfb4d60284a45b771ee180a43beeb52c6cad19 Mon Sep 17 00:00:00 2001 From: vishnu Date: Wed, 28 Aug 2024 15:12:22 +0000 Subject: [PATCH 2/2] fix: indentation (cherry picked from commit 598e9c1390d756ed0f1f0afa80fa13efe94af820) --- erpnext/public/js/financial_statements.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js index 8cea4dc91b9..25620de834d 100644 --- a/erpnext/public/js/financial_statements.js +++ b/erpnext/public/js/financial_statements.js @@ -113,6 +113,8 @@ erpnext.financial_statements = { onload: function (report) { // dropdown for links to other financial statements erpnext.financial_statements.filters = get_filters(); + + let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today()); var filters = report.get_values(); if (!filters.period_start_date || !filters.period_end_date) {