Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1033 into 14.0 

Signed-off-by pedrobaeza
pull/871/head
OCA-git-bot 2023-05-12 23:23:46 +00:00
parent 693f8d226e 2bb7251e0b
commit 23c49870ad
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
account_financial_report/report/abstract_report_xlsx.py
View File

@ -531,7 +531,10 @@ class AbstractReportXslx(models.AbstractModel):
format_amt = report_data["formats"]["format_amount"]
field_prefix = "format_amount"
if "currency_id" in line_object and line_object.get("currency_id", False):
currency = line_object["currency_id"]
if isinstance(line_object["currency_id"], int):
currency = self.env["res.currency"].browse(line_object["currency_id"])
else:
currency = line_object["currency_id"]
field_name = "{}_{}".format(field_prefix, currency.name)
if hasattr(self, field_name):
format_amt = getattr(self, field_name)

16
account_financial_report/report/general_ledger_xlsx.py
View File

@ -236,6 +236,15 @@ class GeneralLedgerXslx(models.AbstractModel):
# Display array header for move lines
self.write_array_header(report_data)
account.update(
{
"currency_id": accounts_data[account["id"]]["currency_id"],
"currency_name": accounts_data[account["id"]][
"currency_name"
],
}
)
# Display initial balance line for partner
group_item.update(
{
@ -247,6 +256,9 @@ class GeneralLedgerXslx(models.AbstractModel):
if "grouped_by" in account
else "",
"currency_id": accounts_data[account["id"]]["currency_id"],
"currency_name": accounts_data[account["id"]][
"currency_name"
],
}
)
if foreign_currency:
@ -304,8 +316,6 @@ class GeneralLedgerXslx(models.AbstractModel):
group_item.update(
{
"final_bal_curr": group_item["fin_bal"]["bal_curr"],
"currency_name": group_item["currency_id"].name,
"currency_id": group_item["currency_id"].id,
}
)
self.write_ending_balance_from_dict(group_item, report_data)
@ -325,8 +335,6 @@ class GeneralLedgerXslx(models.AbstractModel):
account.update(
{
"final_bal_curr": account["fin_bal"]["bal_curr"],
"currency_name": account["currency_id"].name,
"currency_id": account["currency_id"].id,
}
)
self.write_ending_balance_from_dict(account, report_data)

24
account_financial_report/report/templates/general_ledger.xml
View File

@ -313,6 +313,10 @@
</div>
<t t-if="foreign_currency">
<t t-if="account['currency_id']">
<t
t-set="account_currency"
t-value="currency_model.browse(account['currency_id'])"
/>
<div class="act_as_cell amount" style="width: 3.63%;">
<t t-if="type == 'account_type'">
<span
@ -321,7 +325,7 @@
>
<t
t-raw="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</span>
</t>
@ -332,7 +336,7 @@
>
<t
t-raw="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</span>
</t>
@ -345,7 +349,7 @@
>
<t
t-raw="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</span>
</t>
@ -356,7 +360,7 @@
>
<t
t-raw="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</span>
</t>
@ -693,6 +697,10 @@
<t t-set="misc_grouped_domain" t-value="[]" t-else="" />
<t t-if="foreign_currency">
<t t-if="account['currency_id']">
<t
t-set="account_currency"
t-value="currency_model.browse(account['currency_id'])"
/>
<div class="act_as_cell amount" style="width: 3.63%;">
<t t-if="type == 'account_type'">
<span>
@ -704,7 +712,7 @@
>
<t
t-raw="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</a>
</span>
@ -719,7 +727,7 @@
>
<t
t-raw="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</a>
</span>
@ -736,7 +744,7 @@
>
<t
t-raw="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</a>
</span>
@ -751,7 +759,7 @@
>
<t
t-raw="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/>
</a>
</span>