nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33311 from frappe/mergify/bp/version-14-hotfix/pr-33303

Browse Source 
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch (backport #33303)
This commit is contained in:
ruthra kumar
2022-12-13 13:45:41 +05:30
committed by GitHub
parent d707528113 436e93c129
commit dbd0d560a8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,12 +533,13 @@ def get_accounts(root_type, companies):
],
filters={"company": company, "root_type": root_type},
):
if account.account_name not in added_accounts:
if account.account_number:
account_key = account.account_number + "-" + account.account_name
else:
account_key = account.account_name
if account_key not in added_accounts:
accounts.append(account)
if account.account_number:
account_key = account.account_number + "-" + account.account_name
else:
account_key = account.account_name
added_accounts.append(account_key)
return accounts