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

fix: Values with same account and different account number in consolidated balance sheet report (#27493)

Browse Source 
(cherry picked from commit 625626b973)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
This commit is contained in:
Deepesh Garg
2021-09-15 10:10:54 +05:30
committed by Mergify
parent f5160dc83d
commit a3b8735222
1 changed files with 26 additions and 0 deletions
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

@@ -400,12 +400,20 @@ def calculate_values(accounts_by_name, gl_entries_by_account, companies, filters
for entries in gl_entries_by_account.values(): for entries in gl_entries_by_account.values():
for entry in entries: for entry in entries:
if entry.account_number: if entry.account_number:
<<<<<<< HEAD
account_name = entry.account_number + " - " + entry.account_name account_name = entry.account_number + " - " + entry.account_name
else: else:
account_name = entry.account_name account_name = entry.account_name
d = accounts_by_name.get(account_name) d = accounts_by_name.get(account_name)
=======
account_name = entry.account_number + ' - ' + entry.account_name
else:
account_name = entry.account_name
d = accounts_by_name.get(account_name)
>>>>>>> 625626b973 (fix: Values with same account and different account number in consolidated balance sheet report (#27493))
if d: if d:
debit, credit = 0, 0 debit, credit = 0, 0
for company in companies: for company in companies:
@@ -482,9 +490,15 @@ def update_parent_account_names(accounts):
for d in accounts: for d in accounts:
if d.account_number: if d.account_number:
<<<<<<< HEAD
account_name = d.account_number + " - " + d.account_name account_name = d.account_number + " - " + d.account_name
else: else:
account_name = d.account_name account_name = d.account_name
=======
account_name = d.account_number + ' - ' + d.account_name
else:
account_name = d.account_name
>>>>>>> 625626b973 (fix: Values with same account and different account number in consolidated balance sheet report (#27493))
name_to_account_map[d.name] = account_name name_to_account_map[d.name] = account_name
for account in accounts: for account in accounts:
@@ -660,9 +674,15 @@ def set_gl_entries_by_account(
for entry in gl_entries: for entry in gl_entries:
if entry.account_number: if entry.account_number:
<<<<<<< HEAD
account_name = entry.account_number + " - " + entry.account_name account_name = entry.account_number + " - " + entry.account_name
else: else:
account_name = entry.account_name account_name = entry.account_name
=======
account_name = entry.account_number + ' - ' + entry.account_name
else:
account_name = entry.account_name
>>>>>>> 625626b973 (fix: Values with same account and different account number in consolidated balance sheet report (#27493))
validate_entries(account_name, entry, accounts_by_name, accounts) validate_entries(account_name, entry, accounts_by_name, accounts)
gl_entries_by_account.setdefault(account_name, []).append(entry) gl_entries_by_account.setdefault(account_name, []).append(entry)
@@ -770,10 +790,16 @@ def filter_accounts(accounts, depth=10):
accounts_by_name = {} accounts_by_name = {}
for d in accounts: for d in accounts:
if d.account_number: if d.account_number:
<<<<<<< HEAD
account_name = d.account_number + " - " + d.account_name account_name = d.account_number + " - " + d.account_name
else: else:
account_name = d.account_name account_name = d.account_name
d["company_wise_opening_bal"] = defaultdict(float) d["company_wise_opening_bal"] = defaultdict(float)
=======
account_name = d.account_number + ' - ' + d.account_name
else:
account_name = d.account_name
>>>>>>> 625626b973 (fix: Values with same account and different account number in consolidated balance sheet report (#27493))
accounts_by_name[account_name] = d accounts_by_name[account_name] = d
parent_children_map.setdefault(d.parent_account or None, []).append(d) parent_children_map.setdefault(d.parent_account or None, []).append(d)