Skip to content

Commit

Permalink
Fix printing of ICP
Browse files Browse the repository at this point in the history
  • Loading branch information
@astirpe
astirpe committed Jan 14, 2019
1 parent 7340735 commit 9db0a71
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion l10n_nl_tax_statement_icp/models/l10n_nl_vat_statement_icp_line.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def _check_country_code(self):
if code not in europe_codes:
raise ValidationError(_(
'Wrong country code (%s) for ICP report. '
'Please check your configuration') % code)
'Please check your configuration.') % code)
46 changes: 23 additions & 23 deletions l10n_nl_tax_statement_icp/report/report_tax_statement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<t t-set="title">ICP</t>
<t t-set="company_name" t-value="o.company_id.name"/>

<div class="page">
<div class="page nl_tax">
<!-- Display filters -->
<t t-call="l10n_nl_tax_statement.report_tax_statement_filters"/>

Expand All @@ -21,34 +21,34 @@
</div>

<!-- Top header -->
<div class="act_as_table data_table" style="width: 1140px;">
<div class="act_as_row labels">
<div class="act_as_cell left">Partner</div>
<div class="act_as_cell left">VAT</div>
<div class="act_as_cell left">Country Code</div>
<div class="act_as_cell right">Currency</div>
<div class="act_as_cell right">Amount Product</div>
<div class="act_as_cell right">Amount Service</div>
<div class="nl_tax_act_as_table nl_tax_table" style="width: 1140px;">
<div class="nl_tax_act_as_row labels">
<div class="nl_tax_act_as_cell left">Partner</div>
<div class="nl_tax_act_as_cell left">VAT</div>
<div class="nl_tax_act_as_cell left">Country Code</div>
<div class="nl_tax_act_as_cell right">Currency</div>
<div class="nl_tax_act_as_cell right">Amount Product</div>
<div class="nl_tax_act_as_cell right">Amount Service</div>
</div>
<!-- Display lines -->
<t t-foreach="o.icp_line_ids" t-as="line">
<div class="act_as_row lines">
<div class="act_as_cell left"><span t-field="line.partner_id"/></div>
<div class="act_as_cell left"><span t-field="line.vat"/></div>
<div class="act_as_cell left"><span t-field="line.country_code"/></div>
<div class="act_as_cell right"><span t-field="line.currency_id"/></div>
<div class="act_as_cell right"><span t-field="line.format_amount_products"/></div>
<div class="act_as_cell right"><span t-field="line.format_amount_services"/></div>
<div class="nl_tax_act_as_row lines">
<div class="nl_tax_act_as_cell left"><span t-field="line.partner_id"/></div>
<div class="nl_tax_act_as_cell left"><span t-field="line.vat"/></div>
<div class="nl_tax_act_as_cell left"><span t-field="line.country_code"/></div>
<div class="nl_tax_act_as_cell right"><span t-field="line.currency_id"/></div>
<div class="nl_tax_act_as_cell right"><span t-field="line.format_amount_products"/></div>
<div class="nl_tax_act_as_cell right"><span t-field="line.format_amount_services"/></div>
</div>
</t>
<div class="act_as_row labels">
<div class="nl_tax_act_as_row labels">
<!--## total amount-->
<div class="act_as_cell left"> </div>
<div class="act_as_cell left"> </div>
<div class="act_as_cell left"> </div>
<div class="act_as_cell right">Total amount</div>
<div class="act_as_cell right">(product + service)</div>
<div class="act_as_cell right"><span t-field="o.icp_total"/></div>
<div class="nl_tax_act_as_cell left"> </div>
<div class="nl_tax_act_as_cell left"> </div>
<div class="nl_tax_act_as_cell left"> </div>
<div class="nl_tax_act_as_cell right">Total amount</div>
<div class="nl_tax_act_as_cell right">(product + service)</div>
<div class="nl_tax_act_as_cell right"><span t-field="o.icp_total"/></div>
</div>
</div>
</div>
Expand Down

0 comments on commit 9db0a71

Please sign in to comment.