[IMP] account_financial_report: Trial balance changes:
- Show Initial balance and Ending balance only when it is necessary with currency + hide currency column - Show currency in the correct column - Create a dict with all keys when it does not exist - Prevent wrong values TT41158
This commit is contained in:
Víctor Martínez
committed by
chaule97
chaule97
parent
80559a323f
commit
babce27fd8
@@ -211,33 +211,15 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
):
|
||||
for tb in tb_period_acc:
|
||||
acc_id = tb["account_id"][0]
|
||||
total_amount[acc_id] = {}
|
||||
total_amount[acc_id] = self._prepare_total_amount(tb, foreign_currency)
|
||||
total_amount[acc_id]["credit"] = tb["credit"]
|
||||
total_amount[acc_id]["debit"] = tb["debit"]
|
||||
total_amount[acc_id]["balance"] = tb["balance"]
|
||||
total_amount[acc_id]["initial_balance"] = 0.0
|
||||
total_amount[acc_id]["ending_balance"] = tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id]["initial_currency_balance"] = 0.0
|
||||
total_amount[acc_id]["ending_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
for tb in tb_initial_acc:
|
||||
acc_id = tb["account_id"]
|
||||
if acc_id not in total_amount.keys():
|
||||
total_amount[acc_id] = {}
|
||||
total_amount[acc_id]["credit"] = 0.0
|
||||
total_amount[acc_id]["debit"] = 0.0
|
||||
total_amount[acc_id]["balance"] = 0.0
|
||||
total_amount[acc_id]["initial_balance"] = tb["balance"]
|
||||
total_amount[acc_id]["ending_balance"] = tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id]["initial_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
total_amount[acc_id]["ending_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
total_amount[acc_id] = self._prepare_total_amount(tb, foreign_currency)
|
||||
else:
|
||||
total_amount[acc_id]["initial_balance"] = tb["balance"]
|
||||
total_amount[acc_id]["ending_balance"] += tb["balance"]
|
||||
@@ -250,23 +232,42 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
)
|
||||
return total_amount
|
||||
|
||||
@api.model
|
||||
def _prepare_total_amount(self, tb, foreign_currency):
|
||||
res = {
|
||||
"credit": 0.0,
|
||||
"debit": 0.0,
|
||||
"balance": 0.0,
|
||||
"initial_balance": tb["balance"],
|
||||
"ending_balance": tb["balance"],
|
||||
}
|
||||
if foreign_currency:
|
||||
res["initial_currency_balance"] = round(tb["amount_currency"], 2)
|
||||
res["ending_currency_balance"] = round(tb["amount_currency"], 2)
|
||||
return res
|
||||
|
||||
@api.model
|
||||
def _compute_acc_prt_amount(
|
||||
self, total_amount, tb, acc_id, prt_id, foreign_currency
|
||||
):
|
||||
total_amount[acc_id][prt_id] = {}
|
||||
total_amount[acc_id][prt_id]["credit"] = 0.0
|
||||
total_amount[acc_id][prt_id]["debit"] = 0.0
|
||||
total_amount[acc_id][prt_id]["balance"] = 0.0
|
||||
total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
|
||||
total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id][prt_id]["initial_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
# Add keys to dict if not exists
|
||||
if acc_id not in total_amount:
|
||||
total_amount[acc_id] = self._prepare_total_amount(tb, foreign_currency)
|
||||
if prt_id not in total_amount[acc_id]:
|
||||
total_amount[acc_id][prt_id] = self._prepare_total_amount(
|
||||
tb, foreign_currency
|
||||
)
|
||||
else:
|
||||
# Increase balance field values
|
||||
total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
|
||||
total_amount[acc_id][prt_id]["ending_balance"] += tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id][prt_id]["initial_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
total_amount[acc_id][prt_id]["ending_currency_balance"] += round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
return total_amount
|
||||
|
||||
@api.model
|
||||
@@ -283,18 +284,14 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
partners_data.update(
|
||||
{prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
|
||||
)
|
||||
total_amount[acc_id][prt_id] = {}
|
||||
total_amount[acc_id][prt_id] = self._prepare_total_amount(
|
||||
tb, foreign_currency
|
||||
)
|
||||
total_amount[acc_id][prt_id]["credit"] = tb["credit"]
|
||||
total_amount[acc_id][prt_id]["debit"] = tb["debit"]
|
||||
total_amount[acc_id][prt_id]["balance"] = tb["balance"]
|
||||
total_amount[acc_id][prt_id]["initial_balance"] = 0.0
|
||||
total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id][prt_id]["initial_currency_balance"] = 0.0
|
||||
total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
|
||||
tb["amount_currency"], 2
|
||||
)
|
||||
partners_ids.add(tb["partner_id"])
|
||||
partners_ids.add(tb["partner_id"])
|
||||
for tb in tb_initial_prt:
|
||||
acc_id = tb["account_id"][0]
|
||||
if tb["partner_id"]:
|
||||
@@ -303,26 +300,9 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
partners_data.update(
|
||||
{prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
|
||||
)
|
||||
if acc_id not in total_amount.keys():
|
||||
total_amount = self._compute_acc_prt_amount(
|
||||
total_amount, tb, acc_id, prt_id, foreign_currency
|
||||
)
|
||||
partners_ids.add(tb["partner_id"])
|
||||
elif prt_id not in total_amount[acc_id].keys():
|
||||
total_amount = self._compute_acc_prt_amount(
|
||||
total_amount, tb, acc_id, prt_id, foreign_currency
|
||||
)
|
||||
partners_ids.add(tb["partner_id"])
|
||||
else:
|
||||
total_amount[acc_id][prt_id]["initial_balance"] += tb["balance"]
|
||||
total_amount[acc_id][prt_id]["ending_balance"] += tb["balance"]
|
||||
if foreign_currency:
|
||||
total_amount[acc_id][prt_id][
|
||||
"initial_currency_balance"
|
||||
] += round(tb["amount_currency"], 2)
|
||||
total_amount[acc_id][prt_id][
|
||||
"ending_currency_balance"
|
||||
] += round(tb["amount_currency"], 2)
|
||||
total_amount = self._compute_acc_prt_amount(
|
||||
total_amount, tb, acc_id, prt_id, foreign_currency
|
||||
)
|
||||
return total_amount, partners_data
|
||||
|
||||
def _remove_accounts_at_cero(self, total_amount, show_partner_details, company):
|
||||
|
||||
Reference in New Issue
Block a user