fix: Cost center filter not working in cash flow report
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index d4f2011..12a6bc1 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -8,6 +8,7 @@
from erpnext.accounts.report.financial_statements import (
get_columns,
+ get_cost_centers_with_children,
get_data,
get_filtered_list_for_consolidated_report,
get_period_list,
@@ -160,10 +161,11 @@
total = 0
for period in period_list:
start_date = get_start_date(period, accumulated_values, company)
+ filters.start_date = start_date
+ filters.end_date = period["to_date"]
+ filters.account_type = account_type
- amount = get_account_type_based_gl_data(
- company, start_date, period["to_date"], account_type, filters
- )
+ amount = get_account_type_based_gl_data(company, filters)
if amount and account_type == "Depreciation":
amount *= -1
@@ -175,7 +177,7 @@
return data
-def get_account_type_based_gl_data(company, start_date, end_date, account_type, filters=None):
+def get_account_type_based_gl_data(company, filters=None):
cond = ""
filters = frappe._dict(filters or {})
@@ -191,19 +193,25 @@
frappe.db.escape(cstr(filters.finance_book))
)
+ if filters.get("cost_center"):
+ filters.cost_center = get_cost_centers_with_children(filters.cost_center)
+ cond += " and cost_center in %(cost_center)s"
+
gl_sum = frappe.db.sql_list(
"""
select sum(credit) - sum(debit)
from `tabGL Entry`
- where company=%s and posting_date >= %s and posting_date <= %s
+ where company=%(company)s and posting_date >= %(start_date)s and posting_date <= %(end_date)s
and voucher_type != 'Period Closing Voucher'
- and account in ( SELECT name FROM tabAccount WHERE account_type = %s) {cond}
+ and account in ( SELECT name FROM tabAccount WHERE account_type = %(account_type)s) {cond}
""".format(
cond=cond
),
- (company, start_date, end_date, account_type),
+ filters,
)
+ print(gl_sum)
+
return gl_sum[0] if gl_sum and gl_sum[0] else 0