tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account_financial_report: multiple fixes and improvements

Browse Source
This commit is contained in:
Jordi Ballester Alomar
2020-05-01 08:14:01 +02:00
committed by chaule97
parent cbaabca8ae
commit e4377eb3bb
17 changed files with 830 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_financial_report/report/templates/aged_partner_balance.xml
View File

@@ -295,7 +295,7 @@
<!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action"-->
<!-- style="color: black;">-->
<t t-raw="line['ref']" />
<t t-raw="line['ref_label']" />
<!-- </a>-->
<!-- </span>-->
</div>

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

@@ -357,7 +357,7 @@
>
<div class="act_as_cell amount" style="width: 2.08%;">
<span
t-field="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
@@ -376,7 +376,7 @@
>
<t
t-raw="account_or_partner_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
/>
</a>
</span>
@@ -397,7 +397,7 @@
>
<t
t-raw="account_or_partner_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
/>
</a>
</span>
@@ -501,10 +501,7 @@
<t t-if="taxes_data and line['tax_ids']">
<t t-foreach="line['tax_ids']" t-as="tax_id">
<span
t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'amount')"
/>
<span
t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'string')"
t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
/>
</t>
</t>
@@ -534,7 +531,7 @@
class="o_account_financial_reports_web_action"
style="color: black;"
>
<t t-raw="line['ref']" />
<t t-raw="line['ref_label']" />
</a>
</span>
</t>
@@ -544,7 +541,7 @@
class="o_account_financial_reports_web_action"
style="color: black;"
>
<t t-raw="line['ref']" />
<t t-raw="line['ref_label']" />
</a>
</span>
</t>
@@ -780,7 +777,7 @@
>
<div class="act_as_cell amount" style="width: 2.08%;">
<span
t-field="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
@@ -799,7 +796,7 @@
>
<t
t-raw="account_or_partner_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account_or_partner_object.account_id.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
/>
</a>
</span>
@@ -820,7 +817,7 @@
>
<t
t-raw="account_or_partner_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account_or_partner_object.report_account_id.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
/>
</a>
</span>

8
account_financial_report/report/templates/open_items.xml
View File

@@ -172,7 +172,7 @@
<div class="act_as_row lines">
<!--## date-->
<div class="act_as_cell left">
<span t-raw="line['date']" />
<span t-raw="line['date'].strftime('%d/%m/%Y')" />
</div>
<!--## move-->
<div class="act_as_cell left">
@@ -190,11 +190,11 @@
</div>
<!--## journal-->
<div class="act_as_cell left">
<span t-esc="line['journal']" />
<span t-esc="journals_data[line['journal_id']]['code']" />
</div>
<!--## account code-->
<div class="act_as_cell left">
<span t-esc="line['account']" />
<span t-esc="accounts_data[account_id]['code']" />
</div>
<!--## partner-->
<div class="act_as_cell left">
@@ -203,7 +203,7 @@
</div>
<!--## ref - label-->
<div class="act_as_cell left">
<span t-esc="line['ref']" />
<span t-esc="line['ref_label']" />
</div>
<!--## date_due-->
<div class="act_as_cell left">