nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 15:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(consolidated cash flow): correct totals and labels in section foo… (backport #57336) (#58056)

Browse Source 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2026-08-11 16:42:43 +00:00
committed by GitHub
parent 0637bdad11
commit f11d0d5cec
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/accounts/report/cash_flow/cash_flow.py
View File

@@ -269,9 +269,13 @@ def add_total_row_account(
consolidated=False, consolidated=False,
add_blank_row=True, add_blank_row=True,
): ):
name_key = "account" if consolidated else "section"
parent_key = "parent_account" if consolidated else "parent_section"
label_str = "'" + str(label) + "'"
total_row = { total_row = {
"section_name": "'" + _("{0}").format(label) + "'", f"{name_key}_name": label_str,
"section": "'" + _("{0}").format(label) + "'", name_key: label_str,
"currency": currency, "currency": currency,
} }
@@ -282,15 +286,15 @@ def add_total_row_account(
period_list = get_filtered_list_for_consolidated_report(filters, period_list) period_list = get_filtered_list_for_consolidated_report(filters, period_list)
for row in data: for row in data:
if row.get("parent_section"): if row.get(parent_key):
for period in period_list: for period in period_list:
key = period if consolidated else period["key"] key = period if consolidated else period["key"]
total_row.setdefault(key, 0.0) total_row.setdefault(key, 0.0)
total_row[key] += row.get(key, 0.0) total_row[key] += row.get(key, 0.0)
summary_data[label] += row.get(key) summary_data[label] += row.get(key) or 0.0
total_row.setdefault("total", 0.0) total_row.setdefault("total", 0.0)
total_row["total"] += row["total"] total_row["total"] += row.get("total", 0.0)
out.append(total_row) out.append(total_row)
@@ -431,7 +435,6 @@ def get_opening_range_using_fiscal_year(company, period_list):
def get_report_summary(summary_data, currency): def get_report_summary(summary_data, currency):
report_summary = [] report_summary = []
for label, value in summary_data.items(): for label, value in summary_data.items():
report_summary.append({"value": value, "label": label, "datatype": "Currency", "currency": currency}) report_summary.append({"value": value, "label": label, "datatype": "Currency", "currency": currency})