schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correcting balance sheet calculation for zero liabilities and equity (#41497)

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

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

(cherry picked from commit 3c3313594d)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.py
This commit is contained in:
Nihantra C. Patel
2024-06-03 16:05:49 +05:30
committed by Mergify
parent 8ff5a67b99
commit 2104d903aa
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/accounts/report/balance_sheet/balance_sheet.py
View File

@@ -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