From bb4c43c2bdb37447deca7d804013d0e00ff41edc Mon Sep 17 00:00:00 2001
From: Daniel Herrero <dherrero@alfatecsistemas.es>
Date: Wed, 15 Nov 2017 09:38:39 +0100
Subject: [PATCH] cambios en formularios de client

---
 client/client/routes.json                     |  2 +-
 .../client/src/address-edit/address-edit.html |  1 +
 client/client/src/basic-data/basic-data.html  | 13 +++--
 client/client/src/basic-data/locale/es.json   |  5 +-
 .../client/src/billing-data/billing-data.html |  7 +--
 .../client/src/fiscal-data/fiscal-data.html   | 52 ++++++++++++-------
 client/client/src/locale/es.json              |  3 +-
 7 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/client/client/routes.json b/client/client/routes.json
index 8b1e32a7b..c938dd8a6 100644
--- a/client/client/routes.json
+++ b/client/client/routes.json
@@ -48,7 +48,7 @@
                 "client": "$ctrl.client"
             },
             "menu": {       
-                "description": "Datos facturación",
+                "description": "Pay method",
                 "icon": "assignment"
             }
         }, {
diff --git a/client/client/src/address-edit/address-edit.html b/client/client/src/address-edit/address-edit.html
index 56fe01aab..afc77305b 100644
--- a/client/client/src/address-edit/address-edit.html
+++ b/client/client/src/address-edit/address-edit.html
@@ -36,6 +36,7 @@
             </vn-horizontal>
             <vn-horizontal>
                 <vn-autocomplete vn-one
+                    initial-data="$ctrl.address.defaultAgencyFk"
                     field="$ctrl.address.defaultAgencyFk"
                     url="/client/api/AgencyModes"
                     show-field="name"
diff --git a/client/client/src/basic-data/basic-data.html b/client/client/src/basic-data/basic-data.html
index 00fca8fd0..5ee41ce7d 100644
--- a/client/client/src/basic-data/basic-data.html
+++ b/client/client/src/basic-data/basic-data.html
@@ -10,17 +10,20 @@
         <vn-vertical pad-large>
             <vn-title>Basic data</vn-title>
             <vn-horizontal>
-                <vn-textfield vn-one label="Name" field="$ctrl.client.name" vn-focus></vn-textfield>
-                <vn-textfield vn-one label="Tax number" field="$ctrl.client.fi"></vn-textfield>
-                <vn-textfield autofocus vn-one label="Social name" field="$ctrl.client.socialName"></vn-textfield>
+                <vn-textfield vn-one label="Comercial Name" field="$ctrl.client.name" vn-focus></vn-textfield>
+                <vn-textfield vn-one label="Contact" field="$ctrl.client.contact"></vn-textfield>
             </vn-horizontal>
             <vn-horizontal>
                 <vn-textfield vn-one label="Phone" field="$ctrl.client.phone"></vn-textfield>
                 <vn-textfield vn-one label="Mobile" field="$ctrl.client.mobile"></vn-textfield>
-                <vn-textfield vn-one label="Fax" field="$ctrl.client.fax"></vn-textfield>
+                <vn-textfield vn-one 
+                    label="Email" 
+                    field="$ctrl.client.email" 
+                    info="You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main"
+                    >
+                </vn-textfield>
             </vn-horizontal>
             <vn-horizontal>
-                <vn-textfield vn-one label="Email" field="$ctrl.client.email" info="You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main"></vn-textfield>
                 <vn-autocomplete vn-one
                     initial-data="$ctrl.client.salesPerson"
                     field="$ctrl.client.salesPersonFk"
diff --git a/client/client/src/basic-data/locale/es.json b/client/client/src/basic-data/locale/es.json
index 7722f869e..d0e654979 100644
--- a/client/client/src/basic-data/locale/es.json
+++ b/client/client/src/basic-data/locale/es.json
@@ -1,6 +1,6 @@
 {
     "Basic data": "Datos básicos",
-    "Name": "Nombre",
+    "Comercial Name": "Nombre comercial",
     "Tax number": "NIF/CIF",
     "Social name": "Razón social",
     "Phone": "Teléfono",
@@ -9,5 +9,6 @@
     "Email": "Correo electrónico",
     "Salesperson": "Comercial",
     "Channel": "Canal",
-    "You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main": "Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios, ejemplo: user@dominio.com,user2@dominio.com siendo el primer correo electrónico el principal"
+    "You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main": "Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios, ejemplo: user@dominio.com,user2@dominio.com siendo el primer correo electrónico el principal",
+    "Contact": "Contacto"
 }
\ No newline at end of file
diff --git a/client/client/src/billing-data/billing-data.html b/client/client/src/billing-data/billing-data.html
index a8a7d79b0..5ec67fa6e 100644
--- a/client/client/src/billing-data/billing-data.html
+++ b/client/client/src/billing-data/billing-data.html
@@ -8,7 +8,7 @@
 <form name="form" ng-submit="$ctrl.submit()" pad-medium>
     <vn-card margin-small-bottom>
         <vn-vertical pad-large>
-            <vn-title>Billing information</vn-title>
+            <vn-title>Pay method</vn-title>
             <vn-horizontal>
                 <vn-autocomplete vn-two
                     vn-acl="administrative"
@@ -16,7 +16,7 @@
                     url="/client/api/PayMethods"
                     select-fields="ibanRequired"
                     initial-data="$ctrl.client.payMethod"
-                    label="Forma de pago">
+                    label="Pay method">
                 </vn-autocomplete>
                 <vn-textfield vn-two label="IBAN" field="$ctrl.client.iban" vn-acl="administrative"></vn-textfield>
                 <vn-textfield vn-one label="Vencimiento" field="$ctrl.client.dueDay" vn-acl="administrative"></vn-textfield>
@@ -26,9 +26,6 @@
                 <vn-textfield vn-one label="Crédito asegurado" field="$ctrl.client.creditInsurance" vn-acl="administrative"></vn-textfield>
             </vn-horizontal>
             <vn-horizontal margin-medium-bottom>
-                <vn-one>
-                    <vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
-                </vn-one>
                 <vn-one>
                     <vn-check label="Recibido core VNH" field="$ctrl.client.coreVnh" vn-acl="administrative"></vn-check>
                 </vn-one>
diff --git a/client/client/src/fiscal-data/fiscal-data.html b/client/client/src/fiscal-data/fiscal-data.html
index 9c0bf5837..f9c9c418b 100644
--- a/client/client/src/fiscal-data/fiscal-data.html
+++ b/client/client/src/fiscal-data/fiscal-data.html
@@ -9,33 +9,25 @@
     <vn-card margin-small-bottom>
         <vn-vertical pad-large>
             <vn-title>Fiscal data</vn-title>
-            <vn-horizontal>                         
-                <vn-one>
-                    <vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice"></vn-check>
-                </vn-one>
-                <vn-one>
-                    <vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail"></vn-check>
-                </vn-one>
-                <vn-one>
-                    <vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
-                </vn-one>
-                <vn-one>
-                    <vn-check label="Vies" field="$ctrl.client.vies" vn-acl="administrative"></vn-check>
-                </vn-one>
+            <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-horizontal>
             <vn-horizontal>
-                <vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus></vn-textfield>
-                <vn-textfield vn-one label="City" field="$ctrl.client.city"></vn-textfield> 
+                <vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
+                <vn-textfield vn-one label="City" field="$ctrl.client.city" vn-acl="administrative"></vn-textfield> 
             </vn-horizontal>
             <vn-horizontal>
-                <vn-textfield vn-one label="Postcode" field="$ctrl.client.postcode"></vn-textfield>
+                <vn-textfield vn-one label="Postcode" field="$ctrl.client.postcode" vn-acl="administrative"></vn-textfield>
                 <vn-autocomplete vn-one
                     initial-data="$ctrl.client.province"
                     field="$ctrl.client.provinceFk"
                     url="/client/api/Provinces"
                     show-field="name"
                     value-field="id"
-                    label="Province">
+                    label="Province"
+                    vn-acl="administrative"
+                    >
                 </vn-autocomplete>
                 <vn-autocomplete vn-one
                     initial-data="$ctrl.client.country"
@@ -43,10 +35,34 @@
                     url="/client/api/Countries"
                     show-field="name"
                     value-field="id"
-                    label="Country">
+                    label="Country"
+                    vn-acl="administrative"
+                    >
                 </vn-autocomplete>
             </vn-horizontal>
+            <vn-horizontal margin-small-bottom>
+                <vn-one>
+                    <vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative" vn-acl="administrative"></vn-check>
+                </vn-one>
+                <vn-one>
+                    <vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative" vn-acl="administrative"></vn-check>
+                </vn-one>
+                <vn-one></vn-one>
+            </vn-horizontal>
+            <vn-horizontal>                         
+                    <vn-one>
+                        <vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
+                    </vn-one>
+                    <vn-one>
+                        <vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
+                    </vn-one>
+                    <vn-one>
+                        <vn-check label="Vies" field="$ctrl.client.vies" vn-acl="administrative" vn-acl="administrative"></vn-check>
+                    </vn-one>
+                </vn-horizontal>
+                
         </vn-vertical>
+        
     </vn-card>
     
     <vn-button-bar>
diff --git a/client/client/src/locale/es.json b/client/client/src/locale/es.json
index 4dd110d72..20089e85c 100644
--- a/client/client/src/locale/es.json
+++ b/client/client/src/locale/es.json
@@ -9,5 +9,6 @@
     "City": "Municipio",
     "Postcode": "Código postal",
     "Province": "Provincia",
-    "Save": "Guardar"
+    "Save": "Guardar",
+    "Pay method" : "Forma de pago"
 }