NaNtic
/
trytond-account_reports
mirror of https://github.com/NaN-tic/trytond-account_reports.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Align to right the number text of the tax by invoice report.

This commit is contained in:
Bernat Brunet 2023-10-26 10:13:23 +02:00
parent f2cfeee65b
commit 70d1505efd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taxes_by_invoice/templates/detail_lines_macro.html
View File

@ -8,12 +8,12 @@
<td>{{ l.invoice.party_tax_identifier and l.invoice.party_tax_identifier.render.code or l.invoice.party.tax_identifier and l.invoice.party.tax_identifier.render.code }}</td>
<td>{% if l.invoice.raw.state == 'cancel' %}*{% endif %}{{ l.invoice.render.number }}</td>
<td>{{ l.invoice.render.invoice_date }}</td>
<td>{% if l.render.base %}{{l.raw.company_base | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td style="text-align: right;">{% if l.render.base %}{{l.raw.company_base | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td>{% if l.tax %}{{ l.tax.raw.name }}{% else %} --- {% endif %}</td>
<td class="no-wrap">{% if l.render.amount %}{{ l.raw.company_amount | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td style="text-align: right;" class="no-wrap">{% if l.render.amount %}{{ l.raw.company_amount | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
{% set total = l.raw.company_base + l.raw.company_amount %}
<td class="no-wrap">{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
<td class="bold no-wrap">{{ l.invoice.raw.company_total_amount | render(digits=l.invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;" class="no-wrap">{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
<td style="text-align: right;" class="bold no-wrap">{{ l.invoice.raw.company_total_amount | render(digits=l.invoice.company.currency.raw.digits)}}</td>
</tr>
{% else %}
<tr>
@ -25,9 +25,9 @@
<td></td>
<td>{% if l.render.base %}{{l.raw.company_base | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td>{% if l.tax %}{{ l.tax.raw.name }}{% else %} --- {% endif %}</td>
<td class="no-wrap">{% if l.render.amount %}{{ l.raw.company_amount | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td style="text-align: right;" class="no-wrap">{% if l.render.amount %}{{ l.raw.company_amount | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
{% set total = l.raw.company_base + l.raw.company_amount %}
<td class="no-wrap">{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
<td style="text-align: right;" class="no-wrap">{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
</tr>
{% endif %}
{% set nc.before_invoice_id = l.invoice.raw.id %}

12
taxes_by_invoice/templates/detail_macro.html
View File

@ -38,20 +38,20 @@
{% endif %}
<tr class="bold">
<td colspan="6" class="right">{% if data['parameters']['jump_page'] %} {{ _('Total Period') }} {% else %} {{ _('Total') }} {% endif %} {{k.name}}</td>
<td>{{data['parameters']['tax_totals'][k]['total_untaxed'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{data['parameters']['tax_totals'][k]['total_untaxed'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td></td>
<td>{{data['parameters']['tax_totals'][k]['total_tax'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td>{{data['parameters']['tax_totals'][k]['total'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{data['parameters']['tax_totals'][k]['total_tax'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{data['parameters']['tax_totals'][k]['total'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td></td>
</tr>
{% if data['parameters']['jump_page'] %}
{% if loop.nextitem is not defined %}
<tr class="bold">
<td colspan="6" class="right"> {{ _('Total') }}</td>
<td>{{ data['parameters']['totals']['total_untaxed'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{ data['parameters']['totals']['total_untaxed'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td></td>
<td>{{ data['parameters']['totals']['total_tax'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td>{{ data['parameters']['totals']['total'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{ data['parameters']['totals']['total_tax'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td style="text-align: right;">{{ data['parameters']['totals']['total'] | render(digits=record[0].invoice.company.currency.raw.digits)}}</td>
<td></td>
</tr>
{% endif %}