diff --git a/client/client/src/descriptor/descriptor.html b/client/client/src/descriptor/descriptor.html
index 950baf89c..8d2c825df 100644
--- a/client/client/src/descriptor/descriptor.html
+++ b/client/client/src/descriptor/descriptor.html
@@ -25,30 +25,36 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/client/client/src/web-access/locale/es.yml b/client/client/src/web-access/locale/es.yml
index 2d1905c16..9d95dcc24 100644
--- a/client/client/src/web-access/locale/es.yml
+++ b/client/client/src/web-access/locale/es.yml
@@ -2,4 +2,5 @@ User: Usuario
Enable web access: Habilitar acceso web
New password: Nueva contraseña
Repeat password: Repetir contraseña
-Change password: Cambiar contraseña
\ No newline at end of file
+Change password: Cambiar contraseña
+Client must be checked to activate: No se puede activar un cliente si no esta verificado (036)
\ No newline at end of file
diff --git a/client/client/src/web-access/web-access.html b/client/client/src/web-access/web-access.html
index 47e05759a..7c9b87df9 100644
--- a/client/client/src/web-access/web-access.html
+++ b/client/client/src/web-access/web-access.html
@@ -23,6 +23,7 @@
vn-one
margin-medium-top
label="User"
+ info="Client must be checked to activate"
field="$ctrl.account.name">
diff --git a/client/core/src/styles/fontello-icons.css b/client/core/src/styles/fontello-icons.css
index 03698f3cf..cebb4042b 100644
--- a/client/core/src/styles/fontello-icons.css
+++ b/client/core/src/styles/fontello-icons.css
@@ -1,7 +1,9 @@
-.icon-barcode:before { content: '\e800'; } /* '' */
+.icon-tags:before { content: '\e800'; } /* '' */
.icon-volume:before { content: '\e801'; } /* '' */
-.icon-bucket:before { content: '\e802'; } /* '' */
+.icon-barcode:before { content: '\e802'; } /* '' */
+.icon-bucket:before { content: '\e803'; } /* '' */
+.icon-frozen:before { content: '\e808'; } /* '' */
.icon-disabled:before { content: '\e80b'; } /* '' */
.icon-invoices:before { content: '\e80c'; } /* '' */
.icon-noweb:before { content: '\e812'; } /* '' */
@@ -15,4 +17,6 @@
.icon-addperson:before { content: '\e81e'; } /* '' */
.icon-bin:before { content: '\e81f'; } /* '' */
.icon-sms:before { content: '\e820'; } /* '' */
-.icon-tags:before { content: '\e821'; } /* '' */
\ No newline at end of file
+.icon-ticket:before { content: '\e821'; } /* '' */
+.icon-tax:before { content: '\e822'; } /* '' */
+.icon-no036:before { content: '\e823'; } /* '' */
\ No newline at end of file
diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2
index eea564017..286d7d8ab 100644
Binary files a/client/core/src/styles/fontello.woff2 and b/client/core/src/styles/fontello.woff2 differ
diff --git a/client/item/routes.json b/client/item/routes.json
index d6cb65da6..08490c8d8 100644
--- a/client/item/routes.json
+++ b/client/item/routes.json
@@ -58,7 +58,7 @@
"component": "vn-item-tax",
"menu": {
"description": "Tax",
- "icon": "folder"
+ "icon": "icon-tax"
}
},
{
@@ -82,7 +82,7 @@
},
"menu": {
"description": "Niche",
- "icon": "folder"
+ "icon": "place"
},
"acl": ["buyer","replenisher"]
},
@@ -95,7 +95,7 @@
},
"menu": {
"description": "Botanical",
- "icon": "folder"
+ "icon": "local_florist"
},
"acl": ["buyer"]
},{
diff --git a/client/salix/src/locale/es.yml b/client/salix/src/locale/es.yml
index fe3cdf228..e1ba19aa9 100644
--- a/client/salix/src/locale/es.yml
+++ b/client/salix/src/locale/es.yml
@@ -18,4 +18,9 @@ credit: Crédito
phone: Teléfono
creditInsurance: Crédito Asegurado
Return to module index: Volver a la página principal del módulo
-Preview: Vista previa
\ No newline at end of file
+Preview: Vista previa
+Client has debt: Cliente con riesgo
+Web Account inactive: Sin acceso Web
+Client Frozen: Cliente congelado
+Client inactive: Cliente inactivo
+Client not checked: Cliente no comprobado
\ No newline at end of file
diff --git a/client/ticket/routes.json b/client/ticket/routes.json
index 74908edd0..cfcdd0e4b 100644
--- a/client/ticket/routes.json
+++ b/client/ticket/routes.json
@@ -1,7 +1,7 @@
{
"module": "ticket",
"name": "Tickets",
- "icon": "receipt",
+ "icon": "icon-ticket",
"validations": false,
"routes": [
{
diff --git a/services/loopback/common/locale/es.json b/services/loopback/common/locale/es.json
index 7e09dd22c..d460ae82c 100644
--- a/services/loopback/common/locale/es.json
+++ b/services/loopback/common/locale/es.json
@@ -5,5 +5,7 @@
"The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
"Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
"El método de pago seleccionado requiere que se especifique el IBAN": "El método de pago seleccionado requiere que se especifique el IBAN",
- "can't be blank": "can't be blank"
+ "can't be blank": "can't be blank",
+ "DNI Incorrecto": "DNI Incorrecto",
+ "Ya existe un usuario con ese nombre": "Ya existe un usuario con ese nombre"
}
\ No newline at end of file