Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32713 from ernestoruiz89/patch-9

Browse Source 
fix: add missing translation function on report related documents
This commit is contained in:
Deepesh Garg 2022-11-03 09:46:43 +05:30 committed by GitHub
commit 8581b7820d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -1009,7 +1009,7 @@ class ReceivablePayableReport(object):
"{range3}-{range4}".format( "{range3}-{range4}".format(
range3=cint(self.filters["range3"]) + 1, range4=self.filters["range4"] range3=cint(self.filters["range3"]) + 1, range4=self.filters["range4"]
), ),
"{range4}-{above}".format(range4=cint(self.filters["range4"]) + 1, above=_("Above")), _("{range4}-Above").format(range4=cint(self.filters["range4"]) + 1),
] ]
): ):
self.add_column(label=label, fieldname="range" + str(i + 1)) self.add_column(label=label, fieldname="range" + str(i + 1))

2
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@ -75,7 +75,7 @@ frappe.query_reports["Budget Variance Report"] = {
"formatter": function (value, row, column, data, default_formatter) { "formatter": function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data); value = default_formatter(value, row, column, data);
if (column.fieldname.includes('variance')) { if (column.fieldname.includes(__("variance"))) {
if (data[column.fieldname] < 0) { if (data[column.fieldname] < 0) {
value = "<span style='color:red'>" + value + "</span>"; value = "<span style='color:red'>" + value + "</span>";

4
erpnext/accounts/report/budget_variance_report/budget_variance_report.py
View File

@ -383,8 +383,8 @@ def get_chart_data(filters, columns, data):
"data": { "data": {
"labels": labels, "labels": labels,
"datasets": [ "datasets": [
{"name": "Budget", "chartType": "bar", "values": budget_values}, {"name": _("Budget"), "chartType": "bar", "values": budget_values},
{"name": "Actual Expense", "chartType": "bar", "values": actual_values}, {"name": _("Actual Expense"), "chartType": "bar", "values": actual_values},
], ],
}, },
"type": "bar", "type": "bar",

4
erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
View File

@ -396,7 +396,7 @@ class Deferred_Revenue_and_Expense_Report(object):
"labels": [period.label for period in self.period_list], "labels": [period.label for period in self.period_list],
"datasets": [ "datasets": [
{ {
"name": "Actual Posting", "name": _("Actual Posting"),
"chartType": "bar", "chartType": "bar",
"values": [x.actual for x in self.period_total], "values": [x.actual for x in self.period_total],
} }
@ -410,7 +410,7 @@ class Deferred_Revenue_and_Expense_Report(object):
if self.filters.with_upcoming_postings: if self.filters.with_upcoming_postings:
chart["data"]["datasets"].append( chart["data"]["datasets"].append(
{"name": "Expected", "chartType": "line", "values": [x.total for x in self.period_total]} {"name": _("Expected"), "chartType": "line", "values": [x.total for x in self.period_total]}
) )
return chart return chart

8
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@ -313,11 +313,13 @@ class Analytics(object):
def get_period(self, posting_date): def get_period(self, posting_date):
if self.filters.range == "Weekly": if self.filters.range == "Weekly":
period = "Week " + str(posting_date.isocalendar()[1]) + " " + str(posting_date.year) period = _("Week {0} {1}").format(str(posting_date.isocalendar()[1]), str(posting_date.year))
elif self.filters.range == "Monthly": elif self.filters.range == "Monthly":
period = str(self.months[posting_date.month - 1]) + " " + str(posting_date.year) period = _(str(self.months[posting_date.month - 1])) + " " + str(posting_date.year)
elif self.filters.range == "Quarterly": elif self.filters.range == "Quarterly":
period = "Quarter " + str(((posting_date.month - 1) // 3) + 1) + " " + str(posting_date.year) period = _("Quarter {0} {1}").format(
str(((posting_date.month - 1) // 3) + 1), str(posting_date.year)
)
else: else:
year = get_fiscal_year(posting_date, company=self.filters.company) year = get_fiscal_year(posting_date, company=self.filters.company)
period = str(year[0]) period = str(year[0])

4
erpnext/stock/report/stock_ageing/stock_ageing.py
View File

@ -198,11 +198,11 @@ def setup_ageing_columns(filters: Filters, range_columns: List):
f"0 - {filters['range1']}", f"0 - {filters['range1']}",
f"{cint(filters['range1']) + 1} - {cint(filters['range2'])}", f"{cint(filters['range1']) + 1} - {cint(filters['range2'])}",
f"{cint(filters['range2']) + 1} - {cint(filters['range3'])}", f"{cint(filters['range2']) + 1} - {cint(filters['range3'])}",
f"{cint(filters['range3']) + 1} - {_('Above')}", _("{0} - Above").format(cint(filters["range3"]) + 1),
] ]
for i, label in enumerate(ranges): for i, label in enumerate(ranges):
fieldname = "range" + str(i + 1) fieldname = "range" + str(i + 1)
add_column(range_columns, label=f"Age ({label})", fieldname=fieldname) add_column(range_columns, label=_("Age ({0})").format(label), fieldname=fieldname)
def add_column( def add_column(

8
erpnext/stock/report/stock_analytics/stock_analytics.py
View File

@ -114,11 +114,13 @@ def get_period(posting_date, filters):
months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
if filters.range == "Weekly": if filters.range == "Weekly":
period = "Week " + str(posting_date.isocalendar()[1]) + " " + str(posting_date.year) period = _("Week {0} {1}").format(str(posting_date.isocalendar()[1]), str(posting_date.year))
elif filters.range == "Monthly": elif filters.range == "Monthly":
period = str(months[posting_date.month - 1]) + " " + str(posting_date.year) period = _(str(months[posting_date.month - 1])) + " " + str(posting_date.year)
elif filters.range == "Quarterly": elif filters.range == "Quarterly":
period = "Quarter " + str(((posting_date.month - 1) // 3) + 1) + " " + str(posting_date.year) period = _("Quarter {0} {1}").format(
str(((posting_date.month - 1) // 3) + 1), str(posting_date.year)
)
else: else:
year = get_fiscal_year(posting_date, company=filters.company) year = get_fiscal_year(posting_date, company=filters.company)
period = str(year[2]) period = str(year[2])