From a62bf80140c22ed6ee0b7d848a9e505fdded5cde Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 22 Apr 2024 15:03:19 +0200 Subject: [PATCH] fix: reports translations --- .../purchase_order_analysis.py | 4 +++- .../sales_pipeline_analytics.js | 5 ++++- .../production_analytics/production_analytics.py | 14 +++++++------- .../sales_order_analysis/sales_order_analysis.py | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py index b88efe13c0..79a592d982 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py @@ -138,6 +138,8 @@ def prepare_data(data, filters): for field in fields: po_row[field] = flt(row[field]) + flt(po_row[field]) + row["status"] = _(row["status"]) + chart_data = prepare_chart_data(pending, completed) if filters.get("group_by_po"): @@ -150,7 +152,7 @@ def prepare_data(data, filters): def prepare_chart_data(pending, completed): - labels = ["Amount to Bill", "Billed Amount"] + labels = [_("Amount to Bill"), _("Billed Amount")] return { "data": {"labels": labels, "datasets": [{"values": [pending, completed]}]}, diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js index 3111121522..943daddb7f 100644 --- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js +++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js @@ -44,7 +44,10 @@ frappe.query_reports["Sales Pipeline Analytics"] = { fieldname: "based_on", label: __("Based On"), fieldtype: "Select", - options: "Number\nAmount", + options: [ + {label: __("Number", null, "Sales Pipeline Analytics"), value: "Number"}, + {label: __("Amount"), value: "Amount"}, + ], default: "Number" }, { diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.py b/erpnext/manufacturing/report/production_analytics/production_analytics.py index 310603e1b6..dd667e49c0 100644 --- a/erpnext/manufacturing/report/production_analytics/production_analytics.py +++ b/erpnext/manufacturing/report/production_analytics/production_analytics.py @@ -114,7 +114,7 @@ def get_data(filters, columns): for label in labels: work = {} - work["Status"] = label + work["Status"] = _(label) for dummy, end_date in ranges: period = get_period(end_date, filters) if periodic_data.get(label).get(period): @@ -127,7 +127,7 @@ def get_data(filters, columns): def get_chart_data(periodic_data, columns): - labels = [d.get("label") for d in columns[1:]] + labels = [_(d.get("label")) for d in columns[1:]] all_data, not_start, overdue, pending, completed = [], [], [], [], [] datasets = [] @@ -139,11 +139,11 @@ def get_chart_data(periodic_data, columns): pending.append(periodic_data.get("Pending").get(d)) completed.append(periodic_data.get("Completed").get(d)) - datasets.append({"name": "All Work Orders", "values": all_data}) - datasets.append({"name": "Not Started", "values": not_start}) - datasets.append({"name": "Overdue", "values": overdue}) - datasets.append({"name": "Pending", "values": pending}) - datasets.append({"name": "Completed", "values": completed}) + datasets.append({"name": _("All Work Orders"), "values": all_data}) + datasets.append({"name": _("Not Started"), "values": not_start}) + datasets.append({"name": _("Overdue"), "values": overdue}) + datasets.append({"name": _("Pending"), "values": pending}) + datasets.append({"name": _("Completed"), "values": completed}) chart = {"data": {"labels": labels, "datasets": datasets}} chart["type"] = "line" diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py index c922ab5b0e..b225dc6c76 100644 --- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py +++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py @@ -191,6 +191,8 @@ def prepare_data(data, so_elapsed_time, filters): for field in fields: so_row[field] = flt(row[field]) + flt(so_row[field]) + row["status"] = _(row["status"]) + chart_data = prepare_chart_data(pending, completed) if filters.get("group_by_so"): @@ -203,7 +205,7 @@ def prepare_data(data, so_elapsed_time, filters): def prepare_chart_data(pending, completed): - labels = ["Amount to Bill", "Billed Amount"] + labels = [_("Amount to Bill"), _("Billed Amount")] return { "data": {"labels": labels, "datasets": [{"values": [pending, completed]}]}, -- GitLab