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

[IMP] account_financial_report: Remove "Cur." column (currency is now added in "Amount cur.") from general_ledger. 

TT38722
pull/939/head
Víctor Martínez 2022-09-01 12:57:33 +02:00 committed by David Ramia
parent 867477d2e2
commit d000496137
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account_financial_report/report/general_ledger.py
View File

@ -859,4 +859,5 @@ class GeneralLedgerReport(models.AbstractModel):
"centralize": centralize, "centralize": centralize,
"tags_data": tags_data, "tags_data": tags_data,
"filter_partner_ids": filter_partner_ids, "filter_partner_ids": filter_partner_ids,
"currency_model": self.env["res.currency"],
} }

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

@ -188,12 +188,11 @@
Cumul. Bal. Cumul. Bal.
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<!--## currency_name-->
<div class="act_as_cell" style="width: 2.08%;">Cur.</div>
<!--## amount_currency--> <!--## amount_currency-->
<div class="act_as_cell amount" style="width: 5.19%;"> <div
Amount cur. class="act_as_cell amount"
</div> style="width: 7.27%;"
>Amount cur.</div>
</t> </t>
</div> </div>
</div> </div>
@ -321,12 +320,7 @@
<t <t
t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;"> <div class="act_as_cell amount" style="width: 7.27%;">
<span
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<t <t
t-set="domain" t-set="domain"
@ -365,8 +359,7 @@
<t <t
t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell" style="width: 2.08%;" /> <div class="act_as_cell" style="width: 7.27%;" />
<div class="act_as_cell" style="width: 5.19%;" />
</t> </t>
</t> </t>
</div> </div>
@ -583,26 +576,24 @@
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<t t-if="line['currency_id']"> <t t-if="line['currency_id']">
<!--## currency_name-->
<div class="act_as_cell amount" style="width: 2.08%;">
<span t-esc="line['currency_id'][1]" />
</div>
<!--## amount_currency--> <!--## amount_currency-->
<div class="act_as_cell amount" style="width: 5.19%;"> <div class="act_as_cell amount" style="width: 7.27%;">
<t
t-set="line_currency"
t-value="currency_model.browse(line['currency_id'][0])"
/>
<span <span
t-att-res-id="line['id']" t-att-res-id="line['id']"
res-model="account.move.line" res-model="account.move.line"
view-type="form" view-type="form"
> t-raw="line['bal_curr']"
<t t-raw="line['bal_curr']" /> t-options="{'widget': 'monetary', 'display_currency': line_currency}"
</span> />
</div> </div>
</t> </t>
<t t-if="not line['currency_id']"> <t t-if="not line['currency_id']">
<!--## currency_name-->
<div class="act_as_cell amount" style="width: 2.08%;" />
<!--## amount_currency--> <!--## amount_currency-->
<div class="act_as_cell amount" style="width: 5.19%;" /> <div class="act_as_cell amount" style="width: 7.27%;" />
</t> </t>
</t> </t>
</div> </div>
@ -670,12 +661,7 @@
<t <t
t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;"> <div class="act_as_cell amount" style="width: 7.27%;">
<span
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<t <t
t-set="domain" t-set="domain"
@ -722,8 +708,7 @@
<t <t
t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;" /> <div class="act_as_cell amount" style="width: 7.27%;" />
<div class="act_as_cell amount" style="width: 5.19%;" />
</t> </t>
</t> </t>
</div> </div>