Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: added missing positional argument #18897

Merged
merged 2 commits into from
Sep 5, 2019
Merged

fix: added missing positional argument #18897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f848a32
fix: added missing positional argument
Anurag810 Sep 3, 2019
770ded9
Merge branch 'version-11-hotfix' into consolidated_financial_statemen…
nabinhait Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def get_cash_flow_data(fiscal_year, companies, filters):
section_data.append(net_profit_loss)

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_name": account['label'],
"account": account['label'],
Expand All @@ -148,12 +148,12 @@ def get_cash_flow_data(fiscal_year, companies, filters):

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 = {}
total = 0
for company in companies:
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":
amount *= -1
Expand Down