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

Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error

Browse Source 
fix: Error in consolidated financial statements
This commit is contained in:
rohitwaghchaure 2022-02-20 18:21:54 +05:30 committed by GitHub
commit 6956578339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,9 +354,6 @@ def accumulate_values_into_parents(accounts, accounts_by_name, companies):
if d.parent_account: if d.parent_account:
account = d.parent_account_name account = d.parent_account_name
# 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)
@ -367,7 +364,7 @@ def accumulate_values_into_parents(accounts, accounts_by_name, companies):
accounts_by_name[account].get("opening_balance", 0.0) + d.get("opening_balance", 0.0) accounts_by_name[account].get("opening_balance", 0.0) + d.get("opening_balance", 0.0)
def get_account_heads(root_type, companies, filters): def get_account_heads(root_type, companies, filters):
accounts = get_accounts(root_type, filters) accounts = get_accounts(root_type, companies)
if not accounts: if not accounts:
return None, None, None return None, None, None
@ -396,7 +393,7 @@ def update_parent_account_names(accounts):
for account in accounts: for account in accounts:
if account.parent_account: if account.parent_account:
account["parent_account_name"] = name_to_account_map[account.parent_account] account["parent_account_name"] = name_to_account_map.get(account.parent_account)
return accounts return accounts
@ -419,12 +416,19 @@ def get_subsidiary_companies(company):
return frappe.db.sql_list("""select name from `tabCompany` return frappe.db.sql_list("""select name from `tabCompany`
where lft >= {0} and rgt <= {1} order by lft, rgt""".format(lft, rgt)) where lft >= {0} and rgt <= {1} order by lft, rgt""".format(lft, rgt))
def get_accounts(root_type, filters): def get_accounts(root_type, companies):
return frappe.db.sql(""" select name, is_group, company, accounts = []
parent_account, lft, rgt, root_type, report_type, account_name, account_number added_accounts = []
from
`tabAccount` where company = %s and root_type = %s for company in companies:
""" , (filters.get('company'), root_type), as_dict=1) for account in frappe.get_all("Account", fields=["name", "is_group", "company",
"parent_account", "lft", "rgt", "root_type", "report_type", "account_name", "account_number"],
filters={"company": company, "root_type": root_type}):
if account.account_name not in added_accounts:
accounts.append(account)
added_accounts.append(account.account_name)
return accounts
def prepare_data(accounts, start_date, end_date, balance_must_be, companies, company_currency, filters): def prepare_data(accounts, start_date, end_date, balance_must_be, companies, company_currency, filters):
data = [] data = []