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

[FIX] account_financial_report: filter by correct data in trial balance

Browse Source 
When on a Trial Balance report and filtering by hierarchical accounts or for a foreing currency, an error was produced when generating the report.

The report fields were dependant on data that is no longer present, such as line data.

This uses the correct data provided when generating the report to avoid this errors

TT29261
This commit is contained in:
João Marques
2021-05-13 09:06:26 +01:00
committed by chaule97
parent f9c27f2824
commit 0b1044d039
2 changed files with 18 additions and 18 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).
{
"name": "Account Financial Reports",
"version": "14.0.1.2.1",
"version": "14.0.1.2.3",
"category": "Reporting",
"summary": "OCA Financial Reports",
"author": "Camptocamp SA,"

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

@@ -313,8 +313,8 @@
<t t-if="balance['type'] == 'group_type'">
<t
t-set="domain"
t-value="[('account_id', 'in', line.compute_account_ids.ids),
('date', '&lt;', date_from.strftime('%Y-%m-%d'))]"
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&lt;', date_from)]"
/>
<span t-att-domain="domain" res-model="account.move.line">
<t
@@ -363,9 +363,9 @@
<t t-if="balance['type'] == 'group_type'">
<t
t-set="domain"
t-value="[('account_id', 'in', line.compute_account_ids.ids),
('date', '&gt;=', line.report_id.date_from.strftime('%Y-%m-%d')),
('date', '&lt;=', line.report_id.date_to.strftime('%Y-%m-%d')),
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
<span t-att-domain="domain" res-model="account.move.line">
@@ -417,9 +417,9 @@
<t t-if="balance['type'] == 'group_type'">
<t
t-set="domain"
t-value="[('account_id', 'in', line.compute_account_ids.ids),
('date', '&gt;=', line.report_id.date_from.strftime('%Y-%m-%d')),
('date', '&lt;=', line.report_id.date_to.strftime('%Y-%m-%d')),
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
<span t-att-domain="domain" res-model="account.move.line">
@@ -471,9 +471,9 @@
<t t-if="balance['type'] == 'group_type'">
<t
t-set="domain"
t-value="[('account_id', 'in', line.compute_account_ids.ids),
('date', '&gt;=', line.report_id.date_from.strftime('%Y-%m-%d')),
('date', '&lt;=', line.report_id.date_to.strftime('%Y-%m-%d'))]"
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to)]"
/>
<span t-att-domain="domain" res-model="account.move.line">
<t
@@ -561,7 +561,7 @@
<div class="act_as_cell amount">
<t
t-set="domain"
t-value="[('account_id', '=', line.account_id.id)]"
t-value="[('account_id', '=', balance['id'])]"
/>
<span
t-att-domain="domain"
@@ -599,8 +599,8 @@
<div class="act_as_cell amount">
<t
t-set="domain"
t-value="[('account_id', '=', line.report_account_id.account_id.id),
('partner_id', '=', line.partner_id.id)]"
t-value="[('account_id', '=', account_id),
('partner_id', '=', partner_id)]"
/>
<span
t-att-domain="domain"
@@ -622,7 +622,7 @@
<div class="act_as_cell amount">
<t
t-set="domain"
t-value="[('account_id', '=', line.account_id.id)]"
t-value="[('account_id', '=', balance['id'])]"
/>
<span
t-att-domain="domain"
@@ -654,8 +654,8 @@
<t t-if="type == 'partner_type'">
<t
t-set="domain"
t-value="[('account_id', '=', line.report_account_id.account_id.id),
('partner_id', '=', line.partner_id.id)]"
t-value="[('account_id', '=', account_id),
('partner_id', '=', partner_id)]"
/>
<span
t-att-domain="domain"