From 2104d903aa65a5a09b5ecfbb6b937fa181fc33af Mon Sep 17 00:00:00 2001
From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:05:49 +0530
Subject: [PATCH] fix: correcting balance sheet calculation for zero
 liabilities and equity (#41497)

* fix: correcting balance sheet calculation for zero liabilities and equity

* fix: correcting balance sheet calculation for zero liabilities and equity

(cherry picked from commit 3c3313594d94cf1fbd76d0ec6f2ce5d5bfc2603c)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.py
---
 .../report/balance_sheet/balance_sheet.py     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index 2106451bd1a..eaa49631167 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -109,7 +109,7 @@ def get_provisional_profit_loss(
 ):
 	provisional_profit_loss = {}
 	total_row = {}
-	if asset and (liability or equity):
+	if asset:
 		total = total_row_total = 0
 		currency = currency or frappe.get_cached_value("Company", company, "default_currency")
 		total_row = {
@@ -122,6 +122,7 @@ def get_provisional_profit_loss(
 
 		for period in period_list:
 			key = period if consolidated else period.key
+<<<<<<< HEAD
 			effective_liability = 0.0
 			if liability:
 				effective_liability += flt(liability[-2].get(key))
@@ -130,6 +131,22 @@ def get_provisional_profit_loss(
 
 			provisional_profit_loss[key] = flt(asset[-2].get(key)) - effective_liability
 			total_row[key] = effective_liability + provisional_profit_loss[key]
+=======
+			total_assets = flt(asset[0].get(key))
+
+			if liability or equity:
+				effective_liability = 0.0
+				if liability:
+					effective_liability += flt(liability[0].get(key))
+				if equity:
+					effective_liability += flt(equity[0].get(key))
+
+				provisional_profit_loss[key] = total_assets - effective_liability
+			else:
+				provisional_profit_loss[key] = total_assets
+
+			total_row[key] = provisional_profit_loss[key]
+>>>>>>> 3c3313594d (fix: correcting balance sheet calculation for zero liabilities and equity (#41497))
 
 			if provisional_profit_loss[key]:
 				has_value = True