From 81a31a867411709f74a480452ab21766fb787cdd Mon Sep 17 00:00:00 2001
From: Juan <juan@pc-juan.verdnatura.es>
Date: Thu, 21 Jun 2018 08:43:48 +0200
Subject: [PATCH] Landing and shipping date shown in tickets

---
 debian/changelog                    | 2 +-
 forms/ecomerce/ticket/locale/ca.yml | 2 ++
 forms/ecomerce/ticket/locale/en.yml | 2 ++
 forms/ecomerce/ticket/locale/es.yml | 2 ++
 forms/ecomerce/ticket/locale/fr.yml | 2 ++
 forms/ecomerce/ticket/locale/pt.yml | 2 ++
 forms/ecomerce/ticket/ui.xml        | 5 ++++-
 package.json                        | 2 +-
 reports/delivery-note/ui.xml        | 5 ++++-
 9 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99153a61..cc4c36cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.406.11) stable; urgency=low
+hedera-web (1.406.12) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/ticket/locale/ca.yml b/forms/ecomerce/ticket/locale/ca.yml
index a58dc38e..04a36470 100644
--- a/forms/ecomerce/ticket/locale/ca.yml
+++ b/forms/ecomerce/ticket/locale/ca.yml
@@ -17,3 +17,5 @@ Origin: Orige
 Price: Preu
 Disc: Desc
 Subtotal: Subtotal
+Preparation: Preparació
+Delivery: Entrega
diff --git a/forms/ecomerce/ticket/locale/en.yml b/forms/ecomerce/ticket/locale/en.yml
index 1df0727f..1d09f9b4 100644
--- a/forms/ecomerce/ticket/locale/en.yml
+++ b/forms/ecomerce/ticket/locale/en.yml
@@ -17,3 +17,5 @@ Origin: Origin
 Price: Price
 Disc: Disc
 Subtotal: Subtotal
+Preparation: Preparation
+Delivery: Delivery
diff --git a/forms/ecomerce/ticket/locale/es.yml b/forms/ecomerce/ticket/locale/es.yml
index b6696cd5..271d5dde 100644
--- a/forms/ecomerce/ticket/locale/es.yml
+++ b/forms/ecomerce/ticket/locale/es.yml
@@ -17,3 +17,5 @@ Origin: Origen
 Price: Precio
 Disc: Desc
 Subtotal: Subtotal
+Preparation: Preparación
+Delivery: Entrega
diff --git a/forms/ecomerce/ticket/locale/fr.yml b/forms/ecomerce/ticket/locale/fr.yml
index d766ae19..b40629e8 100644
--- a/forms/ecomerce/ticket/locale/fr.yml
+++ b/forms/ecomerce/ticket/locale/fr.yml
@@ -17,3 +17,5 @@ Origin: Origine
 Price: Prix
 Disc: Remise
 Subtotal: Sous-total
+Preparation: Préparation
+Delivery: Livraison
diff --git a/forms/ecomerce/ticket/locale/pt.yml b/forms/ecomerce/ticket/locale/pt.yml
index 8c3409e1..8cc2e758 100644
--- a/forms/ecomerce/ticket/locale/pt.yml
+++ b/forms/ecomerce/ticket/locale/pt.yml
@@ -17,3 +17,5 @@ Origin: Orígem
 Price: Preço
 Disc: Desc
 Subtotal: Sub-total
+Preparation: Preparação
+Delivery: Entrega
diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml
index 955b8796..546ebcbf 100644
--- a/forms/ecomerce/ticket/ui.xml
+++ b/forms/ecomerce/ticket/ui.xml
@@ -30,7 +30,10 @@
 					@<htk-text column="id" form="ticket"/>
 				</p>
 				<p>
-					<htk-text form="ticket" column="landed" format="%D"/>
+					<t>Preparation</t> <htk-text form="ticket" column="shipped" format="%D"/>
+				</p>
+				<p>
+					<t>Delivery</t> <htk-text form="ticket" column="landed" format="%D"/>
 				</p>
 				<p>
 					<span id="method"></span> <htk-text form="ticket" column="agency"/>
diff --git a/package.json b/package.json
index 3dd2e44f..d92e503a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.406.11",
+  "version": "1.406.12",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml
index b8f0c2af..16189ecb 100644
--- a/reports/delivery-note/ui.xml
+++ b/reports/delivery-note/ui.xml
@@ -13,7 +13,10 @@
 	<div class="header">
 		<div>
 			<p>
-				<htk-text form="ticket" column="landed" format="%D"/>
+				<t>Preparation</t> <htk-text form="ticket" column="shipped" format="%D"/>
+			</p>
+			<p>
+				<t>Delivery</t> <htk-text form="ticket" column="landed" format="%D"/>
 			</p>
 			<p>
 				<span id="method"></span> <htk-text form="ticket" column="agency"/>