diff --git a/web/pdf/invoice.product-tab.tpl b/web/pdf/invoice.product-tab.tpl index 1c744371f..6e8bfba7f 100644 --- a/web/pdf/invoice.product-tab.tpl +++ b/web/pdf/invoice.product-tab.tpl @@ -28,13 +28,13 @@ {l s='Reference' d='Shop.Pdf' pdf='true'} {l s='Product' d='Shop.Pdf' pdf='true'} - {l s='Tax Rate' d='Shop.Pdf' pdf='true'} + {l s='Unit Price' d='Shop.Pdf' pdf='true'}
{l s='(Tax excl.)' d='Shop.Pdf' pdf='true'} + {l s='Tax Rate' d='Shop.Pdf' pdf='true'} {if isset($layout.before_discount)} {l s='Base price' d='Shop.Pdf' pdf='true'}
{l s='(Tax excl.)' d='Shop.Pdf' pdf='true'} {/if} - {l s='Unit Price' d='Shop.Pdf' pdf='true'}
{l s='(Tax excl.)' d='Shop.Pdf' pdf='true'} {l s='Qty' d='Shop.Pdf' pdf='true'} {l s='Total' d='Shop.Pdf' pdf='true'}
{l s='(Tax excl.)' d='Shop.Pdf' pdf='true'} @@ -68,12 +68,18 @@ {else} {$order_detail.product_name} {/if} - + + {displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax} + {if $order_detail.ecotax_tax_excl > 0} +
+ {{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}} + {/if} + + {$order_detail.order_detail_tax_label} - {if isset($layout.before_discount)} {if isset($order_detail.unit_price_tax_excl_before_specific_price)} @@ -84,13 +90,6 @@ {/if} - - {displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax} - {if $order_detail.ecotax_tax_excl > 0} -
- {{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}} - {/if} - {$order_detail.product_quantity} diff --git a/web/pdf/invoice.summary-tab.tpl b/web/pdf/invoice.summary-tab.tpl index 2fae1cdb0..a4585f79e 100644 --- a/web/pdf/invoice.summary-tab.tpl +++ b/web/pdf/invoice.summary-tab.tpl @@ -25,18 +25,18 @@ - - + + {if $addresses.invoice->vat_number} {/if} - - + + {if $addresses.invoice->vat_number}
{l s='Invoice Number' d='Shop.Pdf' pdf='true'}{l s='Invoice Date' d='Shop.Pdf' pdf='true'}{l s='Order Reference' d='Shop.Pdf' pdf='true'} {l s='Order date' d='Shop.Pdf' pdf='true'}{l s='Order Reference' d='Shop.Pdf' pdf='true'}{l s='Invoice Date' d='Shop.Pdf' pdf='true'}{l s='VAT Number' d='Shop.Pdf' pdf='true'}
{$title|escape:'html':'UTF-8'}{dateFormat date=$order->invoice_date full=0}{$order->getUniqReference()} {dateFormat date=$order->date_add full=0}{$order->getUniqReference()}{dateFormat date=$order->invoice_date full=0} {$addresses.invoice->vat_number}