nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50524 from aerele/financial-ratio-calculation-fix

Browse Source 
fix: use dynamic account type to get average ratio balance
This commit is contained in:
ruthra kumar
2025-11-18 16:52:17 +05:30
committed by GitHub
parent 9b374d605a f420371a7e
commit d2c19007cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,7 @@ def add_solvency_ratios(
return_on_equity_ratio = {"ratio": _("Return on Equity Ratio")} return_on_equity_ratio = {"ratio": _("Return on Equity Ratio")}
for year in years: for year in years:
profit_after_tax = flt(total_income.get(year)) + flt(total_expense.get(year)) profit_after_tax = flt(total_income.get(year)) - flt(total_expense.get(year))
share_holder_fund = flt(total_asset.get(year)) - flt(total_liability.get(year)) share_holder_fund = flt(total_asset.get(year)) - flt(total_liability.get(year))
debt_equity_ratio[year] = calculate_ratio(total_liability.get(year), share_holder_fund, precision) debt_equity_ratio[year] = calculate_ratio(total_liability.get(year), share_holder_fund, precision)
@@ -199,7 +199,7 @@ def add_turnover_ratios(data, years, period_list, filters, total_asset, net_sale
avg_data = {} avg_data = {}
for d in ["Receivable", "Payable", "Stock"]: for d in ["Receivable", "Payable", "Stock"]:
avg_data[frappe.scrub(d)] = avg_ratio_balance("Receivable", period_list, precision, filters) avg_data[frappe.scrub(d)] = avg_ratio_balance(d, period_list, precision, filters)
avg_debtors, avg_creditors, avg_stock = ( avg_debtors, avg_creditors, avg_stock = (
avg_data.get("receivable"), avg_data.get("receivable"),