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

fix: Error in consolidated financial statement (#34330)

Browse Source
This commit is contained in:
Deepesh Garg 2023-03-11 19:06:56 +05:30 committed by GitHub
parent a9989b12d5
commit aae53bb910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,7 @@ def prepare_companywise_opening_balance(asset_data, liability_data, equity_data,
for data in [asset_data, liability_data, equity_data]: for data in [asset_data, liability_data, equity_data]:
if data: if data:
account_name = get_root_account_name(data[0].root_type, company) account_name = get_root_account_name(data[0].root_type, company)
if account_name:
opening_value += get_opening_balance(account_name, data, company) or 0.0 opening_value += get_opening_balance(account_name, data, company) or 0.0
opening_balance[company] = opening_value opening_balance[company] = opening_value
@ -155,7 +156,7 @@ def get_opening_balance(account_name, data, company):
def get_root_account_name(root_type, company): def get_root_account_name(root_type, company):
return frappe.get_all( root_account = frappe.get_all(
"Account", "Account",
fields=["account_name"], fields=["account_name"],
filters={ filters={
@ -165,7 +166,10 @@ def get_root_account_name(root_type, company):
"parent_account": ("is", "not set"), "parent_account": ("is", "not set"),
}, },
as_list=1, as_list=1,
)[0][0] )
if root_account:
return root_account[0][0]
def get_profit_loss_data(fiscal_year, companies, columns, filters): def get_profit_loss_data(fiscal_year, companies, columns, filters):