Browse Source

Merge PR #788 into 13.0

Signed-off-by pedrobaeza
pull/791/head
OCA-git-bot 4 years ago
parent
commit
6772ed19be
  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-if="balance['type'] == 'group_type'">
<t <t
t-set="domain" 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"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
@ -357,9 +357,9 @@
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t
t-set="domain" 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)]" ('debit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
@ -411,9 +411,9 @@
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t
t-set="domain" 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)]" ('credit', '&lt;&gt;', 0)]"
/> />
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
@ -465,9 +465,9 @@
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t
t-set="domain" 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"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
@ -555,7 +555,7 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t
t-set="domain" t-set="domain"
t-value="[('account_id', '=', line.account_id.id)]"
t-value="[('account_id', '=', balance['id'])]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain"
@ -593,8 +593,8 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t
t-set="domain" 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 <span
t-att-domain="domain" t-att-domain="domain"
@ -616,7 +616,7 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t
t-set="domain" t-set="domain"
t-value="[('account_id', '=', line.account_id.id)]"
t-value="[('account_id', '=', balance['id'])]"
/> />
<span <span
t-att-domain="domain" t-att-domain="domain"
@ -648,8 +648,8 @@
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t
t-set="domain" 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 <span
t-att-domain="domain" t-att-domain="domain"

Loading…
Cancel
Save