Merge branch 'dev' into 4059-revocar-permisos-client-account

CHANGELOG.md

@@ -5,6 +5,74 @@ 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).
 
+
+## [2338.01] - 2023-09-21
+
+### Added
+
+### Changed
+- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
+
+### Fixed
+
+## [2336.01] - 2023-09-07
+
+### Added
+
+### Changed
+
+### Fixed
+
+
+## [2334.01] - 2023-08-24
+
+### Added
+- (General -> Errores) Botón para enviar cau con los datos del error
+
+
+## [2332.01] - 2023-08-10
+
+### Added
+- (Trabajadores -> Gestión documental) Soporte para Docuware
+- (General -> Agencia) Soporte para Viaexpress
+- (Tickets -> SMS) Nueva sección en Lilium
+
+### Changed
+- (General -> Tickets) Devuelve el motivo por el cual no es editable
+- (Desplegables -> Trabajadores) Mejorados
+- (General -> Clientes) Razón social y dirección en mayúsculas
+
+### Fixed
+- (Clientes -> SMS) Al pasar el ratón por encima muestra el mensaje completo
+
+
+## [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) Permite crear clientes con la misma razón social según el país
+
+
+## [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

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,40 +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 [response] = await Self.get(fileCabinet, filter);
+            if (!response) return false;
 
-            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;
-            if (!documents) return false;
-
-            const state = documents.Fields.find(field => field.FieldName == 'ESTADO');
-            if (signed && state.Item != 'Firmado') return false;
-
-            return {id: documents.Id};
+            return {id: response['Document ID']};
         } catch (error) {
             return false;
         }

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)));
+    }
 };

back/methods/docuware/deliveryNoteEmail.js

@@ -65,7 +65,7 @@ module.exports = Self => {
 
         const email = new Email('delivery-note', params);
 
-        const docuwareFile = await models.Docuware.download(ctx, id, 'deliveryNote');
+        const docuwareFile = await models.Docuware.download(id, 'deliveryNote');
 
         return email.send({
             overrideAttachments: true,

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);

back/methods/docuware/specs/checkFile.spec.js

@@ -1,81 +1,27 @@
 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);
     });
 
     it('should return the document data', async() => {
         const docuwareId = 1;
-        const response = {
-            data: {
-                Items: [
-                    {
-                        Id: docuwareId,
-                        Fields: [
-                            {
-                                FieldName: 'ESTADO',
-                                Item: 'Firmado'
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+        const response = [{
+            'Document ID': docuwareId
+        }];
+        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);
     });

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);
+        });
+    });
+});

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"`);

back/methods/docuware/upload.js

@@ -111,7 +111,7 @@ module.exports = Self => {
                 throw new UserError('Action not allowed on the test environment');
 
             // delete old
-            const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false);
+            const docuwareFile = await models.Docuware.checkFile(id, fileCabinet, false);
             if (docuwareFile) {
                 const deleteJson = {
                     'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]

back/methods/osticket/sendToSupport.js

@@ -0,0 +1,63 @@
+const smtp = require('vn-print/core/smtp');
+const config = require('vn-print/core/config');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('sendToSupport', {
+        description: 'Send mail to support',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'reason',
+                type: 'string',
+                description: 'The reason'
+            },
+            {
+                arg: 'additionalData',
+                type: 'object',
+                required: true,
+                description: 'The additional data'
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/send-to-support`,
+            verb: 'POST'
+        }
+    });
+
+    Self.sendToSupport = async(ctx, reason, additionalData) => {
+        const emailUser =
+            await Self.app.models.EmailUser.findById(ctx.req.accessToken.userId, {fields: ['email']});
+
+        let html = `<strong>Motivo</strong>:<br/>${reason}<br/>`;
+        html += `<strong>Usuario</strong>:<br/>${ctx.req.accessToken.userId} ${emailUser.email}<br/>`;
+
+        for (const data in additionalData)
+            html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
+
+        const subjectReason = JSON.parse(additionalData?.httpRequest)?.data?.error;
+        smtp.send({
+            to: `${config.app.reportEmail}, ${emailUser.email}`,
+            subject:
+                '[Support-Salix] ' +
+                additionalData?.frontPath + ' ' +
+                subjectReason?.name + ':' +
+                subjectReason?.message,
+            html
+        });
+    };
+
+    function tryParse(value) {
+        try {
+            try {
+                value = JSON.parse(value);
+            } catch {}
+            return JSON.stringify(value, null, '&nbsp;').split('\n').join('<br>');
+        } catch {
+            return value;
+        }
+    }
+};

back/methods/viaexpress-config/internationalExpedition.js

@@ -0,0 +1,45 @@
+const axios = require('axios');
+const {DOMParser} = require('xmldom');
+
+module.exports = Self => {
+    Self.remoteMethod('internationalExpedition', {
+        description: 'Create an expedition and return a label',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'expeditionFk',
+            type: 'number',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/internationalExpedition`,
+            verb: 'POST'
+        }
+    });
+
+    Self.internationalExpedition = async expeditionFk => {
+        const models = Self.app.models;
+
+        const viaexpressConfig = await models.ViaexpressConfig.findOne({
+            fields: ['url']
+        });
+
+        const renderedXml = await models.ViaexpressConfig.renderer(expeditionFk);
+        const response = await axios.post(`${viaexpressConfig.url}ServicioVxClientes.asmx`, renderedXml, {
+            headers: {
+                'Content-Type': 'application/soap+xml; charset=utf-8'
+            }
+        });
+
+        const xmlString = response.data;
+        const parser = new DOMParser();
+        const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
+        const referenciaVxElement = xmlDoc.getElementsByTagName('ReferenciaVx')[0];
+        const referenciaVx = referenciaVxElement.textContent;
+
+        return referenciaVx;
+    };
+};

back/methods/viaexpress-config/renderer.js

@@ -0,0 +1,126 @@
+const fs = require('fs');
+const ejs = require('ejs');
+
+module.exports = Self => {
+    Self.remoteMethod('renderer', {
+        description: 'Renders the data from an XML',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'expeditionFk',
+            type: 'number',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/renderer`,
+            verb: 'GET'
+        }
+    });
+
+    Self.renderer = async expeditionFk => {
+        const models = Self.app.models;
+
+        const viaexpressConfig = await models.ViaexpressConfig.findOne({
+            fields: ['client', 'user', 'password', 'defaultWeight', 'deliveryType']
+        });
+
+        const expedition = await models.Expedition.findOne({
+            fields: ['id', 'ticketFk'],
+            where: {id: expeditionFk},
+            include: [
+                {
+                    relation: 'ticket',
+                    scope: {
+                        fields: ['shipped', 'addressFk', 'clientFk', 'companyFk'],
+                        include: [
+                            {
+                                relation: 'client',
+                                scope: {
+                                    fields: ['mobile', 'phone', 'email']
+                                }
+                            },
+                            {
+                                relation: 'address',
+                                scope: {
+                                    fields: [
+                                        'nickname',
+                                        'street',
+                                        'postalCode',
+                                        'city',
+                                        'mobile',
+                                        'phone',
+                                        'provinceFk'
+                                    ],
+                                    include: {
+                                        relation: 'province',
+                                        scope: {
+                                            fields: ['name', 'countryFk'],
+                                            include: {
+                                                relation: 'country',
+                                                scope: {
+                                                    fields: ['code'],
+                                                }
+                                            }
+
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                relation: 'company',
+                                scope: {
+                                    fields: ['clientFk'],
+                                    include: {
+                                        relation: 'client',
+                                        scope: {
+                                            fields: ['socialName', 'mobile', 'phone', 'email', 'defaultAddressFk'],
+                                            include: {
+                                                relation: 'defaultAddress',
+                                                scope: {
+                                                    fields: [
+                                                        'street',
+                                                        'postalCode',
+                                                        'city',
+                                                        'mobile',
+                                                        'phone',
+                                                        'provinceFk'
+                                                    ],
+                                                    include: {
+                                                        relation: 'province',
+                                                        scope: {
+                                                            fields: ['name']
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        ]
+                    }
+
+                }
+            ]
+        });
+
+        const ticket = expedition.ticket();
+        const sender = ticket.company().client();
+        const shipped = ticket.shipped.toISOString();
+        const data = {
+            viaexpressConfig,
+            sender,
+            senderAddress: sender.defaultAddress(),
+            client: ticket.client(),
+            address: ticket.address(),
+            shipped
+        };
+
+        const template = fs.readFileSync(__dirname + '/template.ejs', 'utf-8');
+        const renderedXml = ejs.render(template, data);
+        return renderedXml;
+    };
+};

back/methods/viaexpress-config/template.ejs

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
+<soap12:Body>
+    <PutExpedicionInternacional xmlns="http://82.223.6.71:82">
+    <ObjetoEnvio>
+            <Peso><%= viaexpressConfig.defaultWeight %></Peso>
+            <Bultos>1</Bultos>
+            <Reembolso>0</Reembolso>
+            <Fecha><%= shipped %></Fecha>
+            <ConRetorno>0</ConRetorno>
+            <Tipo><%= viaexpressConfig.deliveryType %></Tipo>
+            <Debidos>0</Debidos>
+            <Asegurado>0</Asegurado>
+            <Imprimir>0</Imprimir>
+            <ConDevolucionAlbaran>0</ConDevolucionAlbaran>
+            <Intradia>0</Intradia>
+            <Observaciones></Observaciones>
+            <AlbaranRemitente></AlbaranRemitente>
+            <Modo>0</Modo>
+            <TextoAgencia></TextoAgencia>
+            <Terminal></Terminal>
+            <ObjetoRemitente>
+                    <RazonSocial><%= sender.socialName %></RazonSocial>
+                    <Domicilio><%= senderAddress.street %></Domicilio>
+                    <Cpostal><%= senderAddress.postalCode %></Cpostal>
+                    <Poblacion><%= senderAddress.city %></Poblacion>
+                    <Provincia><%= senderAddress.province().name %></Provincia>
+                    <Contacto></Contacto>
+                    <Telefono><%= senderAddress.mobile || senderAddress.phone || sender.mobile || sender.phone %></Telefono>
+                    <Email><%= sender.email %></Email>
+            </ObjetoRemitente>
+            <ObjetoDestinatario>
+                    <RazonSocial><%= address.nickname %></RazonSocial>
+                    <Domicilio><%= address.street %></Domicilio>
+                    <Cpostal><%= address.postalCode %></Cpostal>
+                    <Poblacion><%= address.city %></Poblacion>
+                    <Municipio></Municipio>
+                    <Provincia><%= address.province().name %></Provincia>
+                    <Contacto></Contacto>
+                    <Telefono><%= address.mobile || address.phone || client.mobile || client.phone %></Telefono>
+                    <Email><%= client.email %></Email>
+                    <Pais><%= address.province().country().code %></Pais>
+            </ObjetoDestinatario>
+            <ObjetoLogin>
+                    <IdCliente><%= viaexpressConfig.client %></IdCliente>
+                    <Usuario><%= viaexpressConfig.user %></Usuario>
+                    <Password><%= viaexpressConfig.password %></Password>
+            </ObjetoLogin>
+    </ObjetoEnvio>
+    </PutExpedicionInternacional>
+</soap12:Body>
+</soap12:Envelope>

back/methods/vn-user/privileges.js

@@ -47,7 +47,7 @@ module.exports = Self => {
         const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);
 
         const userToUpdate = await Self.findById(id, {
-            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password'],
+            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password', 'email'],
             include: {
                 relation: 'role',
                 scope: {

back/methods/vn-user/recover-password.js

@@ -7,6 +7,11 @@ module.exports = Self => {
                 type: 'string',
                 description: 'The user name or email',
                 required: true
+            },
+            {
+                arg: 'app',
+                type: 'string',
+                description: 'The directory for mail'
             }
         ],
         http: {
@@ -15,7 +20,7 @@ module.exports = Self => {
         }
     });
 
-    Self.recoverPassword = async function(user) {
+    Self.recoverPassword = async function(user, app) {
         const models = Self.app.models;
 
         const usesEmail = user.indexOf('@') !== -1;
@@ -29,7 +34,7 @@ module.exports = Self => {
         }
 
         try {
-            await Self.resetPassword({email: user, emailTemplate: 'recover-password'});
+            await Self.resetPassword({email: user, emailTemplate: 'recover-password', app});
         } catch (err) {
             if (err.code === 'EMAIL_NOT_FOUND')
                 return;

back/methods/vn-user/sign-in.js

@@ -0,0 +1,96 @@
+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 => {
+        const today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
+
+        if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
+            const err = new UserError('Pass expired', 'passExpired');
+            err.details = {userId: vnUser.id, twoFactor: vnUser.twoFactor ? true : false};
+            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);
+        }
+    };
+};

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};
-    };
-};

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');
+        });
+    });
+});

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');
-        });
-    });
-});

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');
+        });
+    });
+});

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);
+    };
+};

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"
     },
@@ -147,6 +150,9 @@
     },
     "PrintConfig": {
         "dataSource": "vn"
+    },
+    "ViaexpressConfig": {
+        "dataSource": "vn"
     }
 }
 

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"
+		}
+	}
+}

back/models/company.json

@@ -18,11 +18,21 @@
         },
         "expired": {
             "type": "date"
+        },
+        "supplierAccountFk": {
+            "type": "number"
         }
     },
     "scope": {
         "where" :{
             "expired": null
         }
+    },
+    "relations": {
+        "client": {
+          "type": "belongsTo",
+          "model": "Client",
+          "foreignKey": "clientFk"
+        }
     }
 }

back/models/country.json

@@ -22,6 +22,9 @@
         },
         "isUeeMember": {
             "type": "boolean"
+        },
+        "isSocialNameUnique": {
+            "type": "boolean"
         }
     },
     "relations": {
@@ -39,4 +42,4 @@
             "permission": "ALLOW"
         }
     ]
-}
+}

back/models/docuware.json

@@ -28,5 +28,12 @@
         "findById": {
             "type": "string"
         }
+    },
+    "relations": {
+        "dmsType": {
+            "type": "belongsTo",
+            "model": "DmsType",
+            "foreignKey": "dmsTypeFk"
+        }
     }
 }

back/models/osticket.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/osticket/osTicketReportEmail')(Self);
     require('../methods/osticket/closeTicket')(Self);
+    require('../methods/osticket/sendToSupport')(Self);
 };

back/models/viaexpress-config.js

@@ -0,0 +1,4 @@
+module.exports = Self => {
+    require('../methods/viaexpress-config/internationalExpedition')(Self);
+    require('../methods/viaexpress-config/renderer')(Self);
+};

back/models/viaexpress-config.json

@@ -0,0 +1,34 @@
+{
+	"name": "ViaexpressConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "viaexpressConfig"
+		}
+	},
+	"properties": {
+		"id": {
+			"type": "number",
+			"required": true
+		},
+		"url": {
+			"type": "string",
+			"required": true
+		},
+		"client": {
+			"type": "string"
+		},
+		"user": {
+			"type": "string"
+		},
+		"password": {
+			"type": "string"
+		},
+		"defaultWeight": {
+			"type": "number"
+		},
+		"deliveryType": {
+			"type": "string"
+		}
+	}
+}

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');
@@ -19,7 +20,7 @@ module.exports = function(Self) {
     Self.validatesFormatOf('email', {
         message: 'Invalid email',
         allowNull: true,
-        allowBlank: true,
+        allowBlank: false,
         with: /^[\w|.|-]+@[\w|-]+(\.[\w|-]+)*(,[\w|.|-]+@[\w|-]+(\.[\w|-]+)*)*$/
     });
 
@@ -95,11 +96,21 @@ module.exports = function(Self) {
         const headers = httpRequest.headers;
         const origin = headers.origin;
 
+        const defaultHash = '/reset-password?access_token=$token$';
+        const recoverHashes = {
+            hedera: 'verificationToken=$token$'
+        };
+
+        const app = info.options?.app;
+        let recoverHash = app ? recoverHashes[app] : defaultHash;
+        recoverHash = recoverHash.replace('$token$', info.accessToken.id);
+
         const user = await Self.app.models.VnUser.findById(info.user.id);
+
         const params = {
             recipient: info.email,
             lang: user.lang,
-            url: `${origin}/#!/reset-password?access_token=${info.accessToken.id}`
+            url: origin + '/#!' + recoverHash
         };
 
         const options = Object.assign({}, info.options);
@@ -111,6 +122,26 @@ 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');
+
+        const userToken = await token.user.get();
+        try {
+            await Self.app.models.Account.sync(userToken.name, password);
+        } catch (err) {
+            console.warn(err);
+        }
+
+        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 +174,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) => {

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": "*",

db/Dockerfile

@@ -31,7 +31,6 @@ RUN sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
     && gosu mysql docker-structure.sh
 COPY changes ./changes
 COPY dump/fixtures.sql ./
-ARG STAMP=unknown
 RUN gosu mysql docker-fixtures.sh
 
 RUN echo "[INFO] -> Import finished" \

db/PASTE_COMMENT_REMINDER

@@ -1,4 +0,0 @@
-/**
- * Hay una versión en salix que machacará toda esta función/procedimiento avisa
- * a ___ de los cambios que quieres hacer.
- */

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');

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');

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
+);

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 ;

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;

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 ;

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';

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');

db/changes/233001/00-aclSaleTracking.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+    ('SaleTracking', 'deleteSaleGroupDetail', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+    ('SaleTracking', 'replaceOrCreate', 'WRITE', 'ALLOW', 'ROLE', 'employee');

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');

db/changes/233001/00-company.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`company` MODIFY COLUMN sage200Company int(2) DEFAULT 10 NOT NULL;

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');

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;

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 ;
+

db/changes/233001/00-noUniqueSocialName.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`country`
+ADD COLUMN `isSocialNameUnique` tinyint(1) NOT NULL DEFAULT 1;

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';

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');

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;

db/changes/233201/00-acl_viaexpressConfig.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('ViaexpressConfig', 'internationalExpedition', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('ViaexpressConfig', 'renderer', 'READ', 'ALLOW', 'ROLE', 'employee');

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');

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');

db/changes/233201/00-viaexpress.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `vn`.`viaexpressConfig` (
+	id int auto_increment NOT NULL,
+	url varchar(100) NOT NULL,
+	client varchar(100) NOT NULL,
+	user varchar(100) NOT NULL,
+	password varchar(100) NOT NULL,
+    defaultWeight decimal(10,2) NOT NULL,
+    deliveryType varchar(5) NOT NULL,
+	CONSTRAINT viaexpressConfig_PK PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

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/');
+

db/changes/233202/00-client_create_upper.sql

@@ -0,0 +1,87 @@
+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 = UPPER(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 ;

db/changes/233202/00-ticketSmsACL.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('TicketSms', 'find', 'READ', 'ALLOW', 'ROLE', 'salesPerson');

db/changes/233401/00-setDeleted_acl.sql

@@ -0,0 +1,6 @@
+UPDATE `salix`.`ACL`
+    SET principalId='salesPerson'
+        WHERE
+            model='Ticket'
+            AND property='setDeleted'
+            AND accessType='WRITE';

db/changes/233401/01-deviceLog_acl.sql

@@ -0,0 +1,6 @@
+
+ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+

db/changes/233601/00-aclWorker.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('Worker', 'search', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/233601/00-addExpeditionState.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+    VALUES ('ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery');

db/changes/233601/00-createClaimReader.sql

@@ -0,0 +1,32 @@
+INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`)
+	VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1);
+
+INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
+	SELECT `r`.`id`, `r2`.`id`
+		FROM `account`.`role` `r`
+			JOIN `account`.`role` `r2` ON `r2`.`name` = 'claimViewer'
+		WHERE `r`.`name` IN (
+			'salesPerson',
+			'buyer',
+			'deliveryBoss',
+			'handmadeBoss'
+		)
+
+DELETE FROM `salix`.`ACL`
+	WHERE `model`= 'claim'
+		AND `property` IN (
+			'filter',
+			'find',
+			'findById',
+			'getSummary'
+		);
+
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
+	VALUES ('Claim','filter','READ','ALLOW','ROLE','claimViewer');
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
+	VALUES ('Claim','find','READ','ALLOW','ROLE','claimViewer');
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
+	VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer');
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
+	VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');
+

db/changes/233601/00-department.sql

@@ -0,0 +1,3 @@
+UPDATE `vn`.`department`
+    SET code='VN'
+WHERE name='VERDNATURA';

db/changes/233601/00-saleGroupDetail.sql

@@ -0,0 +1,7 @@
+DELETE FROM `vn`.`saleGroupDetail` WHERE id IN (468106,468104,468107,468105,495210,495208,495207,495209,462879,462880,447186,450623,450622,455606,455605,455827,455829,455828,459067,460689,460691,460690,460692,462408,463403,463405,463404,463129,463127,463126,463128,468098,468096,468099,468097,468310,468314,468313,475654,468325,473248,474803,474739,475042,475052,475047,475041,475051,475046,475040,475050,475045,475039,475049,475044,475038,475048,475043,474888,474892,474890,474887,474891,474889,481109,481107,481105,481108,481106,481110,479008,490787,490792,490791,485295,485294,485293,485528,490796,487853,487959,491303,490789,490914,490913,492305,492310,492307,492304,492309,492306,492303,492308,494111,494110,494480,494482,494481,494483,495202,495200,495199,495201,497209,499765,499763,499767,499764,499768,499766,502014,502013,508820,508819,508818,463133,463131,463130,463132,468102,468100,468103,468101,468311,468316,468315,468327,474894,474898,474896,474893,474897,474895,495206,495204,495203,495205,499771,499769,499773,499770,499774,499772);
+ALTER TABLE `vn`.`saleGroupDetail` ADD CONSTRAINT saleGroupDetail_UN UNIQUE KEY (saleFk);
+
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES
+        ('SaleGroupDetail','deleteById','WRITE','ALLOW','employee');
+

db/docker.js

@@ -22,12 +22,8 @@ module.exports = class Docker {
      * @param {String} networkName Name of the container network
      */
     async run(ci, networkName = 'jenkins') {
-        let d = new Date();
-        let pad = v => v < 10 ? '0' + v : v;
-        let stamp = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
-
         log('Building container image...');
-        await this.execP(`docker build --build-arg STAMP=${stamp} -t salix-db ./db`);
+        await this.execP(`docker build -t salix-db ./db`);
         log('Image built.');
 
         let dockerArgs;

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
@@ -357,18 +360,18 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
 
 INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'Batman',         'Alfred',           '1007 Mountain Drive, Gotham',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1102,     'Petter Parker',      '87945234L',  'Spider man',     'Aunt May',         '20 Ingram Street, Queens, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1103,     'Clark Kent',         '06815934E',  'Super man',      'lois lane',        '344 Clinton Street, Apartament 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1104,     'Tony Stark',         '06089160W',  'Iron man',       'Pepper Potts',     '10880 Malibu Point, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1105,     'Max Eisenhardt',     '251628698',  'Magneto',        'Rogue',            'Unknown Whereabouts',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'Legion',         'Charles Xavier',   'City of New York, New York, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1107,     'Hank Pym',           '09854837G',  'Ant man',        'Hawk',             'Anthill, San Francisco, California',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
-        (1110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
-        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
-        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -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
@@ -569,13 +579,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
     VALUES
          (241, 442, 'ES111122333344111122221111', 128);
 
-INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary`)
+INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
     VALUES
-        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         1, NULL),
-        (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'),
-        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'),
-        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL),
-        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport');
+        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         1, NULL                             , NULL),
+        (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'   , 1101),
+        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'   , NULL),
+        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL                             , NULL),
+        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport'   , NULL);
 
 INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
     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);
@@ -867,7 +871,9 @@ INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
         ('SLV', 'Silver',       1, 4, 'CACFD2'),
         ('BRW', 'Brown',        1, 5, 'DC7633'),
         ('BLK', 'Black',        1, 6, '000000'),
-        ('BAS', 'Blue/Silver',  1, 7, '5DADE2');
+        ('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
+        ('GRN', 'Green',        1, 8, '28A745'),
+        ('WHT', 'White',        1, 9, 'FFFFFF');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
     VALUES
@@ -914,26 +920,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('SER', 'Services'),
         ('VT',  'Sales');
 
-INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
+INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
-        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
-        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
-        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
-        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT',   1,  NULL,   NULL, 1, NULL,NULL),
-        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
-        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
-        (16, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
-        (71, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL);
+        (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
+        (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
+        (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
+        (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT',   1,  NULL,   NULL, 1, NULL,NULL),
+        (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL);
 
 -- Update the taxClass after insert of the items
 UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
@@ -1001,45 +1007,45 @@ INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`,
 
 INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`)
     VALUES
-        (1,  1, 1,  'Ranged weapon longbow 2m',         5,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (1,  1, 1,  'Ranged weapon longbow 200cm',         5,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
         (2,  2, 1,  'Melee weapon combat fist 15cm',    10, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (3,  1, 1,  'Ranged weapon longbow 2m',         2,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (4,  4, 1,  'Melee weapon heavy shield 1x0.5m', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (5,  1, 2,  'Ranged weapon longbow 2m',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (6,  1, 3,  'Ranged weapon longbow 2m',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+        (3,  1, 1,  'Ranged weapon longbow 200cm',         2,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (4,  4, 1,  'Melee weapon heavy shield 100cm', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (5,  1, 2,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (6,  1, 3,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
         (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.44,   0, 0, 0, util.VN_CURDATE()),
-        (8,  4, 11, 'Melee weapon heavy shield 1x0.5m', 10, 1.79,   0, 0, 0, util.VN_CURDATE()),
-        (9,  1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
+        (8,  4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79,   0, 0, 0, util.VN_CURDATE()),
+        (9,  1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
         (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.09,   0, 0, 0, util.VN_CURDATE()),
-        (11, 1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
-        (12, 4, 16, 'Melee weapon heavy shield 1x0.5m', 20, 1.71,   0, 0, 0, util.VN_CURDATE()),
+        (11, 1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
+        (12, 4, 16, 'Melee weapon heavy shield 100cm', 20, 1.71,   0, 0, 0, util.VN_CURDATE()),
         (13, 2, 8,  'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, util.VN_CURDATE()),
-        (14, 1, 8,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
-        (15, 1, 19, 'Ranged weapon longbow 2m',         1, 103.49,   0, 0, 0, util.VN_CURDATE()),
+        (14, 1, 8,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
+        (15, 1, 19, 'Ranged weapon longbow 200cm',         1, 103.49,   0, 0, 0, util.VN_CURDATE()),
         (16, 2, 20, 'Melee weapon combat fist 15cm',    20, 7.07,   0, 0, 0, util.VN_CURDATE()),
         (17, 2, 22, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (18, 4, 22, 'Melee weapon heavy shield 1x0.5m', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (19, 1, 4,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
-        (20, 1, 5,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
-        (21, 1, 6,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (22, 1, 7,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (23, 1, 9,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (24, 1, 10, 'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (25, 4, 12, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (26, 4, 13, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (27, 4, 14, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (28, 4, 15, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (29, 4, 17, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (30, 4, 18, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (18, 4, 22, 'Melee weapon heavy shield 100cm', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
+        (19, 1, 4,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
+        (20, 1, 5,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
+        (21, 1, 6,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (22, 1, 7,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (23, 1, 9,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (24, 1, 10, 'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, util.VN_CURDATE()),
-        (32, 1, 24, 'Ranged weapon longbow 2m',         -1, 8.07,   0, 0, 0, util.VN_CURDATE()),
+        (32, 1, 24, 'Ranged weapon longbow 200cm',         -1, 8.07,   0, 0, 0, util.VN_CURDATE()),
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
-        (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (39, 1, 32,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
+        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1255,7 +1261,7 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
     (5,     NULL,       'Diámetro',         1, 1, NULL,     'mm',NULL,  'diameter'),
     (7,     NULL,       'Ancho de la base', 1, 1, NULL,     'mm',NULL,  NULL),
     (23,    'stems',    'Tallos',           1, 1, NULL,     NULL, NULL, 'stems'),
-    (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, NULL),
+    (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, 'size'),
     (36,    'producer',       'Proveedor',        1, 0, NULL,     NULL, NULL, 'producer'),
     (56,    NULL,       'Genero',           1, 0, NULL,     NULL, NULL, NULL),
     (58,    NULL,       'Variedad',         1, 0, NULL,     NULL, NULL, NULL),
@@ -1266,7 +1272,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
     VALUES
         (1,     1,  56, 'Ranged weapon',            1),
         (2,     1,  58, 'longbow',                  2),
-        (3,     1,  27, '2m',                       3),
+        (3,     1,  27, '200cm',                    3),
         (4,     1,  36, 'Stark Industries',         4),
         (5,     1,  1,  'Brown',                    5),
         (6,     1,  67, '+1 precission',            6),
@@ -1280,42 +1286,42 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (14,    2,  23, '2',                        7),
         (15,    3,  56, 'Ranged weapon',            1),
         (16,    3,  58, 'sniper rifle',             2),
-        (17,    3,  4,  '300mm',                    3),
+        (17,    3,  4,  '113cm',                    3),
         (18,    3,  36, 'Stark Industries',         4),
         (19,    3,  1,  'Green',                    5),
         (20,    3,  67, 'precission',               6),
         (21,    3,  23, '3',                        7),
         (22,    4,  56, 'Melee weapon',             1),
         (23,    4,  58, 'heavy shield',             2),
-        (24,    4,  4,  '1x0.5m',                   3),
+        (24,    4,  4,  '100cm',                    3),
         (25,    4,  36, 'Stark Industries',         4),
         (26,    4,  1,  'Black',                    5),
         (27,    4,  67, 'containtment',             6),
         (28,    4,  23, '4',                        7),
         (29,    5,  56, 'Ranged weapon',            1),
         (30,    5,  58, 'pistol',                   2),
-        (31,    5,  27, '9mm',                      3),
+        (31,    5,  67, '9mm',                      3),
         (32,    5,  36, 'Stark Industries',         4),
         (33,    5,  1,  'Silver',                   5),
-        (34,    5,  67, 'rapid fire',               6),
+        (34,    5,  27, '15cm',                     6),
         (35,    5,  23, '5',                        7),
         (36,    6,  56, 'Container',                1),
         (37,    6,  58, 'ammo box',                 2),
-        (38,    6,  27, '1m',                       3),
+        (38,    6,  27, '100cm',                    3),
         (39,    6,  36, 'Stark Industries',         4),
         (40,    6,  1,  'Green',                    5),
         (41,    6,  67, 'supply',                   6),
         (42,    6,  23, '6',                        7),
         (43,    7,  56, 'Container',                1),
         (44,    7,  58, 'medical box',              2),
-        (45,    7,  27, '1m',                       3),
+        (45,    7,  27, '100cm',                     3),
         (46,    7,  36, 'Stark Industries',         4),
         (47,    7,  1,  'White',                    5),
         (48,    7,  67, 'supply',                   6),
         (49,    7,  23, '7',                        7),
         (50,    8,  56, 'Ranged Reinforced weapon', 1),
         (51,    8,  58, '+1 longbow',               2),
-        (52,    8,  27, '2m',                       3),
+        (52,    8,  27, '200cm',                    3),
         (53,    8,  36, 'Stark Industries',         4),
         (54,    8,  1,  'Brown',                    5),
         (55,    8,  67, 'precission',               6),
@@ -1329,14 +1335,14 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (63,    9,  23, '9',                        7),
         (64,    10, 56, 'Ranged Reinforced weapon', 1),
         (65,    10, 58, 'sniper rifle',             2),
-        (66,    10, 4,  '300mm',                    3),
+        (66,    10, 67, '700mm',                    3),
         (67,    10, 36, 'Stark Industries',         4),
         (68,    10, 1,  'Green',                    5),
-        (69,    10, 67, 'precission',               6),
+        (69,    10, 27, '130cm',                    6),
         (70,    10, 23, '10',                       7),
         (71,    11, 56, 'Melee Reinforced weapon',  1),
         (72,    11, 58, 'heavy shield',             2),
-        (73,    11, 4,  '1x0.5m',                   3),
+        (73,    11, 4,  '120cm',                    3),
         (74,    11, 36, 'Stark Industries',         4),
         (75,    11, 1,  'Black',                    5),
         (76,    11, 67, 'containtment',             6),
@@ -1346,18 +1352,18 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (80,    12, 27, '9mm',                      3),
         (81,    12, 36, 'Stark Industries',         4),
         (82,    12, 1,  'Silver',                   5),
-        (83,    12, 67, 'rapid fire',               6),
+        (83,    12, 67, '23cm',                     6),
         (84,    12, 23, '12',                       7),
         (85,    13, 56, 'Chest',                    1),
         (86,    13, 58, 'ammo box',                 2),
-        (87,    13, 27, '1m',                       3),
+        (87,    13, 27, '100cm',                    3),
         (88,    13, 36, 'Stark Industries',         4),
         (89,    13, 1,  'Green',                    5),
         (90,    13, 67, 'supply',                   6),
         (91,    13, 23, '13',                       7),
         (92,    14, 56, 'Chest',                    1),
         (93,    14, 58, 'medical box',              2),
-        (94,    14, 27, '1m',                       3),
+        (94,    14, 27, '100cm',                    3),
         (95,    14, 36, 'Stark Industries',         4),
         (96,    14, 1,  'White',                    5),
         (97,    14, 67, 'supply',                   6),
@@ -1923,9 +1929,9 @@ INSERT INTO `vn`.`workerTeam`(`id`, `team`, `workerFk`)
 
 INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk`, `quantity`, `itemFk`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
     VALUES
-        (1, 'Ranged weapon longbow 2m',         18, 35, 5,  1,      9.10, 1,    1,      1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
+        (1, 'Ranged weapon longbow 200cm',         18, 35, 5,  1,      9.10, 1,    1,      1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
         (2, 'Melee weapon combat first 15cm',   18, 35, 10, 2,      1.07, 0,    NULL,   1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
-        (3, 'Melee weapon heavy shield 1x0.5m', 18, 35, 20, NULL,   3.06, NULL, NULL,   23, util.VN_CURDATE()),
+        (3, 'Melee weapon heavy shield 100cm', 18, 35, 20, NULL,   3.06, NULL, NULL,   23, util.VN_CURDATE()),
         (4, 'Melee weapon combat first 15cm',   18, 35, 15, NULL,   1.30, NULL, NULL,   11, util.VN_CURDATE()),
         (5, 'Melee weapon combat first 15cm',   18, 35, 15, 4,      1.30, 0,    NULL,   18, util.VN_CURDATE());
 
@@ -1961,6 +1967,8 @@ INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
     VALUES
         (1, 'General schedule', 40, 0);
 
+INSERT INTO `vn`.`workerBusinessAgreement` (`id`, `name`, `monthHolidays`, `yearHours`, `started`, `ended`)
+    VALUES(1, 'flowers', 2.5, 1830, '2001-01-01', NULL);
 
 DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
@@ -2593,7 +2601,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 +2610,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
@@ -2817,7 +2834,7 @@ INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldIns
         (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
         (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
         (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
-        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"),
+        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
         (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
 
 
@@ -2848,8 +2865,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
@@ -2883,11 +2900,11 @@ INSERT INTO `vn`.`deviceProductionState` (`code`, `description`)
         ('retired', 'retirada');
 
 INSERT INTO `vn`.`deviceProduction` (`imei`, `modelFk`, `macWifi`, `serialNumber`, `android_id`, `purchased`, `stateFk`, `isInScalefusion`, `description`)
-    VALUES
-        ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'android_id1', util.VN_NOW(), 'active', 0, NULL),
-        ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'android_id2', util.VN_NOW(), 'idle', 0, NULL),
-        ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'android_id3', util.VN_NOW(), 'active', 0, NULL),
-        ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'android_id4', util.VN_NOW(), 'idle', 0, NULL);
+VALUES
+    ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'androidid11234567890', util.VN_NOW(), 'active', 0, NULL),
+    ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'androidid21234567890', util.VN_NOW(), 'idle', 0, NULL),
+    ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'androidid31234567890', util.VN_NOW(), 'active', 0, NULL),
+    ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'androidid41234567890', util.VN_NOW(), 'idle', 0, NULL);
 
 INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `created`)
     VALUES
@@ -2940,3 +2957,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');

db/export-data.sh

@@ -65,7 +65,6 @@ TABLES=(
     sample
     state
     ticketUpdateAction
-    time
     volumeConfig
     workCenter
     companyI18n
@@ -98,13 +97,6 @@ TABLES=(
 )
 dump_tables ${TABLES[@]}
 
-TABLES=(
-    postgresql
-    labour_agreement
-    media_type
-)
-dump_tables ${TABLES[@]}
-
 TABLES=(
     sage
     TiposIva

db/export-structure.sh

@@ -7,7 +7,6 @@ SCHEMAS=(
     edi
     hedera
     pbx
-    postgresql
     sage
     salix
     stock
@@ -23,7 +22,6 @@ IGNORETABLES=(
     --ignore-table=bs.productionIndicators
     --ignore-table=bs.VentasPorCliente
     --ignore-table=bs.v_ventas
-    --ignore-table=postgresql.currentWorkersStats
     --ignore-table=vn.accounting__
     --ignore-table=vn.agencyModeZone
     --ignore-table=vn.agencyProvince

db/tests/vn/workerTimeControlCheck.spec.js

@@ -54,7 +54,6 @@ xdescribe('worker workerTimeControl_check()', () => {
     });
 
     it('should throw an error if the worker with a special category has not finished the 9h break', async() => {
-        // dayBreak to 9h in postgresql.professional_category
         const workerId = 1110;
         const tabletId = 1;
         let stmts = [];
@@ -91,7 +90,6 @@ xdescribe('worker workerTimeControl_check()', () => {
     });
 
     it('should check f the worker with a special category has finished the 9h break', async() => {
-        // dayBreak to 9h in postgresql.professional_category
         const workerId = 1110;
         const tabletId = 1;
         let stmts = [];
@@ -239,12 +237,6 @@ xdescribe('worker workerTimeControl_check()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmt = new ParameterizedSQL(`INSERT INTO postgresql.calendar_employee(businessFk,calendar_state_id,date)
-            VALUES
-                (?,1,CURDATE())`, [
-            workerId
-        ]);
-        stmts.push(stmt);
         stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction)
             VALUES
                 (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"),

e2e/helpers/extensions.js

@@ -632,6 +632,7 @@ let actions = {
                 await this.write(selector, value.toString());
             break;
         case 'vn-autocomplete':
+        case 'vn-worker-autocomplete':
             if (value)
                 await this.autocompleteSearch(selector, value.toString());
             else
@@ -667,6 +668,7 @@ let actions = {
         switch (tagName) {
         case 'vn-textfield':
         case 'vn-autocomplete':
+        case 'vn-worker-autocomplete':
         case 'vn-input-time':
         case 'vn-datalist':
             el = await input.$('input');

e2e/helpers/selectors.js

@@ -187,7 +187,7 @@ export default {
         country: 'vn-client-create vn-autocomplete[ng-model="$ctrl.client.countryFk"]',
         userName: 'vn-client-create vn-textfield[ng-model="$ctrl.client.userName"]',
         email: 'vn-client-create vn-textfield[ng-model="$ctrl.client.email"]',
-        salesPerson: 'vn-client-create vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
+        salesPerson: 'vn-client-create vn-worker-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
         saveNewProvicenButton: '#saveProvince',
         saveNewCityButton: '#saveCity',
         saveNewPoscode: '#savePostcode',
@@ -199,7 +199,7 @@ export default {
         email: 'vn-client-basic-data vn-textfield[ng-model="$ctrl.client.email"]',
         phone: 'vn-client-basic-data vn-textfield[ng-model="$ctrl.client.phone"]',
         mobile: 'vn-client-basic-data vn-textfield[ng-model="$ctrl.client.mobile"]',
-        salesPerson: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
+        salesPerson: 'vn-client-basic-data vn-worker-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
         channel: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.contactChannelFk"]',
         transferor: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.transferorFk"]',
         businessType: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.businessTypeFk"]',
@@ -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"]',
@@ -734,7 +735,7 @@ export default {
     },
     createStateView: {
         state: 'vn-autocomplete[ng-model="$ctrl.stateFk"]',
-        worker: 'vn-autocomplete[ng-model="$ctrl.workerFk"]',
+        worker: 'vn-worker-autocomplete[ng-model="$ctrl.workerFk"]',
         saveStateButton: `button[type=submit]`
     },
     claimsIndex: {
@@ -780,12 +781,12 @@ export default {
         firstClaimReason: 'vn-claim-development vn-horizontal:nth-child(1) vn-autocomplete[ng-model="claimDevelopment.claimReasonFk"]',
         firstClaimResult: 'vn-claim-development vn-horizontal:nth-child(1) vn-autocomplete[ng-model="claimDevelopment.claimResultFk"]',
         firstClaimResponsible: 'vn-claim-development vn-horizontal:nth-child(1) vn-autocomplete[ng-model="claimDevelopment.claimResponsibleFk"]',
-        firstClaimWorker: 'vn-claim-development vn-horizontal:nth-child(1) vn-autocomplete[ng-model="claimDevelopment.workerFk"]',
+        firstClaimWorker: 'vn-claim-development vn-horizontal:nth-child(1) vn-worker-autocomplete[ng-model="claimDevelopment.workerFk"]',
         firstClaimRedelivery: 'vn-claim-development vn-horizontal:nth-child(1) vn-autocomplete[ng-model="claimDevelopment.claimRedeliveryFk"]',
         secondClaimReason: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimReasonFk"]',
         secondClaimResult: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimResultFk"]',
         secondClaimResponsible: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimResponsibleFk"]',
-        secondClaimWorker: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.workerFk"]',
+        secondClaimWorker: 'vn-claim-development vn-horizontal:nth-child(2) vn-worker-autocomplete[ng-model="claimDevelopment.workerFk"]',
         secondClaimRedelivery: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimRedeliveryFk"]',
         saveDevelopmentButton: 'button[type=submit]'
     },
@@ -853,7 +854,7 @@ export default {
 
     },
     createRouteView: {
-        worker: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
+        worker: 'vn-route-create vn-worker-autocomplete[ng-model="$ctrl.route.workerFk"]',
         createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.created"]',
         vehicleAuto: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
         agency: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
@@ -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"]',
@@ -956,7 +976,7 @@ export default {
         street: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.street"]',
         user: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.name"]',
         email: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.email"]',
-        boss: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bossFk"]',
+        boss: 'vn-worker-create vn-worker-autocomplete[ng-model="$ctrl.worker.bossFk"]',
         role: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.roleFk"]',
         iban: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.iban"]',
         createButton: 'vn-worker-create vn-submit[label="Create"]',

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, {

e2e/paths/02-client/01_create_client.spec.js

@@ -73,8 +73,8 @@ describe('Client create path', () => {
 
     it(`should attempt to create a new user with all it's data but wrong email`, async() => {
         await page.write(selectors.createClientView.name, 'Carol Danvers');
-        await page.write(selectors.createClientView.socialName, 'AVG tax');
-        await page.write(selectors.createClientView.street, 'Many places');
+        await page.write(selectors.createClientView.socialName, 'AVG TAX');
+        await page.write(selectors.createClientView.street, 'MANY PLACES');
         await page.clearInput(selectors.createClientView.email);
         await page.write(selectors.createClientView.email, 'incorrect email format');
         await page.waitToClick(selectors.createClientView.createButton);

e2e/paths/02-client/03_edit_fiscal_data.spec.js

@@ -61,7 +61,7 @@ describe('Client Edit fiscalData path', () => {
             await page.clearInput(selectors.clientFiscalData.fiscalId);
             await page.write(selectors.clientFiscalData.fiscalId, 'INVALID!');
             await page.clearInput(selectors.clientFiscalData.address);
-            await page.write(selectors.clientFiscalData.address, 'Somewhere edited');
+            await page.write(selectors.clientFiscalData.address, 'SOMEWHERE EDITED');
             await page.autocompleteSearch(selectors.clientFiscalData.country, 'España');
             await page.autocompleteSearch(selectors.clientFiscalData.province, 'Province one');
             await page.clearInput(selectors.clientFiscalData.city);
@@ -190,7 +190,7 @@ describe('Client Edit fiscalData path', () => {
             const verifiedData = await page.checkboxState(selectors.clientFiscalData.verifiedDataCheckbox);
 
             expect(fiscalId).toEqual('94980061C');
-            expect(address).toEqual('Somewhere edited');
+            expect(address).toEqual('SOMEWHERE EDITED');
             expect(postcode).toContain('46000');
             expect(sageTax).toEqual('Operaciones no sujetas');
             expect(sageTransaction).toEqual('Regularización de inversiones');

e2e/paths/02-client/12_lock_of_verified_data.spec.js

@@ -28,7 +28,7 @@ describe('Client lock verified data path', () => {
         it('should edit the social name', async() => {
             await page.waitForSelector(selectors.clientFiscalData.socialName);
             await page.clearInput(selectors.clientFiscalData.socialName);
-            await page.write(selectors.clientFiscalData.socialName, 'Captain America Civil War');
+            await page.write(selectors.clientFiscalData.socialName, 'CAPTAIN AMERICA CIVIL WAR');
             await page.waitToClick(selectors.clientFiscalData.saveButton);
             const message = await page.waitForSnackbar();
 
@@ -39,7 +39,7 @@ describe('Client lock verified data path', () => {
             await page.reloadSection('client.card.fiscalData');
             const result = await page.waitToGetProperty(selectors.clientFiscalData.socialName, 'value');
 
-            expect(result).toEqual('Captain America Civil War');
+            expect(result).toEqual('CAPTAIN AMERICA CIVIL WAR');
         });
     });
 
@@ -88,7 +88,7 @@ describe('Client lock verified data path', () => {
             await page.reloadSection('client.card.fiscalData');
             const result = await page.waitToGetProperty(selectors.clientFiscalData.socialName, 'value');
 
-            expect(result).toEqual('Ant man and the Wasp');
+            expect(result).toEqual('ANT MAN AND THE WASP');
         });
     });
 
@@ -142,7 +142,7 @@ describe('Client lock verified data path', () => {
             await page.reloadSection('client.card.fiscalData');
             const result = await page.waitToGetProperty(selectors.clientFiscalData.socialName, 'value');
 
-            expect(result).toEqual('new social name edition');
+            expect(result).toEqual('NEW SOCIAL NAME EDITION');
         });
     });
 

e2e/paths/02-client/19_summary.spec.js

@@ -36,7 +36,7 @@ describe('Client summary path', () => {
     it('should display fiscal address details', async() => {
         const result = await page.waitToGetProperty(selectors.clientSummary.street, 'innerText');
 
-        expect(result).toContain('20 Ingram Street');
+        expect(result).toContain('20 INGRAM STREET');
     });
 
     it('should display some fiscal data', async() => {

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('-');
+    });
+});

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);
+    });
+});

e2e/paths/03-worker/06_create.spec.js

@@ -23,7 +23,7 @@ describe('Worker create path', () => {
         await page.write(selectors.workerCreate.fi, '78457139E');
         await page.write(selectors.workerCreate.phone, '12356789');
         await page.write(selectors.workerCreate.postcode, '46680');
-        await page.write(selectors.workerCreate.street, 'S/ Doomstadt');
+        await page.write(selectors.workerCreate.street, 'S/ DOOMSTADT');
         await page.write(selectors.workerCreate.email, 'doctorDoom@marvel.com');
         await page.write(selectors.workerCreate.iban, 'ES9121000418450200051332');
 

e2e/paths/04-item/01_summary.spec.js

@@ -27,10 +27,10 @@ describe('Item summary path', () => {
     });
 
     it(`should check the item summary preview shows fields from basic data`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 2m');
+        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 200cm');
         const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
 
-        expect(result).toContain('Ranged weapon longbow 2m');
+        expect(result).toContain('Ranged weapon longbow 200cm');
     });
 
     it(`should check the item summary preview shows fields from tags`, async() => {

e2e/paths/04-item/03_tax.spec.js

@@ -8,7 +8,7 @@ describe('Item edit tax path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.tax');
     });
 

e2e/paths/04-item/04_tags.spec.js

@@ -8,7 +8,7 @@ describe('Item create tags path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.tags');
     });
 

e2e/paths/04-item/06_barcode.spec.js

@@ -8,7 +8,7 @@ describe('Item Create barcodes path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.itemBarcode');
     });
 

e2e/paths/04-item/12_request.spec.js

@@ -22,10 +22,10 @@ describe('Item request path', () => {
     it('should fill the id and quantity then check the concept was updated', async() => {
         await page.writeOnEditableTD(selectors.itemRequest.firstRequestItemID, '4');
         await page.writeOnEditableTD(selectors.itemRequest.firstRequestQuantity, '10');
-        await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 1x0.5m');
+        await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 100cm');
         let filledConcept = await page.waitToGetProperty(selectors.itemRequest.firstRequestConcept, 'innerText');
 
-        expect(filledConcept).toContain('Melee weapon heavy shield 1x0.5m');
+        expect(filledConcept).toContain('Melee weapon heavy shield 100cm');
     });
 
     it('should check the status of the request should now be accepted', async() => {

e2e/paths/05-ticket/01-sale/01_list_sales.spec.js

@@ -54,7 +54,7 @@ describe('Ticket List sale path', () => {
     });
 
     it('should select a valid item to be added as the second item in the sales list', async() => {
-        let searchValue = 'Melee weapon heavy shield 1x0.5m';
+        let searchValue = 'Melee weapon heavy shield 100cm';
         await page.autocompleteSearch(selectors.ticketSales.secondSaleIdAutocomplete, searchValue);
         await page.waitToClick(selectors.ticketSales.secondSaleQuantityCell);
         await page.type(selectors.ticketSales.secondSaleQuantity, '1');

e2e/paths/05-ticket/04_packages.spec.js

@@ -36,7 +36,7 @@ describe('Ticket Create packages path', () => {
 
     it(`should delete the first package and receive and error to save a new one with blank quantity`, async() => {
         await page.clearInput($.firstQuantity);
-        await page.autocompleteSearch($.firstPackage, 'Container medical box 1m');
+        await page.autocompleteSearch($.firstPackage, 'Container medical box 100cm');
         await page.waitToClick($.savePackagesButton);
         const message = await page.waitForSnackbar();
 
@@ -63,10 +63,10 @@ describe('Ticket Create packages path', () => {
 
     it(`should confirm the first select is the expected one`, async() => {
         await page.reloadSection('ticket.card.package');
-        await page.waitForTextInField($.firstPackage, 'Container medical box 1m');
+        await page.waitForTextInField($.firstPackage, 'Container medical box 100cm');
         const result = await page.waitToGetProperty($.firstPackage, 'value');
 
-        expect(result).toEqual('Container medical box 1m');
+        expect(result).toEqual('Container medical box 100cm');
     });
 
     it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {

e2e/paths/05-ticket/05_tracking_state.spec.js

@@ -59,7 +59,7 @@ describe('Ticket Create new tracking state path', () => {
             const result = await page
                 .waitToGetProperty(selectors.createStateView.worker, 'value');
 
-            expect(result).toEqual('salesPersonNick');
+            expect(result).toEqual('salesPerson');
         });
 
         it(`should succesfully create a valid state`, async() => {

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);

e2e/paths/05-ticket/14_create_ticket.spec.js

@@ -10,7 +10,7 @@ describe('Ticket create path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
+        await page.loginAndModule('salesPerson', 'ticket');
     });
 
     afterAll(async() => {

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();
 

e2e/paths/12-entry/07_buys.spec.js

@@ -41,10 +41,10 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForTextInField(selectors.entryBuys.ref, '200573095, 200573106, 200573117, 200573506');
         await page.waitForTextInField(selectors.entryBuys.observation, '729-6340 2846');
 
-        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged weapon longbow 2m');
-        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Ranged weapon longbow 2m');
-        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Ranged weapon sniper rifle 300mm');
-        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Melee weapon heavy shield 1x0.5m');
+        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged weapon longbow 200cm');
+        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Ranged weapon longbow 200cm');
+        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Ranged weapon sniper rifle 113cm');
+        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Melee weapon heavy shield 100cm');
 
         await page.waitToClick(selectors.entryBuys.importBuysButton);
 

front/core/components/autocomplete/index.html

@@ -18,7 +18,7 @@
         <label>
             <span translate>{{$ctrl.label}}</span>
             <span class="required">*</span>
-        </label> 
+        </label>
     </div>
     <div class="icons pre">
         <vn-icon
@@ -50,4 +50,4 @@
     on-select="$ctrl.onDropDownSelect(item)"
     on-data-ready="$ctrl.onDataReady()"
     on-close-start="$ctrl.onDropDownClose()">
-</vn-drop-down>
+</vn-drop-down>