From 37b9c5c4ce0a3cbafbf408f38ede60a7cdf8606d Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 2 Sep 2019 11:25:31 +0200
Subject: [PATCH] Added zone inflation field #1641

---
 modules/agency/back/models/zone.json       |  3 +++
 modules/agency/front/basic-data/index.html | 10 ++++++++--
 modules/agency/front/locale/es.yml         |  3 ++-
 modules/ticket/front/sale/locale/es.yml    |  1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/agency/back/models/zone.json b/modules/agency/back/models/zone.json
index 9b03bee6ad..997fedcc7a 100644
--- a/modules/agency/back/models/zone.json
+++ b/modules/agency/back/models/zone.json
@@ -30,6 +30,9 @@
 		},
 		"isVolumetric": {
 			"type": "Boolean"
+		},
+		"inflation": {
+			"type": "Number"
 		}
 	},
 	"relations": {
diff --git a/modules/agency/front/basic-data/index.html b/modules/agency/front/basic-data/index.html
index 7eaac4ef92..5cff23eb16 100644
--- a/modules/agency/front/basic-data/index.html
+++ b/modules/agency/front/basic-data/index.html
@@ -5,7 +5,7 @@
     form="form"
     save="patch">
 </vn-watcher>
-<form name="form" ng-submit="$ctrl.onSubmit()">
+<form name="form" ng-submit="$ctrl.onSubmit()" compact>
     <vn-card pad-large>
         <vn-horizontal>
             <vn-textfield vn-two vn-focus
@@ -62,7 +62,13 @@
             </vn-input-number> 
         </vn-horizontal>
         <vn-horizontal>
-            <vn-check  label="Volumetric"
+            <vn-input-number vn-one
+                label="Inflation"
+                model="$ctrl.zone.inflation"
+                min="0" step="0.01"
+                vn-acl="deliveryBoss">
+            </vn-input-number>
+            <vn-check label="Volumetric" vn-one
                 field="$ctrl.zone.isVolumetric"
                 vn-acl="deliveryBoss">
             </vn-check>
diff --git a/modules/agency/front/locale/es.yml b/modules/agency/front/locale/es.yml
index ef226ef107..cae17b94b5 100644
--- a/modules/agency/front/locale/es.yml
+++ b/modules/agency/front/locale/es.yml
@@ -10,4 +10,5 @@ Zones: Zonas
 New zone: Nueva zona
 Volumetric: Volumétrico
 Clone: Clonar
-Search zone by id or name: Buscar zonas por identificador o nombre
\ No newline at end of file
+Search zone by id or name: Buscar zonas por identificador o nombre
+Inflation: Inflación
\ No newline at end of file
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 753323c414..9deb3f06ad 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -19,6 +19,7 @@ Available: Disponible
 In which day you want to add the ticket?: ¿A que dia quieres añadir el ticket?
 Add claim: Crear reclamación
 Claim: Reclamación
+Transfer lines: Transferir líneas
 Sales to transfer: Líneas a transferir
 Destination ticket: Ticket destinatario
 Change ticket state to 'Ok': Cambiar estado del ticket a 'Ok'