From c87cd5da0499a3fad6b54bc91061c34069411c79 Mon Sep 17 00:00:00 2001 From: venkat102 Date: Sun, 29 Sep 2024 17:42:23 +0530 Subject: [PATCH 1/2] fix: show total amount on report summary --- .../accounts/report/balance_sheet/balance_sheet.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py index 504fec76ef0..d59934f1d9d 100644 --- a/erpnext/accounts/report/balance_sheet/balance_sheet.py +++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py @@ -122,13 +122,13 @@ def get_provisional_profit_loss( for period in period_list: key = period if consolidated else period.key - total_assets = flt(asset[0].get(key)) + total_assets = flt(asset[-2].get(key)) effective_liability = 0.00 if liability: - effective_liability += flt(liability[0].get(key)) + effective_liability += flt(liability[-2].get(key)) if equity: - effective_liability += flt(equity[0].get(key)) + effective_liability += flt(equity[-2].get(key)) provisional_profit_loss[key] = total_assets - effective_liability total_row[key] = provisional_profit_loss[key] + effective_liability @@ -194,11 +194,11 @@ def get_report_summary( for period in period_list: key = period if consolidated else period.key if asset: - net_asset += asset[0].get(key) + net_asset += asset[-2].get(key) if liability: - net_liability += liability[0].get(key) + net_liability += liability[-2].get(key) if equity: - net_equity += equity[0].get(key) + net_equity += equity[-2].get(key) if provisional_profit_loss: net_provisional_profit_loss += provisional_profit_loss.get(key) From d60600efb29349644792dad93c3311f98861c104 Mon Sep 17 00:00:00 2001 From: venkat102 Date: Thu, 10 Oct 2024 12:07:20 +0530 Subject: [PATCH 2/2] fix: check for empty row to get total amount --- erpnext/accounts/report/balance_sheet/balance_sheet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py index d59934f1d9d..05ab7629841 100644 --- a/erpnext/accounts/report/balance_sheet/balance_sheet.py +++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py @@ -125,9 +125,9 @@ def get_provisional_profit_loss( total_assets = flt(asset[-2].get(key)) effective_liability = 0.00 - if liability: + if liability and liability[-1] == {}: effective_liability += flt(liability[-2].get(key)) - if equity: + if equity and equity[-1] == {}: effective_liability += flt(equity[-2].get(key)) provisional_profit_loss[key] = total_assets - effective_liability @@ -195,9 +195,9 @@ def get_report_summary( key = period if consolidated else period.key if asset: net_asset += asset[-2].get(key) - if liability: + if liability and liability[-1] == {}: net_liability += liability[-2].get(key) - if equity: + if equity and equity[-1] == {}: net_equity += equity[-2].get(key) if provisional_profit_loss: net_provisional_profit_loss += provisional_profit_loss.get(key)