Merge pull request #42974 from Vishnu7025/report_fix

fix: retain date filter when redirecting in Profit and Loss report
This commit is contained in:
ruthra kumar
2024-09-03 15:43:01 +05:30
committed by GitHub

View File

@@ -117,14 +117,17 @@ erpnext.financial_statements = {
erpnext.financial_statements.filters = get_filters(); erpnext.financial_statements.filters = get_filters();
let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today()); let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today());
var filters = report.get_values();
frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) { if (!filters.period_start_date || !filters.period_end_date) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
frappe.query_report.set_filter_value({ var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
period_start_date: fy.year_start_date, frappe.query_report.set_filter_value({
period_end_date: fy.year_end_date, period_start_date: fy.year_start_date,
period_end_date: fy.year_end_date,
});
}); });
}); }
if (report.page) { if (report.page) {
const views_menu = report.page.add_custom_button_group(__("Financial Statements")); const views_menu = report.page.add_custom_button_group(__("Financial Statements"));