From d383c700209374e6e98526f6465e13049193cf0b Mon Sep 17 00:00:00 2001 From: lauty95 Date: Tue, 30 Sep 2025 18:54:44 +0000 Subject: [PATCH 1/3] fix: add financial ratios translations --- .../financial_ratios/financial_ratios.js | 4 +- .../financial_ratios/financial_ratios.py | 26 ++++----- erpnext/locale/es.po | 56 +++++++++++++++++++ 3 files changed, 71 insertions(+), 15 deletions(-) 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..5171809ceeb 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 = { diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po index 884137c2d24..3db9b3398ea 100644 --- a/erpnext/locale/es.po +++ b/erpnext/locale/es.po @@ -19618,6 +19618,62 @@ msgstr "" msgid "End Year" msgstr "Fin de año" +#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 +msgid "Liquidity Ratios" +msgstr "Ratios de Liquidez" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 +msgid "Solvency Ratios" +msgstr "Ratios de Solvencia" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 +msgid "Turnover Ratios" +msgstr "Ratios de Rotación" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:152 +msgid "Current Ratio" +msgstr "Ratio de Liquidez Corriente" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:152 +msgid "Quick Ratio" +msgstr "Ratio de Liquidez Inmediata" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:170 +msgid "Debt Equity Ratio" +msgstr "Ratio Deuda-Patrimonio" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:171 +msgid "Gross Profit Ratio" +msgstr "Ratio de Margen Bruto" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:172 +msgid "Net Profit Ratio" +msgstr "Ratio de Margen Neto" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:173 +msgid "Return on Asset Ratio" +msgstr "Ratio de Rentabilidad sobre Activos" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:174 +msgid "Return on Equity Ratio" +msgstr "Ratio de Rentabilidad sobre Patrimonio" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:211 +msgid "Fixed Asset Turnover Ratio" +msgstr "Ratio de Rotación de Activos Fijos" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:212 +msgid "Debtor Turnover Ratio" +msgstr "Ratio de Rotación de Deudores" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:213 +msgid "Creditor Turnover Ratio" +msgstr "Ratio de Rotación de Acreedores" + +#: erpnext/accounts/report/financial_ratios/financial_ratios.py:214 +msgid "Inventory Turnover Ratio" +msgstr "Ratio de Rotación de Inventario" + #: erpnext/accounts/report/financial_statements.py:133 msgid "End Year cannot be before Start Year" msgstr "Año de finalización no puede ser anterior al Año de Inicio" From 1963e0326422f06b0744e43339e43f6ac3ab32ef Mon Sep 17 00:00:00 2001 From: lauty95 Date: Tue, 30 Sep 2025 18:59:07 +0000 Subject: [PATCH 2/3] fix: syntax error --- erpnext/accounts/report/financial_ratios/financial_ratios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/financial_ratios/financial_ratios.py b/erpnext/accounts/report/financial_ratios/financial_ratios.py index 5171809ceeb..5084b6c1651 100644 --- a/erpnext/accounts/report/financial_ratios/financial_ratios.py +++ b/erpnext/accounts/report/financial_ratios/financial_ratios.py @@ -165,7 +165,7 @@ 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")} From a403940612af50592eec56ae45bb4fc4c7d88475 Mon Sep 17 00:00:00 2001 From: lauty95 Date: Wed, 1 Oct 2025 11:51:11 +0000 Subject: [PATCH 3/3] fix: es.po file --- erpnext/locale/es.po | 56 -------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po index 3db9b3398ea..884137c2d24 100644 --- a/erpnext/locale/es.po +++ b/erpnext/locale/es.po @@ -19618,62 +19618,6 @@ msgstr "" msgid "End Year" msgstr "Fin de año" -#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 -msgid "Liquidity Ratios" -msgstr "Ratios de Liquidez" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 -msgid "Solvency Ratios" -msgstr "Ratios de Solvencia" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.js:58 -msgid "Turnover Ratios" -msgstr "Ratios de Rotación" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:152 -msgid "Current Ratio" -msgstr "Ratio de Liquidez Corriente" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:152 -msgid "Quick Ratio" -msgstr "Ratio de Liquidez Inmediata" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:170 -msgid "Debt Equity Ratio" -msgstr "Ratio Deuda-Patrimonio" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:171 -msgid "Gross Profit Ratio" -msgstr "Ratio de Margen Bruto" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:172 -msgid "Net Profit Ratio" -msgstr "Ratio de Margen Neto" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:173 -msgid "Return on Asset Ratio" -msgstr "Ratio de Rentabilidad sobre Activos" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:174 -msgid "Return on Equity Ratio" -msgstr "Ratio de Rentabilidad sobre Patrimonio" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:211 -msgid "Fixed Asset Turnover Ratio" -msgstr "Ratio de Rotación de Activos Fijos" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:212 -msgid "Debtor Turnover Ratio" -msgstr "Ratio de Rotación de Deudores" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:213 -msgid "Creditor Turnover Ratio" -msgstr "Ratio de Rotación de Acreedores" - -#: erpnext/accounts/report/financial_ratios/financial_ratios.py:214 -msgid "Inventory Turnover Ratio" -msgstr "Ratio de Rotación de Inventario" - #: erpnext/accounts/report/financial_statements.py:133 msgid "End Year cannot be before Start Year" msgstr "Año de finalización no puede ser anterior al Año de Inicio"