diff --git a/erpnext/accounts/report/financial_ratios/financial_ratios.js b/erpnext/accounts/report/financial_ratios/financial_ratios.js index c0ae31d9bee..e5bc59a3833 100644 --- a/erpnext/accounts/report/financial_ratios/financial_ratios.js +++ b/erpnext/accounts/report/financial_ratios/financial_ratios.js @@ -52,7 +52,7 @@ frappe.query_reports["Financial Ratios"] = { }, ], formatter: function (value, row, column, data, default_formatter) { - let heading_ratios = ["Liquidity Ratios", "Solvency Ratios", "Turnover Ratios"]; + let heading_ratios = [__("Liquidity Ratios"), __("Solvency Ratios"), __("Turnover Ratios")]; if (heading_ratios.includes(value)) { value = $(`${value}`); @@ -60,7 +60,7 @@ frappe.query_reports["Financial Ratios"] = { value = $value.wrap("

").parent().html(); } - if (heading_ratios.includes(row[1].content) && column.fieldtype == "Float") { + if (heading_ratios.includes(row[1]?.content) && column.fieldtype == "Float") { column.fieldtype = "Data"; } diff --git a/erpnext/accounts/report/financial_ratios/financial_ratios.py b/erpnext/accounts/report/financial_ratios/financial_ratios.py index c97cd898ca2..5084b6c1651 100644 --- a/erpnext/accounts/report/financial_ratios/financial_ratios.py +++ b/erpnext/accounts/report/financial_ratios/financial_ratios.py @@ -147,9 +147,9 @@ def get_gl_data(filters, period_list, years): def add_liquidity_ratios(data, years, current_asset, current_liability, quick_asset): precision = frappe.db.get_single_value("System Settings", "float_precision") - data.append({"ratio": "Liquidity Ratios"}) + data.append({"ratio": _("Liquidity Ratios")}) - ratio_data = [["Current Ratio", current_asset], ["Quick Ratio", quick_asset]] + ratio_data = [[_("Current Ratio"), current_asset], [_("Quick Ratio"), quick_asset]] for d in ratio_data: row = { @@ -165,13 +165,13 @@ def add_solvency_ratios( data, years, total_asset, total_liability, net_sales, cogs, total_income, total_expense ): precision = frappe.db.get_single_value("System Settings", "float_precision") - data.append({"ratio": "Solvency Ratios"}) + data.append({"ratio": _("Solvency Ratios")}) - debt_equity_ratio = {"ratio": "Debt Equity Ratio"} - gross_profit_ratio = {"ratio": "Gross Profit Ratio"} - net_profit_ratio = {"ratio": "Net Profit Ratio"} - return_on_asset_ratio = {"ratio": "Return on Asset Ratio"} - return_on_equity_ratio = {"ratio": "Return on Equity Ratio"} + debt_equity_ratio = {"ratio": _("Debt Equity Ratio")} + gross_profit_ratio = {"ratio": _("Gross Profit Ratio")} + net_profit_ratio = {"ratio": _("Net Profit Ratio")} + return_on_asset_ratio = {"ratio": _("Return on Asset Ratio")} + return_on_equity_ratio = {"ratio": _("Return on Equity Ratio")} for year in years: profit_after_tax = flt(total_income.get(year)) + flt(total_expense.get(year)) @@ -195,7 +195,7 @@ def add_solvency_ratios( def add_turnover_ratios(data, years, period_list, filters, total_asset, net_sales, cogs, direct_expense): precision = frappe.db.get_single_value("System Settings", "float_precision") - data.append({"ratio": "Turnover Ratios"}) + data.append({"ratio": _("Turnover Ratios")}) avg_data = {} for d in ["Receivable", "Payable", "Stock"]: @@ -208,10 +208,10 @@ def add_turnover_ratios(data, years, period_list, filters, total_asset, net_sale ) ratio_data = [ - ["Fixed Asset Turnover Ratio", net_sales, total_asset], - ["Debtor Turnover Ratio", net_sales, avg_debtors], - ["Creditor Turnover Ratio", direct_expense, avg_creditors], - ["Inventory Turnover Ratio", cogs, avg_stock], + [_("Fixed Asset Turnover Ratio"), net_sales, total_asset], + [_("Debtor Turnover Ratio"), net_sales, avg_debtors], + [_("Creditor Turnover Ratio"), direct_expense, avg_creditors], + [_("Inventory Turnover Ratio"), cogs, avg_stock], ] for ratio in ratio_data: row = {