Browse Source

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

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
pull/788/head
João Marques 3 years ago
committed by Isaac Gallart Bochons
parent
commit
cedccd03e7
  1. 34
      account_financial_report/report/templates/trial_balance.xml

34
account_financial_report/report/templates/trial_balance.xml

@ -307,8 +307,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
@ -357,9 +357,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">
@ -411,9 +411,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">
@ -465,9 +465,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
@ -555,7 +555,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"
@ -593,8 +593,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"
@ -616,7 +616,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"
@ -648,8 +648,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"

Loading…
Cancel
Save