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

Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11

Browse Source 
[Fix] Consolidated Financial Statement report
This commit is contained in:
rohitwaghchaure 2018-09-28 17:06:57 +05:30 committed by GitHub
commit 1cf71d96b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,9 @@ def accumulate_values_into_parents(accounts, accounts_by_name, companies):
for d in reversed(accounts): for d in reversed(accounts):
if d.parent_account: if d.parent_account:
account = d.parent_account.split('-')[0].strip() account = d.parent_account.split('-')[0].strip()
if not accounts_by_name.get(account):
continue
for company in companies: for company in companies:
accounts_by_name[account][company] = \ accounts_by_name[account][company] = \
accounts_by_name[account].get(company, 0.0) + d.get(company, 0.0) accounts_by_name[account].get(company, 0.0) + d.get(company, 0.0)