vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: simplify function and better naming

Browse source
This commit is contained in:
sokumon 2025-03-03 18:54:03 +05:30
parent 86a0482cbc
commit 299d7bfccb
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frappe/desk/query_report.py
View file

@ -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

4
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -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",