From 583e7c34bce342551ac3286b81c82f9656e7d05f Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 22 Nov 2017 08:35:09 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adir=20activo=20a=20datos=20fiscal-data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/client/src/descriptor/descriptor.html   | 2 +-
 client/client/src/fiscal-data/fiscal-data.html | 9 +++++----
 client/client/src/locale/es.json               | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/client/src/descriptor/descriptor.html b/client/client/src/descriptor/descriptor.html
index 64dd29fe4..53cb3a101 100644
--- a/client/client/src/descriptor/descriptor.html
+++ b/client/client/src/descriptor/descriptor.html
@@ -8,7 +8,7 @@
                 <div class="margin-none">{{::$ctrl.client.id}}</div>
                 <div class="margin-none">{{$ctrl.client.name}}</div>
                 <div class="margin-none">{{$ctrl.client.phone}}</div>
-                <vn-switch label="Activo" model="$ctrl.active"></vn-switch>
+                <vn-switch label="Active" model="$ctrl.active"></vn-switch>
             </vn-vertical>
         </vn-horizontal>    
     </vn-vertical>
diff --git a/client/client/src/fiscal-data/fiscal-data.html b/client/client/src/fiscal-data/fiscal-data.html
index 5e32cdafc..6ebffd925 100644
--- a/client/client/src/fiscal-data/fiscal-data.html
+++ b/client/client/src/fiscal-data/fiscal-data.html
@@ -12,6 +12,7 @@
             <vn-horizontal>
                     <vn-textfield autofocus vn-two label="Social name" field="$ctrl.client.socialName" vn-acl="administrative"></vn-textfield>
                     <vn-textfield vn-one label="Tax number" field="$ctrl.client.fi" vn-acl="administrative"></vn-textfield>
+                    <vn-check vn-one label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
             </vn-horizontal>
             <vn-horizontal>
                 <vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
@@ -41,13 +42,13 @@
                 </vn-autocomplete>
             </vn-horizontal>
             <vn-horizontal margin-small-bottom>
-                <vn-one>
-                    <vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
-                </vn-one>
+
                 <vn-one>
                     <vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
                 </vn-one>
-                <vn-one></vn-one>
+                <vn-one>
+                    <vn-check label="Active" field="$ctrl.client.active" vn-acl="administrative"></vn-check>
+                </vn-one>
             </vn-horizontal>
             <vn-horizontal>                         
                     <vn-one>
diff --git a/client/client/src/locale/es.json b/client/client/src/locale/es.json
index f828c7abc..ae0e1a52a 100644
--- a/client/client/src/locale/es.json
+++ b/client/client/src/locale/es.json
@@ -1,4 +1,5 @@
 {
+    "Active": "Activo",
     "Client": "Cliente",
     "Clients": "Clientes",
     "Fiscal data": "Datos Fiscales",