Browse Source

Merge PR #773 into 13.0

Signed-off-by JordiBForgeFlow
pull/772/head
OCA-git-bot 4 years ago
parent
commit
18954c8be9
  1. 43
      account_financial_report/report/templates/vat_report.xml

43
account_financial_report/report/templates/vat_report.xml

@ -70,34 +70,17 @@
</div> </div>
<div class="act_as_cell amount" style="width: 15%;"> <div class="act_as_cell amount" style="width: 15%;">
<t <t
t-set="domain"
t-value="[('tax_ids', 'in', [tax.tax_id.id for tax in tag.tax_ids]),
('date', '&gt;=', o.date_from),
('date', '&lt;=', o.date_to)]"
t-att-style="style"
t-raw="tag_or_group['net']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
<span t-att-domain="domain" res-model="account.move.line">
<t
t-att-style="style"
t-raw="tag_or_group['net']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
</div> </div>
<div class="act_as_cell amount" style="width: 15%;"> <div class="act_as_cell amount" style="width: 15%;">
<t <t
t-set="domain"
t-value="[('tax_line_id', 'in', [tax.tax_id.id for tax in tag.tax_ids]),
('date', '&gt;=', o.date_from),
('date', '&lt;=', o.date_to),
('tax_exigible', '=', True)]"
t-att-style="style"
t-raw="tag_or_group['tax']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
<span t-att-domain="domain" res-model="account.move.line">
<t
t-att-style="style"
t-raw="tag_or_group['tax']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
</div> </div>
</div> </div>
<t t-if="tax_detail"> <t t-if="tax_detail">
@ -109,7 +92,7 @@
style="padding-left: 20px; width: 65%;" style="padding-left: 20px; width: 65%;"
> >
<span <span
t-att-res-id="tax.tax_id.id"
t-att-res-id="tax['id']"
t-att-res-model="res_model" t-att-res-model="res_model"
view-type="form" view-type="form"
> >
@ -119,9 +102,9 @@
<div class="act_as_cell amount" style="width: 15%;"> <div class="act_as_cell amount" style="width: 15%;">
<t <t
t-set="domain" t-set="domain"
t-value="[('tax_ids', 'in', tax.tax_id.ids),
('date', '&gt;=', o.date_from),
('date', '&lt;=', o.date_to),
t-value="[('tax_ids', 'in', tax['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('tax_exigible', '=', True)]" ('tax_exigible', '=', True)]"
/> />
<span <span
@ -138,9 +121,9 @@
<div class="act_as_cell amount" style="width: 15%;"> <div class="act_as_cell amount" style="width: 15%;">
<t <t
t-set="domain" t-set="domain"
t-value="[('tax_line_id', '=', tax.tax_id.id),
('date', '&gt;=', o.date_from),
('date', '&lt;=', o.date_to),
t-value="[('tax_line_id', '=', tax['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('tax_exigible', '=', True)]" ('tax_exigible', '=', True)]"
/> />
<span <span

Loading…
Cancel
Save