From 239479d854e7cfa81fa1363838c9b3b620e7fd61 Mon Sep 17 00:00:00 2001
From: Laurent LE CORRE <laurent@thecoredev.fr>
Date: Fri, 27 Mar 2020 09:47:07 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20correction=20ano=200000019=20:=20O?=
 =?UTF-8?q?K=20sur=20dates=20+=20OK=20sur=20inversion=20"unitaire=20HT"=20?=
 =?UTF-8?q?et=20"Taxe"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pdf/invoice.product-tab.tpl | 21 ++++++++++-----------
 web/pdf/invoice.summary-tab.tpl |  8 ++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

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 @@
 	<tr>
 		<th class="product header small" width="{$layout.reference.width}%">{l s='Reference' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header small" width="{$layout.product.width}%">{l s='Product' d='Shop.Pdf' pdf='true'}</th>
-		<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th>
+		<th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 
+		<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th>
 		{if isset($layout.before_discount)}
 			<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Base price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 		{/if}
 
-		<th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header small" width="{$layout.quantity.width}%">{l s='Qty' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header-right small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 	</tr>
@@ -68,12 +68,18 @@
 				{else}
 					{$order_detail.product_name}
 				{/if}
-
 			</td>
+			<td class="product right">
+				{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
+				{if $order_detail.ecotax_tax_excl > 0}
+					<br>
+					<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
+				{/if}
+			</td>
+
 			<td class="product center">
 				{$order_detail.order_detail_tax_label}
 			</td>
-
 			{if isset($layout.before_discount)}
 				<td class="product center">
 					{if isset($order_detail.unit_price_tax_excl_before_specific_price)}
@@ -84,13 +90,6 @@
 				</td>
 			{/if}
 
-			<td class="product right">
-				{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
-				{if $order_detail.ecotax_tax_excl > 0}
-					<br>
-					<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
-				{/if}
-			</td>
 			<td class="product center">
 				{$order_detail.product_quantity}
 			</td>
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 @@
 <table id="summary-tab" width="100%">
 	<tr>
 		<th class="header small" valign="middle">{l s='Invoice Number' d='Shop.Pdf' pdf='true'}</th>
-		<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
-		<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
 		<th class="header small" valign="middle">{l s='Order date' d='Shop.Pdf' pdf='true'}</th>
+		<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
+		<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
 		{if $addresses.invoice->vat_number}
 			<th class="header small" valign="middle">{l s='VAT Number' d='Shop.Pdf' pdf='true'}</th>
 		{/if}
 	</tr>
 	<tr>
 		<td class="center small white">{$title|escape:'html':'UTF-8'}</td>
-		<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
-		<td class="center small white">{$order->getUniqReference()}</td>
 		<td class="center small white">{dateFormat date=$order->date_add full=0}</td>
+		<td class="center small white">{$order->getUniqReference()}</td>
+		<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
 		{if $addresses.invoice->vat_number}
 			<td class="center small white">
 				{$addresses.invoice->vat_number}