From a3b87352222247052b5e52b4a67e250721ebef0c Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Wed, 15 Sep 2021 10:10:54 +0530
Subject: [PATCH] fix: Values with same account and different account number in
 consolidated balance sheet report (#27493)

(cherry picked from commit 625626b973b399ccc963370edb940e2e9f84d948)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
---
 .../consolidated_financial_statement.py       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index 9a3e82486af..3730a5eeab6 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -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 entry in entries:
 			if entry.account_number:
+<<<<<<< HEAD
 				account_name = entry.account_number + " - " + entry.account_name
 			else:
 				account_name = entry.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:
 				debit, credit = 0, 0
 				for company in companies:
@@ -482,9 +490,15 @@ def update_parent_account_names(accounts):
 
 	for d in accounts:
 		if d.account_number:
+<<<<<<< HEAD
 			account_name = d.account_number + " - " + d.account_name
 		else:
 			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
 
 	for account in accounts:
@@ -660,9 +674,15 @@ def set_gl_entries_by_account(
 
 		for entry in gl_entries:
 			if entry.account_number:
+<<<<<<< HEAD
 				account_name = entry.account_number + " - " + entry.account_name
 			else:
 				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)
 			gl_entries_by_account.setdefault(account_name, []).append(entry)
@@ -770,10 +790,16 @@ def filter_accounts(accounts, depth=10):
 	accounts_by_name = {}
 	for d in accounts:
 		if d.account_number:
+<<<<<<< HEAD
 			account_name = d.account_number + " - " + d.account_name
 		else:
 			account_name = d.account_name
 		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
 
 		parent_children_map.setdefault(d.parent_account or None, []).append(d)