Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jun 3, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8702ac4
fix: correcting balance sheet calculation for zero liabilities and eq…
Nihantra-Patel May 16, 2024
d8eadac
fix: correcting balance sheet calculation for zero liabilities and eq…
Nihantra-Patel May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 15 additions & 9 deletions erpnext/accounts/report/balance_sheet/balance_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -122,14 +122,20 @@ def get_provisional_profit_loss(

for period in period_list:
key = period if consolidated else period.key
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] = flt(asset[0].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]

if provisional_profit_loss[key]:
has_value = True
Expand Down