Merge branch 'develop' into fix-minor-custom-cash-flow
diff --git a/erpnext/accounts/report/cash_flow/custom_cash_flow.py b/erpnext/accounts/report/cash_flow/custom_cash_flow.py
index 20f7fcf..e81e0d7 100644
--- a/erpnext/accounts/report/cash_flow/custom_cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/custom_cash_flow.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _
from frappe.query_builder.functions import Sum
-from frappe.utils import add_to_date, get_date_str
+from frappe.utils import add_to_date, flt, get_date_str
from erpnext.accounts.report.financial_statements import get_columns, get_data, get_period_list
from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import (
@@ -442,8 +442,8 @@
else:
gl_sum = 0
- total += gl_sum
- data.setdefault(period["key"], gl_sum)
+ total += flt(gl_sum)
+ data.setdefault(period["key"], flt(gl_sum))
data["total"] = total
return data