Merge branch 'dev' into 4791-refactor-sendsms

2022-12-19 12:25:58 +00:00 · 2022-12-19 12:25:58 +00:00 · 5a01e49f27
parent 9ed9c1a82c c94c8a159e
commit 5a01e49f27
224 changed files with 33499 additions and 35659 deletions
--- a/back/methods/account/recover-password.js
+++ b/back/methods/account/recover-password.js
@ -0,0 +1,30 @@
+module.exports = Self => {
+    Self.remoteMethod('recoverPassword', {
+        description: 'Send email to the user',
+        accepts: [
+            {
+                arg: 'email',
+                type: 'string',
+                description: 'The email of user',
+                required: true
+            }
+        ],
+        http: {
+            path: `/recoverPassword`,
+            verb: 'POST'
+        }
+    });
+
+    Self.recoverPassword = async function(email) {
+        const models = Self.app.models;
+
+        try {
+            await models.user.resetPassword({email, emailTemplate: 'recover-password'});
+        } catch (err) {
+            if (err.code === 'EMAIL_NOT_FOUND')
+                return;
+            else
+                throw err;
+        }
+    };
+};
--- a/back/methods/account/specs/set-password.spec.js
+++ b/back/methods/account/specs/set-password.spec.js
@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');

-describe('account changePassword()', () => {
+describe('account setPassword()', () => {
    it('should throw an error when password does not meet requirements', async() => {
        let req = app.models.Account.setPassword(1, 'insecurePass');

--- a/back/methods/chat/notifyIssues.js
+++ b/back/methods/chat/notifyIssues.js
@ -32,7 +32,7 @@ module.exports = Self => {
        let message = $t(`There's a new urgent ticket:`);
        const ostUri = 'https://cau.verdnatura.es/scp/tickets.php?id=';
        tickets.forEach(ticket => {
-            message += `\r\n[ID: *${ticket.number}* - ${ticket.subject} @${ticket.username}](${ostUri + ticket.id})`;
+            message += `\r\n[ID: ${ticket.number} - ${ticket.subject} @${ticket.username}](${ostUri + ticket.id})`;
        });

        const department = await models.Department.findOne({
--- a/back/methods/chat/spec/notifyIssue.spec.js
+++ b/back/methods/chat/spec/notifyIssue.spec.js
@ -27,7 +27,7 @@ describe('Chat notifyIssue()', () => {
            subject: 'Issue title'}
        ]);
        // eslint-disable-next-line max-len
-        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: *00001* - Issue title (@batman)](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
+        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: 00001 - Issue title @batman](https://cau.verdnatura.es/scp/tickets.php?id=1)`;

        const department = await app.models.Department.findById(departmentId);
        let orgChatName = department.chatName;
--- a/back/methods/dms/deleteTrashFiles.js
+++ b/back/methods/dms/deleteTrashFiles.js
@ -51,7 +51,7 @@ module.exports = Self => {
                const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
                await fs.unlink(dstFile);
            } catch (err) {
-                if (err.code != 'ENOENT')
+                if (err.code != 'ENOENT' && dms.file)
                    throw err;
            }

--- a/back/methods/starred-module/specs/getStarredModules.spec.js
+++ b/back/methods/starred-module/specs/getStarredModules.spec.js
@ -19,11 +19,11 @@ describe('getStarredModules()', () => {
    });

    it(`should return the starred modules for a given user`, async() => {
-        const newStarred = await app.models.StarredModule.create({workerFk: 9, moduleFk: 'Clients', position: 1});
+        const newStarred = await app.models.StarredModule.create({workerFk: 9, moduleFk: 'customer', position: 1});
        const starredModules = await app.models.StarredModule.getStarredModules(ctx);

        expect(starredModules.length).toEqual(1);
-        expect(starredModules[0].moduleFk).toEqual('Clients');
+        expect(starredModules[0].moduleFk).toEqual('customer');

        // restores
        await app.models.StarredModule.destroyById(newStarred.id);
--- a/back/methods/starred-module/specs/setPosition.spec.js
+++ b/back/methods/starred-module/specs/setPosition.spec.js
@ -26,29 +26,29 @@ describe('setPosition()', () => {
        const filter = {
            where: {
                workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Orders'
+                moduleFk: 'order'
            }
        };

        try {
            const options = {transaction: tx};
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);

            let orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            let clients = await app.models.StarredModule.findOne(filter, options);

            expect(orders.position).toEqual(1);
            expect(clients.position).toEqual(2);

-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'left', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'left', options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            clients = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            orders = await app.models.StarredModule.findOne(filter, options);

            expect(clients.position).toEqual(1);
@ -67,29 +67,29 @@ describe('setPosition()', () => {
        const filter = {
            where: {
                workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Orders'
+                moduleFk: 'order'
            }
        };

        try {
            const options = {transaction: tx};
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);

            let orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            let clients = await app.models.StarredModule.findOne(filter, options);

            expect(orders.position).toEqual(1);
            expect(clients.position).toEqual(2);

-            await app.models.StarredModule.setPosition(ctx, 'Orders', 'right', options);
+            await app.models.StarredModule.setPosition(ctx, 'order', 'right', options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            clients = await app.models.StarredModule.findOne(filter, options);

            expect(orders.position).toEqual(2);
@ -108,35 +108,35 @@ describe('setPosition()', () => {
        const filter = {
            where: {
                workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Items'
+                moduleFk: 'item'
            }
        };

        try {
            const options = {transaction: tx};

-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Items', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Zones', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'item', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'zone', options);

            const items = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Claims';
+            filter.where.moduleFk = 'claim';
            const claims = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            let clients = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            let orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Zones';
+            filter.where.moduleFk = 'zone';
            const zones = await app.models.StarredModule.findOne(filter, options);

            expect(items.position).toEqual(1);
@ -145,12 +145,12 @@ describe('setPosition()', () => {
            expect(orders.position).toEqual(4);
            expect(zones.position).toEqual(5);

-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'right', options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            clients = await app.models.StarredModule.findOne(filter, options);

            expect(orders.position).toEqual(3);
@ -169,31 +169,31 @@ describe('setPosition()', () => {
        const filter = {
            where: {
                workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Items'
+                moduleFk: 'item'
            }
        };

        try {
            const options = {transaction: tx};

-            await app.models.StarredModule.toggleStarredModule(ctx, 'Items', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Zones', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'item', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'zone', options);

            const items = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            let clients = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Claims';
+            filter.where.moduleFk = 'claim';
            const claims = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            let orders = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Zones';
+            filter.where.moduleFk = 'zone';
            const zones = await app.models.StarredModule.findOne(filter, options);

            expect(items.position).toEqual(1);
@ -202,13 +202,13 @@ describe('setPosition()', () => {
            expect(orders.position).toEqual(4);
            expect(zones.position).toEqual(5);

-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'right', options);

-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
            clients = await app.models.StarredModule.findOne(filter, options);

-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
            orders = await app.models.StarredModule.findOne(filter, options);

            expect(orders.position).toEqual(2);
--- a/back/methods/starred-module/specs/toggleStarredModule.spec.js
+++ b/back/methods/starred-module/specs/toggleStarredModule.spec.js
@ -21,15 +21,15 @@ describe('toggleStarredModule()', () => {
    });

    it('should create a new starred module and then remove it by calling the method again with same args', async() => {
-        const starredModule = await app.models.StarredModule.toggleStarredModule(ctx, 'Orders');
+        const starredModule = await app.models.StarredModule.toggleStarredModule(ctx, 'order');
        let starredModules = await app.models.StarredModule.getStarredModules(ctx);

        expect(starredModules.length).toEqual(1);
-        expect(starredModule.moduleFk).toEqual('Orders');
+        expect(starredModule.moduleFk).toEqual('order');
        expect(starredModule.workerFk).toEqual(activeCtx.accessToken.userId);
        expect(starredModule.position).toEqual(starredModules.length);

-        await app.models.StarredModule.toggleStarredModule(ctx, 'Orders');
+        await app.models.StarredModule.toggleStarredModule(ctx, 'order');
        starredModules = await app.models.StarredModule.getStarredModules(ctx);

        expect(starredModules.length).toEqual(0);
--- a/back/models/account.js
+++ b/back/models/account.js
@ -1,4 +1,7 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
 const md5 = require('md5');
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');

 module.exports = Self => {
    require('../methods/account/login')(Self);
@ -6,6 +9,7 @@ module.exports = Self => {
    require('../methods/account/acl')(Self);
    require('../methods/account/change-password')(Self);
    require('../methods/account/set-password')(Self);
+    require('../methods/account/recover-password')(Self);
    require('../methods/account/validate-token')(Self);
    require('../methods/account/privileges')(Self);

@ -27,17 +31,62 @@ module.exports = Self => {
            ctx.data.password = md5(ctx.data.password);
    });

+    Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => {
+        if (!ctx.args || !ctx.args.data.email) return;
+        const models = Self.app.models;
+
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+        const url = origin.split(':');
+
+        const userId = ctx.instance.id;
+        const user = await models.user.findById(userId);
+
+        class Mailer {
+            async send(verifyOptions, cb) {
+                const params = {
+                    url: verifyOptions.verifyHref,
+                    recipient: verifyOptions.to,
+                    lang: ctx.req.getLocale()
+                };
+
+                const email = new Email('email-verify', params);
+                email.send();
+
+                cb(null, verifyOptions.to);
+            }
+        }
+
+        const options = {
+            type: 'email',
+            to: instance.email,
+            from: {},
+            redirect: `${origin}/#!/account/${instance.id}/basic-data?emailConfirmed`,
+            template: false,
+            mailer: new Mailer,
+            host: url[1].split('/')[2],
+            port: url[2],
+            protocol: url[0],
+            user: Self
+        };
+
+        await user.verify(options);
+    });
+
    Self.remoteMethod('getCurrentUserData', {
        description: 'Gets the current user data',
        accepts: [
            {
                arg: 'ctx',
-                type: 'Object',
+                type: 'object',
                http: {source: 'context'}
            }
        ],
        returns: {
-            type: 'Object',
+            type: 'object',
            root: true
        },
        http: {
@ -58,7 +107,7 @@ module.exports = Self => {
     *
     * @param {Integer} userId The user id
     * @param {String} name The role name
-     * @param {Object} options Options
+     * @param {object} options Options
     * @return {Boolean} %true if user has the role, %false otherwise
     */
    Self.hasRole = async function(userId, name, options) {
@ -70,8 +119,8 @@ module.exports = Self => {
     * Get all user roles.
     *
     * @param {Integer} userId The user id
-     * @param {Object} options Options
-     * @return {Object} User role list
+     * @param {object} options Options
+     * @return {object} User role list
     */
    Self.getRoles = async(userId, options) => {
        let result = await Self.rawSql(
--- a/back/models/account.json
+++ b/back/models/account.json
@ -40,6 +40,9 @@
 		"email": {
 			"type": "string"
 		},
+        "emailVerified": {
+			"type": "boolean"
+		},
 		"created": {
 			"type": "date"
 		},
@ -88,16 +91,23 @@
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-		},
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
 		{
-			"property": "logout",
+            "property": "logout",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		},
 		{
-			"property": "validateToken",
+            "property": "validateToken",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
--- a/back/models/chat.js
+++ b/back/models/chat.js
@ -11,9 +11,11 @@ module.exports = Self => {
        let {message} = ctx.instance;
        if (!message) return;

-        const parts = message.match(/(?<=\[).*(?=])/g);
+        const parts = message.match(/(?<=\[)[a-zA-Z0-9_\-+!@#$%^&*()={};':"\\|,.<>/?\s]*(?=])/g);
+        if (!parts) return;
+
        const replacedParts = parts.map(part => {
-            return part.replace(/[*()]/g, '');
+            return part.replace(/[!$%^&*()={};':"\\,.<>/?]/g, '');
        });

        for (const [index, part] of parts.entries())
--- a/back/models/specs/account.spec.js
+++ b/back/models/specs/account.spec.js
@ -1,14 +1,14 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;

 describe('loopback model Account', () => {
    it('should return true if the user has the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'employee');
+        let result = await models.Account.hasRole(1, 'employee');

        expect(result).toBeTruthy();
    });

    it('should return false if the user doesnt have the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'administrator');
+        let result = await models.Account.hasRole(1, 'administrator');

        expect(result).toBeFalsy();
    });
--- a/back/models/specs/user.spec.js
+++ b/back/models/specs/user.spec.js
@ -0,0 +1,32 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('account recoverPassword()', () => {
+    const userId = 1107;
+
+    const activeCtx = {
+        accessToken: {userId: userId},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    it('should send email with token', async() => {
+        const userId = 1107;
+        const user = await models.Account.findById(userId);
+
+        await models.Account.recoverPassword(user.email);
+
+        const result = await models.AccessToken.findOne({where: {userId: userId}});
+
+        expect(result).toBeDefined();
+    });
+});
--- a/back/models/user.js
+++ b/back/models/user.js
@ -0,0 +1,27 @@
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');
+
+module.exports = function(Self) {
+    Self.on('resetPasswordRequest', async function(info) {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+
+        const user = await Self.app.models.Account.findById(info.user.id);
+        const params = {
+            recipient: info.email,
+            lang: user.lang,
+            url: `${origin}/#!/reset-password?access_token=${info.accessToken.id}`
+        };
+
+        const options = Object.assign({}, info.options);
+        for (const param in options)
+            params[param] = options[param];
+
+        const email = new Email(options.emailTemplate, params);
+
+        return email.send();
+    });
+};
--- a/db/changes/10470-family/00-accountingType.sql
+++ b/db/changes/10470-family/00-accountingType.sql
@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`accountingType` ADD daysInFuture INT NULL;
-ALTER TABLE `vn`.`accountingType` MODIFY COLUMN daysInFuture int(11) DEFAULT 0 NULL;
-UPDATE `vn`.`accountingType` SET daysInFuture=1 WHERE id=8;
--- a/db/changes/10470-family/00-aclItemType.sql
+++ b/db/changes/10470-family/00-aclItemType.sql
@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
--- a/db/changes/10470-family/00-aclMdb.sql
+++ b/db/changes/10470-family/00-aclMdb.sql
@ -1,14 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vn`.`mdbBranch` (
-	`name` VARCHAR(255),
-    PRIMARY KEY(`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `vn`.`mdbVersion` (
-	`app` VARCHAR(255) NOT NULL,
-	`branchFk` VARCHAR(255) NOT NULL,
-	`version` INT,
-    CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-INSERT IGNORE INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES(318, 'MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer');
--- a/db/changes/10470-family/00-chat.sql
+++ b/db/changes/10470-family/00-chat.sql
@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`chat` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `senderFk` int(10) unsigned DEFAULT NULL,
-  `recipient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dated` date DEFAULT NULL,
-  `checkUserStatus` tinyint(1) DEFAULT NULL,
-  `message` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` tinyint(1) DEFAULT NULL,
-  `attempts` int(1) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `chat_FK` (`senderFk`),
-  CONSTRAINT `chat_FK` FOREIGN KEY (`senderFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--- a/db/changes/10470-family/00-creditInsurance.sql
+++ b/db/changes/10470-family/00-creditInsurance.sql
@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance` ADD creditClassificationFk int(11) NULL;
-
-UPDATE `vn`.`creditInsurance` AS `destiny`
-   SET `destiny`.`creditClassificationFk`= (SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id = `destiny`.id);
-
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
--- a/db/changes/10470-family/00-defaultViewConfig.sql
+++ b/db/changes/10470-family/00-defaultViewConfig.sql
@ -1,3 +0,0 @@
-INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
-VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
-
--- a/db/changes/10470-family/00-ticket_doRefund.sql
+++ b/db/changes/10470-family/00-ticket_doRefund.sql
@ -1,127 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(OUT vNewTicket INT)
-BEGIN
-/**
- * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
- * 
- * @return vNewTicket
- */  
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vClientFk MEDIUMINT;
-	DECLARE vWarehouse TINYINT;
-	DECLARE vCompany MEDIUMINT;
-	DECLARE vAddress MEDIUMINT;
-	DECLARE vRefundAgencyMode INT;
-	DECLARE vItemFk INT;
-	DECLARE vQuantity DECIMAL (10,2);
-	DECLARE vConcept VARCHAR(50);
-	DECLARE vPrice DECIMAL (10,2);
-	DECLARE vDiscount TINYINT;
-	DECLARE vSaleNew INT;
-	DECLARE vSaleMain INT;
-	DECLARE vZoneFk INT;
-	DECLARE vDescription VARCHAR(50);
-	DECLARE vTaxClassFk INT;
-	DECLARE vTicketServiceTypeFk INT;
-	DECLARE vOriginTicket INT;
-
-	DECLARE cSales CURSOR FOR
-		SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
-			FROM tmp.sale s;
-
-	DECLARE cTicketServices CURSOR FOR
-		SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
-			FROM tmp.ticketService ts;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	SELECT sub.ticketFk INTO vOriginTicket
-		FROM (
-			SELECT s.ticketFk
-				FROM tmp.sale s
-			UNION ALL
-			SELECT ts.ticketFk
-				FROM tmp.ticketService ts
-		) sub
-	LIMIT 1;
-
-	SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vClientFk, vWarehouse, vCompany, vAddress
-		FROM ticket
-		WHERE id = vOriginTicket;
-
-	SELECT id INTO vZoneFk
-		FROM zone WHERE agencyModeFk = vRefundAgencyMode
-		LIMIT 1;
-
-	INSERT INTO vn.ticket (
-			clientFk,
-			shipped,
-			addressFk,
-			agencyModeFk,
-			nickname,
-			warehouseFk,
-			companyFk,
-			landed,
-			zoneFk
-		)
-		SELECT
-					vClientFk,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-					vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := FALSE;
-	OPEN cSales;
-	FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
-			VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
-	SET vSaleNew = LAST_INSERT_ID();
-
-	INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) 
-		SELECT vSaleNew,componentFk,`value`
-			FROM vn.saleComponent
-			WHERE saleFk = vSaleMain;
-
-		FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	END WHILE;
-	CLOSE cSales;
-
-	SET vDone := FALSE;
-	OPEN cTicketServices;
-	FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
-			VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
-		FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	END WHILE;
-	CLOSE cTicketServices;
-
-	INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
-		VALUES(vNewTicket, vOriginTicket);
-END$$
-DELIMITER ;
--- a/db/changes/10470-family/01-creditInsuranceTriggers.sql
+++ b/db/changes/10470-family/01-creditInsuranceTriggers.sql
@ -1,11 +0,0 @@
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
-	BEFORE INSERT ON `creditInsurance`
-	FOR EACH ROW
-BEGIN
-	IF NEW.creditClassificationFk THEN
-		SET NEW.creditClassification = NEW.creditClassificationFk;
-	END IF;
-END$$
-DELIMITER ;
--- a/db/changes/10470-family/01-tableConfig.sql
+++ b/db/changes/10470-family/01-tableConfig.sql
@ -1 +0,0 @@
-RENAME TABLE `edi`.`fileConfig` to `edi`.`tableConfig`;
--- a/db/changes/10470-family/02-fileConfig.sql
+++ b/db/changes/10470-family/02-fileConfig.sql
@ -1,22 +0,0 @@
-CREATE TABLE `edi`.`fileConfig`
-(
-    name     varchar(25)             NOT NULL,
-    checksum text                    NULL,
-    keyValue tinyint(1) default true NOT NULL,
-    constraint fileConfig_pk
-        primary key (name)
-);
-
-create unique index fileConfig_name_uindex
-    on  `edi`.`fileConfig` (name);
-
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('FEC010104', null, 0);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('VBN020101', null, 1);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('florecompc2', null, 1);
-
--- a/db/changes/10471-family/00-chat.sql
+++ b/db/changes/10471-family/00-chat.sql
@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`chat` MODIFY COLUMN message TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` MODIFY COLUMN dated DATETIME DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` ADD error TEXT NULL;
--- a/db/changes/10472-family/00-creditInsurance.sql
+++ b/db/changes/10472-family/00-creditInsurance.sql
@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
--- a/db/changes/10480-june/00-ACL.sql
+++ b/db/changes/10480-june/00-ACL.sql
@ -1,21 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Sale','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),
-		('ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),
-		('ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),
-		('Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),
-		('Client','updateUser','WRITE','ALLOW','ROLE','salesPerson');
-
-DELETE FROM `salix`.`ACL` WHERE id=313;
-
-UPDATE `salix`.`ACL`
-	SET principalId='invoicing'
-	WHERE id=297;
--- a/db/changes/10480-june/00-aclShelvingLog.sql
+++ b/db/changes/10480-june/00-aclShelvingLog.sql
@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('ShelvingLog','*','READ','ALLOW','ROLE','employee');
--- a/db/changes/10480-june/00-aclZoneExclusionGeos.sql
+++ b/db/changes/10480-june/00-aclZoneExclusionGeos.sql
@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ZoneExclusionGeo', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ZoneExclusionGeo', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
--- a/db/changes/10480-june/00-albaran_gestdoc.sql
+++ b/db/changes/10480-june/00-albaran_gestdoc.sql
@ -1,2 +0,0 @@
-ALTER TABLE `vn2008`.`albaran_gestdoc` DROP FOREIGN KEY fk_albaran_gestdoc_gestdoc1;
-ALTER TABLE `vn2008`.`albaran_gestdoc` ADD CONSTRAINT albaran_gestdoc_FK FOREIGN KEY (gestdoc_id) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
--- a/db/changes/10480-june/00-client.sql
+++ b/db/changes/10480-june/00-client.sql
@ -1,3 +0,0 @@
-alter table `vn`.`client`
-    add hasIncoterms tinyint(1) default 0 not null comment 'Received incoterms authorization from client';
-
--- a/db/changes/10480-june/00-deprecations.sql
+++ b/db/changes/10480-june/00-deprecations.sql
@ -1,13 +0,0 @@
-DROP FUNCTION `account`.`userGetId`;
-DROP FUNCTION `account`.`myUserGetName`;
-DROP FUNCTION `account`.`myUserGetId`;
-DROP FUNCTION `account`.`myUserHasRole`;
-DROP FUNCTION `account`.`myUserHasRoleId`;
-DROP FUNCTION `account`.`userGetName`;
-DROP FUNCTION `account`.`userHasRole`;
-DROP FUNCTION `account`.`userHasRoleId`;
-DROP PROCEDURE `account`.`myUserLogout`;
-DROP PROCEDURE `account`.`userLogin`;
-DROP PROCEDURE `account`.`userLoginWithKey`;
-DROP PROCEDURE `account`.`userLoginWithName`;
-DROP PROCEDURE `account`.`userSetPassword`;
--- a/db/changes/10480-june/00-item.sql
+++ b/db/changes/10480-june/00-item.sql
@ -1 +0,0 @@
-ALTER TABLE `vn`.`item` MODIFY COLUMN description TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
--- a/db/changes/10480-june/00-route.sql
+++ b/db/changes/10480-june/00-route.sql
@ -1,10 +0,0 @@
-UPDATE `vn`.`route` r
-      JOIN(SELECT r.id, wl.workcenterFk 
-            FROM `vn`.`route` r     
-              JOIN `vn`.`routeLog` rl ON rl.originFk = r.id
-              JOIN `vn`.`workerLabour` wl ON wl.workerFk = rl.userFk 
-                AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
-            WHERE r.created BETWEEN '2021-12-01' AND CURDATE()     
-              AND rl.action = 'insert'
-          )sub ON sub.id = r.id 
-    SET r.commissionWorkCenterFk = sub.workcenterFk;
--- a/db/changes/10480-june/00-sample.sql
+++ b/db/changes/10480-june/00-sample.sql
@ -1,2 +0,0 @@
-INSERT INTO `vn`.`sample` (code, description, isVisible, hasCompany, hasPreview, datepickerEnabled)
-VALUES ('incoterms-authorization', 'Autorización de incoterms', 1, 1, 1, 0);
--- a/db/changes/10480-june/00-shelving.sql
+++ b/db/changes/10480-june/00-shelving.sql
@ -1,18 +0,0 @@
-ALTER TABLE `vn`.`itemShelving` DROP FOREIGN KEY itemShelving_fk2;
-ALTER TABLE `vn`.`shelvingLog` DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE `vn`.`smartTag` DROP FOREIGN KEY smartTag_shelving_fk;
-ALTER TABLE `vn`.`workerShelving` DROP FOREIGN KEY workerShelving_shelving_fk;
-
-ALTER TABLE `vn`.`shelving` DROP PRIMARY KEY;
-ALTER TABLE `vn`.`shelving` ADD id INT auto_increment PRIMARY KEY NULL;
-ALTER TABLE `vn`.`shelving` CHANGE id id int(11) auto_increment NOT NULL FIRST;
-ALTER TABLE `vn`.`shelving` ADD CONSTRAINT shelving_UN UNIQUE KEY (code);
-
-ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
-ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;
--- a/db/changes/10480-june/00-ticketRefund_beforeUpsert.sql
+++ b/db/changes/10480-june/00-ticketRefund_beforeUpsert.sql
@ -1,21 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticketRefund_beforeUpsert`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_beforeUpsert`(vRefundTicketFk INT, vOriginalTicketFk INT)
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF vRefundTicketFk = vOriginalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE originalTicketFk = vOriginalTicketFk; 
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;
--- a/db/changes/10480-june/01-claimObservation.sql
+++ b/db/changes/10480-june/01-claimObservation.sql
@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`claimObservation` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `claimFk` int(10) unsigned NOT NULL,
-  `workerFk` int(10) unsigned DEFAULT NULL,
-  `text` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `worker_key` (`workerFk`),
-  KEY `claim_key` (`claimFk`),
-  KEY `claimObservation_created_IDX` (`created`) USING BTREE,
-  CONSTRAINT `claimObservation_ibfk_1` FOREIGN KEY (`claimFk`) REFERENCES `vn`.`claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `claimObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) COMMENT='Todas las observaciones referentes a una reclamación'
--- a/db/changes/10480-june/02-claimTextMigration.sql
+++ b/db/changes/10480-june/02-claimTextMigration.sql
@ -1,2 +0,0 @@
-INSERT INTO `vn`.`claimObservation` (`claimFk`, `text`, `created`)
-SELECT `id`, `observation`, `created` FROM `vn`.`claim`
--- a/db/changes/10480-june/04-aclParking.sql
+++ b/db/changes/10480-june/04-aclParking.sql
@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Parking','*','*','ALLOW','ROLE','employee')
--- a/db/changes/10480-june/04-aclShelving.sql
+++ b/db/changes/10480-june/04-aclShelving.sql
@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Shelving','*','*','ALLOW','ROLE','employee')
--- a/db/changes/10481-june/00-aclOsTicket.sql
+++ b/db/changes/10481-june/00-aclOsTicket.sql
@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('OsTicket', '*', '*', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/10481-june/00-aclOsTicketConfig.sql
+++ b/db/changes/10481-june/00-aclOsTicketConfig.sql
@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('OsTicketConfig', '*', '*', 'ALLOW', 'ROLE', 'it');
--- a/db/changes/10481-june/00-osTicketConfig.sql
+++ b/db/changes/10481-june/00-osTicketConfig.sql
@ -1,16 +0,0 @@
-CREATE TABLE `vn`.`osTicketConfig` (
-  `id` int(11) NOT NULL,
-  `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `newStatusId` int(11) DEFAULT NULL,
-  `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `day` int(11) DEFAULT NULL,
-  `comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `hostDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `userDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `portDb` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
--- a/db/changes/10510-december/deleteMe.keep
+++ b/db/changes/10510-december/deleteMe.keep
@ -1 +0,0 @@
-Delete this file
--- a/db/changes/10490-august/00-ACL.sql
+++ b/db/changes/10490-august/00-ACL.sql
--- a/db/changes/10490-august/00-acl_receiptPdf.sql
+++ b/db/changes/10490-august/00-acl_receiptPdf.sql
--- a/db/changes/10490-august/00-clientConsumptionQueue.sql
+++ b/db/changes/10490-august/00-clientConsumptionQueue.sql
--- a/db/changes/10490-august/00-invoiceOutQueue.sql
+++ b/db/changes/10490-august/00-invoiceOutQueue.sql
--- a/db/changes/10490-august/00-itemConfig.sql
+++ b/db/changes/10490-august/00-itemConfig.sql
--- a/db/changes/10490-august/00-printConfig.sql
+++ b/db/changes/10490-august/00-printConfig.sql
--- a/db/changes/10490-august/00-sale_afterUpdate.sql
+++ b/db/changes/10490-august/00-sale_afterUpdate.sql
--- a/db/changes/10490-august/00-sample.sql
+++ b/db/changes/10490-august/00-sample.sql
--- a/db/changes/10490-august/00-user_hasGrant.sql
+++ b/db/changes/10490-august/00-user_hasGrant.sql
--- a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
+++ b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
--- a/db/changes/10491-august/00-aclBusiness.sql
+++ b/db/changes/10491-august/00-aclBusiness.sql
--- a/db/changes/10491-august/00-aclUsesMana.sql
+++ b/db/changes/10491-august/00-aclUsesMana.sql
--- a/db/changes/10491-august/00-defaultPayDem_sameAs_production.sql
+++ b/db/changes/10491-august/00-defaultPayDem_sameAs_production.sql
--- a/db/changes/10491-august/00-invoiceInPdf.sql
+++ b/db/changes/10491-august/00-invoiceInPdf.sql
--- a/db/changes/10491-august/00-newSupplier_ACL.sql
+++ b/db/changes/10491-august/00-newSupplier_ACL.sql
--- a/db/changes/10491-august/00-notificationProc.sql
+++ b/db/changes/10491-august/00-notificationProc.sql
--- a/db/changes/10491-august/00-notificationTables.sql
+++ b/db/changes/10491-august/00-notificationTables.sql
--- a/db/changes/10491-august/00-payMethodFk_Allow_Null.sql
+++ b/db/changes/10491-august/00-payMethodFk_Allow_Null.sql
--- a/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql
+++ b/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql
--- a/db/changes/10491-august/00-ticket_closeByTicket.sql
+++ b/db/changes/10491-august/00-ticket_closeByTicket.sql
--- a/db/changes/10491-august/00-zipConfig.sql
+++ b/db/changes/10491-august/00-zipConfig.sql
--- a/db/changes/10500-november/00-ACL.sql
+++ b/db/changes/10500-november/00-ACL.sql
--- a/db/changes/10500-november/00-claim.sql
+++ b/db/changes/10500-november/00-claim.sql
--- a/db/changes/10500-november/00-claimRma.sql
+++ b/db/changes/10500-november/00-claimRma.sql
--- a/db/changes/10501-november/00-aclNotification.sql
+++ b/db/changes/10501-november/00-aclNotification.sql
--- a/db/changes/10501-november/00-packingSiteConfig.sql
+++ b/db/changes/10501-november/00-packingSiteConfig.sql
--- a/db/changes/10501-november/00-packingSiteUpdate.sql
+++ b/db/changes/10501-november/00-packingSiteUpdate.sql
--- a/db/changes/10501-november/00-salix_url.sql
+++ b/db/changes/10501-november/00-salix_url.sql
--- a/db/changes/224902/00-aclUserPassword.sql
+++ b/db/changes/224902/00-aclUserPassword.sql
@ -0,0 +1,2 @@
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'UserPassword';
--- a/db/changes/10502-november/00-deletePickupContact.sql
+++ b/db/changes/10502-november/00-deletePickupContact.sql
--- a/db/changes/10502-november/00-itemShelvingACL.sql
+++ b/db/changes/10502-november/00-itemShelvingACL.sql
--- a/db/changes/10502-november/00-itemShelvingPlacementSupplyStockACL.sql
+++ b/db/changes/10502-november/00-itemShelvingPlacementSupplyStockACL.sql
--- a/db/changes/10502-november/00-workerTimeControlMail.sql
+++ b/db/changes/10502-november/00-workerTimeControlMail.sql
--- a/db/changes/10502-november/00-zone_getPostalCode.sql
+++ b/db/changes/10502-november/00-zone_getPostalCode.sql
--- a/db/changes/10503-november/00-ACL_notification_InvoiceE.sql
+++ b/db/changes/10503-november/00-ACL_notification_InvoiceE.sql
--- a/db/changes/10503-november/00-aclInvoiceOut.sql
+++ b/db/changes/10503-november/00-aclInvoiceOut.sql
--- a/db/changes/10503-november/00-alter_expedition_itemFk.sql
+++ b/db/changes/10503-november/00-alter_expedition_itemFk.sql
--- a/db/changes/10503-november/00-clientHasInvoiceElectronic.sql
+++ b/db/changes/10503-november/00-clientHasInvoiceElectronic.sql
--- a/db/changes/10503-november/00-collection_missingTrash.sql
+++ b/db/changes/10503-november/00-collection_missingTrash.sql
--- a/db/changes/10503-november/00-deleteInvoiceOutQueue.sql
+++ b/db/changes/10503-november/00-deleteInvoiceOutQueue.sql
--- a/db/changes/10503-november/00-editTrackedACL.sql
+++ b/db/changes/10503-november/00-editTrackedACL.sql
--- a/db/changes/10503-november/00-greuge.sql
+++ b/db/changes/10503-november/00-greuge.sql
--- a/db/changes/10503-november/00-insert_notification_invoiceE.sql
+++ b/db/changes/10503-november/00-insert_notification_invoiceE.sql
--- a/db/changes/10503-november/00-isCompensationACL.sql
+++ b/db/changes/10503-november/00-isCompensationACL.sql
--- a/db/changes/10503-november/00-osTicketConfig.sql
+++ b/db/changes/10503-november/00-osTicketConfig.sql
--- a/db/changes/10503-november/00-ticket_canMerge.sql
+++ b/db/changes/10503-november/00-ticket_canMerge.sql
--- a/db/changes/10503-november/00-ticket_canbePostponed.sql
+++ b/db/changes/10503-november/00-ticket_canbePostponed.sql
--- a/db/changes/10503-november/00-timeBusiness_calculate.sql
+++ b/db/changes/10503-november/00-timeBusiness_calculate.sql
--- a/db/changes/10503-november/01-updateClientHasInvoiceElectronic.sql
+++ b/db/changes/10503-november/01-updateClientHasInvoiceElectronic.sql
--- a/db/changes/225001/00-entryDeleteRef.sql
+++ b/db/changes/225001/00-entryDeleteRef.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`entry` DROP COLUMN `ref`;
--- a/db/changes/225001/00-invoiceInConfig.sql
+++ b/db/changes/225001/00-invoiceInConfig.sql
@ -0,0 +1,12 @@
+CREATE TABLE `vn`.`invoiceInConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `retentionRate` int(3) NOT NULL,
+  `retentionName` varchar(25) NOT NULL,
+  `sageWithholdingFk` smallint(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `invoiceInConfig_sageWithholdingFk` FOREIGN KEY (`sageWithholdingFk`) REFERENCES `sage`.`TiposRetencion`(`CodigoRetencion`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`)
+    VALUES
+        (1, -2, 'Retención 2%', 2);
--- a/db/changes/225001/01-modules.sql
+++ b/db/changes/225001/01-modules.sql
@ -0,0 +1,60 @@
+UPDATE salix.module t
+SET t.code = 'supplier'
+WHERE t.code LIKE 'Suppliers' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'travel'
+WHERE t.code LIKE 'Travels' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'ticket'
+WHERE t.code LIKE 'Tickets' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'zone'
+WHERE t.code LIKE 'Zones' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'monitor'
+WHERE t.code LIKE 'Monitors' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'entry'
+WHERE t.code LIKE 'Entries' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'invoiceIn'
+WHERE t.code LIKE 'Invoices in' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'customer'
+WHERE t.code LIKE 'Clients' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'route'
+WHERE t.code LIKE 'Routes' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'item'
+WHERE t.code LIKE 'Items' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'claim'
+WHERE t.code LIKE 'Claims' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'user'
+WHERE t.code LIKE 'Users' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'invoiceOut'
+WHERE t.code LIKE 'Invoices out' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'order'
+WHERE t.code LIKE 'Orders' ESCAPE '#';
+
+UPDATE salix.module t
+SET t.code = 'worker'
+WHERE t.code LIKE 'Workers' ESCAPE '#';
+
--- a/db/changes/225001/02-starredModule.sql
+++ b/db/changes/225001/02-starredModule.sql
@ -0,0 +1,16 @@
+UPDATE `vn`.starredModule SET moduleFk = 'customer' WHERE moduleFk = 'Clients';
+UPDATE `vn`.starredModule SET moduleFk = 'ticket' WHERE moduleFk = 'Tickets';
+UPDATE `vn`.starredModule SET moduleFk = 'route' WHERE moduleFk = 'Routes';
+UPDATE `vn`.starredModule SET moduleFk = 'zone' WHERE moduleFk = 'Zones';
+UPDATE `vn`.starredModule SET moduleFk = 'order' WHERE moduleFk = 'Orders';
+UPDATE `vn`.starredModule SET moduleFk = 'claim' WHERE moduleFk = 'Claims';
+UPDATE `vn`.starredModule SET moduleFk = 'item' WHERE moduleFk = 'Items';
+UPDATE `vn`.starredModule SET moduleFk = 'worker' WHERE moduleFk = 'Workers';
+UPDATE `vn`.starredModule SET moduleFk = 'entry' WHERE moduleFk = 'Entries';
+UPDATE `vn`.starredModule SET moduleFk = 'invoiceOut' WHERE moduleFk = 'Invoices out';
+UPDATE `vn`.starredModule SET moduleFk = 'invoiceIn' WHERE moduleFk = 'Invoices in';
+UPDATE `vn`.starredModule SET moduleFk = 'monitor' WHERE moduleFk = 'Monitors';
+UPDATE `vn`.starredModule SET moduleFk = 'user' WHERE moduleFk = 'Users';
+UPDATE `vn`.starredModule SET moduleFk = 'supplier' WHERE moduleFk = 'Suppliers';
+UPDATE `vn`.starredModule SET moduleFk = 'travel' WHERE moduleFk = 'Travels';
+UPDATE `vn`.starredModule SET moduleFk = 'shelving' WHERE moduleFk = 'Shelvings';
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -60,7 +60,7 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`)

 INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `userFk`, `bossFk`)
    SELECT id,UPPER(LPAD(role, 3, '0')), name, name, id, 9
-        FROM `vn`.`user`;
+        FROM `account`.`user`;

 UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
 UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9;
@ -105,20 +105,8 @@ INSERT INTO `account`.`mailForward`(`account`, `forwardTo`)
    VALUES
        (1, 'employee@domain.local');

-INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`)
-    VALUES
-        (1, 'printer1', 'path1', 0),
-        (2, 'printer2', 'path2', 1);


-INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
-    VALUES
-        (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL),
-        (1107, 'ANT', 'Hank'         , 'Pym'   , 1107, 19, 432978107, NULL, 1),
-        (1108, 'DCX', 'Charles'      , 'Xavier', 1108, 19, 432978108, 1,    NULL),
-        (1109, 'HLK', 'Bruce'        , 'Banner', 1109, 19, 432978109, 1,    2),
-        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110, 2,    1);
-
 INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
    VALUES
        (1, 'EUR', 'Euro',          1),
@ -159,6 +147,19 @@ INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPrepare
        (1, 'First sector',     1, 1, 'FIRST'),
        (2, 'Second sector',    2, 0, 'SECOND');

+INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`)
+    VALUES
+        (1, 'printer1', 'path1', 0, 1),
+        (2, 'printer2', 'path2', 1, 1);
+
+INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
+    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);
+
 INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
    VALUES
        ('1',   700, '01', 1, '700-01', 70001),
@ -216,18 +217,18 @@ INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
        (3, 'PICKUP', 'Recogida'),
        (4, 'OTHER', 'Otros');

-INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `bankFk__`, `warehouseAliasFk`)
+INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `warehouseAliasFk`)
    VALUES
-        (1,     'inhouse pickup'        ,   1, 1, 1),
-        (2,     'Super-Man delivery'    ,   1, 1, 1),
-        (3,     'Teleportation device'  ,   1, 1, 1),
-        (4,     'Entanglement'          ,   1, 1, 1),
-        (5,     'Quantum break device'  ,   1, 1, 1),
-        (6,     'Walking'               ,   1, 1, 1),
-        (7,     'Gotham247'             ,   1, 1, 1),
-        (8,     'Gotham247Expensive'    ,   1, 1, 1),
-        (9,     'Refund'                ,   1, 1, 1),
-        (10,    'Other agency'          ,   1, 1, 1);
+        (1,     'inhouse pickup'        ,   1, 1),
+        (2,     'Super-Man delivery'    ,   1, 1),
+        (3,     'Teleportation device'  ,   1, 1),
+        (4,     'Entanglement'          ,   1, 1),
+        (5,     'Quantum break device'  ,   1, 1),
+        (6,     'Walking'               ,   1, 1),
+        (7,     'Gotham247'             ,   1, 1),
+        (8,     'Gotham247Expensive'    ,   1, 1),
+        (9,     'Refund'                ,   1, 1),
+        (10,    'Other agency'          ,   1, 1);

 UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
 UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
@ -921,21 +922,21 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
        (3, 'Perdida', 'LOST');


-INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
    VALUES
-        (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  15,      1,  18, 'UR9000006041',   94, 1,   'pc1'),
-        (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  16,      2,  18, 'UR9000006041',   94, 1,   NULL),
-        (3,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  NULL,    3,  18, 'UR9000006041',   94, 2,   NULL),
-        (4,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  NULL,    4,  18, 'UR9000006041',   94, 2,   NULL),
-        (5,  1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  NULL,    1,  18, NULL,             94, 3,   NULL),
-        (6,  7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  NULL,    1,  18, NULL,             94, 3,   NULL),
-        (7,  2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  NULL,    1,  18, NULL,             94, NULL,NULL),
-        (8,  3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  NULL,    1,  18, NULL,             94, 1,   NULL),
-        (9,  3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  NULL,    1,  18, NULL,             94, 2,   NULL),
-        (10, 7, 7, 71, NOW(),                                           NULL,    1,  18, NULL,             94, 3,   NULL),
-        (11, 7, 8, 71, NOW(),                                           NULL,    1,  18, NULL,             94, 3,   NULL),
-        (12, 7, 9, 71, NOW(),                                           NULL,    1,  18, NULL,             94, 3,   NULL),
-        (13, 1, 10,71, NOW(),                                           NULL,    1,  18, NULL,             94, 3,   NULL);
+        (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, 'UR9000006041',   94, 1,   'pc1'),
+        (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  2,  18, 'UR9000006041',   94, 1,   NULL),
+        (3,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  3,  18, 'UR9000006041',   94, 2,   NULL),
+        (4,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  4,  18, 'UR9000006041',   94, 2,   NULL),
+        (5,  1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 3,   NULL),
+        (6,  7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1,  18, NULL,             94, 3,   NULL),
+        (7,  2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  1,  18, NULL,             94, NULL,NULL),
+        (8,  3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  1,  18, NULL,             94, 1,   NULL),
+        (9,  3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 2,   NULL),
+        (10, 7, 7, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (11, 7, 8, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (12, 7, 9, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (13, 1, 10,71, NOW(),                                           1,  18, NULL,             94, 3,   NULL);


 INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`)
@ -1132,11 +1133,11 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
        (32,    36, -92.324),
        (32,    39, 0.994);

-INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `shelve`, `visible`, `grouping`, `packing`, `userFk`)
+INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`, `userFk`)
    VALUES
-        (2, 'GVC', 'A', 1, 1, 1, 1106),
-        (4, 'HEJ', 'A', 1, 1, 1, 1106),
-        (1, 'UXN', 'A', 2, 12, 12, 1106);
+        (2, 'GVC', 1, 1, 1, 1106),
+        (4, 'HEJ', 1, 1, 1, 1106),
+        (1, 'UXN', 2, 12, 12, 1106);

 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
    VALUES
@ -1377,16 +1378,16 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
        (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,   'seventh travel',   2, 1),
        (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2);

-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `ref`,`isExcludedFromAvailable`, `isRaid`, `notes`, `evaNotes`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `notes`, `evaNotes`)
    VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'Movement 1', 0, 0, '',    ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'Movement 4', 0, 0, 'this is the note four',   'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'Movement 8', 1, 1, '',  '');
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0, '',    ''),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0, 'this is the note four',   'observation four'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1, '',  '');

 INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWaste`, `rate`)
    VALUES
@ -1406,23 +1407,23 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF
        ('HankPym',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),     'Miscellaneous Accessories',    6, 1, '186',      '0',    '0.0'),
        ('HankPym',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),     'Adhesives',                    7, 1, '277',      '0',    '0.0');

-INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`producer`,`printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
+INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
    VALUES
-        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
-        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  0, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 1,     util.VN_CURDATE()),
-        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00,   NULL, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  0, NULL, 0.00, 78.3, 75.6,   NULL, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, NULL, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   NULL, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00,   NULL, 0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   NULL, 0, 1, 0, 4,     util.VN_CURDATE());
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  0, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
+        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  0, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());

 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
    VALUES
@ -1951,30 +1952,34 @@ INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`
        (100,   'INDEFINIDO A TIEMPO COMPLETO',                     1, 1, 1),
        (109,   'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO',  1, 1, 1);

+INSERT INTO `vn`.`businessCategory` (`id`, `description`, `rate`)
+    VALUES
+        (1, 'basic employee', 1);
+
 UPDATE `vn`.`business` b
    SET `rate` = 7,
-        `workerBusinessCategoryFk` = 12,
+        `workerBusinessCategoryFk` = 1,
        `workerBusinessTypeFk` = 100,
        `amount` = 900.50
    WHERE b.id = 1;

 UPDATE `vn`.`business` b
    SET `rate` = 7,
-        `workerBusinessCategoryFk` = 12,
+        `workerBusinessCategoryFk` = 1,
        `workerBusinessTypeFk` = 100,
        `amount` = 1263.03
    WHERE b.id = 1106;

 UPDATE `vn`.`business` b
    SET `rate` = 7,
-        `workerBusinessCategoryFk` = 12,
+        `workerBusinessCategoryFk` = 1,
        `workerBusinessTypeFk` = 100,
        `amount` = 2000
    WHERE b.id = 1107;

 UPDATE `vn`.`business` b
    SET `rate` = 7,
-        `workerBusinessCategoryFk` = 12,
+        `workerBusinessCategoryFk` = 1,
        `workerBusinessTypeFk` = 100,
        `amount` = 1500
    WHERE b.id = 1108;
@ -2564,10 +2569,6 @@ UPDATE `vn`.`route`
 UPDATE `vn`.`route`
    SET `invoiceInFk`=2
    WHERE `id`=2;
-INSERT INTO `bs`.`salesPerson` (`workerFk`, `year`, `month`, `portfolioWeight`)
-    VALUES
-        (18,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  807.23),
-        (19,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  34.40);

 INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
    VALUES
@ -2735,4 +2736,13 @@ INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`

 INSERT INTO `vn`.`ticketLog` (`id`, `originFk`, `userFk`, `action`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`)
    VALUES
-        (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);
+        (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);
+
+INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
+    VALUES
+        ('lilium', 'dev', 'http://localhost:8080/#/'),
+        ('salix', 'dev', 'http://localhost:5000/#!/');
+
+INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
+    VALUES
+        (1, 1);
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				RENAME TABLE `edi`.`fileConfig` to `edi`.`tableConfig`;
				`@ -1 +0,0 @@`
				ALTER TABLE `vn`.`item` MODIFY COLUMN description TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;