mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 15:39:20 +00:00
fix: calculation of P/L in balance sheet
This commit is contained in:
@@ -124,11 +124,11 @@ def get_provisional_profit_loss(
|
|||||||
key = period if consolidated else period.key
|
key = period if consolidated else period.key
|
||||||
effective_liability = 0.0
|
effective_liability = 0.0
|
||||||
if liability:
|
if liability:
|
||||||
effective_liability += flt(liability[-2].get(key))
|
effective_liability += flt(liability[0].get(key))
|
||||||
if equity:
|
if equity:
|
||||||
effective_liability += flt(equity[-2].get(key))
|
effective_liability += flt(equity[0].get(key))
|
||||||
|
|
||||||
provisional_profit_loss[key] = flt(asset[-2].get(key)) - effective_liability
|
provisional_profit_loss[key] = flt(asset[0].get(key)) - effective_liability
|
||||||
total_row[key] = effective_liability + provisional_profit_loss[key]
|
total_row[key] = effective_liability + provisional_profit_loss[key]
|
||||||
|
|
||||||
if provisional_profit_loss[key]:
|
if provisional_profit_loss[key]:
|
||||||
@@ -193,11 +193,11 @@ def get_report_summary(
|
|||||||
for period in period_list:
|
for period in period_list:
|
||||||
key = period if consolidated else period.key
|
key = period if consolidated else period.key
|
||||||
if asset:
|
if asset:
|
||||||
net_asset += asset[-2].get(key)
|
net_asset += asset[0].get(key)
|
||||||
if liability:
|
if liability:
|
||||||
net_liability += liability[-2].get(key)
|
net_liability += liability[0].get(key)
|
||||||
if equity:
|
if equity:
|
||||||
net_equity += equity[-2].get(key)
|
net_equity += equity[0].get(key)
|
||||||
if provisional_profit_loss:
|
if provisional_profit_loss:
|
||||||
net_provisional_profit_loss += provisional_profit_loss.get(key)
|
net_provisional_profit_loss += provisional_profit_loss.get(key)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user