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 #1054 into 14.0 

Signed-off-by pedrobaeza
pull/1086/head
OCA-git-bot 2023-07-25 19:04:50 +00:00
parent 3623c7a212 acc18e9157
commit 2bf53b3b48
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_financial_report/report/templates/trial_balance.xml
View File

@ -731,6 +731,10 @@
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t t-if="balance['currency_id']"> <t t-if="balance['currency_id']">
<t
t-set="balance_currency"
t-value="currency_model.browse(balance['currency_id'])"
/>
<!--## Initial balance cur.--> <!--## Initial balance cur.-->
<div class="act_as_cell amount" t-att-style="style"> <div class="act_as_cell amount" t-att-style="style">
<t t-if="only_posted_moves"> <t t-if="only_posted_moves">
@ -751,7 +755,7 @@
> >
<t <t
t-esc="balance['initial_currency_balance']" t-esc="balance['initial_currency_balance']"
t-options="{'widget': 'monetary', 'display_currency': balance['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': balance_currency}"
/> />
</span> </span>
<!-- <t t-if="line.account_group_id">--> <!-- <t t-if="line.account_group_id">-->
@ -792,9 +796,13 @@
t-att-domain="domain+aml_domain_common" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t
t-set="total_amount_item_currency"
t-value="currency_model.browse(total_amount[account_id]['currency_id'])"
/>
<t <t
t-raw="total_amount[account_id][partner_id]['initial_currency_balance']" t-raw="total_amount[account_id][partner_id]['initial_currency_balance']"
t-options="{'widget': 'monetary', 'display_currency': total_amount[account_id]['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': total_amount_item_currency}"
/> />
</span> </span>
</div> </div>
@ -824,7 +832,7 @@
> >
<t <t
t-raw="balance['ending_currency_balance']" t-raw="balance['ending_currency_balance']"
t-options="{'widget': 'monetary', 'display_currency': balance['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': balance_currency}"
/> />
</span> </span>
<!-- <t t-if="line.account_group_id">--> <!-- <t t-if="line.account_group_id">-->
@ -865,9 +873,13 @@
t-att-domain="domain+aml_domain_common" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t
t-set="total_amount_item_currency"
t-value="currency_model.browse(total_amount[account_id]['currency_id'])"
/>
<t <t
t-raw="total_amount[account_id][partner_id]['ending_currency_balance']" t-raw="total_amount[account_id][partner_id]['ending_currency_balance']"
t-options="{'widget': 'monetary', 'display_currency': total_amount[account_id]['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': total_amount_item_currency}"
/> />
</span> </span>
</t> </t>

1
account_financial_report/report/trial_balance.py
View File

@ -731,4 +731,5 @@ class TrialBalanceReport(models.AbstractModel):
"accounts_data": accounts_data, "accounts_data": accounts_data,
"partners_data": partners_data, "partners_data": partners_data,
"show_hierarchy_level": show_hierarchy_level, "show_hierarchy_level": show_hierarchy_level,
"currency_model": self.env["res.currency"],
} }