diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index ee6a986bf9..507ec4cf73 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -111,10 +111,8 @@ def generate_report_result( if cint(report.add_total_row) and result and not skip_total_row: result = add_total_row(result, columns, is_tree=is_tree, parent_field=parent_field) - if isinstance(filters, dict): - translate_data = filters.get("translate_data") - if translate_data: - result = translate_report_data(result) + if isinstance(filters, dict) and filters.get("translate_data"): + result = translate_report_data(result) return { "result": result, @@ -817,11 +815,8 @@ def validate_filters_permissions(report_name, filters=None, user=None): def translate_report_data(data): - # remove total row - total_row = data[-1] - data = data[:-1] for d in data: - for field, value in d.items(): - d[field] = _(value) - data.append(total_row) + if isinstance(d, dict): + for field, value in d.items(): + d[field] = _(value) return data diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index da3561d578..7fe7677732 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -173,7 +173,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { frappe.run_serially([ () => this.get_report_doc(), () => this.get_report_settings(), - () => this.add_standard_checkbox(), + () => this.add_translate_data_checkbox(), () => this.setup_progress_bar(), () => this.setup_page_head(), () => this.refresh_report(route_options), @@ -2114,7 +2114,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { return this.get_filter_values; } - add_standard_checkbox() { + add_translate_data_checkbox() { if (frappe.boot.lang == "en") return; let filter_config = { fieldname: "translate_data",