Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398)

Browse Source
This commit is contained in:
Saurabh 2019-07-22 11:22:34 +05:30 committed by Nabin Hait
parent 23d4b7cc46
commit 90d7a8888f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,9 @@ def get_account_type_based_data(company, account_type, period_list, accumulated_
data["total"] = total data["total"] = total
return data return data
def get_account_type_based_gl_data(company, start_date, end_date, account_type, filters): def get_account_type_based_gl_data(company, start_date, end_date, account_type, filters={}):
cond = "" cond = ""
filters = frappe._dict(filters)
if filters.finance_book: if filters.finance_book:
cond = " and finance_book = %s" %(frappe.db.escape(filters.finance_book)) cond = " and finance_book = %s" %(frappe.db.escape(filters.finance_book))
@ -187,7 +188,7 @@ def get_chart_data(columns, data):
}, },
"type": "bar" "type": "bar"
} }
chart["fieldtype"] = "Currency" chart["fieldtype"] = "Currency"
return chart return chart

6
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@ -130,7 +130,7 @@ def get_cash_flow_data(fiscal_year, companies, filters):
section_data.append(net_profit_loss) section_data.append(net_profit_loss)
for account in cash_flow_account['account_types']: for account in cash_flow_account['account_types']:
account_data = get_account_type_based_data(account['account_type'], companies, fiscal_year) account_data = get_account_type_based_data(account['account_type'], companies, fiscal_year, filters)
account_data.update({ account_data.update({
"account_name": account['label'], "account_name": account['label'],
"account": account['label'], "account": account['label'],
@ -148,12 +148,12 @@ def get_cash_flow_data(fiscal_year, companies, filters):
return data return data
def get_account_type_based_data(account_type, companies, fiscal_year): def get_account_type_based_data(account_type, companies, fiscal_year, filters):
data = {} data = {}
total = 0 total = 0
for company in companies: for company in companies:
amount = get_account_type_based_gl_data(company, amount = get_account_type_based_gl_data(company,
fiscal_year.year_start_date, fiscal_year.year_end_date, account_type) fiscal_year.year_start_date, fiscal_year.year_end_date, account_type, filters)
if amount and account_type == "Depreciation": if amount and account_type == "Depreciation":
amount *= -1 amount *= -1