Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono

2023-07-26 13:12:01 +02:00 · 2023-07-26 13:12:01 +02:00 · 118f41c898
parent f42273006c fca03e5b7c
commit 118f41c898
251 changed files with 5619 additions and 1710 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [2330.01] - 2023-07-27
+
+### Added
+
+### Changed
+
+### Fixed
+
+
+## [2330.01] - 2023-07-27
+
+### Added
+- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
+- (Rutas -> Troncales) Nueva sección
+- (Tickets -> Opciones) Opción establecer peso
+- (Clientes -> SMS) Nueva sección
+
+### Changed
+- (General -> Iconos) Añadidos nuevos iconos
+- (Clientes -> Razón social) Nuevas restricciones por pais
+
+
+### Fixed
+
+
+## [2328.01] - 2023-07-13
+
+### Added
+- (Clientes -> Morosos) Añadida columna "es trabajador"
+- (Trabajadores -> Departamentos) Nueva sección
+- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
+- (Trabajadores -> Departamentos) Añadido características de departamento e información
+
+### Changed
+
+### Fixed
+- (Trabajadores -> Departamentos) Arreglado búscador
+
+
 ## [2326.01] - 2023-06-29

 ### Added
--- a/back/methods/docuware/checkFile.js
+++ b/back/methods/docuware/checkFile.js
@ -1,7 +1,5 @@
-const axios = require('axios');
-
 module.exports = Self => {
-    Self.remoteMethodCtx('checkFile', {
+    Self.remoteMethod('checkFile', {
        description: 'Check if exist docuware file',
        accessType: 'READ',
        accepts: [
@ -17,12 +15,16 @@ module.exports = Self => {
                required: true,
                description: 'The fileCabinet name'
            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'The filter'
+            },
            {
                arg: 'signed',
                type: 'boolean',
-                required: true,
                description: 'If pdf is necessary to be signed'
-            }
+            },
        ],
        returns: {
            type: 'object',
@ -34,7 +36,7 @@ module.exports = Self => {
        }
    });

-    Self.checkFile = async function(ctx, id, fileCabinet, signed) {
+    Self.checkFile = async function(id, fileCabinet, filter, signed) {
        const models = Self.app.models;
        const action = 'find';

@ -45,39 +47,34 @@ module.exports = Self => {
            }
        });

-        const searchFilter = {
-            condition: [
-                {
-                    DBName: docuwareInfo.findById,
-
-                    Value: [id]
-                }
-            ],
-            sortOrder: [
-                {
-                    Field: 'FILENAME',
-                    Direction: 'Desc'
-                }
-            ]
-        };
+        if (!filter) {
+            filter = {
+                condition: [
+                    {
+                        DBName: docuwareInfo.findById,
+                        Value: [id]
+                    }
+                ],
+                sortOrder: [
+                    {
+                        Field: 'FILENAME',
+                        Direction: 'Desc'
+                    }
+                ]
+            };
+        }
+        if (signed) {
+            filter.condition.push({
+                DBName: 'ESTADO',
+                Value: ['Firmado']
+            });
+        }

        try {
-            const options = await Self.getOptions();
-
-            const fileCabinetId = await Self.getFileCabinet(fileCabinet);
-            const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
-
-            const response = await axios.post(
-                `${options.url}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`,
-                searchFilter,
-                options.headers
-            );
-            const [documents] = response.data.Items;
+            const response = await Self.get(fileCabinet, filter);
+            const [documents] = response.Items;
            if (!documents) return false;

-            const state = documents.Fields.find(field => field.FieldName == 'ESTADO');
-            if (signed && state.Item != 'Firmado') return false;
-
            return {id: documents.Id};
        } catch (error) {
            return false;
--- a/back/methods/docuware/core.js
+++ b/back/methods/docuware/core.js
@ -1,59 +1,6 @@
 const axios = require('axios');

 module.exports = Self => {
-    /**
-     * Returns the dialog id
-     *
-     * @param {string} code - The fileCabinet name
-     * @param {string} action - The fileCabinet name
-     * @param {string} fileCabinetId - Optional The fileCabinet name
-     * @return {number} - The fileCabinet id
-     */
-    Self.getDialog = async(code, action, fileCabinetId) => {
-        const docuwareInfo = await Self.app.models.Docuware.findOne({
-            where: {
-                code: code,
-                action: action
-            }
-        });
-        if (!fileCabinetId) fileCabinetId = await Self.getFileCabinet(code);
-
-        const options = await Self.getOptions();
-
-        if (!process.env.NODE_ENV)
-            return Math.round();
-
-        const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers);
-        const dialogs = response.data.Dialog;
-        const dialogId = dialogs.find(dialogs => dialogs.DisplayName === docuwareInfo.dialogName).Id;
-
-        return dialogId;
-    };
-
-    /**
-     * Returns the fileCabinetId
-     *
-     * @param {string} code - The fileCabinet code
-     * @return {number} - The fileCabinet id
-     */
-    Self.getFileCabinet = async code => {
-        const options = await Self.getOptions();
-        const docuwareInfo = await Self.app.models.Docuware.findOne({
-            where: {
-                code: code
-            }
-        });
-
-        if (!process.env.NODE_ENV)
-            return Math.round();
-
-        const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers);
-        const fileCabinets = fileCabinetResponse.data.FileCabinet;
-        const fileCabinetId = fileCabinets.find(fileCabinet => fileCabinet.Name === docuwareInfo.fileCabinetName).Id;
-
-        return fileCabinetId;
-    };
-
    /**
     * Returns basic headers
     *
@ -75,4 +22,139 @@ module.exports = Self => {
            headers
        };
    };
+
+    /**
+     * Returns the dialog id
+     *
+     * @param {string} code - The fileCabinet name
+     * @param {string} action - The fileCabinet name
+     * @param {string} fileCabinetId - Optional The fileCabinet name
+     * @return {number} - The fileCabinet id
+     */
+    Self.getDialog = async(code, action, fileCabinetId) => {
+        if (!process.env.NODE_ENV)
+            return Math.floor(Math.random() + 100);
+
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code,
+                action
+            }
+        });
+        if (!fileCabinetId) fileCabinetId = await Self.getFileCabinet(code);
+
+        const options = await Self.getOptions();
+
+        const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers);
+        const dialogs = response.data.Dialog;
+        const dialogId = dialogs.find(dialogs => dialogs.DisplayName === docuwareInfo.dialogName).Id;
+
+        return dialogId;
+    };
+
+    /**
+     * Returns the fileCabinetId
+     *
+     * @param {string} code - The fileCabinet code
+     * @return {number} - The fileCabinet id
+     */
+    Self.getFileCabinet = async code => {
+        if (!process.env.NODE_ENV)
+            return Math.floor(Math.random() + 100);
+
+        const options = await Self.getOptions();
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code
+            }
+        });
+
+        const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers);
+        const fileCabinets = fileCabinetResponse.data.FileCabinet;
+        const fileCabinetId = fileCabinets.find(fileCabinet => fileCabinet.Name === docuwareInfo.fileCabinetName).Id;
+
+        return fileCabinetId;
+    };
+
+    /**
+     * Returns docuware data
+     *
+     * @param {string} code - The fileCabinet code
+     * @param {object} filter - The filter for docuware
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data
+     */
+    Self.get = async(code, filter, parse) => {
+        if (!process.env.NODE_ENV) return;
+
+        const options = await Self.getOptions();
+        const fileCabinetId = await Self.getFileCabinet(code);
+        const dialogId = await Self.getDialog(code, 'find', fileCabinetId);
+
+        const data = await axios.post(
+            `${options.url}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`,
+            filter,
+            options.headers
+        );
+        return parser(data.data, parse);
+    };
+
+    /**
+     * Returns docuware data
+     *
+     * @param {string} code - The fileCabinet code
+     * @param {any} id - The id of docuware
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data
+     */
+    Self.getById = async(code, id, parse) => {
+        if (!process.env.NODE_ENV) return;
+
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            fields: ['findById'],
+            where: {
+                code,
+                action: 'find'
+            }
+        });
+        const filter = {
+            condition: [
+                {
+                    DBName: docuwareInfo.findById,
+                    Value: [id]
+                }
+            ]
+        };
+
+        return Self.get(code, filter, parse);
+    };
+
+    /**
+     * Returns docuware data filtered
+     *
+     * @param {array} data - The data
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data parsed
+     */
+    function parser(data, parse) {
+        if (!(data && data.Items)) return data;
+
+        const parsed = [];
+        for (item of data.Items) {
+            const itemParsed = {};
+            item.Fields.map(field => {
+                if (field.ItemElementName.includes('Date')) field.Item = toDate(field.Item);
+                if (!parse) return itemParsed[field.FieldLabel] = field.Item;
+                if (parse[field.FieldLabel])
+                    itemParsed[parse[field.FieldLabel]] = field.Item;
+            });
+            parsed.push(itemParsed);
+        }
+        return parsed;
+    }
+
+    function toDate(value) {
+        if (!value) return;
+        return new Date(Number(value.substring(6, 19)));
+    }
 };
--- a/back/methods/docuware/download.js
+++ b/back/methods/docuware/download.js
@ -3,7 +3,7 @@ const axios = require('axios');
 const UserError = require('vn-loopback/util/user-error');

 module.exports = Self => {
-    Self.remoteMethodCtx('download', {
+    Self.remoteMethod('download', {
        description: 'Download an docuware PDF',
        accessType: 'READ',
        accepts: [
@ -16,8 +16,12 @@ module.exports = Self => {
            {
                arg: 'fileCabinet',
                type: 'string',
-                description: 'The file cabinet',
-                http: {source: 'path'}
+                description: 'The file cabinet'
+            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'The filter'
            }
        ],
        returns: [
@ -36,14 +40,15 @@ module.exports = Self => {
            }
        ],
        http: {
-            path: `/:id/download/:fileCabinet`,
+            path: `/:id/download`,
            verb: 'GET'
        }
    });

-    Self.download = async function(ctx, id, fileCabinet) {
+    Self.download = async function(id, fileCabinet, filter) {
        const models = Self.app.models;
-        const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, true);
+
+        const docuwareFile = await models.Docuware.checkFile(id, fileCabinet, filter);
        if (!docuwareFile) throw new UserError('The DOCUWARE PDF document does not exists');

        const fileCabinetId = await Self.getFileCabinet(fileCabinet);
--- a/back/methods/docuware/specs/checkFile.spec.js
+++ b/back/methods/docuware/specs/checkFile.spec.js
@ -1,57 +1,15 @@
 const models = require('vn-loopback/server/server').models;
-const axios = require('axios');

 describe('docuware download()', () => {
    const ticketId = 1;
-    const userId = 9;
-    const ctx = {
-        req: {
-
-            accessToken: {userId: userId},
-            headers: {origin: 'http://localhost:5000'},
-        }
-    };

    const docuwareModel = models.Docuware;
    const fileCabinetName = 'deliveryNote';

-    beforeAll(() => {
-        spyOn(docuwareModel, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-        spyOn(docuwareModel, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-    });
-
    it('should return false if there are no documents', async() => {
-        const response = {
-            data: {
-                Items: []
-            }
-        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+        spyOn(docuwareModel, 'get').and.returnValue((new Promise(resolve => resolve({Items: []}))));

-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
-
-        expect(result).toEqual(false);
-    });
-
-    it('should return false if the document is unsigned', async() => {
-        const response = {
-            data: {
-                Items: [
-                    {
-                        Id: 1,
-                        Fields: [
-                            {
-                                FieldName: 'ESTADO',
-                                Item: 'Unsigned'
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
-
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+        const result = await models.Docuware.checkFile(ticketId, fileCabinetName, null, true);

        expect(result).toEqual(false);
    });
@ -59,23 +17,21 @@ describe('docuware download()', () => {
    it('should return the document data', async() => {
        const docuwareId = 1;
        const response = {
-            data: {
-                Items: [
-                    {
-                        Id: docuwareId,
-                        Fields: [
-                            {
-                                FieldName: 'ESTADO',
-                                Item: 'Firmado'
-                            }
-                        ]
-                    }
-                ]
-            }
+            Items: [
+                {
+                    Id: docuwareId,
+                    Fields: [
+                        {
+                            FieldName: 'ESTADO',
+                            Item: 'Firmado'
+                        }
+                    ]
+                }
+            ]
        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+        spyOn(docuwareModel, 'get').and.returnValue((new Promise(resolve => resolve(response))));

-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+        const result = await models.Docuware.checkFile(ticketId, fileCabinetName, null, true);

        expect(result.id).toEqual(docuwareId);
    });
--- a/back/methods/docuware/specs/core.spec.js
+++ b/back/methods/docuware/specs/core.spec.js
@ -0,0 +1,135 @@
+const axios = require('axios');
+const models = require('vn-loopback/server/server').models;
+
+describe('Docuware core', () => {
+    beforeAll(() => {
+        process.env.NODE_ENV = 'testing';
+    });
+
+    afterAll(() => {
+        delete process.env.NODE_ENV;
+    });
+
+    describe('getOptions()', () => {
+        it('should return url and headers', async() => {
+            const result = await models.Docuware.getOptions();
+
+            expect(result.url).toBeDefined();
+            expect(result.headers).toBeDefined();
+        });
+    });
+
+    describe('getDialog()', () => {
+        it('should return dialogId', async() => {
+            const dialogs = {
+                data: {
+                    Dialog: [
+                        {
+                            DisplayName: 'find',
+                            Id: 'getDialogTest'
+                        }
+                    ]
+                }
+            };
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+
+            expect(result).toEqual('getDialogTest');
+        });
+    });
+
+    describe('getFileCabinet()', () => {
+        it('should return fileCabinetId', async() => {
+            const code = 'deliveryNote';
+            const docuwareInfo = await models.Docuware.findOne({
+                where: {
+                    code
+                }
+            });
+            const dialogs = {
+                data: {
+                    FileCabinet: [
+                        {
+                            Name: docuwareInfo.fileCabinetName,
+                            Id: 'getFileCabinetTest'
+                        }
+                    ]
+                }
+            };
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+            const result = await models.Docuware.getFileCabinet(code);
+
+            expect(result).toEqual('getFileCabinetTest');
+        });
+    });
+
+    describe('get()', () => {
+        it('should return data without parse', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    id: 1
+                }
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const result = await models.Docuware.get('deliveryNote');
+
+            expect(result.id).toEqual(1);
+        });
+
+        it('should return data with parse', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    Items: [{
+                        Fields: [
+                            {
+                                ItemElementName: 'integer',
+                                FieldLabel: 'firstRequiredField',
+                                Item: 1
+                            },
+                            {
+                                ItemElementName: 'string',
+                                FieldLabel: 'secondRequiredField',
+                                Item: 'myName'
+                            },
+                            {
+                                ItemElementName: 'integer',
+                                FieldLabel: 'notRequiredField',
+                                Item: 2
+                            }
+                        ]
+                    }]
+                }
+            };
+            const parse = {
+                'firstRequiredField': 'id',
+                'secondRequiredField': 'name',
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const [result] = await models.Docuware.get('deliveryNote', null, parse);
+
+            expect(result.id).toEqual(1);
+            expect(result.name).toEqual('myName');
+            expect(result.notRequiredField).not.toBeDefined();
+        });
+    });
+
+    describe('getById()', () => {
+        it('should return data', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    id: 1
+                }
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const result = await models.Docuware.getById('deliveryNote', 1);
+
+            expect(result.id).toEqual(1);
+        });
+    });
+});
--- a/back/methods/docuware/specs/download.spec.js
+++ b/back/methods/docuware/specs/download.spec.js
@ -39,7 +39,7 @@ describe('docuware download()', () => {
        spyOn(docuwareModel, 'checkFile').and.returnValue({});
        spyOn(axios, 'get').and.returnValue(new stream.PassThrough({objectMode: true}));

-        const result = await models.Docuware.download(ctx, ticketId, fileCabinetName);
+        const result = await models.Docuware.download(ticketId, fileCabinetName);

        expect(result[1]).toEqual('application/pdf');
        expect(result[2]).toEqual(`filename="${ticketId}.pdf"`);
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@ -0,0 +1,102 @@
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('signIn', {
+        description: 'Login a user with username/email and password',
+        accepts: [
+            {
+                arg: 'user',
+                type: 'String',
+                description: 'The user name or email',
+                required: true
+            }, {
+                arg: 'password',
+                type: 'String',
+                description: 'The password'
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/sign-in`,
+            verb: 'POST'
+        }
+    });
+
+    Self.signIn = async function(ctx, user, password, options) {
+        const myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const where = Self.userUses(user);
+        const vnUser = await Self.findOne({
+            fields: ['id', 'name', 'password', 'active', 'email', 'passExpired', 'twoFactor'],
+            where
+        }, myOptions);
+
+        const validCredentials = vnUser
+            && await vnUser.hasPassword(password);
+
+        if (validCredentials) {
+            if (!vnUser.active)
+                throw new UserError('User disabled');
+            await Self.sendTwoFactor(ctx, vnUser, myOptions);
+            await Self.passExpired(vnUser, myOptions);
+
+            if (vnUser.twoFactor)
+                throw new ForbiddenError(null, 'REQUIRES_2FA');
+        }
+
+        return Self.validateLogin(user, password);
+    };
+
+    Self.passExpired = async(vnUser, myOptions) => {
+        const today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
+
+        if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
+            const $ = Self.app.models;
+            const changePasswordToken = await $.AccessToken.create({
+                scopes: ['changePassword'],
+                userId: vnUser.id
+            }, myOptions);
+            const err = new UserError('Pass expired', 'passExpired');
+            changePasswordToken.twoFactor = vnUser.twoFactor ? true : false;
+            err.details = {token: changePasswordToken};
+            throw err;
+        }
+    };
+
+    Self.sendTwoFactor = async(ctx, vnUser, myOptions) => {
+        if (vnUser.twoFactor === 'email') {
+            const $ = Self.app.models;
+
+            const code = String(Math.floor(Math.random() * 999999));
+            const maxTTL = ((60 * 1000) * 5); // 5 min
+            await $.AuthCode.upsertWithWhere({userFk: vnUser.id}, {
+                userFk: vnUser.id,
+                code: code,
+                expires: Date.vnNow() + maxTTL
+            }, myOptions);
+
+            const headers = ctx.req.headers;
+            const platform = headers['sec-ch-ua-platform']?.replace(/['"=]+/g, '');
+            const browser = headers['sec-ch-ua']?.replace(/['"=]+/g, '');
+            const params = {
+                args: {
+                    recipientId: vnUser.id,
+                    recipient: vnUser.email,
+                    code: code,
+                    ip: ctx.req?.connection?.remoteAddress,
+                    device: platform && browser ? platform + ', ' + browser : headers['user-agent'],
+                },
+                req: {getLocale: ctx.req.getLocale},
+            };
+
+            await Self.sendTemplate(params, 'auth-code', true);
+        }
+    };
+};
--- a/back/methods/vn-user/signIn.js
+++ b/back/methods/vn-user/signIn.js
@ -1,81 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-
-module.exports = Self => {
-    Self.remoteMethod('signIn', {
-        description: 'Login a user with username/email and password',
-        accepts: [
-            {
-                arg: 'user',
-                type: 'String',
-                description: 'The user name or email',
-                http: {source: 'form'},
-                required: true
-            }, {
-                arg: 'password',
-                type: 'String',
-                description: 'The password'
-            }
-        ],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/signIn`,
-            verb: 'POST'
-        }
-    });
-
-    Self.signIn = async function(user, password) {
-        const models = Self.app.models;
-        const usesEmail = user.indexOf('@') !== -1;
-        let token;
-
-        const userInfo = usesEmail
-            ? {email: user}
-            : {username: user};
-        const instance = await Self.findOne({
-            fields: ['username', 'password'],
-            where: userInfo
-        });
-
-        const where = usesEmail
-            ? {email: user}
-            : {name: user};
-        const vnUser = await Self.findOne({
-            fields: ['id', 'active', 'passExpired'],
-            where
-        });
-
-        const today = Date.vnNew();
-        today.setHours(0, 0, 0, 0);
-
-        const validCredentials = instance
-            && await instance.hasPassword(password);
-
-        if (validCredentials) {
-            if (!vnUser.active)
-                throw new UserError('User disabled');
-
-            if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
-                const changePasswordToken = await models.AccessToken.create({
-                    scopes: ['change-password'],
-                    userId: vnUser.id
-                });
-                const err = new UserError('Pass expired', 'passExpired');
-                err.details = {token: changePasswordToken};
-                throw err;
-            }
-
-            try {
-                await models.Account.sync(instance.username, password);
-            } catch (err) {
-                console.warn(err);
-            }
-        }
-
-        let loginInfo = Object.assign({password}, userInfo);
-        token = await Self.login(loginInfo, 'user');
-        return {token: token.id, ttl: token.ttl};
-    };
-};
--- a/back/methods/vn-user/specs/sign-in.spec.js
+++ b/back/methods/vn-user/specs/sign-in.spec.js
@ -0,0 +1,101 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('VnUser Sign-in()', () => {
+    const employeeId = 1;
+    const unauthCtx = {
+        req: {
+            headers: {},
+            connection: {
+                remoteAddress: '127.0.0.1'
+            },
+            getLocale: () => 'en'
+        },
+        args: {}
+    };
+    const {VnUser, AccessToken} = models;
+    describe('when credentials are correct', () => {
+        it('should return the token', async() => {
+            let login = await VnUser.signIn(unauthCtx, 'salesAssistant', 'nightmare');
+            let accessToken = await AccessToken.findById(login.token);
+            let ctx = {req: {accessToken: accessToken}};
+
+            expect(login.token).toBeDefined();
+
+            await VnUser.logout(ctx.req.accessToken.id);
+        });
+
+        it('should return the token if the user doesnt exist but the client does', async() => {
+            let login = await VnUser.signIn(unauthCtx, 'PetterParker', 'nightmare');
+            let accessToken = await AccessToken.findById(login.token);
+            let ctx = {req: {accessToken: accessToken}};
+
+            expect(login.token).toBeDefined();
+
+            await VnUser.logout(ctx.req.accessToken.id);
+        });
+    });
+
+    describe('when credentials are incorrect', () => {
+        it('should throw a 401 error', async() => {
+            let error;
+
+            try {
+                await VnUser.signIn(unauthCtx, 'IDontExist', 'TotallyWrongPassword');
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.statusCode).toBe(401);
+            expect(error.code).toBe('LOGIN_FAILED');
+        });
+    });
+
+    describe('when two-factor auth is required', () => {
+        it('should throw a 403 error', async() => {
+            const employee = await VnUser.findById(employeeId);
+            const tx = await VnUser.beginTransaction({});
+
+            let error;
+            try {
+                const options = {transaction: tx};
+                await employee.updateAttribute('twoFactor', 'email', options);
+
+                await VnUser.signIn(unauthCtx, 'employee', 'nightmare', options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.statusCode).toBe(403);
+            expect(error.code).toBe('REQUIRES_2FA');
+        });
+    });
+
+    describe('when passExpired', () => {
+        it('should throw a passExpired error', async() => {
+            const tx = await VnUser.beginTransaction({});
+            const employee = await VnUser.findById(employeeId);
+            const yesterday = Date.vnNew();
+            yesterday.setDate(yesterday.getDate() - 1);
+
+            let error;
+            try {
+                const options = {transaction: tx};
+                await employee.updateAttribute('passExpired', yesterday, options);
+
+                await VnUser.signIn(unauthCtx, 'employee', 'nightmare', options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.statusCode).toBe(400);
+            expect(error.message).toBe('Pass expired');
+        });
+    });
+});
--- a/back/methods/vn-user/specs/signIn.spec.js
+++ b/back/methods/vn-user/specs/signIn.spec.js
@ -1,41 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('VnUser signIn()', () => {
-    describe('when credentials are correct', () => {
-        it('should return the token', async() => {
-            let login = await models.VnUser.signIn('salesAssistant', 'nightmare');
-            let accessToken = await models.AccessToken.findById(login.token);
-            let ctx = {req: {accessToken: accessToken}};
-
-            expect(login.token).toBeDefined();
-
-            await models.VnUser.logout(ctx.req.accessToken.id);
-        });
-
-        it('should return the token if the user doesnt exist but the client does', async() => {
-            let login = await models.VnUser.signIn('PetterParker', 'nightmare');
-            let accessToken = await models.AccessToken.findById(login.token);
-            let ctx = {req: {accessToken: accessToken}};
-
-            expect(login.token).toBeDefined();
-
-            await models.VnUser.logout(ctx.req.accessToken.id);
-        });
-    });
-
-    describe('when credentials are incorrect', () => {
-        it('should throw a 401 error', async() => {
-            let error;
-
-            try {
-                await models.VnUser.signIn('IDontExist', 'TotallyWrongPassword');
-            } catch (e) {
-                error = e;
-            }
-
-            expect(error).toBeDefined();
-            expect(error.statusCode).toBe(401);
-            expect(error.code).toBe('LOGIN_FAILED');
-        });
-    });
-});
--- a/back/methods/vn-user/specs/validate-auth.spec.js
+++ b/back/methods/vn-user/specs/validate-auth.spec.js
@ -0,0 +1,52 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('VnUser validate-auth()', () => {
+    describe('validateAuth', () => {
+        it('should signin if data is correct', async() => {
+            await models.AuthCode.create({
+                userFk: 9,
+                code: '555555',
+                expires: Date.vnNow() + (60 * 1000)
+            });
+            const token = await models.VnUser.validateAuth('developer', 'nightmare', '555555');
+
+            expect(token.token).toBeDefined();
+        });
+    });
+
+    describe('validateCode', () => {
+        it('should throw an error for a non existent code', async() => {
+            let error;
+            try {
+                await models.VnUser.validateCode('developer', '123456');
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.statusCode).toBe(400);
+            expect(error.message).toEqual('Invalid or expired verification code');
+        });
+
+        it('should throw an error when a code doesn`t match the login username', async() => {
+            let error;
+            let authCode;
+            try {
+                authCode = await models.AuthCode.create({
+                    userFk: 1,
+                    code: '555555',
+                    expires: Date.vnNow() + (60 * 1000)
+                });
+
+                await models.VnUser.validateCode('developer', '555555');
+            } catch (e) {
+                authCode && await authCode.destroy();
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.statusCode).toBe(400);
+            expect(error.message).toEqual('Authentication failed');
+        });
+    });
+});
--- a/back/methods/vn-user/validate-auth.js
+++ b/back/methods/vn-user/validate-auth.js
@ -0,0 +1,66 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('validateAuth', {
+        description: 'Login a user with username/email and password',
+        accepts: [
+            {
+                arg: 'user',
+                type: 'String',
+                description: 'The user name or email',
+                required: true
+            },
+            {
+                arg: 'password',
+                type: 'String',
+                description: 'The password'
+            },
+            {
+                arg: 'code',
+                type: 'String',
+                description: 'The auth code'
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/validate-auth`,
+            verb: 'POST'
+        }
+    });
+
+    Self.validateAuth = async(username, password, code, options) => {
+        const myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const token = Self.validateLogin(username, password);
+        await Self.validateCode(username, code, myOptions);
+        return token;
+    };
+
+    Self.validateCode = async(username, code, myOptions) => {
+        const {AuthCode} = Self.app.models;
+
+        const authCode = await AuthCode.findOne({
+            where: {
+                code: code
+            }
+        }, myOptions);
+
+        const expired = authCode && Date.vnNow() > authCode.expires;
+        if (!authCode || expired)
+            throw new UserError('Invalid or expired verification code');
+
+        const user = await Self.findById(authCode.userFk, {
+            fields: ['name', 'twoFactor']
+        }, myOptions);
+
+        if (user.name !== username)
+            throw new UserError('Authentication failed');
+
+        await authCode.destroy(myOptions);
+    };
+};
--- a/back/model-config.json
+++ b/back/model-config.json
@ -1,7 +1,4 @@
 {
-    "AccountingType": {
-        "dataSource": "vn"
-    },
    "AccessTokenConfig": {
        "dataSource": "vn",
        "options": {
@ -10,6 +7,12 @@
            }
        }
    },
+    "AccountingType": {
+        "dataSource": "vn"
+    },
+    "AuthCode": {
+        "dataSource": "vn"
+    },
    "Bank": {
        "dataSource": "vn"
    },
--- a/back/models/auth-code.json
+++ b/back/models/auth-code.json
@ -0,0 +1,31 @@
+{
+	"name": "AuthCode",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "salix.authCode"
+		}
+	},
+	"properties": {
+		"userFk": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"code": {
+			"type": "string",
+			"required": true
+		},
+		"expires": {
+			"type": "number",
+			"required": true
+		}
+	},
+	"relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "userFk"
+		}
+	}
+}
--- a/back/models/company.json
+++ b/back/models/company.json
@ -18,6 +18,9 @@
        },
        "expired": {
            "type": "date"
+        },
+        "supplierAccountFk": {
+            "type": "number"
        }
    },
    "scope": {
--- a/back/models/country.json
+++ b/back/models/country.json
@ -22,6 +22,9 @@
        },
        "isUeeMember": {
            "type": "boolean"
+        },
+        "isSocialNameUnique": {
+            "type": "boolean"
        }
    },
    "relations": {
@ -39,4 +42,4 @@
            "permission": "ALLOW"
        }
    ]
-}
+}
--- a/back/models/docuware.json
+++ b/back/models/docuware.json
@ -28,5 +28,12 @@
        "findById": {
            "type": "string"
        }
+    },
+    "relations": {
+        "dmsType": {
+            "type": "belongsTo",
+            "model": "DmsType",
+            "foreignKey": "dmsTypeFk"
+        }
    }
 }
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@ -5,11 +5,12 @@ const {Email} = require('vn-print');
 module.exports = function(Self) {
    vnModel(Self);

-    require('../methods/vn-user/signIn')(Self);
+    require('../methods/vn-user/sign-in')(Self);
    require('../methods/vn-user/acl')(Self);
    require('../methods/vn-user/recover-password')(Self);
    require('../methods/vn-user/validate-token')(Self);
    require('../methods/vn-user/privileges')(Self);
+    require('../methods/vn-user/validate-auth')(Self);
    require('../methods/vn-user/renew-token')(Self);

    Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
@ -111,6 +112,18 @@ module.exports = function(Self) {
        return email.send();
    });

+    Self.validateLogin = async function(user, password) {
+        let loginInfo = Object.assign({password}, Self.userUses(user));
+        token = await Self.login(loginInfo, 'user');
+        return {token: token.id, ttl: token.ttl};
+    };
+
+    Self.userUses = function(user) {
+        return user.indexOf('@') !== -1
+            ? {email: user}
+            : {username: user};
+    };
+
    const _setPassword = Self.prototype.setPassword;
    Self.prototype.setPassword = async function(newPassword, options, cb) {
        if (cb === undefined && typeof options === 'function') {
@ -143,8 +156,9 @@ module.exports = function(Self) {
        }
    };

-    Self.sharedClass._methods.find(method => method.name == 'changePassword')
-        .accessScopes = ['change-password'];
+    Self.sharedClass._methods.find(method => method.name == 'changePassword').ctor.settings.acls =
+    Self.sharedClass._methods.find(method => method.name == 'changePassword').ctor.settings.acls
+        .filter(acl => acl.property != 'changePassword');

    // FIXME: https://redmine.verdnatura.es/issues/5761
    // Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => {
--- a/back/models/vn-user.json
+++ b/back/models/vn-user.json
@ -59,7 +59,10 @@
 		},
        "passExpired": {
            "type": "date"
-        }
+        },
+		"twoFactor": {
+			"type": "string"
+		}
 	},
 	"relations": {
 		"role": {
@ -111,6 +114,13 @@
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		},
+		{
+            "property": "validateAuth",
+			"accessType": "EXECUTE",
+			"principalType": "ROLE",
+			"principalId": "$everyone",
+			"permission": "ALLOW"
+		},
 		{
 			"property": "privileges",
 			"accessType": "*",
--- a/db/changes/232601/00-aclInvoiceTickets.sql
+++ b/db/changes/232601/00-aclInvoiceTickets.sql
@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES('Ticket', 'invoiceTickets', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/232602/01-aclAddAlias.sql
+++ b/db/changes/232602/01-aclAddAlias.sql
@ -0,0 +1,8 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'MailAliasAccount';
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('MailAliasAccount', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', 'canEditAlias', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
--- a/db/changes/232801/00-authCode.sql
+++ b/db/changes/232801/00-authCode.sql
@ -0,0 +1,13 @@
+create table `salix`.`authCode`
+(
+    userFk int UNSIGNED not null,
+    code   int          not null,
+    expires   bigint   not null,
+    constraint authCode_pk
+        primary key (userFk),
+    constraint authCode_unique
+        unique (code),
+    constraint authCode_user_id_fk
+        foreign key (userFk) references `account`.`user` (id)
+            on update cascade on delete cascade
+);
--- a/db/changes/232801/00-client_create.sql
+++ b/db/changes/232801/00-client_create.sql
@ -0,0 +1,89 @@
+DROP PROCEDURE IF EXISTS `vn`.`clientCreate`;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_create`(
+	vFirstname VARCHAR(50),
+	vSurnames VARCHAR(50),
+	vFi VARCHAR(9),
+	vAddress TEXT,
+	vPostcode CHAR(5),
+	vCity VARCHAR(25),
+	vProvinceFk SMALLINT(5),
+	vCompanyFk SMALLINT(5),
+	vPhone VARCHAR(11),
+	vEmail VARCHAR(255),
+	vUserFk INT
+)
+BEGIN
+/**
+ * Create new client
+ *
+ * @params vFirstname firstName
+ * @params vSurnames surnames
+ * @params vFi company code from accounting transactions
+ * @params vAddress address
+ * @params vPostcode postCode
+ * @params vCity city
+ * @params vProvinceFk province
+ * @params vCompanyFk company in which he has become a client
+ * @params vPhone telephone number
+ * @params vEmail email address
+ * @params vUserFk user id
+ */
+	DECLARE vPayMethodFk INT;
+	DECLARE vDueDay INT;
+	DECLARE vDefaultCredit DECIMAL(10, 2);
+	DECLARE vIsTaxDataChecked TINYINT(1);
+	DECLARE vHasCoreVnl BOOLEAN;
+	DECLARE vMandateTypeFk INT;
+
+	SELECT defaultPayMethodFk,
+			defaultDueDay,
+			defaultCredit,
+			defaultIsTaxDataChecked,
+			defaultHasCoreVnl,
+			defaultMandateTypeFk
+		INTO vPayMethodFk,
+			vDueDay,
+			vDefaultCredit,
+			vIsTaxDataChecked,
+			vHasCoreVnl,
+			vMandateTypeFk
+		FROM clientConfig;
+
+	INSERT INTO `client`
+			SET id = vUserFk,
+				name = CONCAT(vFirstname, ' ', vSurnames),
+				street = vAddress,
+				fi = TRIM(vFi),
+				phone = vPhone,
+				email = vEmail,
+				provinceFk = vProvinceFk,
+				city = vCity,
+				postcode = vPostcode,
+				socialName = CONCAT(vSurnames, ' ', vFirstname),
+				payMethodFk = vPayMethodFk,
+				dueDay = vDueDay,
+				credit = vDefaultCredit,
+				isTaxDataChecked = vIsTaxDataChecked,
+				hasCoreVnl = vHasCoreVnl,
+				isEqualizated = FALSE
+		ON duplicate KEY UPDATE
+			payMethodFk = vPayMethodFk,
+			dueDay = vDueDay,
+			credit = vDefaultCredit,
+			isTaxDataChecked = vIsTaxDataChecked,
+			hasCoreVnl = vHasCoreVnl,
+			isActive = TRUE;
+
+	INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
+		SELECT vUserFk, vCompanyFk, vMandateTypeFk
+			WHERE NOT EXISTS (
+				SELECT id
+					FROM mandate
+					WHERE clientFk = vUserFk
+						AND companyFk = vCompanyFk
+						AND mandateTypeFk = vMandateTypeFk
+			);
+END$$
+DELIMITER ;
--- a/db/changes/232801/00-client_create2.sql
+++ b/db/changes/232801/00-client_create2.sql
@ -0,0 +1,17 @@
+ALTER TABLE `vn`.`clientConfig` ADD defaultPayMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`clientConfig` ADD defaultDueDay int unsigned NULL;
+ALTER TABLE `vn`.`clientConfig` ADD defaultCredit decimal(10, 2) NULL;
+ALTER TABLE `vn`.`clientConfig` ADD defaultIsTaxDataChecked tinyint(1) NULL;
+ALTER TABLE `vn`.`clientConfig` ADD defaultHasCoreVnl boolean  NULL;
+ALTER TABLE `vn`.`clientConfig` ADD defaultMandateTypeFk smallint(5) NULL;
+ALTER TABLE `vn`.`clientConfig` ADD CONSTRAINT clientNewConfigPayMethod_FK FOREIGN KEY (defaultPayMethodFk) REFERENCES vn.payMethod(id);
+ALTER TABLE `vn`.`clientConfig` ADD CONSTRAINT clientNewConfigMandateType_FK FOREIGN KEY (defaultMandateTypeFk) REFERENCES vn.mandateType(id);
+
+UPDATE `vn`.`clientConfig`
+    SET defaultPayMethodFk = 4,
+        defaultDueDay = 5,
+        defaultCredit = 300.0,
+        defaultIsTaxDataChecked = 1,
+        defaultHasCoreVnl = 1,
+        defaultMandateTypeFk = 2
+    WHERE id = 1;
--- a/db/changes/232801/00-department.sql
+++ b/db/changes/232801/00-department.sql
@ -0,0 +1,24 @@
+alter table `vn`.`department`
+    add `twoFactor` ENUM ('email') null comment 'Default user two-factor auth type';
+
+drop trigger `vn`.`department_afterUpdate`;
+
+DELIMITER $$
+$$
+create definer = root@localhost trigger `vn`.`department_afterUpdate`
+    after update
+    on department
+    for each row
+BEGIN
+	IF !(OLD.parentFk <=> NEW.parentFk) THEN
+		UPDATE vn.department_recalc SET isChanged = TRUE;
+	END IF;
+
+	IF !(OLD.twoFactor <=> NEW.twoFactor) THEN
+		UPDATE account.user u
+                JOIN vn.workerDepartment wd ON wd.workerFk = u.id
+            SET u.twoFactor = NEW.twoFactor
+	    WHERE wd.departmentFk = NEW.id;
+	END IF;
+END;$$
+DELIMITER ;
--- a/db/changes/232801/00-user.sql
+++ b/db/changes/232801/00-user.sql
@ -0,0 +1,5 @@
+alter table `account`.`user`
+    add `twoFactor` ENUM ('email') null comment 'Two-factor auth type';
+
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'VnUser' AND property = 'changePassword';
--- a/db/changes/232802/01-aclWorkerDisable.sql
+++ b/db/changes/232802/01-aclWorkerDisable.sql
@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('WorkerDisableExcluded', '*', 'READ', 'ALLOW', 'ROLE', 'itManagement'),
+        ('WorkerDisableExcluded', '*', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
--- a/db/changes/233001/.gitkeep
+++ b/db/changes/233001/.gitkeep
--- a/db/changes/233001/00-clientSms.sql
+++ b/db/changes/233001/00-clientSms.sql
@ -0,0 +1,15 @@
+CREATE TABLE `vn`.`clientSms` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `clientFk` int(11) NOT NULL,
+  `smsFk` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `clientSms_FK` (`clientFk`),
+  KEY `clientSms_FK_1` (`smsFk`),
+  CONSTRAINT `clientSms_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `clientSms_FK_1` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('ClientSms', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('ClientSms', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/233001/00-company.sql
+++ b/db/changes/233001/00-company.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`company` MODIFY COLUMN sage200Company int(2) DEFAULT 10 NOT NULL;
--- a/db/changes/233001/00-fixACLVehicle.sql
+++ b/db/changes/233001/00-fixACLVehicle.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES
+        ('Vehicle','sorted','WRITE','ALLOW','employee');
--- a/db/changes/233001/00-itemRecycle.sql
+++ b/db/changes/233001/00-itemRecycle.sql
@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`item` ADD recycledPlastic INT NULL;
+ALTER TABLE `vn`.`item` ADD nonRecycledPlastic INT NULL;
--- a/db/changes/233001/00-itemShelving_inventory.sql
+++ b/db/changes/233001/00-itemShelving_inventory.sql
@ -0,0 +1,64 @@
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_inventory`(vParkingFromFk VARCHAR(8), vParkingToFk VARCHAR(8))
+BEGIN
+/**
+ *  Devuelve un listado de ubicaciones a revisar
+ * 
+ * @param vParkingFromFk Parking de partida, identificador de parking
+ * @param vParkingToFk Parking de llegada, identificador de parking
+*/
+
+    DECLARE vSectorFk INT;
+    DECLARE vPickingOrderFrom INT;
+	DECLARE vPickingOrderTo INT;
+
+	SELECT p.sectorFk, p.pickingOrder INTO vSectorFk, vPickingOrderFrom
+		FROM parking p
+		WHERE p.code = vParkingFromFk COLLATE 'utf8mb3_general_ci';
+
+	SELECT p.pickingOrder INTO vPickingOrderTo
+		FROM parking p
+		WHERE p.code = vParkingToFk COLLATE 'utf8mb3_general_ci';
+
+	CALL visible_getMisfit(vSectorFk);
+
+	SELECT    ish.id,
+			p.pickingOrder,
+			p.code parking,
+			ish.shelvingFk,
+			ish.itemFk,
+			i.longName,
+			ish.visible,
+			p.sectorFk,
+			it.workerFk buyer,
+			CONCAT('http:',ic.url, '/catalog/1600x900/',i.image) urlImage,
+			ish.isChecked,
+		CASE 
+			WHEN s.notPrepared > sm.parked THEN 0
+			WHEN sm.visible > sm.parked THEN 1
+		ELSE 2
+		END priority
+	FROM itemShelving ish 
+		JOIN item i ON i.id = ish.itemFk 
+		JOIN itemType it ON it.id = i.typeFk
+		JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk 
+		JOIN shelving sh ON sh.code = ish.shelvingFk 
+		JOIN parking p ON p.id = sh.parkingFk
+		JOIN (SELECT s.itemFk, sum(s.quantity) notPrepared
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				JOIN warehouse w ON w.id = t.warehouseFk
+				JOIN config c ON c.mainWarehouseFk = w.id
+			WHERE t.shipped BETWEEN util.VN_CURDATE() 
+				AND util.dayEnd(util.VN_CURDATE())
+				AND s.isPicked = FALSE
+			GROUP BY s.itemFk) s ON s.itemFk = i.id
+		JOIN hedera.imageConfig ic
+	WHERE p.pickingOrder BETWEEN vPickingOrderFrom AND vPickingOrderTo
+		AND p.sectorFk = vSectorFk
+	ORDER BY p.pickingOrder;
+
+END$$
+DELIMITER ;
+
--- a/db/changes/233001/00-noUniqueSocialName.sql
+++ b/db/changes/233001/00-noUniqueSocialName.sql
@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`country`
+ADD COLUMN `isSocialNameUnique` tinyint(1) NOT NULL DEFAULT 1;
--- a/db/changes/233001/00-roadmap.sql
+++ b/db/changes/233001/00-roadmap.sql
@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`roadmap` COMMENT='Troncales diarios que se contratan';
+ALTER TABLE `vn`.`roadmap` ADD price decimal(10,2) NULL;
+ALTER TABLE `vn`.`roadmap` ADD driverName  varchar(45) NULL;
+ALTER TABLE `vn`.`roadmap` ADD name varchar(45) NOT NULL;
+ALTER TABLE `vn`.`roadmap` CHANGE name name varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL AFTER id;
+ALTER TABLE `vn`.`roadmap` MODIFY COLUMN etd datetime NOT NULL;
+
+ALTER TABLE `vn`.`expeditionTruck` COMMENT='Distintas paradas que hacen los trocales';
--- a/db/changes/233001/00-roadmapACL.sql
+++ b/db/changes/233001/00-roadmapACL.sql
@ -0,0 +1,6 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Roadmap', '*', '*', 'ALLOW', 'ROLE', 'palletizerBoss'),
+        ('Roadmap', '*', '*', 'ALLOW', 'ROLE', 'productionBoss'),
+        ('ExpeditionTruck', '*', '*', 'ALLOW', 'ROLE', 'palletizerBoss'),
+        ('ExpeditionTruck', '*', '*', 'ALLOW', 'ROLE', 'productionBoss');
--- a/db/changes/233001/00-ticketWeight.sql
+++ b/db/changes/233001/00-ticketWeight.sql
@ -0,0 +1,7 @@
+UPDATE `vn`.`ticket` t
+        JOIN `vn`.`ticketObservation` o ON o.ticketFk = t.id
+    SET t.weight = cast(REPLACE(o.description, ',', '.') as decimal(10,2))
+        WHERE o.observationTypeFk = 6;
+
+DELETE FROM `vn`.`ticketObservation` WHERE observationTypeFk = 6;
+DELETE FROM `vn`.`observationType` WHERE id = 6;
--- a/db/changes/233201/.gitkeep
+++ b/db/changes/233201/.gitkeep
--- a/db/changes/233201/00-transferClient.sql
+++ b/db/changes/233201/00-transferClient.sql
@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+    VALUES ('Ticket','transferClient','WRITE','ALLOW','ROLE','administrative');
--- a/db/changes/233201/00-updatePrice.sql
+++ b/db/changes/233201/00-updatePrice.sql
@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+    VALUES ('Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer');
--- a/db/changes/233201/00-workerDocuware.sql
+++ b/db/changes/233201/00-workerDocuware.sql
@ -0,0 +1,10 @@
+ALTER TABLE `vn`.`docuware` ADD dmsTypeFk INT(11) DEFAULT NULL NULL;
+ALTER TABLE `vn`.`docuware` ADD CONSTRAINT docuware_FK FOREIGN KEY (dmsTypeFk) REFERENCES `vn`.`dmsType`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+INSERT INTO `vn`.`docuware` (code, fileCabinetName, `action`, dialogName, findById, dmsTypeFk)
+    VALUES
+        ('hr', 'RRHH', 'find', 'Búsqueda', 'N__DOCUMENTO', NULL); -- set dmsTypeFk 3 when deploy in production
+
+INSERT INTO `salix`.`url` (appName, environment, url)
+    VALUES
+        ('docuware', 'production', 'https://verdnatura.docuware.cloud/DocuWare/Platform/');
+
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -37,7 +37,7 @@ ALTER TABLE `vn`.`ticket` AUTO_INCREMENT = 1;

 INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`)
    VALUES
-        ('DEFAULT_TOKEN', '1209600', util.VN_CURDATE(), 66);
+        ('DEFAULT_TOKEN', '1209600', CURDATE(), 66);

 INSERT INTO `salix`.`printConfig` (`id`, `itRecipient`, `incidencesEmail`)
    VALUES
@ -77,7 +77,10 @@ INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `
            ORDER BY id;

 INSERT INTO `account`.`account`(`id`)
-    SELECT id FROM `account`.`user`;
+    SELECT `u`.`id`
+        FROM `account`.`user` `u`
+            JOIN `account`.`role` `r` ON `u`.`role` = `r`.`id`
+            WHERE `r`.`name` <> 'customer';

 INSERT INTO `vn`.`educationLevel` (`id`, `name`)
 	VALUES
@ -185,13 +188,13 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd

 UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;

-INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
+INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`)
    VALUES
-        (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL),
-        (1107, 'ANT', 'Hank'         , 'Pym'   , 1107, 19, 432978107, NULL, NULL),
-        (1108, 'DCX', 'Charles'      , 'Xavier', 1108, 19, 432978108, 1,    NULL),
-        (1109, 'HLK', 'Bruce'        , 'Banner', 1109, 19, 432978109, 1,    NULL),
-        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110, 2,    NULL);
+        (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106),
+        (1107, 'ANT', 'Hank'         , 'Pym'   , 1107, 19, 432978107),
+        (1108, 'DCX', 'Charles'      , 'Xavier', 1108, 19, 432978108),
+        (1109, 'HLK', 'Bruce'        , 'Banner', 1109, 19, 432978109),
+        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110);

 INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
    VALUES
@ -382,9 +385,16 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
        (1103, 0,   DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
        (1104, -30, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH));

-INSERT INTO `vn`.`clientConfig`(`riskTolerance`, `maxCreditRows`)
+INSERT INTO `vn`.`mandateType`(`id`, `name`)
    VALUES
-        (200, 10);
+        (1, 'B2B'),
+        (2, 'CORE'),
+        (3, 'LCR');
+
+INSERT INTO `vn`.`clientConfig`(`id`, `riskTolerance`, `maxCreditRows`, `maxPriceIncreasingRatio`, `riskScope`, `defaultPayMethodFk`, `defaultDueDay`, `defaultCredit`, `defaultIsTaxDataChecked`, `defaultHasCoreVnl`, `defaultMandateTypeFk`)
+    VALUES
+        (1, 200, 10, 0.25, 2, 4, 5, 300.00, 1, 1, 2);
+

 INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`)
    VALUES
@ -700,40 +710,40 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
        (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3),
        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5);

-INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`)
+INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`)
    VALUES
-        (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,       0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,       0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,       0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
-        (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,       0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
-        (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,       0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
-        (6 , 1,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham',                         1,   NULL,       0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (7 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Mountain Drive Gotham',                         1,   NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (8 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Bat cave',                                      121, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (9 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1104, 'Stark tower',                                   124, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (10, 1,     1,  5, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'Ingram Street',                                 2,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (11, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (12, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (13, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (14, 1,     2,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1104, 'Malibu Point',                                  4,   NULL,       0, 9,      5, 1, util.VN_CURDATE()),
-        (15, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1105, 'An incredibly long alias for testing purposes', 125, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (16, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (17, 1,     7,  2, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,       0, 12,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR)),
-        (19, 1,     5,  5, NULL,    util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1109, 'Somewhere in Thailand',                         129, NULL,       1, NULL,   5, 1, util.VN_CURDATE()),
-        (20, 1,     5,  5, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand',                         129, NULL,       0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (21, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland',                          102, NULL,       0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (22, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan',                            103, NULL,       0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (23, NULL,  8,  1, 7,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'address 21',                                    121, NULL,       0, 5,      5, 1, util.VN_CURDATE()),
-        (24 ,NULL,  8,  1, 7,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,       0, 5,      5, 1, util.VN_CURDATE()),
-        (25 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (26 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
+        (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1),
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2),
+        (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL),
+        (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL),
+        (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL),
+        (6 , 1,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      NULL),
+        (7 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (8 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Bat cave',                                      121, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (9 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (10, 1,     1,  5, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'Ingram Street',                                 2,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (11, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (12, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (13, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (14, 1,     2,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1104, 'Malibu Point',                                  4,   NULL,     0, 9,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (15, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1105, 'An incredibly long alias for testing purposes', 125, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (16, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (17, 1,     7,  2, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,     0, 12,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR),      NULL),
+        (19, 1,     5,  5, NULL,    util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1109, 'Somewhere in Thailand',                         129, NULL,     1, NULL,   5, 1, util.VN_CURDATE(),                                   NULL),
+        (20, 1,     5,  5, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand',                         129, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL),
+        (21, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland',                          102, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL),
+        (22, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan',                            103, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL),
+        (23, NULL,  8,  1, 7,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'address 21',                                    121, NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (24 ,NULL,  8,  1, 7,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (25 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (26 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL),
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL);

 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
    VALUES
@ -824,12 +834,6 @@ INSERT INTO `vn`.`greuge`(`id`, `clientFk`, `description`, `amount`, `shipped`,
        (11, 1101, 'some heritage charges',      -15.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
        (12, 1101, 'some miscellaneous charges', 58.00,  DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1);

-INSERT INTO `vn`.`mandateType`(`id`, `name`)
-    VALUES
-        (1, 'B2B'),
-        (2, 'CORE'),
-        (3, 'LCR');
-
 INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `mandateTypeFk`)
    VALUES
        (1, 1102, 442, '1-1', util.VN_CURDATE(), 2);
@ -2593,7 +2597,7 @@ UPDATE `vn`.`ticket`

 UPDATE `vn`.`ticket`
    SET refFk = 'A1111111'
-    WHERE id = 6;    
+    WHERE id = 6;

 INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
    VALUES
@ -2602,9 +2606,18 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
        (3,  6,  5),
        (4,  7,  1);

-INSERT INTO `vn`.`expeditionTruck` (`id`, `eta`, `description`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
    VALUES
-        (1, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +3 YEAR))), 'Best truck in fleet');
+        (1, 'val-algemesi', 'RE-001', 'PO-001', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (2, 'alg-valencia', 'RE-002', 'PO-002', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
+        (3, 'alz-algemesi', 'RE-003', 'PO-003', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
+
+INSERT INTO `vn`.`expeditionTruck` (`id`, `roadmapFk`, `warehouseFk`, `eta`, `description`, `userFk`)
+    VALUES
+        (1, 1, 1, DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY),          'Best truck in fleet',      1),
+        (2, 1, 2, DATE_ADD(util.VN_NOW(), INTERVAL '1 2' DAY_HOUR), 'Second truck in fleet',    1),
+        (3, 1, 3, DATE_ADD(util.VN_NOW(), INTERVAL '1 4' DAY_HOUR),  'Third truck in fleet',     1),
+        (4, 2, 1, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY),          'Truck red',                1);

 INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPrint`)
    VALUES
@ -2848,8 +2861,8 @@ INSERT INTO `vn`.`profileType` (`id`, `name`)

 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
    VALUES
-        ('lilium', 'dev', 'http://localhost:9000/#/'),
-        ('salix', 'dev', 'http://localhost:5000/#!/');
+        ('lilium', 'development', 'http://localhost:9000/#/'),
+        ('salix', 'development', 'http://localhost:5000/#!/');

 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
    VALUES
@ -2940,3 +2953,8 @@ INSERT INTO `vn`.`invoiceInSerial` (`code`, `description`, `cplusTerIdNifFk`, `t
        ('E', 'Midgard',    1, 'CEE'),
        ('R', 'Jotunheim',  1, 'NATIONAL'),
        ('W', 'Vanaheim',   1, 'WORLD');
+
+
+INSERT INTO `hedera`.`imageConfig` (`id`, `maxSize`, `useXsendfile`, `url`) 
+    VALUES
+        (1, 0, 0, 'marvel.com');
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -77831,7 +77831,7 @@ BEGIN
 			LEAVE cur1Loop;
 	    END IF;

-		CALL zone_getLeaves2(vZoneFk, NULL, NULL);
+		CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);

 		myLoop: LOOP
 			SET vGeoFk = NULL;
@ -77844,7 +77844,7 @@ BEGIN
 				LEAVE myLoop;
 			END IF;

-			CALL zone_getLeaves2(vZoneFk, vGeoFk, NULL);
+			CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
 			UPDATE tmp.zoneNodes
 				SET isChecked = TRUE
 				WHERE geoFk = vGeoFk;
@ -78130,55 +78130,58 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getLeaves`(vSelf INT, vParentFk INT, vSearch VARCHAR(255))
-BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getLeaves`(
+	vSelf INT,
+	vParentFk INT,
+	vSearch VARCHAR(255),
+	vHasInsert BOOL
+)
+BEGIN 
 /**
 * Devuelve las ubicaciones incluidas en la ruta y que sean hijos de parentFk.
 * @param vSelf Id de la zona
 * @param vParentFk Id del geo a calcular
- * @param vSearch cadena a buscar
+ * @param vSearch Cadena a buscar
+ * @param vHasInsert Indica si inserta en tmp.zoneNodes
+ * Optional @table tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
 */
 	DECLARE vIsNumber BOOL;
-	DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch != '';
+	DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch <> '';

-	DROP TEMPORARY TABLE IF EXISTS tNodes;
-	CREATE TEMPORARY TABLE tNodes
+	CREATE OR REPLACE TEMPORARY TABLE tNodes
 		(UNIQUE (id))
 		ENGINE = MEMORY
-		SELECT id
-			FROM zoneGeo
+		SELECT id 
+			FROM zoneGeo 
 			LIMIT 0;

 	IF vIsSearch THEN
 		SET vIsNumber = vSearch REGEXP '^[0-9]+$';
-
+	
 		INSERT INTO tNodes
-			SELECT id
+			SELECT id 
 				FROM zoneGeo
 				WHERE (vIsNumber AND `name` = vSearch)
 					OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%'))
 				LIMIT 1000;
-
+			
 	ELSEIF vParentFk IS NULL THEN
 		INSERT INTO tNodes
-			SELECT geoFk
+			SELECT geoFk 
 				FROM zoneIncluded
 				WHERE zoneFk = vSelf;
 	END IF;

 	IF vParentFk IS NULL THEN
-		DROP TEMPORARY TABLE IF EXISTS tChilds;
-		CREATE TEMPORARY TABLE tChilds
+		CREATE OR REPLACE TEMPORARY TABLE tChilds
+			(INDEX(id))
 			ENGINE = MEMORY
-			SELECT id
-				FROM tNodes;
+			SELECT id FROM tNodes;

-		DROP TEMPORARY TABLE IF EXISTS tParents;
-		CREATE TEMPORARY TABLE tParents
+		CREATE OR REPLACE TEMPORARY TABLE tParents
+			(INDEX(id))
 			ENGINE = MEMORY
-			SELECT id
-				FROM zoneGeo
-				LIMIT 0;
+			SELECT id FROM zoneGeo LIMIT 0;

 		myLoop: LOOP
 			DELETE FROM tParents;
@ -78186,43 +78189,67 @@ BEGIN
 				SELECT parentFk id
 					FROM zoneGeo g
 						JOIN tChilds c ON c.id = g.id
-					WHERE g.parentFk IS NOT NULL;
-
+					WHERE  g.parentFk IS NOT NULL;
+			
 			INSERT IGNORE INTO tNodes
-				SELECT id
-					FROM tParents;
-
-			IF ROW_COUNT() = 0 THEN
+				SELECT id FROM tParents;
+			
+			IF NOT ROW_COUNT() THEN
 				LEAVE myLoop;
 			END IF;
-
+			
 			DELETE FROM tChilds;
 			INSERT INTO tChilds
-				SELECT id
-					FROM tParents;
+				SELECT id FROM tParents;
 		END LOOP;
-
+		
 		DROP TEMPORARY TABLE tChilds, tParents;
 	END IF;

-	IF !vIsSearch THEN
+	IF NOT vIsSearch THEN
 		INSERT IGNORE INTO tNodes
-			SELECT id
+			SELECT id 
 				FROM zoneGeo
 				WHERE parentFk <=> vParentFk;
 	END IF;

-	SELECT  g.id,
-			g.name,
-			g.parentFk,
-			g.sons,
-			isIncluded selected
-		FROM zoneGeo g
-			JOIN tNodes n ON n.id = g.id
-			LEFT JOIN zoneIncluded i ON i.geoFk = g.id AND i.zoneFk = vSelf
-		ORDER BY `depth`, selected DESC, name;
+	CREATE OR REPLACE TEMPORARY TABLE tZones
+		SELECT g.id,
+				g.name,
+				g.parentFk,
+				g.sons,
+				NOT g.sons OR `type` = 'country' isChecked,
+				i.isIncluded selected,
+				g.`depth`,
+				vSelf
+			FROM zoneGeo g
+				JOIN tNodes n ON n.id = g.id
+				LEFT JOIN zoneIncluded i ON i.geoFk = g.id
+					AND i.zoneFk = vSelf
+			ORDER BY g.`depth`, selected DESC, g.name;

-	DROP TEMPORARY TABLE tNodes;
+	IF vHasInsert THEN
+		INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
+			SELECT id,
+					name,
+					parentFk,
+					sons,
+					isChecked,
+					vSelf
+				FROM tZones
+				WHERE selected
+					OR (selected IS NULL AND vParentFk IS NOT NULL);
+	ELSE
+		SELECT id,
+				name,
+				parentFk,
+				sons,
+				selected
+			FROM tZones
+			ORDER BY `depth`, selected DESC, name;
+	END IF;
+
+	DROP TEMPORARY TABLE tNodes, tZones;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -78540,7 +78567,7 @@ BEGIN
 		INDEX(geoFk))
 		ENGINE = MEMORY;

-	CALL zone_getLeaves2(vSelf, NULL , NULL);
+	CALL zone_getLeaves(vSelf, NULL , NULL, TRUE);

 	UPDATE tmp.zoneNodes zn
 		SET isChecked = 0
@ -78553,7 +78580,7 @@ BEGIN
 			WHERE NOT isChecked
 			LIMIT 1;

-		CALL zone_getLeaves2(vSelf, vGeoFk, NULL);
+		CALL zone_getLeaves(vSelf, vGeoFk, NULL, TRUE);
 		UPDATE tmp.zoneNodes
 			SET isChecked = TRUE
 			WHERE geoFk = vGeoFk;
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -547,6 +547,7 @@ export default {
        moreMenuMakeInvoice: '.vn-menu [name="makeInvoice"]',
        moreMenuRegenerateInvoice: '.vn-menu [name="regenerateInvoice"]',
        moreMenuChangeShippedHour: '.vn-menu [name="changeShipped"]',
+        moreMenuSMSOptions: '.vn-menu [name="smsOptions"]',
        moreMenuPaymentSMS: '.vn-menu [name="sendPaymentSms"]',
        moreMenuSendImportSms: '.vn-menu [name="sendImportSms"]',
        SMStext: 'textarea[name="message"]',
@ -874,7 +875,7 @@ export default {

    },
    routeTickets: {
-        firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-input-number[ng-model="ticket.priority"]',
+        firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-td-editable',
        firstTicketCheckbox: 'vn-route-tickets vn-tr:nth-child(1) vn-check',
        buscamanButton: 'vn-route-tickets vn-button[icon="icon-buscaman"]',
        firstTicketDeleteButton: 'vn-route-tickets vn-tr:nth-child(1) vn-icon[icon="delete"]',
@ -894,6 +895,18 @@ export default {
        extension: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(5) > section > span',

    },
+    department: {
+        firstDepartment: 'vn-worker-department-index vn-card > vn-treeview vn-treeview-childs vn-treeview-childs vn-treeview-childs a'
+    },
+    departmentSummary: {
+        header: 'vn-worker-department-summary h5',
+        name: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(1) > section > span',
+        code: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(2) > section > span',
+        chat: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(3) > section > span',
+        bossDepartment: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(4) > section > span',
+        email: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(5) > section > span',
+        clientFk: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(6) > section > span',
+    },
    workerBasicData: {
        name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',
        surname: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.lastName"]',
@ -901,6 +914,13 @@ export default {
        locker: 'vn-worker-basic-data vn-input-number[ng-model="$ctrl.worker.locker"]',
        saveButton: 'vn-worker-basic-data button[type=submit]'
    },
+    departmentBasicData: {
+        Name: 'vn-worker-department-basic-data vn-textfield[ng-model="$ctrl.department.name"]',
+        Code: 'vn-worker-department-basic-data vn-textfield[ng-model="$ctrl.department.code"]',
+        Chat: 'vn-worker-department-basic-data vn-textfield[ng-model="$ctrl.department.chat"]',
+        Email: 'vn-worker-department-basic-data vn-textfield[ng-model="$ctrl.department.notificationEmail"]',
+        saveButton: 'vn-worker-department-basic-data button[type=submit]'
+    },
    workerNotes: {
        addNoteFloatButton: 'vn-worker-note vn-icon[icon="add"]',
        note: 'vn-note-worker-create vn-textarea[ng-model="$ctrl.note.text"]',
--- a/e2e/paths/01-salix/05_changePassword.spec.js
+++ b/e2e/paths/01-salix/05_changePassword.spec.js
@ -16,6 +16,7 @@ describe('ChangePassword path', async() => {
        await browser.close();
    });

+    const badPassword = 'badpass';
    const oldPassword = 'nightmare';
    const newPassword = 'newPass.1234';
    describe('Bad login', async() => {
@ -37,13 +38,22 @@ describe('ChangePassword path', async() => {
            expect(message.text).toContain('Invalid current password');

            // Bad attempt: password not meet requirements
+            message = await page.sendForm($.form, {
+                oldPassword: oldPassword,
+                newPassword: badPassword,
+                repeatPassword: badPassword
+            });
+
+            expect(message.text).toContain('Password does not meet requirements');
+
+            // Bad attempt: same password
            message = await page.sendForm($.form, {
                oldPassword: oldPassword,
                newPassword: oldPassword,
                repeatPassword: oldPassword
            });

-            expect(message.text).toContain('Password does not meet requirements');
+            expect(message.text).toContain('You can not use the same password');

            // Correct attempt: change password
            message = await page.sendForm($.form, {
--- a/e2e/paths/03-worker/01-department/01_summary.spec.js
+++ b/e2e/paths/03-worker/01-department/01_summary.spec.js
@ -0,0 +1,29 @@
+import selectors from '../../../helpers/selectors.js';
+import getBrowser from '../../../helpers/puppeteer';
+
+describe('department summary path', () => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.accessToSection('worker.department');
+        await page.doSearch('INFORMATICA');
+        await page.click(selectors.department.firstDepartment);
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should reach the employee summary section and check all properties', async() => {
+        expect(await page.waitToGetProperty(selectors.departmentSummary.header, 'innerText')).toEqual('INFORMATICA');
+        expect(await page.getProperty(selectors.departmentSummary.name, 'innerText')).toEqual('INFORMATICA');
+        expect(await page.getProperty(selectors.departmentSummary.code, 'innerText')).toEqual('it');
+        expect(await page.getProperty(selectors.departmentSummary.chat, 'innerText')).toEqual('informatica-cau');
+        expect(await page.getProperty(selectors.departmentSummary.bossDepartment, 'innerText')).toEqual('');
+        expect(await page.getProperty(selectors.departmentSummary.email, 'innerText')).toEqual('-');
+        expect(await page.getProperty(selectors.departmentSummary.clientFk, 'innerText')).toEqual('-');
+    });
+});
--- a/e2e/paths/03-worker/01-department/02-basicData.spec.js
+++ b/e2e/paths/03-worker/01-department/02-basicData.spec.js
@ -0,0 +1,43 @@
+import getBrowser from '../../../helpers/puppeteer';
+import selectors from '../../../helpers/selectors.js';
+
+const $ = {
+    form: 'vn-worker-department-basic-data form',
+};
+
+describe('department summary path', () => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.accessToSection('worker.department');
+        await page.doSearch('INFORMATICA');
+        await page.click(selectors.department.firstDepartment);
+    });
+
+    beforeEach(async() => {
+        await page.accessToSection('worker.department.card.basicData');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it(`should edit the department basic data and confirm the department data was edited`, async() => {
+        const values = {
+            Name: 'Informatica',
+            Code: 'IT',
+            Chat: 'informatica-cau',
+            Email: 'it@verdnatura.es',
+        };
+
+        await page.fillForm($.form, values);
+        const formValues = await page.fetchForm($.form, Object.keys(values));
+        const message = await page.sendForm($.form, values);
+
+        expect(message.isSuccess).toBeTrue();
+        expect(formValues).toEqual(values);
+    });
+});
--- a/e2e/paths/05-ticket/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@ -124,6 +124,7 @@ describe('Ticket descriptor path', () => {
    describe('SMS', () => {
        it('should send the payment SMS using the descriptor menu', async() => {
            await page.waitToClick(selectors.ticketDescriptor.moreMenu);
+            await page.waitToClick(selectors.ticketDescriptor.moreMenuSMSOptions);
            await page.waitToClick(selectors.ticketDescriptor.moreMenuPaymentSMS);
            await page.waitForSelector(selectors.ticketDescriptor.SMStext);
            await page.waitPropertyLength(selectors.ticketDescriptor.SMStext, 'value', 128);
@ -134,8 +135,7 @@ describe('Ticket descriptor path', () => {
        });

        it('should send the import SMS using the descriptor menu', async() => {
-            await page.waitToClick(selectors.ticketDescriptor.moreMenu);
-            await page.waitForContentLoaded();
+            await page.waitToClick(selectors.ticketDescriptor.moreMenuSMSOptions);
            await page.waitToClick(selectors.ticketDescriptor.moreMenuSendImportSms);
            await page.waitForSelector(selectors.ticketDescriptor.SMStext);
            await page.waitPropertyLength(selectors.ticketDescriptor.SMStext, 'value', 144);
--- a/e2e/paths/08-route/04_tickets.spec.js
+++ b/e2e/paths/08-route/04_tickets.spec.js
@ -18,8 +18,7 @@ describe('Route tickets path', () => {
    });

    it('should modify the first ticket priority', async() => {
-        await page.clearInput(selectors.routeTickets.firstTicketPriority);
-        await page.type(selectors.routeTickets.firstTicketPriority, '9');
+        await page.writeOnEditableTD(selectors.routeTickets.firstTicketPriority, '9');
        await page.keyboard.press('Enter');
        const message = await page.waitForSnackbar();

--- a/front/core/services/app.js
+++ b/front/core/services/app.js
@ -66,7 +66,11 @@ export default class App {

        return this.logger.$http.get('Urls/findOne', {filter})
            .then(res => {
-                return res.data.url + route;
+                if (res && res.data)
+                    return res.data.url + route;
+            })
+            .catch(() => {
+                this.showError('Direction not found');
            });
    }
 }
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@ -24,7 +24,7 @@ export default class Auth {
    initialize() {
        let criteria = {
            to: state => {
-                const outLayout = ['login', 'recover-password', 'reset-password', 'change-password'];
+                const outLayout = ['login', 'recover-password', 'reset-password', 'change-password', 'validate-email'];
                return !outLayout.some(ol => ol == state.name);
            }
        };
@ -60,7 +60,25 @@ export default class Auth {
        };

        const now = new Date();
-        return this.$http.post('VnUsers/signIn', params)
+        return this.$http.post('VnUsers/sign-in', params).then(
+            json => this.onLoginOk(json, now, remember));
+    }
+
+    validateCode(user, password, code, remember) {
+        if (!user) {
+            let err = new UserError('Please enter your username');
+            err.code = 'EmptyLogin';
+            return this.$q.reject(err);
+        }
+
+        let params = {
+            user: user,
+            password: password || undefined,
+            code: code
+        };
+
+        const now = new Date();
+        return this.$http.post('VnUsers/validate-auth', params)
            .then(json => this.onLoginOk(json, now, remember));
    }

--- a/front/core/services/locale/es.yml
+++ b/front/core/services/locale/es.yml
@ -3,4 +3,5 @@ Could not contact the server: No se ha podido contactar con el servidor, asegura
 Please enter your username: Por favor introduce tu nombre de usuario
 It seems that the server has fall down: Parece que el servidor se ha caído, espera unos minutos e inténtalo de nuevo
 Session has expired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
-Access denied: Acción no permitida
+Access denied: Acción no permitida
+Direction not found: Dirección no encontrada
--- a/front/core/services/token.js
+++ b/front/core/services/token.js
@ -34,7 +34,6 @@ export default class Token {
            remember
        });
        this.vnInterceptor.setToken(token);
-
        try {
            if (remember)
                this.setStorage(localStorage, token, created, ttl);
@ -84,7 +83,6 @@ export default class Token {
            this.renewPeriod = data.renewPeriod;
            this.stopRenewer();
            this.inservalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000);
-            this.checkValidity();
        });
    }

--- a/front/core/styles/icons/salixfont.css
+++ b/front/core/styles/icons/salixfont.css
@ -1,402 +1,411 @@
@font-face {
-  font-family: 'salixfont';
-  src:
-    url('./salixfont.ttf?wtrl3') format('truetype'),
-    url('./salixfont.woff?wtrl3') format('woff'),
-    url('./salixfont.svg?wtrl3#salixfont') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
+    font-family: 'salixfont';
+    src:
+      url('./salixfont.ttf?wtrl3') format('truetype'),
+      url('./salixfont.woff?wtrl3') format('woff'),
+      url('./salixfont.svg?wtrl3#salixfont') format('svg');
+    font-weight: normal;
+    font-style: normal;
+  }

-[class^="icon-"], [class*=" icon-"] {
-  /* use !important to prevent issues with browser extensions that change fonts */
-  font-family: 'salixfont' !important;
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
+  [class^="icon-"], [class*=" icon-"] {
+    /* use !important to prevent issues with browser extensions that change fonts */
+    font-family: 'salixfont' !important;
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;

-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }

-.icon-agency-term:before {
-  content: "\e950";
-}
-.icon-defaulter:before {
-  content: "\e94b";
-}
-.icon-100:before {
-  content: "\e95a";
-}
-.icon-clientUnpaid:before {
-  content: "\e95b";
-}
-.icon-history:before {
-  content: "\e968";
-}
-.icon-Person:before {
-  content: "\e901";
-}
-.icon-accessory:before {
-  content: "\e90a";
-}
-.icon-account:before {
-  content: "\e92a";
-}
-.icon-actions:before {
-  content: "\e960";
-}
-.icon-addperson:before {
-  content: "\e90e";
-}
-.icon-agency:before {
-  content: "\e938";
-}
-.icon-albaran:before {
-  content: "\e94d";
-}
-.icon-anonymous:before {
-  content: "\e930";
-}
-.icon-apps:before {
-  content: "\e951";
-}
-.icon-artificial:before {
-  content: "\e90b";
-}
-.icon-attach:before {
-  content: "\e92e";
-}
-.icon-barcode:before {
-  content: "\e971";
-}
-.icon-basket:before {
-  content: "\e914";
-}
-.icon-basketadd:before {
-  content: "\e913";
-}
-.icon-bin:before {
-  content: "\e96f";
-}
-.icon-botanical:before {
-  content: "\e972";
-}
-.icon-bucket:before {
-  content: "\e97a";
-}
-.icon-buscaman:before {
-  content: "\e93b";
-}
-.icon-buyrequest:before {
-  content: "\e932";
-}
-.icon-calc_volum .path1:before {
-  content: "\e915";
-}
-.icon-calc_volum .path2:before {
-  content: "\e916";
-  margin-left: -1em;
-}
-.icon-calc_volum .path3:before {
-  content: "\e917";
-  margin-left: -1em;
-}
-.icon-calc_volum .path4:before {
-  content: "\e918";
-  margin-left: -1em;
-}
-.icon-calc_volum .path5:before {
-  content: "\e919";
-  margin-left: -1em;
-}
-.icon-calc_volum .path6:before {
-  content: "\e91a";
-  margin-left: -1em;
-}
-.icon-calendar:before {
-  content: "\e93d";
-}
-.icon-catalog:before {
-  content: "\e937";
-}
-.icon-claims:before {
-  content: "\e963";
-}
-.icon-client:before {
-  content: "\e928";
-}
-.icon-clone:before {
-  content: "\e973";
-}
-.icon-columnadd:before {
-  content: "\e954";
-}
-.icon-columndelete:before {
-  content: "\e953";
-}
-.icon-components:before {
-  content: "\e946";
-}
-.icon-consignatarios:before {
-  content: "\e93f";
-}
-.icon-control:before {
-  content: "\e949";
-}
-.icon-credit:before {
-  content: "\e927";
-}
-.icon-deletedTicket:before {
-  content: "\e935";
-}
-.icon-deleteline:before {
-  content: "\e955";
-}
-.icon-delivery:before {
-  content: "\e939";
-}
-.icon-deliveryprices:before {
-  content: "\e91c";
-}
-.icon-details:before {
-  content: "\e961";
-}
-.icon-dfiscales:before {
-  content: "\e984";
-}
-.icon-disabled:before {
-  content: "\e921";
-}
-.icon-doc:before {
-  content: "\e977";
-}
-.icon-entry:before {
-  content: "\e934";
-}
-.icon-exit:before {
-  content: "\e92f";
-}
-.icon-eye:before {
-  content: "\e976";
-}
-.icon-fixedPrice:before {
-  content: "\e90d";
-}
-.icon-flower:before {
-  content: "\e90c";
-}
-.icon-frozen:before {
-  content: "\e900";
-}
-.icon-fruit:before {
-  content: "\e903";
-}
-.icon-funeral:before {
-  content: "\e904";
-}
-.icon-greenery:before {
-  content: "\e907";
-}
-.icon-greuge:before {
-  content: "\e944";
-}
-.icon-grid:before {
-  content: "\e980";
-}
-.icon-handmade:before {
-  content: "\e909";
-}
-.icon-handmadeArtificial:before {
-  content: "\e902";
-}
-.icon-headercol:before {
-  content: "\e958";
-}
-.icon-info:before {
-  content: "\e952";
-}
-.icon-inventory:before {
-  content: "\e92b";
-}
-.icon-invoice:before {
-  content: "\e923";
-}
-.icon-invoice-in:before {
-  content: "\e911";
-}
-.icon-invoice-in-create:before {
-  content: "\e912";
-}
-.icon-invoice-out:before {
-  content: "\e910";
-}
-.icon-isTooLittle:before {
-  content: "\e91b";
-}
-.icon-item:before {
-  content: "\e956";
-}
-.icon-languaje:before {
-  content: "\e926";
-}
-.icon-lines:before {
-  content: "\e942";
-}
-.icon-linesprepaired:before {
-  content: "\e948";
-}
-.icon-logout:before {
-  content: "\e936";
-}
-.icon-mana:before {
-  content: "\e96a";
-}
-.icon-mandatory:before {
-  content: "\e97b";
-}
-.icon-net:before {
-  content: "\e931";
-}
-.icon-niche:before {
-  content: "\e96c";
-}
-.icon-no036:before {
-  content: "\e920";
-}
-.icon-noPayMethod:before {
-  content: "\e905";
-}
-.icon-notes:before {
-  content: "\e941";
-}
-.icon-noweb:before {
-  content: "\e91f";
-}
-.icon-onlinepayment:before {
-  content: "\e91d";
-}
-.icon-package:before {
-  content: "\e978";
-}
-.icon-payment:before {
-  content: "\e97e";
-}
-.icon-pbx:before {
-  content: "\e93c";
-}
-.icon-pets:before {
-  content: "\e947";
-}
-.icon-photo:before {
-  content: "\e924";
-}
-.icon-plant:before {
-  content: "\e908";
-}
-.icon-polizon:before {
-  content: "\e95e";
-}
-.icon-preserved:before {
-  content: "\e906";
-}
-.icon-recovery:before {
-  content: "\e97c";
-}
-.icon-regentry:before {
-  content: "\e964";
-}
-.icon-reserva:before {
-  content: "\e959";
-}
-.icon-revision:before {
-  content: "\e94a";
-}
-.icon-risk:before {
-  content: "\e91e";
-}
-.icon-services:before {
-  content: "\e94c";
-}
-.icon-settings:before {
-  content: "\e979";
-}
-.icon-shipment-01:before {
-  content: "\e929";
-}
-.icon-sign:before {
-  content: "\e95d";
-}
-.icon-sms:before {
-  content: "\e975";
-}
-.icon-solclaim:before {
-  content: "\e95f";
-}
-.icon-solunion:before {
-  content: "\e94e";
-}
-.icon-stowaway:before {
-  content: "\e94f";
-}
-.icon-splitline:before {
-  content: "\e93e";
-}
-.icon-splur:before {
-  content: "\e970";
-}
-.icon-supplier:before {
-  content: "\e925";
-}
-.icon-supplierfalse:before {
-  content: "\e90f";
-}
-.icon-tags:before {
-  content: "\e96d";
-}
-.icon-tax:before {
-  content: "\e940";
-}
-.icon-thermometer:before {
-  content: "\e933";
-}
-.icon-ticket:before {
-  content: "\e96b";
-}
-.icon-ticketAdd:before {
-  content: "\e945";
-}
-.icon-traceability:before {
-  content: "\e962";
-}
-.icon-transaction:before {
-  content: "\e966";
-}
-.icon-treatments:before {
-  content: "\e922";
-}
-.icon-unavailable:before {
-  content: "\e92c";
-}
-.icon-volume:before {
-  content: "\e96e";
-}
-.icon-wand:before {
-  content: "\e93a";
-}
-.icon-web:before {
-  content: "\e982";
-}
-.icon-wiki:before {
-  content: "\e92d";
-}
-.icon-worker:before {
-  content: "\e957";
-}
-.icon-zone:before {
-  content: "\e943";
-}
+  .icon-trailer:before {
+    content: "\e967";
+  }
+  .icon-grafana:before {
+    content: "\e965";
+  }
+  .icon-trolley:before {
+    content: "\e95c";
+  }
+  .icon-agency-term:before {
+    content: "\e950";
+  }
+  .icon-defaulter:before {
+    content: "\e94b";
+  }
+  .icon-100:before {
+    content: "\e95a";
+  }
+  .icon-clientUnpaid:before {
+    content: "\e95b";
+  }
+  .icon-history:before {
+    content: "\e968";
+  }
+  .icon-Person:before {
+    content: "\e901";
+  }
+  .icon-accessory:before {
+    content: "\e90a";
+  }
+  .icon-account:before {
+    content: "\e92a";
+  }
+  .icon-actions:before {
+    content: "\e960";
+  }
+  .icon-addperson:before {
+    content: "\e90e";
+  }
+  .icon-agency:before {
+    content: "\e938";
+  }
+  .icon-albaran:before {
+    content: "\e94d";
+  }
+  .icon-anonymous:before {
+    content: "\e930";
+  }
+  .icon-apps:before {
+    content: "\e951";
+  }
+  .icon-artificial:before {
+    content: "\e90b";
+  }
+  .icon-attach:before {
+    content: "\e92e";
+  }
+  .icon-barcode:before {
+    content: "\e971";
+  }
+  .icon-basket:before {
+    content: "\e914";
+  }
+  .icon-basketadd:before {
+    content: "\e913";
+  }
+  .icon-bin:before {
+    content: "\e96f";
+  }
+  .icon-botanical:before {
+    content: "\e972";
+  }
+  .icon-bucket:before {
+    content: "\e97a";
+  }
+  .icon-buscaman:before {
+    content: "\e93b";
+  }
+  .icon-buyrequest:before {
+    content: "\e932";
+  }
+  .icon-calc_volum .path1:before {
+    content: "\e915";
+  }
+  .icon-calc_volum .path2:before {
+    content: "\e916";
+    margin-left: -1em;
+  }
+  .icon-calc_volum .path3:before {
+    content: "\e917";
+    margin-left: -1em;
+  }
+  .icon-calc_volum .path4:before {
+    content: "\e918";
+    margin-left: -1em;
+  }
+  .icon-calc_volum .path5:before {
+    content: "\e919";
+    margin-left: -1em;
+  }
+  .icon-calc_volum .path6:before {
+    content: "\e91a";
+    margin-left: -1em;
+  }
+  .icon-calendar:before {
+    content: "\e93d";
+  }
+  .icon-catalog:before {
+    content: "\e937";
+  }
+  .icon-claims:before {
+    content: "\e963";
+  }
+  .icon-client:before {
+    content: "\e928";
+  }
+  .icon-clone:before {
+    content: "\e973";
+  }
+  .icon-columnadd:before {
+    content: "\e954";
+  }
+  .icon-columndelete:before {
+    content: "\e953";
+  }
+  .icon-components:before {
+    content: "\e946";
+  }
+  .icon-consignatarios:before {
+    content: "\e93f";
+  }
+  .icon-control:before {
+    content: "\e949";
+  }
+  .icon-credit:before {
+    content: "\e927";
+  }
+  .icon-deletedTicket:before {
+    content: "\e935";
+  }
+  .icon-deleteline:before {
+    content: "\e955";
+  }
+  .icon-delivery:before {
+    content: "\e939";
+  }
+  .icon-deliveryprices:before {
+    content: "\e91c";
+  }
+  .icon-details:before {
+    content: "\e961";
+  }
+  .icon-dfiscales:before {
+    content: "\e984";
+  }
+  .icon-disabled:before {
+    content: "\e921";
+  }
+  .icon-doc:before {
+    content: "\e977";
+  }
+  .icon-entry:before {
+    content: "\e934";
+  }
+  .icon-exit:before {
+    content: "\e92f";
+  }
+  .icon-eye:before {
+    content: "\e976";
+  }
+  .icon-fixedPrice:before {
+    content: "\e90d";
+  }
+  .icon-flower:before {
+    content: "\e90c";
+  }
+  .icon-frozen:before {
+    content: "\e900";
+  }
+  .icon-fruit:before {
+    content: "\e903";
+  }
+  .icon-funeral:before {
+    content: "\e904";
+  }
+  .icon-greenery:before {
+    content: "\e907";
+  }
+  .icon-greuge:before {
+    content: "\e944";
+  }
+  .icon-grid:before {
+    content: "\e980";
+  }
+  .icon-handmade:before {
+    content: "\e909";
+  }
+  .icon-handmadeArtificial:before {
+    content: "\e902";
+  }
+  .icon-headercol:before {
+    content: "\e958";
+  }
+  .icon-info:before {
+    content: "\e952";
+  }
+  .icon-inventory:before {
+    content: "\e92b";
+  }
+  .icon-invoice:before {
+    content: "\e923";
+  }
+  .icon-invoice-in:before {
+    content: "\e911";
+  }
+  .icon-invoice-in-create:before {
+    content: "\e912";
+  }
+  .icon-invoice-out:before {
+    content: "\e910";
+  }
+  .icon-isTooLittle:before {
+    content: "\e91b";
+  }
+  .icon-item:before {
+    content: "\e956";
+  }
+  .icon-languaje:before {
+    content: "\e926";
+  }
+  .icon-lines:before {
+    content: "\e942";
+  }
+  .icon-linesprepaired:before {
+    content: "\e948";
+  }
+  .icon-logout:before {
+    content: "\e936";
+  }
+  .icon-mana:before {
+    content: "\e96a";
+  }
+  .icon-mandatory:before {
+    content: "\e97b";
+  }
+  .icon-net:before {
+    content: "\e931";
+  }
+  .icon-niche:before {
+    content: "\e96c";
+  }
+  .icon-no036:before {
+    content: "\e920";
+  }
+  .icon-noPayMethod:before {
+    content: "\e905";
+  }
+  .icon-notes:before {
+    content: "\e941";
+  }
+  .icon-noweb:before {
+    content: "\e91f";
+  }
+  .icon-onlinepayment:before {
+    content: "\e91d";
+  }
+  .icon-package:before {
+    content: "\e978";
+  }
+  .icon-payment:before {
+    content: "\e97e";
+  }
+  .icon-pbx:before {
+    content: "\e93c";
+  }
+  .icon-pets:before {
+    content: "\e947";
+  }
+  .icon-photo:before {
+    content: "\e924";
+  }
+  .icon-plant:before {
+    content: "\e908";
+  }
+  .icon-polizon:before {
+    content: "\e95e";
+  }
+  .icon-preserved:before {
+    content: "\e906";
+  }
+  .icon-recovery:before {
+    content: "\e97c";
+  }
+  .icon-regentry:before {
+    content: "\e964";
+  }
+  .icon-reserva:before {
+    content: "\e959";
+  }
+  .icon-revision:before {
+    content: "\e94a";
+  }
+  .icon-risk:before {
+    content: "\e91e";
+  }
+  .icon-services:before {
+    content: "\e94c";
+  }
+  .icon-settings:before {
+    content: "\e979";
+  }
+  .icon-shipment-01:before {
+    content: "\e929";
+  }
+  .icon-sign:before {
+    content: "\e95d";
+  }
+  .icon-sms:before {
+    content: "\e975";
+  }
+  .icon-solclaim:before {
+    content: "\e95f";
+  }
+  .icon-solunion:before {
+    content: "\e94e";
+  }
+  .icon-stowaway:before {
+    content: "\e94f";
+  }
+  .icon-splitline:before {
+    content: "\e93e";
+  }
+  .icon-splur:before {
+    content: "\e970";
+  }
+  .icon-supplier:before {
+    content: "\e925";
+  }
+  .icon-supplierfalse:before {
+    content: "\e90f";
+  }
+  .icon-tags:before {
+    content: "\e96d";
+  }
+  .icon-tax:before {
+    content: "\e940";
+  }
+  .icon-thermometer:before {
+    content: "\e933";
+  }
+  .icon-ticket:before {
+    content: "\e96b";
+  }
+  .icon-ticketAdd:before {
+    content: "\e945";
+  }
+  .icon-traceability:before {
+    content: "\e962";
+  }
+  .icon-transaction:before {
+    content: "\e966";
+  }
+  .icon-treatments:before {
+    content: "\e922";
+  }
+  .icon-unavailable:before {
+    content: "\e92c";
+  }
+  .icon-volume:before {
+    content: "\e96e";
+  }
+  .icon-wand:before {
+    content: "\e93a";
+  }
+  .icon-web:before {
+    content: "\e982";
+  }
+  .icon-wiki:before {
+    content: "\e92d";
+  }
+  .icon-worker:before {
+    content: "\e957";
+  }
+  .icon-zone:before {
+    content: "\e943";
+  }
--- a/front/core/styles/icons/salixfont.eot
+++ b/front/core/styles/icons/salixfont.eot
--- a/front/core/styles/icons/salixfont.svg
+++ b/front/core/styles/icons/salixfont.svg
--- a/front/core/styles/icons/salixfont.ttf
+++ b/front/core/styles/icons/salixfont.ttf
--- a/front/core/styles/icons/salixfont.woff
+++ b/front/core/styles/icons/salixfont.woff
--- a/front/salix/components/change-password/index.html
+++ b/front/salix/components/change-password/index.html
@ -21,6 +21,14 @@
    type="password"
    autocomplete="false">
 </vn-textfield>
+<vn-textfield
+    ng-if="$ctrl.$state.params.twoFactor == 'true'"
+    label="Verification code"
+    ng-model="$ctrl.code"
+    vn-name="code"
+    autocomplete="false"
+    class="vn-mt-md">
+</vn-textfield>
 <div class="footer">
    <vn-submit label="Change password" ng-click="$ctrl.submit()"></vn-submit>
    <div class="spinner-wrapper">
--- a/front/salix/components/change-password/index.js
+++ b/front/salix/components/change-password/index.js
@ -26,11 +26,13 @@ export default class Controller {

    submit() {
        const userId = this.$state.params.userId;
-        const newPassword = this.newPassword;
        const oldPassword = this.oldPassword;
+        const newPassword = this.newPassword;
+        const repeatPassword = this.repeatPassword;
+        const code = this.code;

-        if (!newPassword)
-            throw new UserError(`You must enter a new password`);
+        if (!oldPassword || !newPassword || !repeatPassword)
+            throw new UserError(`You must fill all the fields`);
        if (newPassword != this.repeatPassword)
            throw new UserError(`Passwords don't match`);

@ -38,11 +40,12 @@ export default class Controller {
            Authorization: this.$state.params.id
        };

-        this.$http.post('VnUsers/change-password',
+        this.$http.patch('Accounts/change-password',
            {
                id: userId,
                oldPassword,
-                newPassword
+                newPassword,
+                code
            },
            {headers}
        ).then(() => {
--- a/front/salix/components/change-password/locale/es.yml
+++ b/front/salix/components/change-password/locale/es.yml
@ -2,6 +2,10 @@ Change password: Cambiar contraseña
 Old password: Antigua contraseña
 New password: Nueva contraseña
 Repeat password: Repetir contraseña
+Passwords don't match: Las contraseñas no coinciden
+You must fill all the fields: Debes rellenar todos los campos
+You can not use the same password: No puedes usar la misma contraseña
+Verification code: Código de verificación
 Password updated!: ¡Contraseña actualizada!
 Password requirements: >
    La contraseña debe tener al menos {{ length }} caracteres de longitud,
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@ -9,6 +9,7 @@ import './login';
 import './outLayout';
 import './recover-password';
 import './reset-password';
+import './validate-email';
 import './change-password';
 import './module-card';
 import './module-main';
--- a/front/salix/components/login/index.js
+++ b/front/salix/components/login/index.js
@ -24,13 +24,23 @@ export default class Controller {
                this.loading = false;
            })
            .catch(req => {
-                this.loading = false;
-                this.password = '';
-                this.focusUser();
+                if (req?.data?.error?.code === 'REQUIRES_2FA') {
+                    this.outLayout.login = {
+                        user: this.user,
+                        password: this.password,
+                        remember: this.remember
+                    };
+                    this.$state.go('validate-email');
+                    return;
+                }
+
                const err = req.data?.error;
                if (err?.code == 'passExpired')
                    this.$state.go('change-password', err.details.token);

+                this.loading = false;
+                this.password = '';
+                this.focusUser();
                throw req;
            });
    }
@ -44,5 +54,8 @@ Controller.$inject = ['$scope', '$element', '$state', 'vnAuth'];

 ngModule.vnComponent('vnLogin', {
    template: require('./index.html'),
-    controller: Controller
+    controller: Controller,
+    require: {
+        outLayout: '^vnOutLayout'
+    }
 });
--- a/front/salix/components/validate-email/index.html
+++ b/front/salix/components/validate-email/index.html
@ -0,0 +1,10 @@
+<h5 class="vn-mb-md vn-mt-lg" translate>Enter verification code</h5>
+<span translate>Please enter the verification code that we have sent to your email address within 5 minutes</span>
+<vn-textfield label="Code" ng-model="$ctrl.code" type="text" vn-focus>
+</vn-textfield>
+<div class="footer">
+    <vn-submit label="Validate" ng-click="$ctrl.submit()"></vn-submit>
+    <div class="spinner-wrapper">
+        <vn-spinner enable="$ctrl.loading"></vn-spinner>
+    </div>
+</div>
--- a/front/salix/components/validate-email/index.js
+++ b/front/salix/components/validate-email/index.js
@ -0,0 +1,43 @@
+import ngModule from '../../module';
+import './style.scss';
+
+export default class Controller {
+    constructor($scope, $element, vnAuth, $state) {
+        Object.assign(this, {
+            $scope,
+            $element,
+            vnAuth,
+            user: localStorage.getItem('lastUser'),
+            remember: true,
+            $state
+        });
+    }
+
+    $onInit() {
+        this.loginData = this.outLayout.login;
+        if (!this.loginData)
+            this.$state.go('login');
+    }
+
+    submit() {
+        this.loading = true;
+        this.vnAuth.validateCode(this.loginData.user, this.loginData.password, this.code, this.loginData.remember)
+            .then(() => {
+                localStorage.setItem('lastUser', this.user);
+                this.loading = false;
+            })
+            .catch(error => {
+                this.loading = false;
+                throw error;
+            });
+    }
+}
+Controller.$inject = ['$scope', '$element', 'vnAuth', '$state'];
+
+ngModule.vnComponent('vnValidateEmail', {
+    template: require('./index.html'),
+    controller: Controller,
+    require: {
+        outLayout: '^vnOutLayout'
+    }
+});
--- a/front/salix/components/validate-email/locale/es.yml
+++ b/front/salix/components/validate-email/locale/es.yml
@ -0,0 +1,5 @@
+Validate email auth: Autenticar email
+Enter verification code: Introduce código de verificación
+Code: Código
+Please enter the verification code that we have sent to your email address within 5 minutes: Por favor, introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
+Validate: Validar
--- a/front/salix/components/validate-email/style.scss
+++ b/front/salix/components/validate-email/style.scss
@ -0,0 +1,24 @@
+@import "variables";
+
+vn-validate-email {
+    .footer {
+        margin-top: 32px;
+        text-align: center;
+        position: relative;
+        & > .vn-submit {
+            display: block;
+
+            & > input {
+                display: block;
+                width: 100%;
+            }
+        }
+        & > .spinner-wrapper {
+            position: absolute;
+            width: 0;
+            top: 3px;
+            right: -8px;
+            overflow: visible;
+        }
+    }
+}
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@ -37,9 +37,15 @@ function config($stateProvider, $urlRouterProvider) {
            description: 'Reset password',
            template: '<vn-reset-password></vn-reset-password>'
        })
+        .state('validate-email', {
+            parent: 'outLayout',
+            url: '/validate-email',
+            description: 'Validate email auth',
+            template: '<vn-validate-email></vn-validate-email>'
+        })
        .state('change-password', {
            parent: 'outLayout',
-            url: '/change-password?id&userId',
+            url: '/change-password?id&userId&twoFactor',
            description: 'Change password',
            template: '<vn-change-password></vn-change-password>'
        })
--- a/loopback/common/methods/vn-model/printService.js
+++ b/loopback/common/methods/vn-model/printService.js
@ -39,7 +39,7 @@ module.exports = Self => {
        return [html, 'text/html', `filename=${fileName}.pdf"`];
    };

-    Self.sendTemplate = async function(ctx, templateName) {
+    Self.sendTemplate = async function(ctx, templateName, force) {
        const args = Object.assign({}, ctx.args);
        const params = {
            recipient: args.recipient,
@ -52,6 +52,6 @@ module.exports = Self => {

        const email = new Email(templateName, params);

-        return email.send();
+        return email.send({force: force});
    };
 };
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -147,14 +147,12 @@
 	"Receipt's bank was not found": "Receipt's bank was not found",
 	"This receipt was not compensated": "This receipt was not compensated",
 	"Client's email was not found": "Client's email was not found",
-	"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº {{id}}",
+	"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
 	"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
 	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
 	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
-	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
 	"Warehouse inventory not set": "Almacén inventario no está establecido",
 	"Component cost not set": "Componente coste no está estabecido",
-	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
 	"Description cannot be blank": "Description cannot be blank",
 	"company": "Company",
 	"country": "Country",
@ -177,6 +175,12 @@
 	"Invalid quantity": "Invalid quantity",
 	"Failed to upload delivery note": "Error to upload delivery note {{id}}",
 	"Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
-	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3",
-	"The renew period has not been exceeded": "The renew period has not been exceeded"
+	"The renew period has not been exceeded": "The renew period has not been exceeded",
+	"You can not use the same password": "You can not use the same password",
+	"Valid priorities": "Valid priorities: %d",
+	"Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
+	"You don't have enough privileges.": "You don't have enough privileges.",
+	"This ticket is locked.": "This ticket is locked.",
+	"This ticket is not editable.": "This ticket is not editable.",
+	"The ticket doesn't exist.": "The ticket doesn't exist."
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -268,7 +268,7 @@
 	"Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
 	"Warehouse inventory not set": "El almacén inventario no está establecido",
 	"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
-	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}",
+	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
 	"Not exist this branch": "La rama no existe",
 	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
 	"Collection does not exist": "La colección no existe",
@ -276,6 +276,8 @@
 	"Insert a date range": "Inserte un rango de fechas",
 	"Added observation": "{{user}} añadió esta observacion: {{text}}",
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
+	"Invalid auth code": "Código de verificación incorrecto",
+	"Invalid or expired verification code": "Código de verificación incorrecto o expirado",
 	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
 	"company": "Compañía",
 	"country": "País",
@ -293,10 +295,21 @@
 	"Invalid NIF for VIES": "Invalid NIF for VIES",
 	"Ticket does not exist": "Este ticket no existe",
 	"Ticket is already signed": "Este ticket ya ha sido firmado",
+	"Authentication failed": "Autenticación fallida",
+	"You can't use the same password": "No puedes usar la misma contraseña",
 	"You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
 	"Fecha fuera de rango": "Fecha fuera de rango",
 	"Error while generating PDF": "Error al generar PDF",
 	"Error when sending mail to client": "Error al enviar el correo al cliente",
-    "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
-	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado"
-}
+	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+	"Valid priorities": "Prioridades válidas: %d",
+	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
+	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
+	"You don't have enough privileges.": "No tienes suficientes permisos.",
+	"This ticket is locked.": "Este ticket está bloqueado.",
+	"This ticket is not editable.": "Este ticket no es editable.",
+	"The ticket doesn't exist.": "No existe el ticket."
+}
--- a/loopback/util/forbiddenError.js
+++ b/loopback/util/forbiddenError.js
@ -0,0 +1,9 @@
+module.exports = class ForbiddenError extends Error {
+    constructor(message, code, ...translateArgs) {
+        super(message);
+        this.name = 'ForbiddenError';
+        this.statusCode = 403;
+        this.code = code;
+        this.translateArgs = translateArgs;
+    }
+};
--- a/modules/account/back/methods/account/change-password.js
+++ b/modules/account/back/methods/account/change-password.js
@ -1,15 +1,12 @@
+const UserError = require('vn-loopback/util/user-error');

 module.exports = Self => {
-    Self.remoteMethod('changePassword', {
+    Self.remoteMethodCtx('changePassword', {
        description: 'Changes the user password',
        accessType: 'WRITE',
+        accessScopes: ['changePassword'],
        accepts: [
            {
-                arg: 'id',
-                type: 'number',
-                description: 'The user id',
-                http: {source: 'path'}
-            }, {
                arg: 'oldPassword',
                type: 'string',
                description: 'The old password',
@ -19,15 +16,35 @@ module.exports = Self => {
                type: 'string',
                description: 'The new password',
                required: true
+            }, {
+                arg: 'code',
+                type: 'string',
+                description: 'The 2FA code'
            }
        ],
        http: {
-            path: `/:id/changePassword`,
+            path: `/change-password`,
            verb: 'PATCH'
        }
    });

-    Self.changePassword = async function(id, oldPassword, newPassword) {
-        await Self.app.models.VnUser.changePassword(id, oldPassword, newPassword);
+    Self.changePassword = async function(ctx, oldPassword, newPassword, code, options) {
+        const userId = ctx.req.accessToken.userId;
+
+        const myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const {VnUser} = Self.app.models;
+        const user = await VnUser.findById(userId, {fields: ['name', 'twoFactor']}, myOptions);
+        await user.hasPassword(oldPassword);
+
+        if (oldPassword == newPassword)
+            throw new UserError(`You can not use the same password`);
+
+        if (user.twoFactor)
+            await VnUser.validateCode(user.name, code, myOptions);
+
+        await VnUser.changePassword(userId, oldPassword, newPassword, myOptions);
    };
 };
--- a/modules/account/back/methods/account/login.js
+++ b/modules/account/back/methods/account/login.js
@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethod('login', {
+    Self.remoteMethodCtx('login', {
        description: 'Login a user with username/email and password',
        accepts: [
            {
@ -23,5 +23,5 @@ module.exports = Self => {
        }
    });

-    Self.login = async(user, password) => Self.app.models.VnUser.signIn(user, password);
+    Self.login = async(ctx, user, password, options) => Self.app.models.VnUser.signIn(ctx, user, password, options);
 };
--- a/modules/account/back/methods/account/set-password.js
+++ b/modules/account/back/methods/account/set-password.js
@ -21,7 +21,8 @@ module.exports = Self => {
        }
    });

-    Self.setPassword = async function(id, newPassword) {
-        await Self.app.models.VnUser.setPassword(id, newPassword);
+    Self.setPassword = async function(id, newPassword, options) {
+        options = typeof options == 'object' ? options : {};
+        await Self.app.models.VnUser.setPassword(id, newPassword, options);
    };
 };
--- a/modules/account/back/methods/account/specs/change-password.spec.js
+++ b/modules/account/back/methods/account/specs/change-password.spec.js
@ -1,22 +1,99 @@
 const {models} = require('vn-loopback/server/server');

 describe('account changePassword()', () => {
-    it('should throw an error when old password is wrong', async() => {
-        let error;
-        try {
-            await models.Account.changePassword(1, 'wrongPassword', 'nightmare.9999');
-        } catch (e) {
-            error = e.message;
-        }
+    const ctx = {req: {accessToken: {userId: 70}}};
+    const unauthCtx = {
+        req: {
+            headers: {},
+            connection: {
+                remoteAddress: '127.0.0.1'
+            },
+            getLocale: () => 'en'
+        },
+        args: {}
+    };
+    describe('Without 2FA', () => {
+        it('should throw an error when old password is wrong', async() => {
+            const tx = await models.Account.beginTransaction({});

-        expect(error).toContain('Invalid current password');
+            let error;
+            try {
+                const options = {transaction: tx};
+
+                await models.Account.changePassword(ctx, 'wrongPassword', 'nightmare.9999', null, options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                error = e.message;
+            }
+
+            expect(error).toContain('Invalid current password');
+        });
+
+        it('should throw an error when old and new password are the same', async() => {
+            const tx = await models.Account.beginTransaction({});
+
+            let error;
+            try {
+                const options = {transaction: tx};
+
+                await models.Account.changePassword(ctx, 'nightmare', 'nightmare.9999', null, options);
+                await models.Account.changePassword(ctx, 'nightmare.9999', 'nightmare.9999', null, options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                error = e.message;
+            }
+
+            expect(error).toContain('You can not use the same password');
+        });
+
+        it('should change password', async() => {
+            const tx = await models.Account.beginTransaction({});
+
+            try {
+                const options = {transaction: tx};
+
+                await models.Account.changePassword(ctx, 'nightmare', 'nightmare.9999', null, options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+
+                expect(e).toBeUndefined();
+            }
+        });
    });

-    it('should change password', async() => {
-        try {
-            await models.Account.changePassword(70, 'nightmare', 'nightmare.9999');
-        } catch (e) {
-            expect(e).toBeUndefined();
-        }
+    describe('With 2FA', () => {
+        it('should change password when code is correct', async() => {
+            const tx = await models.Account.beginTransaction({});
+            const yesterday = Date.vnNew();
+            yesterday.setDate(yesterday.getDate() - 1);
+
+            const options = {transaction: tx};
+            try {
+                await models.VnUser.updateAll(
+                    {id: 70},
+                    {
+                        twoFactor: 'email',
+                        passExpired: yesterday
+                    }
+                    , options);
+                await models.VnUser.signIn(unauthCtx, 'trainee', 'nightmare', options);
+            } catch (e) {
+                if (e.message != 'Pass expired')
+                    throw e;
+            }
+
+            try {
+                const authCode = await models.AuthCode.findOne({where: {userFk: 70}}, options);
+                await models.Account.changePassword(ctx, 'nightmare', 'nightmare.9999', authCode.code, options);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+
+                expect(e).toBeUndefined();
+            }
+        });
    });
 });
--- a/modules/account/back/methods/account/specs/set-password.spec.js
+++ b/modules/account/back/methods/account/specs/set-password.spec.js
@ -8,8 +8,18 @@ describe('Account setPassword()', () => {
    });

    it('should update password when it passes requirements', async() => {
-        let req = models.Account.setPassword(1, 'Very$ecurePa22.');
+        const tx = await models.Account.beginTransaction({});

-        await expectAsync(req).toBeResolved();
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Account.setPassword(1, 'Very$ecurePa22.', options);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).not.toBeDefined();
    });
 });
--- a/modules/account/back/models/account.json
+++ b/modules/account/back/models/account.json
@ -37,6 +37,13 @@
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
+		},
+		{
+            "property": "changePassword",
+			"accessType": "EXECUTE",
+			"principalType": "ROLE",
+			"principalId": "$everyone",
+			"permission": "ALLOW"
 		}
 	]
 }
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@ -0,0 +1,55 @@
+
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.observe('before save', async ctx => {
+        const changes = ctx.currentInstance || ctx.instance;
+
+        await Self.hasGrant(ctx, changes.mailAlias);
+    });
+
+    Self.observe('before delete', async ctx => {
+        const mailAliasAccount = await Self.findById(ctx.where.id);
+
+        await Self.hasGrant(ctx, mailAliasAccount.mailAlias);
+    });
+
+    /**
+     * Checks if current user has
+     * grant to add/remove alias
+     *
+     * @param {Object} ctx - Request context
+     * @param {Interger} mailAlias - mailAlias id
+     * @return {Boolean} True for user with grant
+     */
+    Self.hasGrant = async function(ctx, mailAlias) {
+        const models = Self.app.models;
+        const accessToken = {req: {accessToken: ctx.options.accessToken}};
+        const userId = accessToken.req.accessToken.userId;
+
+        const canEditAlias = await models.ACL.checkAccessAcl(accessToken, 'MailAliasAccount', 'canEditAlias', 'WRITE');
+        if (canEditAlias) return true;
+
+        const user = await models.VnUser.findById(userId, {fields: ['hasGrant']});
+        if (!user.hasGrant)
+            throw new UserError(`You don't have grant privilege`);
+
+        const account = await models.Account.findById(userId, {
+            fields: ['id'],
+            include: {
+                relation: 'aliases',
+                scope: {
+                    fields: ['mailAlias']
+                }
+            }
+        });
+
+        const aliases = account.aliases().map(alias => alias.mailAlias);
+
+        const hasAlias = aliases.includes(mailAlias);
+        if (!hasAlias)
+            throw new UserError(`You cannot assign/remove an alias that you are not assigned to`);
+
+        return true;
+    };
+};
--- a/modules/account/front/aliases/index.html
+++ b/modules/account/front/aliases/index.html
@ -17,9 +17,7 @@
                        <vn-icon-button
                            icon="delete"
                            translate-attr="{title: 'Unsubscribe'}"
-                            ng-click="removeConfirm.show(row)"
-                            vn-acl="itManagement"
-                            vn-acl-action="remove">
+                            ng-click="removeConfirm.show(row)">
                        </vn-icon-button>
                    </vn-item-section>
                </vn-item>
@ -32,9 +30,7 @@
        translate-attr="{title: 'Add'}"
        vn-bind="+"
        ng-click="$ctrl.onAddClick()"
-        fixed-bottom-right
-        vn-acl="itManagement"
-        vn-acl-action="remove">
+        fixed-bottom-right>
    </vn-float-button>
    <vn-dialog
        vn-id="dialog"
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@ -95,7 +95,7 @@ module.exports = Self => {

            // When claimState has been changed
            if (args.claimStateFk) {
-                const newState = await models.ClaimState.findById(args.claimStateFk, null, options);
+                const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
                if (newState.hasToNotify) {
                    if (newState.code == 'incomplete')
                        notifyStateChange(ctx, salesPerson.id, claim, newState.code);
--- a/modules/client/back/methods/client/canBeInvoiced.js
+++ b/modules/client/back/methods/client/canBeInvoiced.js
@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = function(Self) {
    Self.remoteMethodCtx('canBeInvoiced', {
        description: 'Change property isEqualizated in all client addresses',
@ -9,6 +11,12 @@ module.exports = function(Self) {
                required: true,
                description: 'Client id',
                http: {source: 'path'}
+            },
+            {
+                arg: 'companyFk',
+                description: 'The company id',
+                type: 'number',
+                required: true
            }
        ],
        returns: {
@ -22,18 +30,29 @@ module.exports = function(Self) {
        }
    });

-    Self.canBeInvoiced = async(id, options) => {
+    Self.canBeInvoiced = async(id, companyFk, options) => {
        const models = Self.app.models;
-
        const myOptions = {};

        if (typeof options == 'object')
            Object.assign(myOptions, options);

        const client = await models.Client.findById(id, {
-            fields: ['id', 'isTaxDataChecked', 'hasToInvoice']
+            fields: ['id', 'isTaxDataChecked', 'hasToInvoice', 'payMethodFk'],
+            include:
+                {
+                    relation: 'payMethod',
+                    scope: {
+                        fields: ['code']
+                    }
+                }
        }, myOptions);

+        const company = await models.Company.findById(companyFk, {fields: ['supplierAccountFk']}, myOptions);
+
+        if (client.payMethod().code === 'wireTransfer' && !company.supplierAccountFk)
+            throw new UserError('The company has not informed the supplier account for bank transfers');
+
        if (client.isTaxDataChecked && client.hasToInvoice)
            return true;

--- a/modules/client/back/methods/client/sendSms.js
+++ b/modules/client/back/methods/client/sendSms.js
@ -7,7 +7,7 @@ module.exports = Self => {
            arg: 'id',
            type: 'number',
            required: true,
-            description: 'The ticket id',
+            description: 'The client id',
            http: {source: 'path'}
        },
        {
@ -33,6 +33,12 @@ module.exports = Self => {
    Self.sendSms = async(ctx, id, destination, message) => {
        const models = Self.app.models;
        const sms = await models.Sms.send(ctx, destination, message);
+
+        await models.ClientSms.create({
+            clientFk: id,
+            smsFk: sms.id
+        });
+
        return sms;
    };
 };
--- a/modules/client/back/methods/client/setPassword.js
+++ b/modules/client/back/methods/client/setPassword.js
@ -28,7 +28,7 @@ module.exports = Self => {
        const isAccount = await models.Account.findById(id);

        if (isClient && !isAccount)
-            await models.Account.setPassword(id, newPassword);
+            await models.VnUser.setPassword(id, newPassword);
        else
            throw new UserError(`Modifiable password only via recovery or by an administrator`);
    };
--- a/modules/client/back/methods/client/specs/canBeInvoiced.spec.js
+++ b/modules/client/back/methods/client/specs/canBeInvoiced.spec.js
@ -4,6 +4,7 @@ const LoopBackContext = require('loopback-context');
 describe('client canBeInvoiced()', () => {
    const userId = 19;
    const clientId = 1101;
+    const companyId = 442;
    const activeCtx = {
        accessToken: {userId: userId}
    };
@ -23,7 +24,7 @@ describe('client canBeInvoiced()', () => {
            const client = await models.Client.findById(clientId, null, options);
            await client.updateAttribute('isTaxDataChecked', false, options);

-            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, options);
+            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, companyId, options);

            expect(canBeInvoiced).toEqual(false);

@ -43,7 +44,7 @@ describe('client canBeInvoiced()', () => {
            const client = await models.Client.findById(clientId, null, options);
            await client.updateAttribute('hasToInvoice', false, options);

-            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, options);
+            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, companyId, options);

            expect(canBeInvoiced).toEqual(false);

@ -60,7 +61,7 @@ describe('client canBeInvoiced()', () => {
        try {
            const options = {transaction: tx};

-            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, options);
+            const canBeInvoiced = await models.Client.canBeInvoiced(clientId, companyId, options);

            expect(canBeInvoiced).toEqual(true);

--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@ -70,11 +70,12 @@ module.exports = Self => {
                        c.creditInsurance,
                        d.defaulterSinced,
                        cn.country,
+                        c.countryFk,
                        pm.name payMethod
                    FROM vn.defaulter d
                        JOIN vn.client c ON c.id = d.clientFk
                        JOIN vn.country cn ON cn.id = c.countryFk
-                        JOIN vn.payMethod pm ON pm.id = c.payMethodFk 
+                        JOIN vn.payMethod pm ON pm.id = c.payMethodFk
                        LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                        LEFT JOIN account.user u ON u.id = c.salesPersonFk
                        LEFT JOIN account.user uw ON uw.id = co.workerFk
--- a/modules/client/back/model-config.json
+++ b/modules/client/back/model-config.json
@ -95,6 +95,9 @@
    "ClientSample": {
        "dataSource": "vn"
    },
+    "ClientSms": {
+        "dataSource": "vn"
+    },
    "Sms": {
        "dataSource": "vn"
    },
--- a/modules/client/back/models/client-sms.json
+++ b/modules/client/back/models/client-sms.json
@ -0,0 +1,26 @@
+{
+    "name": "ClientSms",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "clientSms"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "clientFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "sms": {
+            "type": "belongsTo",
+            "model": "Sms",
+            "foreignKey": "smsFk"
+        }
+    }
+}
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@ -41,7 +41,18 @@ module.exports = Self => {
    });

    async function socialNameIsUnique(err, done) {
+        if (!this.countryFk)
+            return done();
+
        const filter = {
+            include: {
+                relation: 'country',
+                scope: {
+                    fields: {
+                        isSocialNameUnique: true,
+                    },
+                },
+            },
            where: {
                and: [
                    {socialName: this.socialName},
@ -50,9 +61,13 @@ module.exports = Self => {
                ]
            }
        };
-        const client = await Self.app.models.Client.findOne(filter);
-        if (client)
+
+        const client = await Self.app.models.Country.findById(this.countryFk, {fields: ['isSocialNameUnique']});
+        const existingClient = await Self.findOne(filter);
+
+        if (existingClient && (existingClient.country().isSocialNameUnique || client.isSocialNameUnique))
            err();
+
        done();
    }

@ -89,7 +104,7 @@ module.exports = Self => {
        };
        const country = await Self.app.models.Country.findOne(filter);
        const code = country ? country.code.toLowerCase() : null;
-        const countryCode = this.fi.toLowerCase().substring(0, 2);
+        const countryCode = this.fi?.toLowerCase().substring(0, 2);

        if (!this.fi || !validateTin(this.fi, code) || (this.isVies && countryCode == code))
            err();
--- a/modules/client/back/models/client.json
+++ b/modules/client/back/models/client.json
@ -181,6 +181,11 @@
 			"model": "Country",
 			"foreignKey": "countryFk"
 		},
+        "isSocialNameUnique": {
+            "type": "belongsTo",
+            "model": "Country",
+            "foreignKey": "countryFk"
+        },
 		"contactChannel": {
 			"type": "belongsTo",
 			"model": "ContactChannel",
--- a/modules/client/back/models/defaulter.json
+++ b/modules/client/back/models/defaulter.json
@ -33,7 +33,7 @@
    "country": {
      "type": "belongsTo",
      "model": "Country",
-      "foreignKey": "country"
+      "foreignKey": "countryFk"
    },
    "payMethod": {
      "type": "belongsTo",
@ -41,4 +41,4 @@
      "foreignKey": "payMethod"
    }
  }
-}
+}
--- a/modules/client/front/credit-management/index.html
+++ b/modules/client/front/credit-management/index.html
@ -68,7 +68,7 @@
                    </span>
                </vn-td>
                <vn-td number>{{::clientInforma.rating}}</vn-td>
-                <vn-td>{{::clientInforma.recommendedCredit | currency: 'EUR': 2}}</vn-td>
+                <vn-td number>{{::clientInforma.recommendedCredit | currency: 'EUR'}}</vn-td>
            </vn-tr>
        </vn-tbody>
    </vn-table>
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@ -60,7 +60,7 @@
                        <th field="salesPersonFk">
                            <span translate>Comercial</span>
                        </th>
-                        <th field="country">
+                        <th field="countryFk">
                            <span translate>Country</span>
                        </th>
                        <th field="payMethod"
@ -132,7 +132,7 @@
                        </td>
                        <td>
                            {{::defaulter.payMethod}}
-                        </td> 
+                        </td>
                        <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                        <td>
                            <span
--- a/modules/client/front/defaulter/index.js
+++ b/modules/client/front/defaulter/index.js
@ -31,10 +31,11 @@ export default class Controller extends Section {
                        valueField: 'id',
                    }
                }, {
-                    field: 'country',
+                    field: 'countryFk',
                    autocomplete: {
+                        url: 'Countries',
                        showField: 'country',
-                        valueField: 'country'
+                        valueField: 'id'
                    }
                }, {
                    field: 'payMethodFk',
@ -167,7 +168,7 @@ export default class Controller extends Section {
        case 'amount':
        case 'clientFk':
        case 'workerFk':
-        case 'country':
+        case 'countryFk':
        case 'payMethod':
        case 'salesPersonFk':
            return {[`d.${param}`]: value};
--- a/modules/client/front/index.js
+++ b/modules/client/front/index.js
@ -48,4 +48,5 @@ import './notification';
 import './unpaid';
 import './extended-list';
 import './credit-management';
+import './sms';

--- a/modules/client/front/routes.json
+++ b/modules/client/front/routes.json
@ -23,6 +23,7 @@
            {"state": "client.card.recovery.index", "icon": "icon-recovery"},
            {"state": "client.card.webAccess", "icon": "cloud"},
            {"state": "client.card.log", "icon": "history"},
+            {"state": "client.card.sms", "icon": "sms"},
            {
                "description": "Credit management",
                "icon": "monetization_on",
@ -373,6 +374,12 @@
            "component": "vn-client-log",
            "description": "Log"
        },
+        {
+            "url" : "/sms",
+            "state": "client.card.sms",
+            "component": "vn-client-sms",
+            "description": "Sms"
+        },
        {
            "url": "/dms",
            "state": "client.card.dms",
--- a/modules/client/front/sms/index.html
+++ b/modules/client/front/sms/index.html
@ -0,0 +1,40 @@
+<vn-crud-model
+    vn-id="model"
+    url="ClientSms"
+    link="{clientFk: $ctrl.$params.id}"
+    filter="::$ctrl.filter"
+    data="clientSmsList"
+    limit="20"
+    auto-load="true">
+</vn-crud-model>
+<vn-data-viewer model="model">
+    <vn-card class="vn-w-md">
+        <vn-table model="model" auto-load="false">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="senderFk">Sender</vn-th>
+                    <vn-th field="destination" number>Destination</vn-th>
+                    <vn-th field="message">Message</vn-th>
+                    <vn-th field="status">Status</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="clientSms in clientSmsList">
+                    <vn-td>
+                        <span class="link" ng-click="workerDescriptor.show($event, clientSms.sms.senderFk)">
+                            {{::clientSms.sms.sender.name}}
+                        </span>
+                    </vn-td>
+                    <vn-td number expand>{{::clientSms.sms.destination}}</vn-td>
+                    <vn-td>{{::clientSms.sms.message}}</vn-td>
+                    <vn-td>{{::clientSms.sms.status}}</vn-td>
+                    <vn-td shrink-datetime>{{::clientSms.sms.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+    </vn-card>
+</vn-data-viewer>
+<vn-worker-descriptor-popover
+    vn-id="worker-descriptor">
+</vn-worker-descriptor-popover>
--- a/modules/client/front/sms/index.js
+++ b/modules/client/front/sms/index.js
@ -0,0 +1,39 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+
+        this.filter = {
+            fields: ['id', 'smsFk'],
+            include: {
+                relation: 'sms',
+                scope: {
+                    fields: [
+                        'senderFk',
+                        'sender',
+                        'destination',
+                        'message',
+                        'statusCode',
+                        'status',
+                        'created'],
+                    include: {
+                        relation: 'sender',
+                        scope: {
+                            fields: ['name']
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
+
+ngModule.vnComponent('vnClientSms', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        client: '<'
+    }
+});
--- a/modules/client/front/sms/locale/es.yml
+++ b/modules/client/front/sms/locale/es.yml
@ -0,0 +1,2 @@
+Sender: Remitente
+Number sender: Número remitente
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`company` MODIFY COLUMN sage200Company int(2) DEFAULT 10 NOT NULL;