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

[FIX] account_financial_report: Don't show cancelled items when clicking on interactive cells

Browse Source 
TT39954
This commit is contained in:
Víctor Martínez
2022-10-26 16:42:41 +02:00
committed by chaule97
parent 77d2da3725
commit f41e8a6bc2
2 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_financial_report/__manifest__.py
View File

@@ -6,7 +6,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{ {
"name": "Account Financial Reports", "name": "Account Financial Reports",
"version": "15.0.2.0.0", "version": "15.0.2.0.1",
"category": "Reporting", "category": "Reporting",
"summary": "OCA Financial Reports", "summary": "OCA Financial Reports",
"author": "Camptocamp SA," "author": "Camptocamp SA,"

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

@@ -230,6 +230,16 @@
</div> </div>
</template> </template>
<template id="account_financial_report.report_trial_balance_line"> <template id="account_financial_report.report_trial_balance_line">
<t
t-set="aml_domain_common"
t-if="only_posted_moves"
t-value="[('parent_state', '=', 'posted')]"
/>
<t
t-set="aml_domain_common"
t-else=""
t-value="[('parent_state', 'in', ('posted', 'draft'))]"
/>
<!-- # line --> <!-- # line -->
<div class="act_as_row lines"> <div class="act_as_row lines">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
@@ -302,7 +312,10 @@
t-value="[('account_id', '=', balance['id']), t-value="[('account_id', '=', balance['id']),
('date', '&lt;', date_from)]" ('date', '&lt;', date_from)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['initial_balance']" t-esc="balance['initial_balance']"
@@ -316,7 +329,10 @@
t-value="[('account_id', 'in', balance['account_ids']), t-value="[('account_id', 'in', balance['account_ids']),
('date', '&lt;', date_from)]" ('date', '&lt;', date_from)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['initial_balance']" t-raw="balance['initial_balance']"
@@ -332,7 +348,10 @@
('partner_id', '=', int(partner_id)), ('partner_id', '=', int(partner_id)),
('date', '&lt;', date_from)]" ('date', '&lt;', date_from)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['initial_balance']" t-raw="total_amount[account_id][partner_id]['initial_balance']"
@@ -352,7 +371,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]" ('debit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['debit']" t-esc="balance['debit']"
@@ -368,7 +390,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]" ('debit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['debit']" t-raw="balance['debit']"
@@ -386,7 +411,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]" ('debit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['debit']" t-raw="total_amount[account_id][partner_id]['debit']"
@@ -406,7 +434,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]" ('credit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['credit']" t-esc="balance['credit']"
@@ -422,7 +453,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]" ('credit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['credit']" t-raw="balance['credit']"
@@ -440,7 +474,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]" ('credit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['credit']" t-raw="total_amount[account_id][partner_id]['credit']"
@@ -460,7 +497,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]" ('balance', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['balance']" t-esc="balance['balance']"
@@ -475,7 +515,10 @@
('date', '&gt;=', date_from), ('date', '&gt;=', date_from),
('date', '&lt;=', date_to)]" ('date', '&lt;=', date_to)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['balance']" t-raw="balance['balance']"
@@ -493,7 +536,10 @@
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]" ('balance', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['balance']" t-raw="total_amount[account_id][partner_id]['balance']"
@@ -511,7 +557,10 @@
t-value="[('account_id', '=', balance['id']), t-value="[('account_id', '=', balance['id']),
('date', '&lt;=', date_to)]" ('date', '&lt;=', date_to)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['ending_balance']" t-esc="balance['ending_balance']"
@@ -524,7 +573,10 @@
t-set="domain" t-set="domain"
t-value="[('account_id', 'in', balance['account_ids'])]" t-value="[('account_id', 'in', balance['account_ids'])]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['ending_balance']" t-raw="balance['ending_balance']"
@@ -540,7 +592,10 @@
('partner_id', '=', int(partner_id)), ('partner_id', '=', int(partner_id)),
('date', '&lt;=', date_to)]" ('date', '&lt;=', date_to)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span
t-att-domain="domain+aml_domain_common"
res-model="account.move.line"
>
<t <t
t-att-style="style" t-att-style="style"
t-esc="total_amount[account_id][partner_id]['ending_balance']" t-esc="total_amount[account_id][partner_id]['ending_balance']"
@@ -564,7 +619,7 @@
t-value="[('account_id', '=', balance['id'])]" t-value="[('account_id', '=', balance['id'])]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t <t
@@ -603,7 +658,7 @@
('partner_id', '=', partner_id)]" ('partner_id', '=', partner_id)]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t <t
@@ -625,7 +680,7 @@
t-value="[('account_id', '=', balance['id'])]" t-value="[('account_id', '=', balance['id'])]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t <t
@@ -658,7 +713,7 @@
('partner_id', '=', partner_id)]" ('partner_id', '=', partner_id)]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain+aml_domain_common"
res-model="account.move.line" res-model="account.move.line"
> >
<t <t