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

Fix problem when print taxes of an invoice with more than one tax. 

Tasks: #067259
This commit is contained in:
Bernat Brunet 2022-10-16 17:09:29 +02:00
parent 67dc5a3cf7
commit 114c3ead2b
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
taxes_by_invoice/taxes_by_invoice.py
View File

@ -294,6 +294,7 @@ class TaxesByInvoiceReport(HTMLReport):
taxes = AccountInvoiceTax.search(domain,
order=[
('invoice.move.period', 'ASC'),
('invoice.invoice_date', 'ASC'),
('invoice', 'ASC'),
])
@ -326,8 +327,12 @@ class TaxesByInvoiceReport(HTMLReport):
parameters['totals'] = totals
else:
taxes = AccountInvoiceTax.search(domain, order=[('account', 'ASC'),
('invoice', 'ASC')])
taxes = AccountInvoiceTax.search(domain,
order=[
('account', 'ASC'),
('invoice.move.date', 'ASC'),
('invoice', 'ASC'),
])
for tax in taxes:
records.setdefault(tax.tax, []).append(DualRecord(tax))

50
taxes_by_invoice/templates/detail_lines_macro.html
View File

@ -1,20 +1,34 @@
{% set nc = namespace(before_invoice_id=None) %}
{%for l in record %}
<tr>
<td>{{ l.invoice.move.render.date }}</td>
<td>{{ l.account.render.code}}</td>
<td style="text-align: left;">{{ l.invoice.party.render.rec_name}}</td>
<td>{% if l.invoice.party.raw.tax_identifier %}{{ l.invoice.party.tax_identifier.render.code}}{% endif %}</td>
<td>{% if l.invoice.raw.state == 'cancel' %}*{% endif %}{{ l.invoice.render.number }}</td>
<td>{{ l.invoice.render.invoice_date }}</td>
{% for tax_line in l.invoice.taxes %}
{% if tax_line.tax.raw.id == l.tax.raw.id %}
<td>{% if tax_line.render.base %}{{tax_line.raw.company_base | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
<td>{{ l.tax.raw.name }}</td>
<td>{% if tax_line.render.amount %}{{ tax_line.raw.company_amount | render(digits=l.invoice.company.currency.raw.digits)}}{% else %}0.0{% endif %}</td>
{% set total = tax_line.raw.company_base + l.raw.company_amount%}
<td>{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
{% endif %}
{% endfor %}
<td class="bold">{{ l.invoice.raw.company_total_amount | render(digits=l.invoice.company.currency.raw.digits)}}</td>
</tr>
{% if nc.before_invoice_id != l.invoice.raw.id %}
<tr>
<td>{{ l.invoice.move.render.date }}</td>
<td>{{ l.account.render.code}}</td>
<td style="text-align: left;">{{ l.invoice.party.render.rec_name}}</td>
<td>{% if l.invoice.party.raw.tax_identifier %}{{ l.invoice.party.tax_identifier.render.code}}{% endif %}</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>{{ l.tax.raw.name }}</td>
<td>{% 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>{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
<td class="bold">{{ l.invoice.raw.company_total_amount | render(digits=l.invoice.company.currency.raw.digits)}}</td>
</tr>
{% else %}
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<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>{{ l.tax.raw.name }}</td>
<td>{% 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>{{ total | render(l.invoice.company.currency.raw.digits) }} </td>
</tr>
{% endif %}
{% set nc.before_invoice_id = l.invoice.raw.id %}
{% endfor %}