Merge branch 'dev' into 5633-accountShortToStandard

2023-10-20 17:18:04 +00:00 · 2023-10-20 17:18:04 +00:00 · beef33e402
parent c72a534d1c 2a55adb8b8
commit beef33e402
318 changed files with 10512 additions and 6606 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,11 +5,27 @@ 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).

+## [2342.01] - 2023-10-19
+
+### Added
+### Changed
+### Fixed
+
+## [2340.01] - 2023-10-05
+
+### Added
+- (Usuarios -> Foto) Se muestra la foto del trabajador
+
+### Changed
+### Fixed
+- (Usuarios -> Historial) Abre el descriptor del usuario correctamente

 ## [2338.01] - 2023-09-21

 ### Added
-
+- (Ticket -> Servicios) Se pueden abonar servicios
+- (Facturas -> Datos básicos) Muestra valores por defecto
+- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
 ### Changed
 - (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia

--- a/back/methods/collection/getTickets.js
+++ b/back/methods/collection/getTickets.js
@ -0,0 +1,146 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('getTickets', {
+        description: 'Make a new collection of tickets',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            description: 'The collection id',
+            required: true,
+            http: {source: 'path'}
+        }, {
+            arg: 'print',
+            type: 'boolean',
+            description: 'True if you want to print'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:id/getTickets`,
+            verb: 'POST'
+        }
+    });
+
+    Self.getTickets = async(ctx, id, print, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const origin = ctx.req.headers.origin;
+        const $t = ctx.req.__;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        myOptions.userId = userId;
+
+        const promises = [];
+    
+        const [tickets] = await Self.rawSql(`CALL vn.collection_getTickets(?)`, [id], myOptions);
+        const sales = await Self.rawSql(`
+            SELECT s.ticketFk,
+                    sgd.saleGroupFk,
+                    s.id saleFk,
+                    s.itemFk,
+                    i.longName,
+                    i.size,
+                    ic.color,
+                    o.code origin,
+                    ish.packing,
+                    ish.grouping,
+                    s.isAdded,
+                    s.originalQuantity, 
+                    s.quantity saleQuantity,
+                    iss.quantity reservedQuantity,
+                    SUM(iss.quantity) OVER (PARTITION BY s.id ORDER BY ish.id) accumulatedQuantity,
+                    ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
+                    COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
+                    sh.code,
+                    IFNULL(p2.code, p.code) parkingCode,
+                    IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder,
+                    iss.id itemShelvingSaleFk,
+                    iss.isPicked
+                FROM ticketCollection tc
+                    LEFT JOIN collection c ON c.id = tc.collectionFk
+                    JOIN ticket t ON t.id = tc.ticketFk
+                    JOIN sale s ON s.ticketFk = t.id
+                    LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+                    LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
+                    LEFT JOIN parking p2 ON p2.id = sg.parkingFk
+                    JOIN item i ON i.id = s.itemFk
+                    LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
+                    LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+                    LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+                    LEFT JOIN parking p ON p.id = sh.parkingFk
+                    LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
+                    LEFT JOIN origin o ON o.id = i.originFk
+                WHERE tc.collectionFk = ?
+                GROUP BY ish.id, p.code, p2.code
+                ORDER BY pickingOrder;`, [id], myOptions);
+
+        if (print)
+            await Self.rawSql(`CALL vn.collection_printSticker(?, ?)`, [id, null], myOptions);
+
+        const collection = {collectionFk: id, tickets: []};
+        if (tickets && tickets.length) {
+            for (const ticket of tickets) {
+                const ticketId = ticket.ticketFk;
+
+                // SEND ROCKET
+                if (ticket.observaciones != '') {
+                    for (observation of ticket.observaciones.split(' ')) {
+                        if (['#', '@'].includes(observation.charAt(0))) {
+                            promises.push(Self.app.models.Chat.send(ctx, observation,
+                                $t('The ticket is in preparation', {
+                                    ticketId: ticketId,
+                                    ticketUrl: `${origin}/#!/ticket/${ticketId}/summary`,
+                                    salesPersonId: ticket.salesPersonFk
+                                })));
+                        }
+                    }
+                }
+
+                // SET COLLECTION
+                if (sales && sales.length) {
+                    // GET BARCODES
+                    const barcodes = await Self.rawSql(`
+                        SELECT s.id saleFk, b.code, c.id
+                            FROM vn.sale s
+                                LEFT JOIN vn.itemBarcode b ON b.itemFk = s.itemFk
+                                LEFT JOIN vn.buy c ON c.itemFk = s.itemFk
+                                LEFT JOIN vn.entry e ON e.id = c.entryFk
+                                LEFT JOIN vn.travel tr ON tr.id = e.travelFk
+                            WHERE s.ticketFk = ? 
+                                AND tr.landed >= util.VN_CURDATE() - INTERVAL 1 YEAR`,
+                    [ticketId], myOptions);
+
+                    // BINDINGS
+                    ticket.sales = [];
+                    for (const sale of sales) {
+                        if (sale.ticketFk === ticketId) {
+                            sale.Barcodes = [];
+
+                            if (barcodes && barcodes.length) {
+                                for (const barcode of barcodes) {
+                                    if (barcode.saleFk === sale.saleFk) {
+                                        for (const prop in barcode) {
+                                            if (['id', 'code'].includes(prop) && barcode[prop])
+                                                sale.Barcodes.push(barcode[prop].toString(), '0' + barcode[prop]);
+                                        }
+                                    }
+                                }
+                            }
+
+                            ticket.sales.push(sale);
+                        }
+                    }
+                }
+                collection.tickets.push(ticket);
+            }
+        }
+        await Promise.all(promises);
+
+        return collection;
+    };
+};
--- a/back/methods/collection/spec/getTickets.spec.js
+++ b/back/methods/collection/spec/getTickets.spec.js
@ -0,0 +1,39 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('collection getTickets()', () => {
+    let ctx;
+    beforeAll(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            }
+        };
+    });
+
+    it('should get tickets, sales and barcodes from collection', async() => {
+        const tx = await models.Collection.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const collectionId = 1;
+
+            const collectionTickets = await models.Collection.getTickets(ctx, collectionId, null, options);
+
+            expect(collectionTickets.collectionFk).toEqual(collectionId);
+            expect(collectionTickets.tickets.length).toEqual(3);
+            expect(collectionTickets.tickets[0].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[1].ticketFk).toEqual(2);
+            expect(collectionTickets.tickets[2].ticketFk).toEqual(23);
+            expect(collectionTickets.tickets[0].sales[0].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[1].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[2].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[0].Barcodes.length).toBeTruthy();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
--- a/back/methods/collection/spec/setSaleQuantity.spec.js
+++ b/back/methods/collection/spec/setSaleQuantity.spec.js
@ -18,6 +18,14 @@ describe('setSaleQuantity()', () => {

    it('should change quantity sale', async() => {
        const tx = await models.Ticket.beginTransaction({});
+        spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+            if (sqlStatement.includes('catalog_calcFromItem')) {
+                sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
+                        SELECT 100 as available;`;
+                params = null;
+            }
+            return models.Ticket.rawSql(sqlStatement, params, options);
+        });

        try {
            const options = {transaction: tx};
--- a/back/methods/edi/updateData.js
+++ b/back/methods/edi/updateData.js
@ -139,7 +139,7 @@ module.exports = Self => {
            ftpClient.exec((err, response) => {
                if (err || response.error) {
                    console.debug(`Error downloading checksum file... ${response.error}`);
-                    return reject(err);
+                    return reject(response.error || err);
                }

                resolve(response);
--- a/back/methods/url/getByUser.js
+++ b/back/methods/url/getByUser.js
@ -0,0 +1,40 @@
+module.exports = function(Self) {
+    Self.remoteMethod('getByUser', {
+        description: 'returns the starred modules for the current user',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'userId',
+            type: 'number',
+            description: 'The user id',
+            required: true,
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:userId/get-by-user`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getByUser = async userId => {
+        const models = Self.app.models;
+        const appNames = ['hedera'];
+        const filter = {
+            fields: ['appName', 'url'],
+            where: {
+                appName: {inq: appNames},
+                environment: process.env.NODE_ENV ?? 'development',
+            }
+        };
+
+        const isWorker = await models.Account.findById(userId, {fields: ['id']});
+        if (!isWorker)
+            return models.Url.find(filter);
+
+        appNames.push('salix');
+        return models.Url.find(filter);
+    };
+};
--- a/back/methods/url/specs/getByUser.spec.js
+++ b/back/methods/url/specs/getByUser.spec.js
@ -0,0 +1,19 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('getByUser()', () => {
+    const worker = 1;
+    const notWorker = 2;
+    it(`should return only hedera url if not is worker`, async() => {
+        const urls = await models.Url.getByUser(notWorker);
+
+        expect(urls.length).toEqual(1);
+        expect(urls[0].appName).toEqual('hedera');
+    });
+
+    it(`should return more than hedera url`, async() => {
+        const urls = await models.Url.getByUser(worker);
+
+        expect(urls.length).toBeGreaterThan(1);
+        expect(urls.find(url => url.appName == 'salix').appName).toEqual('salix');
+    });
+});
--- a/back/methods/vn-user/update-user.js
+++ b/back/methods/vn-user/update-user.js
@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('updateUser', {
+        description: 'Update user data',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'integer',
+                description: 'The user id',
+                required: true,
+                http: {source: 'path'}
+            }, {
+                arg: 'name',
+                type: 'string',
+                description: 'The user name',
+            }, {
+                arg: 'nickname',
+                type: 'string',
+                description: 'The user nickname',
+            }, {
+                arg: 'email',
+                type: 'string',
+                description: 'The user email'
+            }, {
+                arg: 'lang',
+                type: 'string',
+                description: 'The user lang'
+            }
+        ],
+        http: {
+            path: `/:id/update-user`,
+            verb: 'PATCH'
+        }
+    });
+
+    Self.updateUser = async(ctx, id, name, nickname, email, lang) => {
+        await Self.userSecurity(ctx, id);
+        await Self.upsertWithWhere({id}, {name, nickname, email, lang});
+    };
+};
--- a/back/model-config.json
+++ b/back/model-config.json
@ -15,6 +15,9 @@
    },
    "Bank": {
        "dataSource": "vn"
+    },
+     "Buyer": {
+        "dataSource": "vn"
    },
    "Campaign": {
        "dataSource": "vn"
--- a/back/models/buyer.json
+++ b/back/models/buyer.json
@ -0,0 +1,28 @@
+{
+	"name": "Buyer",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "buyer"
+		}
+	},
+	"properties": {
+		"userFk": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"nickname": {
+			"type": "string",
+			"required": true
+		}
+	},
+	"acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}
--- a/back/models/collection.js
+++ b/back/models/collection.js
@ -4,4 +4,5 @@ module.exports = Self => {
    require('../methods/collection/getSectors')(Self);
    require('../methods/collection/setSaleQuantity')(Self);
    require('../methods/collection/previousLabel')(Self);
+    require('../methods/collection/getTickets')(Self);
 };
--- a/back/models/specs/vn-user.spec.js
+++ b/back/models/specs/vn-user.spec.js
@ -1,4 +1,5 @@
 const models = require('vn-loopback/server/server').models;
+const ForbiddenError = require('vn-loopback/util/forbiddenError');

 describe('loopback model VnUser', () => {
    it('should return true if the user has the given role', async() => {
@ -12,4 +13,42 @@ describe('loopback model VnUser', () => {

        expect(result).toBeFalsy();
    });
+
+    describe('userSecurity', () => {
+        const itManagementId = 115;
+        const hrId = 37;
+        const employeeId = 1;
+
+        it('should check if you are the same user', async() => {
+            const ctx = {options: {accessToken: {userId: employeeId}}};
+            await models.VnUser.userSecurity(ctx, employeeId);
+        });
+
+        it('should check for higher privileges', async() => {
+            const ctx = {options: {accessToken: {userId: itManagementId}}};
+            await models.VnUser.userSecurity(ctx, employeeId);
+        });
+
+        it('should check if you have medium privileges and the user email is not verified', async() => {
+            const ctx = {options: {accessToken: {userId: hrId}}};
+            await models.VnUser.userSecurity(ctx, employeeId);
+        });
+
+        it('should throw an error if you have medium privileges and the users email is verified', async() => {
+            const tx = await models.VnUser.beginTransaction({});
+            const ctx = {options: {accessToken: {userId: hrId}}};
+            try {
+                const options = {transaction: tx};
+                const userToUpdate = await models.VnUser.findById(1, null, options);
+                userToUpdate.updateAttribute('emailVerified', 1, options);
+
+                await models.VnUser.userSecurity(ctx, employeeId, options);
+                await tx.rollback();
+            } catch (error) {
+                await tx.rollback();
+
+                expect(error).toEqual(new ForbiddenError());
+            }
+        });
+    });
 });
--- a/back/models/url.js
+++ b/back/models/url.js
@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/url/getByUser')(Self);
+};
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@ -1,6 +1,7 @@
 const vnModel = require('vn-loopback/common/models/vn-model');
 const LoopBackContext = require('loopback-context');
 const {Email} = require('vn-print');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');

 module.exports = function(Self) {
    vnModel(Self);
@ -12,6 +13,7 @@ module.exports = function(Self) {
    require('../methods/vn-user/privileges')(Self);
    require('../methods/vn-user/validate-auth')(Self);
    require('../methods/vn-user/renew-token')(Self);
+    require('../methods/vn-user/update-user')(Self);

    Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');

@ -178,45 +180,75 @@ module.exports = function(Self) {
    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) => {
-    //     if (!ctx.args || !ctx.args.data.email) return;
+    Self.userSecurity = async(ctx, userId, options) => {
+        const models = Self.app.models;
+        const accessToken = ctx?.options?.accessToken || LoopBackContext.getCurrentContext().active.accessToken;
+        const ctxToken = {req: {accessToken}};

-    //     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(':');
+        if (userId === accessToken.userId) return;

-    //     class Mailer {
-    //         async send(verifyOptions, cb) {
-    //             const params = {
-    //                 url: verifyOptions.verifyHref,
-    //                 recipient: verifyOptions.to,
-    //                 lang: ctx.req.getLocale()
-    //             };
+        const myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);

-    //             const email = new Email('email-verify', params);
-    //             email.send();
+        const hasHigherPrivileges = await models.ACL.checkAccessAcl(ctxToken, 'VnUser', 'higherPrivileges', myOptions);
+        if (hasHigherPrivileges) return;

-    //             cb(null, verifyOptions.to);
-    //         }
-    //     }
+        const hasMediumPrivileges = await models.ACL.checkAccessAcl(ctxToken, 'VnUser', 'mediumPrivileges', myOptions);
+        const user = await models.VnUser.findById(userId, {fields: ['id', 'emailVerified']}, myOptions);
+        if (!user.emailVerified && hasMediumPrivileges) return;

-    //     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
-    //     };
+        throw new ForbiddenError();
+    };

-    //     await instance.verify(options);
-    // });
+    Self.observe('after save', async ctx => {
+        const instance = ctx?.instance;
+        const newEmail = instance?.email;
+        const oldEmail = ctx?.hookState?.oldInstance?.email;
+        if (!ctx.isNewInstance && (!newEmail || !oldEmail || newEmail == oldEmail)) return;
+
+        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 env = process.env.NODE_ENV;
+        const liliumUrl = await Self.app.models.Url.findOne({
+            where: {and: [
+                {appName: 'lilium'},
+                {environment: env}
+            ]}
+        });
+
+        class Mailer {
+            async send(verifyOptions, cb) {
+                const params = {
+                    url: verifyOptions.verifyHref,
+                    recipient: verifyOptions.to
+                };
+
+                const email = new Email('email-verify', params);
+                email.send();
+
+                cb(null, verifyOptions.to);
+            }
+        }
+
+        const options = {
+            type: 'email',
+            to: newEmail,
+            from: {},
+            redirect: `${liliumUrl.url}verifyEmail?userId=${instance.id}`,
+            template: false,
+            mailer: new Mailer,
+            host: url[1].split('/')[2],
+            port: url[2],
+            protocol: url[0],
+            user: Self
+        };
+
+        await instance.verify(options, ctx.options);
+    });
 };
--- a/back/models/vn-user.json
+++ b/back/models/vn-user.json
@ -13,19 +13,12 @@
 			"type": "number",
 			"id": true
 		},
-		"name": {
+        "name": {
 			"type": "string",
 			"required": true
 		},
 		"username": {
-			"type": "string",
-			"mysql": {
-				"columnName": "name"
-			}
-		},
-		"password": {
-			"type": "string",
-			"required": true
+			"type": "string"
 		},
 		"roleFk": {
 			"type": "number",
@ -45,6 +38,9 @@
 		"email": {
 			"type": "string"
 		},
+		"emailVerified": {
+			"type": "boolean"
+		},
 		"created": {
 			"type": "date"
 		},
@ -84,7 +80,7 @@
 		"worker": {
 			"type": "hasOne",
 			"model": "Worker",
-			"foreignKey": "userFk"
+			"foreignKey": "id"
 		},
 		"userConfig": {
 			"type": "hasOne",
@ -144,7 +140,8 @@
                "image",
                "hasGrant",
                "realm",
-                "email"
+                "email",
+				"emailVerified"
            ]
        }
    }
--- a/db/.archive/224903/00-timeBusiness_calculate.sql
+++ b/db/.archive/224903/00-timeBusiness_calculate.sql
@ -34,7 +34,7 @@ BEGIN
 				isAllowedToWork
 			FROM(SELECT t.dated,
 						b.id businessFk,
-						w.userFk,
+						w.id,
 						b.departmentFk,
 						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5) ORDER BY j.start ASC SEPARATOR ' - ')) hourStart ,
 						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) hourEnd,
@ -48,14 +48,14 @@ BEGIN
 					FROM time t
 						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
 						LEFT JOIN worker w ON w.id = b.workerFk
-						JOIN tmp.`user` u ON u.userFK = w.userFK
+						JOIN tmp.`user` u ON u.userFK = w.id
 						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
 						LEFT JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk
 						LEFT JOIN postgresql.journey j ON j.business_id = b.id AND j.day_id = WEEKDAY(t.dated) + 1
 						LEFT JOIN postgresql.calendar_employee ce ON ce.businessFk = b.id AND ce.date = t.dated
 						LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
 					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
-					GROUP BY w.userFk, t.dated
+					GROUP BY w.id, t.dated
 				)sub;

 	UPDATE tmp.timeBusinessCalculate t
--- a/db/changes/231401/00-clientBeforeUpdate.sql
+++ b/db/changes/231401/00-clientBeforeUpdate.sql
@ -46,7 +46,7 @@ BEGIN
                    CONCAT('Cliente ', NEW.id),
 					CONCAT('Recibida la documentación: ', vText)
 				FROM worker w
-					LEFT JOIN account.user u ON w.userFk = u.id AND u.active
+					LEFT JOIN account.user u ON w.id = u.id AND u.active
 					LEFT JOIN account.account ac ON ac.id = u.id
 				WHERE w.id = NEW.salesPersonFk;
 	END IF;
--- a/db/changes/232601/00-useSpecificsAcls.sql
+++ b/db/changes/232601/00-useSpecificsAcls.sql
@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
        ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
        ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),
--- a/db/changes/233401/01-deviceLog_acl.sql
+++ b/db/changes/233401/01-deviceLog_acl.sql
@ -1,6 +0,0 @@
-
-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');
-
--- a/db/changes/233601/00-createClaimReader.sql
+++ b/db/changes/233601/00-createClaimReader.sql
@ -1,4 +1,4 @@
-INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`)
+INSERT INTO `account`.`role` (`name`, `description`, `hasLogin`)
 	VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1);

 INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
@ -10,7 +10,7 @@ INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
 			'buyer',
 			'deliveryBoss',
 			'handmadeBoss'
-		)
+		);

 DELETE FROM `salix`.`ACL`
 	WHERE `model`= 'claim'
@ -28,5 +28,4 @@ INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`princip
 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');
-
+	VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');
--- a/db/changes/233801/00-firstScript.sql
+++ b/db/changes/233801/00-firstScript.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`province` ADD CONSTRAINT `countryName_UN` UNIQUE KEY (`countryFk`,`name`);
--- a/db/changes/233801/01-deviceLog_acl.sql
+++ b/db/changes/233801/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');
+
--- a/db/changes/233802/.gitkeep
+++ b/db/changes/233802/.gitkeep
--- a/db/changes/233802/00-collectionGetTicketsACL.sql
+++ b/db/changes/233802/00-collectionGetTicketsACL.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL`(model, property, accessType, permission, principalType, principalId)
+	VALUES
+        ('Collection', 'getTickets', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/modules/claim/front/development/style.scss
+++ b/modules/claim/front/development/style.scss
--- a/db/changes/234001/00-aclClient.sql
+++ b/db/changes/234001/00-aclClient.sql
@ -0,0 +1,42 @@
+-- No encuentro este back
+DELETE FROM `salix`.`ACL` WHERE property = 'activeWorkersWithRole';
+DELETE FROM `salix`.`ACL` WHERE model = 'Client' AND property = '*';
+
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','findOne','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','findById','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','find','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','exists','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','__get__addresses','READ','ALLOW','ROLE','employee');
+
+DELETE FROM `salix`.`ACL` WHERE model = 'Client' AND property = '*' AND accessType IN (
+    'campaignMetricsEmail',
+    'campaignMetricsPdf',
+    'clientDebtStatementEmail',
+    'clientDebtStatementHtml',
+    'clientDebtStatementPdf',
+	'clientWelcomeEmail',
+	'clientWelcomeHtml',
+	'consumptionSendQueued',
+	'creditRequestEmail',
+	'creditRequestHtml',
+	'creditRequestPdf',
+	'getClientOrSupplierReference',
+	'incotermsAuthorizationEmail',
+	'incotermsAuthorizationHtml',
+	'incotermsAuthorizationPdf',
+	'letterDebtorNdEmail',
+	'letterDebtorNdHtml',
+	'letterDebtorPdf',
+	'letterDebtorStEmail',
+	'letterDebtorStHtml',
+	'printerSetupEmail',
+	'printerSetupHtml',
+	'sepaCoreEmail',
+	'setPassword',
+	'updateUser',
+	'uploadFile');
--- a/db/changes/234001/00-dropUserFk.sql
+++ b/db/changes/234001/00-dropUserFk.sql
@ -0,0 +1,4 @@
+ALTER TABLE `vn`.`worker` DROP KEY `user_id_UNIQUE`;
+
+ALTER TABLE `vn`.`worker` DROP COLUMN `userFk`;
+
--- a/db/changes/234001/00-item_setVisibleDiscard.sql
+++ b/db/changes/234001/00-item_setVisibleDiscard.sql
@ -0,0 +1,62 @@
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_setVisibleDiscard`(
+    vItemFk INT,
+	vWarehouseFk INT,
+	vQuantity INT,
+	vAddressFk INT)
+
+BEGIN
+	DECLARE vTicketFk INT;
+	DECLARE vClientFk INT;
+	DECLARE vCompanyVnlFk INT;
+	DECLARE vCalc INT;
+
+	SELECT barcodeToItem(vItemFk) INTO vItemFk;
+
+	SELECT DEFAULT(companyFk)  INTO vCompanyVnlFk 
+		FROM vn.ticket LIMIT 1;
+
+	SELECT a.clientFk INTO vClientFk
+		FROM address a
+		WHERE a.id = vAddressFk;
+
+	SELECT t.id INTO vTicketFk
+		FROM ticket t
+			JOIN address a ON a.id = t.addressFk
+		WHERE t.warehouseFk = vWarehouseFk
+			AND a.id = vAddressFk
+			AND DATE(t.shipped) = util.VN_CURDATE();
+
+	CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
+
+	IF vTicketFk IS NULL THEN
+		CALL ticket_add(
+			vClientFk,
+			util.VN_CURDATE(),
+			vWarehouseFk,
+			vCompanyVnlFk,
+			vAddressFk,
+			NULL,
+			NULL,
+			util.VN_CURDATE(),
+			account.myUser_getId(),
+			FALSE,
+			vTicketFk);
+	END IF;
+
+	INSERT INTO sale(ticketFk, itemFk, concept, quantity)
+		SELECT vTicketFk,
+				vItemFk,
+				CONCAT(longName,' ', getWorkerCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+				vQuantity
+			FROM item
+			WHERE id = vItemFk;
+
+	UPDATE cache.visible
+		SET visible = visible - vQuantity
+		WHERE calc_id = vCalc
+			AND item_id = vItemFk;
+END$$
+DELIMITER ;
+
--- a/db/changes/234001/00-models.sql
+++ b/db/changes/234001/00-models.sql
@ -0,0 +1,11 @@
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
+    VALUES
+    ('ExpeditionMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('WorkerMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'),
+    ('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
+    ('MistakesTypes', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
+    ('MistakeType','*','READ','ALLOW','ROLE','employee'),
+    ('MachineWorker', '*', 'READ', 'ALLOW', 'ROLE', 'coolerAssist'),
+    ('Printer','*','READ','ALLOW','ROLE','employee'),
+    ('SaleMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');
--- a/db/changes/234001/00-ticketConfig.sql
+++ b/db/changes/234001/00-ticketConfig.sql
@ -0,0 +1,7 @@
+
+	INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+	 VALUES('Item', 'setVisibleDiscard', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+	 
+	INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) 
+	VALUES('Address', 'getAddress', 'READ', 'ALLOW', 'ROLE', 'employee');
+
--- a/db/changes/234001/00-timeBusiness_calculate.sql
+++ b/db/changes/234001/00-timeBusiness_calculate.sql
@ -0,0 +1,86 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/**
+ * Horas que debe trabajar un empleado según contrato y día.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @table tmp.user(userFk)
+ * @return tmp.timeBusinessCalculate
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate;
+	CREATE TEMPORARY TABLE tmp.timeBusinessCalculate
+		(INDEX (departmentFk))
+		SELECT dated,
+				businessFk,
+				sub.id  userFk,
+				departmentFk,
+				hourStart,
+				hourEnd,
+				timeTable,
+				timeWorkSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+				timeWorkSeconds / 3600 timeWorkDecimal,
+				timeWorkSeconds timeBusinessSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeBusinessSexagesimal,
+				timeWorkSeconds / 3600 timeBusinessDecimal,
+				name type,
+				permissionRate,
+				hoursWeek,
+				discountRate,
+				isAllowedToWork
+			FROM(SELECT t.dated,
+						b.id businessFk,
+						w.id,
+						b.departmentFk,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.started,5) ORDER BY bs.started ASC SEPARATOR ' - ')) hourStart ,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.ended,5) ORDER BY bs.ended ASC SEPARATOR ' - ')) hourEnd,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.started,5), " - ",  LEFT(bs.ended,5) ORDER BY bs.ended ASC SEPARATOR ' - ')) timeTable,
+						IF(bs.started = NULL, 0, IFNULL(SUM(TIME_TO_SEC(bs.ended)) - SUM(TIME_TO_SEC(bs.started)), 0)) timeWorkSeconds,
+						at2.name,
+						at2.permissionRate,
+						at2.discountRate,
+						ct.hoursWeek hoursWeek,
+						at2.isAllowedToWork
+					FROM time t
+						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
+						LEFT JOIN worker w ON w.id = b.workerFk
+						JOIN tmp.`user` u ON u.userFK = w.id
+						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
+						LEFT JOIN calendarType ct ON ct.id = b.calendarTypeFk
+						LEFT JOIN businessSchedule bs ON bs.businessFk = b.id AND bs.weekday = WEEKDAY(t.dated) + 1
+						LEFT JOIN calendar c ON c.businessFk = b.id AND c.dated = t.dated
+						LEFT JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
+					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+					GROUP BY w.id, t.dated
+				)sub;
+
+	UPDATE tmp.timeBusinessCalculate t
+		LEFT JOIN businessSchedule bs ON bs.businessFk = t.businessFk
+		SET t.timeWorkSeconds = t.hoursWeek / 5 * 3600,
+			t.timeWorkSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeWorkDecimal =  t.hoursWeek / 5,
+			t.timeBusinessSeconds = t.hoursWeek / 5 * 3600,
+			t.timeBusinessSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeBusinessDecimal = t.hoursWeek / 5
+		WHERE DAYOFWEEK(t.dated) IN(2,3,4,5,6) AND bs.id IS NULL  ;
+
+	UPDATE tmp.timeBusinessCalculate t
+		SET t.timeWorkSeconds = t.timeWorkSeconds - (t.timeWorkSeconds * permissionRate)  ,
+			t.timeWorkSexagesimal = SEC_TO_TIME ((t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)) * 3600),
+			t.timeWorkDecimal = t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)
+		WHERE permissionRate <> 0;
+
+	UPDATE tmp.timeBusinessCalculate t
+			JOIN calendarHolidays ch ON ch.dated = t.dated
+			JOIN business b ON b.id = t.businessFk
+				AND b.workcenterFk = ch.workcenterFk
+		SET t.timeWorkSeconds = 0,
+			t.timeWorkSexagesimal = 0,
+			t.timeWorkDecimal = 0,
+			t.permissionrate = 1,
+			t.type = 'Festivo'
+		WHERE t.type IS NULL;
+END$$
+DELIMITER ;
--- a/db/changes/234001/00-updateAfterBusinnesInsert.sql
+++ b/db/changes/234001/00-updateAfterBusinnesInsert.sql
@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
+BEGIN
+/**
+ * Enables a worker's account and sets up email configurations.
+ */
+    UPDATE user
+        SET active = TRUE
+        WHERE id = vSelf;
+
+    INSERT IGNORE INTO account
+        SET id = vSelf;
+
+    INSERT IGNORE INTO mailAliasAccount (mailAlias, account)
+        SELECT  id, vSelf
+            FROM mailAlias
+            WHERE alias = 'general';
+
+    INSERT IGNORE INTO mailForward (account, forwardTo)
+        SELECT vSelf, email
+            FROM user
+            WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBusiness`(vSelf INT)
+BEGIN
+/**
+ * Activates an account and configures its email settings.
+ *
+ * @param vSelf account id.
+ */
+    DECLARE vOldBusinessFk INT;
+    DECLARE vNewBusinessFk INT;
+
+    SELECT businessFk INTO vOldBusinessFk FROM worker WHERE id = vSelf;
+
+    SELECT id INTO vNewBusinessFk 
+        FROM business 
+        WHERE workerFk = vSelf
+            AND util.VN_CURDATE() BETWEEN started AND IFNULL(ended, util.VN_CURDATE());
+
+    UPDATE worker
+        SET businessFk = vNewBusinessFk
+        WHERE id = vSelf;
+
+    IF NOT (vOldBusinessFk <=> vNewBusinessFk) THEN
+        IF vNewBusinessFk IS NULL THEN 
+            CALL workerDisable(vSelf);
+        END IF;
+        IF vOldBusinessFk IS NULL THEN 
+            CALL account.account_enable(vSelf);
+        END IF;
+    END IF;
+END$$
+DELIMITER ;
--- a/db/changes/234001/01-aclAccount.sql
+++ b/db/changes/234001/01-aclAccount.sql
@ -0,0 +1,10 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'Account' AND property = '*' AND principalId = 'employee';
+
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','findOne','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','findById','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','find','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','exists','READ','ALLOW','ROLE','employee');
--- a/db/changes/234001/01-deliveryAssistantACL.sql
+++ b/db/changes/234001/01-deliveryAssistantACL.sql
@ -0,0 +1,21 @@
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO `account`.`role` (name, description)
+	VALUES ('deliveryAssistant','Jefe auxiliar repartos');
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+    SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
+        FROM account.roleInherit ri
+            JOIN account.role r2 ON r2.id = ri.`role`
+        WHERE r2.name = 'deliveryBoss';
+
+DELETE `account`.`roleInherit` FROM `account`.`roleInherit`
+    JOIN `account`.`role` r ON `account`.`roleInherit`.role = r.id
+    WHERE r.name = 'deliveryBoss';
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
+		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
+
+UPDATE `salix`.`ACL`
+    SET principalId='deliveryAssistant'
+        WHERE principalId='deliveryBoss';
--- a/db/changes/234001/01-workerCreate.sql
+++ b/db/changes/234001/01-workerCreate.sql
@ -0,0 +1,20 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerCreate`(
+  vFirstname VARCHAR(50),
+  vLastName VARCHAR(50),
+  vCode CHAR(3),
+  vBossFk INT,
+  vUserFk INT,
+  vFi VARCHAR(15) ,
+  vBirth DATE
+)
+BEGIN
+/**
+ * Create new worker
+ *
+ */
+  INSERT INTO worker(id, code, firstName, lastName, bossFk, fi, birth)
+    VALUES (vUserFk, vCode, vFirstname, vLastName, vBossFk, vFi, vBirth);
+END$$
+DELIMITER ;
--- a/db/changes/234001/02-roleSync.sql
+++ b/db/changes/234001/02-roleSync.sql
@ -0,0 +1,2 @@
+-- Locally it fails because it is executed before the fixtures and the roleConfig table is empty
+CALL `account`.`role_syncPrivileges`();
--- a/db/changes/234002/.gitkeep
+++ b/db/changes/234002/.gitkeep
--- a/db/changes/234002/01-itemShelvingSale.sql
+++ b/db/changes/234002/01-itemShelvingSale.sql
@ -0,0 +1,291 @@
+ALTER TABLE `vn`.`itemShelvingSale` DROP COLUMN IF EXISTS isPicked;
+
+ALTER TABLE`vn`.`itemShelvingSale` 
+    ADD isPicked TINYINT(1) DEFAULT FALSE NOT NULL;
+
+ALTER TABLE `vn`.`productionConfig` DROP COLUMN IF EXISTS orderMode;
+
+ALTER TABLE `vn`.`productionConfig`
+    ADD orderMode ENUM('Location', 'Age') NOT NULL DEFAULT 'Location';
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reserveByCollection`(
+	vCollectionFk INT(11)
+)
+BEGIN
+/**
+ * Reserva cantidades con ubicaciones para el contenido de una colección
+ *
+ * @param vCollectionFk Identificador de collection
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+		(INDEX(saleFk))
+		ENGINE = MEMORY
+		SELECT s.id saleFk, NULL userFk
+			FROM ticketCollection tc
+				JOIN sale s ON s.ticketFk = tc.ticketFk
+				LEFT JOIN (
+					SELECT DISTINCT saleFk
+						FROM saleTracking st
+							JOIN state s ON s.id = st.stateFk
+						WHERE st.isChecked
+							AND s.semaphore = 1)st ON st.saleFk = s.id
+			WHERE tc.collectionFk = vCollectionFk
+				AND st.saleFk IS NULL
+				AND NOT s.isPicked;
+
+	CALL itemShelvingSale_reserve();
+END$$
+DELIMITER ;
+
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_setQuantity`(
+	vItemShelvingSaleFk INT(10),
+	vQuantity DECIMAL(10,0),
+	vIsItemShelvingSaleEmpty BOOLEAN
+)
+BEGIN
+/**
+ * Gestiona la reserva de un itemShelvingFk, actualizando isPicked y quantity
+ * en vn.itemShelvingSale y vn.sale.isPicked en caso necesario. 
+ * Si la reserva de la ubicación es fallida, se regulariza la situación 
+ * 
+ * @param vItemShelvingSaleFk Id itemShelvingSaleFK 
+ * @param vQuantity Cantidad real que se ha cogido de la ubicación
+ * @param vIsItemShelvingSaleEmpty determina si ka ubicación itemShelvingSale se ha 
+ * quedado vacio tras el movimiento
+ */
+	DECLARE vSaleFk INT;
+	DECLARE vCursorSaleFk INT;
+	DECLARE vItemShelvingFk INT;
+	DECLARE vReservedQuantity INT;
+	DECLARE vRemainingQuantity INT;
+	DECLARE vItemFk INT;
+	DECLARE vUserFk INT;
+	DECLARE vDone BOOLEAN DEFAULT FALSE;
+	DECLARE vSales CURSOR FOR 
+		SELECT iss.saleFk, iss.userFk
+			FROM itemShelvingSale iss
+				JOIN sale s ON s.id = iss.saleFk
+			WHERE iss.id = vItemShelvingSaleFk
+				AND s.itemFk = vItemFk
+				AND NOT iss.isPicked;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	IF (SELECT isPicked FROM itemShelvingSale WHERE id = vItemShelvingSaleFk) THEN
+		CALL util.throw('Booking completed');
+	END IF;
+
+	SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk 
+			INTO vItemFk, vSaleFk, vItemShelvingFk
+		FROM itemShelvingSale iss
+				JOIN sale s ON s.id = iss.saleFk
+			WHERE iss.id = vItemShelvingSaleFk
+				AND NOT iss.isPicked;
+	
+	UPDATE itemShelvingSale 
+		SET isPicked = TRUE,
+			quantity = vQuantity
+		WHERE id = vItemShelvingSaleFk;
+
+	UPDATE itemShelving
+		SET visible = IF(vIsItemShelvingSaleEmpty, 0, GREATEST(0,visible - vQuantity))
+		WHERE id = vItemShelvingFk;
+
+	IF vIsItemShelvingSaleEmpty THEN
+		OPEN vSales;
+l:		LOOP
+			SET vDone = FALSE;
+			FETCH vSales INTO vCursorSaleFk, vUserFk;
+			IF vDone THEN
+				LEAVE l;
+			END IF;
+
+			CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+			(INDEX(saleFk, userFk))
+			ENGINE = MEMORY
+			SELECT vCursorSaleFk, vUserFk;
+
+			CALL itemShelvingSale_reserveWhitUser();
+			DROP TEMPORARY TABLE tmp.sale;
+	
+		END LOOP;
+		CLOSE vSales;
+	
+		DELETE iss
+			FROM itemShelvingSale iss
+				JOIN sale s ON s.id = iss.saleFk
+			WHERE iss.id = vItemShelvingSaleFk
+				AND s.itemFk = vItemFk
+				AND NOT iss.isPicked;
+	END IF;
+
+	SELECT SUM(quantity) INTO vRemainingQuantity
+		FROM itemShelvingSale
+			WHERE saleFk = vSaleFk
+				AND NOT isPicked;
+
+	IF vRemainingQuantity THEN 
+		CALL itemShelvingSale_reserveBySale (vSaleFk, vRemainingQuantity, NULL);
+	
+		SELECT SUM(quantity) INTO vRemainingQuantity
+			FROM itemShelvingSale
+				WHERE saleFk = vSaleFk
+					AND NOT isPicked;
+
+		IF NOT vRemainingQuantity <=> 0 THEN
+			SELECT SUM(iss.quantity) 
+				INTO vReservedQuantity
+				FROM itemShelvingSale iss 
+					WHERE iss.saleFk = vSaleFk;
+	
+			CALL saleTracking_new(
+				vSaleFk,
+				TRUE, 
+				vReservedQuantity, 
+				`account`.`myUser_getId`(), 
+				NULL,
+				'PREPARED',
+				TRUE);
+	
+			UPDATE sale s
+				SET s.quantity = vReservedQuantity
+				WHERE s.id = vSaleFk ;	
+		END IF;
+	END IF;
+END$$
+DELIMITER ;
+
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reserve`()
+BEGIN
+/**
+ * Reserva cantidades con ubicaciones para un conjunto de sales del mismo wareHouse
+ *
+ * @table tmp.sale(saleFk, userFk)
+ */
+	DECLARE vCalcFk INT;
+	DECLARE vWarehouseFk INT;
+	DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
+	DECLARE vLastPickingOrder INT;
+
+	SELECT t.warehouseFk, MAX(p.pickingOrder)
+		INTO vWarehouseFk, vLastPickingOrder
+		FROM ticket t
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN tmp.sale ts ON ts.saleFk = s.id
+			LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
+			LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+			LEFT JOIN parking p ON p.id = sh.parkingFk
+		WHERE t.warehouseFk IS NOT NULL;
+
+	IF vWarehouseFk IS NULL THEN 
+		CALL util.throw('Warehouse not set');
+	END IF;
+
+	CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk);
+
+	SET @outstanding = 0;
+	SET @oldsaleFk = 0;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementQuantity
+		(INDEX(saleFk))
+		ENGINE = MEMORY
+		SELECT saleFk, userFk, quantityToReserve, itemShelvingFk 
+			FROM( SELECT saleFk, 
+						sub.userFk,
+						itemShelvingFk ,
+						IF(saleFk <> @oldsaleFk, @outstanding := quantity, @outstanding),
+						@qtr := LEAST(@outstanding, available) quantityToReserve,
+						@outStanding := @outStanding - @qtr,
+						@oldsaleFk := saleFk 
+					FROM( 
+						SELECT ts.saleFk,
+								ts.userFk,
+								s.quantity,
+								ish.id itemShelvingFk,
+								ish.visible - IFNULL(ishr.reservedQuantity, 0) available
+							FROM tmp.sale ts
+								JOIN sale s ON s.id = ts.saleFk 
+								JOIN itemShelving ish ON ish.itemFk = s.itemFk
+								LEFT JOIN (
+									SELECT itemShelvingFk, SUM(quantity) reservedQuantity  
+										FROM itemShelvingSale
+										WHERE NOT isPicked 
+										GROUP BY itemShelvingFk) ishr ON ishr.itemShelvingFk = ish.id
+								JOIN shelving sh ON sh.code = ish.shelvingFk
+								JOIN parking p ON p.id = sh.parkingFk
+								JOIN sector sc ON sc.id = p.sectorFk
+								JOIN warehouse w ON w.id = sc.warehouseFk
+								JOIN productionConfig pc	
+							WHERE w.id = vWarehouseFk
+								AND NOT sc.isHideForPickers
+						ORDER BY
+								s.id,
+								p.pickingOrder >= vLastPickingOrder,
+								sh.priority DESC,
+								ish.visible >= s.quantity DESC,
+								s.quantity MOD ish.grouping = 0 DESC,
+								ish.grouping DESC,
+								IF(pc.orderMode = 'Location', p.pickingOrder, ish.created)	
+					)sub
+				)sub2 
+		WHERE quantityToReserve > 0;
+
+	INSERT INTO itemShelvingSale(
+			itemShelvingFk,
+			saleFk,
+			quantity,
+			userFk)
+		SELECT itemShelvingFk,
+				saleFk,
+				quantityToReserve,
+				IFNULL(userFk, getUser())
+			FROM tSalePlacementQuantity spl;
+
+	DROP TEMPORARY TABLE tmp.sale;
+END$$
+DELIMITER ;
+
+
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reserveBySale`(
+	vSelf INT , 
+	vQuantity INT,
+	vUserFk INT
+)
+BEGIN
+/**
+ * Reserva cantida y ubicación para una saleFk
+ *
+ * @param vSelf Identificador de la venta
+ * @param vQuantity Cantidad a reservar
+ * @param vUserFk Id de usuario que realiza la reserva
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+		ENGINE = MEMORY
+		SELECT vSelf saleFk, vUserFk userFk;
+			
+	CALL itemShelvingSale_reserve();
+END$$
+DELIMITER ;
+
+
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelvingSale_AFTER_INSERT`
+	AFTER INSERT ON `itemShelvingSale`
+	FOR EACH ROW
+BEGIN
+
+	UPDATE vn.sale
+		SET isPicked = TRUE 
+        WHERE id = NEW.saleFk;
+
+END$$
+DELIMITER ;
--- a/db/changes/234201/.gitkeep
+++ b/db/changes/234201/.gitkeep
--- a/db/changes/234201/00-ACL_workerDepartment.sql
+++ b/db/changes/234201/00-ACL_workerDepartment.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('WorkerDepartment', '*', '*', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/234201/00-account_acl.sql
+++ b/db/changes/234201/00-account_acl.sql
@ -0,0 +1,7 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('VnUser', 'higherPrivileges', '*', 'ALLOW', 'ROLE', 'itManagement'),
+        ('VnUser', 'mediumPrivileges', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('VnUser', 'updateUser', '*', 'ALLOW', 'ROLE', 'employee');
+
+ALTER TABLE `account`.`user` ADD `username` varchar(30) AS (name) VIRTUAL;
--- a/db/changes/234201/00-aclClient.sql
+++ b/db/changes/234201/00-aclClient.sql
@ -0,0 +1,3 @@
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+	VALUES('TicketCollection', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');
--- a/db/changes/234201/00-aclSetPassword.sql
+++ b/db/changes/234201/00-aclSetPassword.sql
@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Worker','setPassword','*','ALLOW','ROLE','employee');
+
+
--- a/db/changes/234201/00-aclUrlHedera.sql
+++ b/db/changes/234201/00-aclUrlHedera.sql
@ -0,0 +1,7 @@
+INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
+    VALUES
+        ('hedera', 'test',          'https://test-shop.verdnatura.es/'),
+        ('hedera', 'production',    'https://shop.verdnatura.es/');
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
+	VALUES('Url', 'getByUser', 'READ', 'ALLOW', 'ROLE', '$everyone');
--- a/db/changes/234201/00-packagingFk.sql
+++ b/db/changes/234201/00-packagingFk.sql
@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`buy` CHANGE `packageFk` `packagingFk` varchar(10) 
+CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT '--' NULL;
+
+ALTER TABLE `vn`.`buy`
+ADD COLUMN `packageFk` varchar(10) AS (`packagingFk`) VIRTUAL;
--- a/db/changes/234201/00-packagingFkviews.sql
+++ b/db/changes/234201/00-packagingFkviews.sql
@ -0,0 +1,146 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Compres`
+AS SELECT `c`.`id` AS `Id_Compra`,
+	`c`.`entryFk` AS `Id_Entrada`,
+	`c`.`itemFk` AS `Id_Article`,
+	`c`.`buyingValue` AS `Costefijo`,
+	`c`.`quantity` AS `Cantidad`,
+	`c`.`packagingFk` AS `Id_Cubo`,
+	`c`.`stickers` AS `Etiquetas`,
+	`c`.`freightValue` AS `Portefijo`,
+	`c`.`packageValue` AS `Embalajefijo`,
+	`c`.`comissionValue` AS `Comisionfija`,
+	`c`.`packing` AS `Packing`,
+	`c`.`grouping` AS `grouping`,
+	`c`.`groupingMode` AS `caja`,
+	`c`.`location` AS `Nicho`,
+	`c`.`price1` AS `Tarifa1`,
+	`c`.`price2` AS `Tarifa2`,
+	`c`.`price3` AS `Tarifa3`,
+	`c`.`minPrice` AS `PVP`,
+	`c`.`printedStickers` AS `Vida`,
+	`c`.`isChecked` AS `punteo`,
+	`c`.`ektFk` AS `buy_edi_id`,
+	`c`.`created` AS `odbc_date`,
+	`c`.`isIgnored` AS `Novincular`,
+	`c`.`isPickedOff` AS `isPickedOff`,
+	`c`.`workerFk` AS `Id_Trabajador`,
+	`c`.`weight` AS `weight`,
+	`c`.`dispatched` AS `dispatched`,
+	`c`.`containerFk` AS `container_id`,
+	`c`.`itemOriginalFk` AS `itemOriginalFk`
+FROM `vn`.`buy` `c`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`buySource`
+AS SELECT `b`.`entryFk` AS `Id_Entrada`,
+	`b`.`isPickedOff` AS `isPickedOff`,
+	NULL AS `tarifa0`,
+	`e`.`kop` AS `kop`,
+	`b`.`id` AS `Id_Compra`,
+	`i`.`typeFk` AS `tipo_id`,
+	`b`.`itemFk` AS `Id_Article`,
+	`i`.`size` AS `Medida`,
+	`i`.`stems` AS `Tallos`,
+	`b`.`stickers` AS `Etiquetas`,
+	`b`.`packagingFk` AS `Id_Cubo`,
+	`b`.`buyingValue` AS `Costefijo`,
+	`b`.`packing` AS `Packing`,
+	`b`.`grouping` AS `Grouping`,
+	`b`.`quantity` AS `Cantidad`,
+	`b`.`price2` AS `Tarifa2`,
+	`b`.`price3` AS `Tarifa3`,
+	`b`.`isChecked` AS `Punteo`,
+	`b`.`groupingMode` AS `Caja`,
+	`i`.`isToPrint` AS `Imprimir`,
+	`i`.`name` AS `Article`,
+	`vn`.`ink`.`picture` AS `Tinta`,
+	`i`.`originFk` AS `id_origen`,
+	`i`.`minPrice` AS `PVP`,
+	NULL AS `Id_Accion`,
+	`s`.`company_name` AS `pro`,
+	`i`.`hasMinPrice` AS `Min`,
+	`b`.`isIgnored` AS `Novincular`,
+	`b`.`freightValue` AS `Portefijo`,
+	round(`b`.`buyingValue` * `b`.`quantity`, 2) AS `Importe`,
+	`b`.`printedStickers` AS `Vida`,
+	`i`.`comment` AS `reference`,
+	`b`.`workerFk` AS `Id_Trabajador`,
+	`e`.`s1` AS `S1`,
+	`e`.`s2` AS `S2`,
+	`e`.`s3` AS `S3`,
+	`e`.`s4` AS `S4`,
+	`e`.`s5` AS `S5`,
+	`e`.`s6` AS `S6`,
+	0 AS `price_fixed`,
+	`i`.`producerFk` AS `producer_id`,
+	`i`.`subName` AS `tag1`,
+	`i`.`value5` AS `tag2`,
+	`i`.`value6` AS `tag3`,
+	`i`.`value7` AS `tag4`,
+	`i`.`value8` AS `tag5`,
+	`i`.`value9` AS `tag6`,
+	`s`.`company_name` AS `company_name`,
+	`b`.`weight` AS `weightPacking`,
+	`i`.`packingOut` AS `packingOut`,
+	`b`.`itemOriginalFk` AS `itemOriginalFk`,
+	`io`.`longName` AS `itemOriginalName`,
+	`it`.`gramsMax` AS `gramsMax`
+FROM (
+		(
+			(
+				(
+					(
+						(
+							`vn`.`item` `i`
+							JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`)
+						)
+						LEFT JOIN `vn`.`ink` ON(`vn`.`ink`.`id` = `i`.`inkFk`)
+					)
+					LEFT JOIN `vn`.`buy` `b` ON(`b`.`itemFk` = `i`.`id`)
+				)
+				LEFT JOIN `vn`.`item` `io` ON(`io`.`id` = `b`.`itemOriginalFk`)
+			)
+			LEFT JOIN `edi`.`ekt` `e` ON(`e`.`id` = `b`.`ektFk`)
+		)
+		LEFT JOIN `edi`.`supplier` `s` ON(`e`.`pro` = `s`.`supplier_id`)
+	);
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`awbVolume`
+AS SELECT `d`.`awbFk` AS `awbFk`,
+	`b`.`stickers` * `i`.`density` * IF(
+		`p`.`volume` > 0,
+		`p`.`volume`,
+		`p`.`width` * `p`.`depth` * IF(`p`.`height` = 0, `i`.`size` + 10, `p`.`height`)
+	) / (`vc`.`aerealVolumetricDensity` * 1000) AS `volume`,
+	`b`.`id` AS `buyFk`
+FROM (
+		(
+			(
+				(
+					(
+						(
+							(
+								(
+									`vn`.`buy` `b`
+									JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`)
+								)
+								JOIN `vn`.`itemType` `it` ON(`i`.`typeFk` = `it`.`id`)
+							)
+							JOIN `vn`.`packaging` `p` ON(`p`.`id` = `b`.`packagingFk`)
+						)
+						JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`)
+					)
+					JOIN `vn`.`travel` `t` ON(`t`.`id` = `e`.`travelFk`)
+				)
+				JOIN `vn`.`duaEntry` `de` ON(`de`.`entryFk` = `e`.`id`)
+			)
+			JOIN `vn`.`dua` `d` ON(`d`.`id` = `de`.`duaFk`)
+		)
+		JOIN `vn`.`volumeConfig` `vc`
+	)
+WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1);
--- a/db/changes/234201/00-supplierAccountCheckLength.sql
+++ b/db/changes/234201/00-supplierAccountCheckLength.sql
@ -0,0 +1,6 @@
+UPDATE `vn`.`supplier`
+    SET account = LPAD(id,10,'0')
+    WHERE account IS NULL;
+
+ALTER TABLE `vn`.`supplier` ADD CONSTRAINT supplierAccountTooShort CHECK (LENGTH(account) = 10);
+ALTER TABLE `vn`.`supplier` MODIFY COLUMN account varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 4100000000 NOT NULL COMMENT 'Default accounting code for suppliers.';
--- a/db/changes/234201/00-zoneIncluded.sql
+++ b/db/changes/234201/00-zoneIncluded.sql
@ -0,0 +1,26 @@
+ALTER TABLE `vn`.`zoneIncluded`
+  ADD COLUMN `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+  DROP PRIMARY KEY,
+  DROP FOREIGN KEY `zoneFk2`,
+  DROP FOREIGN KEY `zoneGeoFk2`,
+  DROP KEY `geoFk_idx`,
+  ADD PRIMARY KEY (`id`),
+  ADD CONSTRAINT `zoneIncluded_FK_1` FOREIGN KEY (zoneFk) REFERENCES `vn`.`zone`(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `zoneIncluded_FK_2` FOREIGN KEY (geoFk) REFERENCES `vn`.`zoneGeo`(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `unique_zone_geo` UNIQUE (`zoneFk`, `geoFk`);
+
+DROP TRIGGER IF EXISTS `vn`.`zoneIncluded_afterDelete`;
+USE `vn`;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_afterDelete`
+	AFTER DELETE ON `zoneIncluded`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO zoneLog
+		SET `action` = 'delete',
+			`changedModel` = 'zoneIncluded',
+			`changedModelId` = OLD.zoneFk,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
--- a/db/changes/234201/02-packagingFktrigger.sql
+++ b/db/changes/234201/02-packagingFktrigger.sql
@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterUpdate`
+	AFTER UPDATE ON `buy`
+	FOR EACH ROW
+trig: BEGIN
+	DECLARE vLanded DATE;
+	DECLARE vBuyerFk INT;
+	DECLARE vIsBuyerToBeEmailed BOOL;
+	DECLARE vItemName VARCHAR(50);
+
+	IF @isModeInventory OR @isTriggerDisabled THEN
+		LEAVE trig;
+	END IF;
+
+	IF !(NEW.id <=> OLD.id)
+	OR !(NEW.entryFk <=> OLD.entryFk)
+	OR !(NEW.itemFk <=> OLD.itemFk)
+	OR !(NEW.quantity <=> OLD.quantity)
+	OR !(NEW.created <=> OLD.created) THEN
+		CALL stock.log_add('buy', NEW.id, OLD.id);
+	END IF;
+
+	CALL buy_afterUpsert(NEW.id);
+
+	SELECT w.isBuyerToBeEmailed, t.landed
+		INTO vIsBuyerToBeEmailed, vLanded
+		FROM entry e
+			JOIN travel t ON t.id = e.travelFk
+			JOIN warehouse w ON w.id = t.warehouseInFk
+		WHERE e.id = NEW.entryFk;
+
+	SELECT it.workerFk, i.longName
+		INTO vBuyerFk, vItemName
+		FROM itemCategory k
+			JOIN itemType it ON it.categoryFk = k.id
+			JOIN item i ON i.typeFk = it.id
+		WHERE i.id = OLD.itemFk;
+
+	IF vIsBuyerToBeEmailed AND
+		vBuyerFk != account.myUser_getId() AND
+		vLanded = util.VN_CURDATE() THEN
+			IF !(NEW.itemFk <=> OLD.itemFk) OR
+				!(NEW.quantity <=> OLD.quantity) OR
+				!(NEW.packing <=> OLD.packing) OR
+				!(NEW.grouping <=> OLD.grouping) OR
+				!(NEW.packagingFk <=> OLD.packagingFk) OR
+				!(NEW.weight <=> OLD.weight) THEN
+					CALL vn.mail_insert(
+						CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'),
+						CONCAT(account.myUser_getName(),'@verdnatura.es'),
+						CONCAT('E ', NEW.entryFk ,' Se ha modificado item ', NEW.itemFk, ' ', vItemName),
+						'Este email se ha generado automáticamente'
+					);
+			END IF;
+	END IF;
+END$$
+DELIMITER ;
--- a/db/changes/234201/03-packagingFkProc.sql
+++ b/db/changes/234201/03-packagingFkProc.sql
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -87,8 +87,8 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`)
 		(1, 'ESTUDIOS PRIMARIOS COMPLETOS'),
 		(2, 'ENSEÑANZAS DE BACHILLERATO');

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

 UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
@ -188,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`)
+INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
    VALUES
-        (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);
+        (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106),
+        (1107, 'ANT', 'Hank'         , 'Pym'   , 19, 432978107),
+        (1108, 'DCX', 'Charles'      , 'Xavier', 19, 432978108),
+        (1109, 'HLK', 'Bruce'        , 'Banner', 19, 432978109),
+        (1110, 'JJJ', 'Jessica'      , 'Jones' , 19, 432978110);

 INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
    VALUES
@ -358,20 +358,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
        (4, 'GCN Channel'),
        (5, 'The Newspaper');

-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`)
+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`,`typeFk`)
    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','loses'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal'),
+        (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','normal');

 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
@ -1013,7 +1013,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
        (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()),
+        (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.74,   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()),
@ -1409,10 +1409,8 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_

 INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
    VALUES
-        (1, 0),
        (2, 1),
        (3, 2),
-        (4, 4),
        (5, 6),
        (15, 6);

@ -1456,7 +1454,7 @@ 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`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
+INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`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,   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)),
@ -2834,24 +2832,24 @@ UPDATE `account`.`user`

 INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
    VALUES
-        (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', 'Sale', '{"quantity":1}', '{"quantity":10}', 22, NULL),
+        (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 22, NULL),
+        (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 22, NULL),
        (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');
+        (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 12, 'Shield');


 INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
    VALUES
        (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
        (1,   18, 'select', '2001-06-09 11:00:03', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
-        (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale',   69854, 'Armor'      , '{"isPicked": false}','{"isPicked": true}', NULL),
-        (1,   18, 'update', '2001-01-01 10:05:01', 'Sale',   69854, 'Armor'      , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
-        (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale',    5689, 'Shield'     , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
-        (1,   18, 'insert', '2000-12-31 15:00:05', 'Sale',   69854, 'Armor'      , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
+        (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale',      5,  'Armor'      , '{"isPicked": false}','{"isPicked": true}', NULL),
+        (1,   18, 'update', '2001-01-01 10:05:01', 'Sale',      5,  'Armor'      , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
+        (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale',      4,  'Shield'     , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
+        (1,   18, 'insert', '2000-12-31 15:00:05', 'Sale',      1,  'Armor'      , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
        (1,   18, 'update', '2000-12-28 08:40:45', 'Ticket',    45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
        (1,   18, 'select', '2000-12-27 03:40:30', 'Ticket',    45, NULL         , NULL, NULL, NULL),
-        (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',    5689, 'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
+        (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',      4,  'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
        (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
    VALUES
@ -2869,6 +2867,7 @@ INSERT INTO `vn`.`profileType` (`id`, `name`)
 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
    VALUES
        ('lilium', 'development', 'http://localhost:9000/#/'),
+        ('hedera', 'development', 'http://localhost:9090/'),
        ('salix', 'development', 'http://localhost:5000/#!/');

 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
@ -2973,4 +2972,8 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU
        (3, 1.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T3333333 Tony Stark', NULL, 0.81, 8.07, 'T', '3333333', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
        (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
        (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
-        (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
+        (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
+
+INSERT INTO `vn`.`mistakeType` (`id`, `description`)
+    VALUES
+        (1, 'Incorrect quantity');
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
--- a/db/tests/vn/item_getBalance.spec.js
+++ b/db/tests/vn/item_getBalance.spec.js
@ -6,13 +6,13 @@ describe('item_getBalance()', () => {
        let stmts = [];

        let params = {
-            warehouseFk: 1,
-            itemFk: 1
+            itemFk: 1,
+            warehouseFk: 1
        };

        const conn = await app.models.Item.dataSource.connector;

-        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?)', [
+        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?, NULL)', [
            params.warehouseFk,
            params.itemFk
        ]));
--- a/db/tests/vn/logAddWithUser.spec.js
+++ b/db/tests/vn/logAddWithUser.spec.js
@ -1,42 +0,0 @@
-const app = require('vn-loopback/server/server');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-describe('logAddWithUser()', () => {
-    it('should log any action taken by the user in a table ending in Log', async() => {
-        let stmts = [];
-        let stmt;
-
-        stmts.push('START TRANSACTION');
-
-        let params = {
-            ticketFk: 1,
-            userId: 9,
-            actionCode: 'update',
-            targetEntity: 'ticket',
-            description: 'we are testing stuff'
-        };
-
-        stmt = new ParameterizedSQL('CALL vn.logAddWithUser(?, ?, ?, ?, ?)', [
-            params.ticketFk,
-            params.userId,
-            params.actionCode,
-            params.targetEntity,
-            params.description
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticketLog WHERE description = ?', [
-            params.description
-        ]);
-        let ticketLogIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        savedDescription = result[ticketLogIndex][0].description;
-
-        expect(savedDescription).toEqual(params.description);
-    });
-});
--- a/db/tests/vn/timeControl_calculateByUser.spec.js
+++ b/db/tests/vn/timeControl_calculateByUser.spec.js
@ -14,14 +14,6 @@ describe('timeControl_calculateByUser()', () => {
        let stmts = [];
        let stmt;

-        stmts.push('START TRANSACTION');
-
-        stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
        let params = {
            workerID: 1106,
            start: start,
@ -37,17 +29,15 @@ describe('timeControl_calculateByUser()', () => {

        let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1;

-        stmts.push('ROLLBACK');
-
        let sql = ParameterizedSQL.join(stmts, ';');
        let result = await app.models.Ticket.rawStmt(sql);

        let [timeControlCalculateTable] = result[tableIndex];

-        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(29400);
+        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28200);
    });
-
-    it(`should return the worked hours between last sunday and monday`, async() => {
+    // #2261
+    xit(`should return the worked hours between last sunday and monday`, async() => {
        let lastSunday = Date.vnNew();
        let daysSinceSunday = lastSunday.getDay();
        if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
@ -65,13 +55,7 @@ describe('timeControl_calculateByUser()', () => {

        stmts.push('START TRANSACTION');

-        stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
-        const workerID = 1107;
+        const workerID = 1108;

        stmt = new ParameterizedSQL(`
            INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction)
--- a/db/tests/vn/zone_getFromGeo.spec.js
+++ b/db/tests/vn/zone_getFromGeo.spec.js
@ -7,7 +7,7 @@ describe('zone zone_getFromGeo()', () => {
        let stmt;

        stmts.push('START TRANSACTION');
-        let geoFk = 17;
+        let geoFk = 16;

        stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [
            geoFk,
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -520,8 +520,7 @@ export default {
        searchResultDate: 'vn-ticket-summary [label=Landed] span',
        topbarSearch: 'vn-searchbar',
        moreMenu: 'vn-ticket-index vn-icon-button[icon=more_vert]',
-        fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)',
-        fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(6)',
+        thirdWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)',
        weeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr',
        firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) vn-icon-button[icon="delete"]',
        firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) [ng-model="weekly.agencyModeFk"]',
@ -671,8 +670,8 @@ export default {
        firstAddServiceTypeButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"]',
        firstServiceType: 'vn-ticket-service vn-autocomplete[ng-model="service.ticketServiceTypeFk"]',
        firstQuantity: 'vn-ticket-service vn-input-number[ng-model="service.quantity"]',
-        firstPrice: 'vn-ticket-service vn-horizontal:nth-child(1) vn-input-number[ng-model="service.price"]',
-        fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]',
+        firstPrice: 'vn-ticket-service vn-horizontal:nth-child(2) vn-input-number[ng-model="service.price"]',
+        fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(2) vn-icon-button[icon="delete"]',
        newServiceTypeName: '.vn-dialog.shown vn-textfield[ng-model="newServiceType.name"]',
        serviceLine: 'vn-ticket-service > form > vn-card > vn-one:nth-child(2) > vn-horizontal',
        saveServiceButton: 'button[type=submit]',
@ -1193,7 +1192,7 @@ export default {
        secondBuyPacking: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.packing"]',
        secondBuyWeight: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.weight"]',
        secondBuyStickers: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.stickers"]',
-        secondBuyPackage: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.packageFk"]',
+        secondBuyPackage: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.packagingFk"]',
        secondBuyQuantity: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.quantity"]',
        secondBuyItem: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.itemFk"]',
        importButton: 'vn-entry-buy-index vn-icon[icon="publish"]',
--- a/e2e/paths/02-client/01_create_client.spec.js
+++ b/e2e/paths/02-client/01_create_client.spec.js
@ -8,7 +8,7 @@ describe('Client create path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule(' deliveryBoss', 'client');
+        await page.loginAndModule('deliveryAssistant', 'client');
    });

    afterAll(async() => {
--- a/e2e/paths/03-worker/06_create.spec.js
+++ b/e2e/paths/03-worker/06_create.spec.js
@ -45,7 +45,7 @@ describe('Worker create path', () => {

        // should create a new worker and go to worker basic data'
        await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
-        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
        await page.waitToClick(selectors.workerCreate.createButton);
        message = await page.waitForSnackbar();
        await page.waitForState('worker.card.basicData');
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@ -134,14 +134,6 @@ describe('Ticket Edit sale path', () => {
        await page.accessToSection('ticket.card.sale');
    });

-    it('should try to add a higher quantity value and then receive an error', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
-        await page.type(selectors.ticketSales.firstSaleQuantity, '11\u000d');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('The new quantity should be smaller than the old one');
-    });
-
    it('should remove 1 from the first sale quantity', async() => {
        await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
        await page.waitForSelector(selectors.ticketSales.firstSaleQuantity);
--- a/e2e/paths/05-ticket/06_basic_data_steps.spec.js
+++ b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
        const result = await page
            .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');

-        expect(result).toContain('-€232.75');
+        expect(result).toContain('-€228.25');
    });

    it(`should select a new reason for the changes made then click on finalize`, async() => {
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@ -19,7 +19,7 @@ describe('Ticket descriptor path', () => {
    it('should count the amount of tickets in the turns section', async() => {
        const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);

-        expect(result).toEqual(7);
+        expect(result).toEqual(5);
    });

    it('should go back to the ticket index then search and access a ticket summary', async() => {
@ -45,7 +45,7 @@ describe('Ticket descriptor path', () => {

    it('should confirm the ticket 11 was added to thursday', async() => {
        await page.accessToSection('ticket.weekly.index');
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.fourthWeeklyTicket, 'value');
+        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');

        expect(result).toEqual('Thursday');
    });
@ -80,7 +80,9 @@ describe('Ticket descriptor path', () => {

    it('should confirm the ticket 11 was added on saturday', async() => {
        await page.accessToSection('ticket.weekly.index');
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.fiveWeeklyTicket, 'value');
+        await page.waitForTimeout(5000);
+
+        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');

        expect(result).toEqual('Saturday');
    });
@ -104,7 +106,7 @@ describe('Ticket descriptor path', () => {
        await page.doSearch();
        const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);

-        expect(nResults).toEqual(7);
+        expect(nResults).toEqual(5);
    });

    it('should update the agency then remove it afterwards', async() => {
--- a/e2e/paths/06-claim/02_detail.spec.js
+++ b/e2e/paths/06-claim/02_detail.spec.js
@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';

 // #1528 e2e claim/detail
 xdescribe('Claim detail', () => {
--- a/e2e/paths/06-claim/02_development.spec.js
+++ b/e2e/paths/06-claim/02_development.spec.js
@ -1,97 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Claim development', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('claimManager', 'claim');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('claim.card.development');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should delete a development and create a new one', async() => {
-        await page.waitToClick(selectors.claimDevelopment.firstDeleteDevelopmentButton);
-        await page.waitToClick(selectors.claimDevelopment.addDevelopmentButton);
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimReason, 'Baja calidad');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResult, 'Deshidratacion');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResponsible, 'Calidad general');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimWorker, 'deliveryNick');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimRedelivery, 'Reparto');
-        await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should redirect to the next section of claims as the role is claimManager`, async() => {
-        await page.waitForState('claim.card.action');
-    });
-
-    it('should edit a development', async() => {
-        await page.reloadSection('claim.card.development');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimReason, 'Calor');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResult, 'Cocido');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResponsible, 'Calidad general');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimWorker, 'adminAssistantNick');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimRedelivery, 'Cliente');
-        await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the first development is the expected one', async() => {
-        await page.reloadSection('claim.card.development');
-        const reason = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimReason, 'value');
-
-        const result = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimResult, 'value');
-
-        const responsible = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimResponsible, 'value');
-
-        const worker = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimWorker, 'value');
-
-        const redelivery = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimRedelivery, 'value');
-
-        expect(reason).toEqual('Calor');
-        expect(result).toEqual('Baboso/Cocido');
-        expect(responsible).toEqual('Calidad general');
-        expect(worker).toEqual('adminAssistantNick');
-        expect(redelivery).toEqual('Cliente');
-    });
-
-    it('should confirm the second development is the expected one', async() => {
-        const reason = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimReason, 'value');
-
-        const result = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimResult, 'value');
-
-        const responsible = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimResponsible, 'value');
-
-        const worker = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimWorker, 'value');
-
-        const redelivery = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimRedelivery, 'value');
-
-        expect(reason).toEqual('Baja calidad');
-        expect(result).toEqual('Deshidratacion');
-        expect(responsible).toEqual('Calidad general');
-        expect(worker).toEqual('deliveryNick');
-        expect(redelivery).toEqual('Reparto');
-    });
-});
--- a/e2e/paths/06-claim/03_claim_action.spec.js
+++ b/e2e/paths/06-claim/03_claim_action.spec.js
@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';

 describe('Claim action path', () => {
    let browser;
--- a/e2e/paths/06-claim/04_summary.spec.js
+++ b/e2e/paths/06-claim/04_summary.spec.js
@ -1,6 +1,6 @@

 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';

 describe('Claim summary path', () => {
    let browser;
--- a/e2e/paths/06-claim/05_descriptor.spec.js
+++ b/e2e/paths/06-claim/05_descriptor.spec.js
@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';

 describe('Claim descriptor path', () => {
    let browser;
--- a/e2e/paths/06-claim/06_note.spec.js
+++ b/e2e/paths/06-claim/06_note.spec.js
--- a/e2e/paths/09-invoice-in/03_basic_data.spec.js
+++ b/e2e/paths/09-invoice-in/03_basic_data.spec.js
@ -82,32 +82,24 @@ describe('InvoiceIn basic data path', () => {
        await page.waitToClick(selectors.invoiceInBasicData.confirm);
        let message = await page.waitForSnackbar();

-        expect(message.text).toContain('The company can\'t be empty');
-
        await page.clearInput(selectors.invoiceInBasicData.companyId);
        await page.autocompleteSearch(selectors.invoiceInBasicData.companyId, 'VNL');

        await page.waitToClick(selectors.invoiceInBasicData.confirm);
        message = await page.waitForSnackbar();

-        expect(message.text).toContain('The warehouse can\'t be empty');
-
        await page.clearInput(selectors.invoiceInBasicData.warehouseId);
        await page.autocompleteSearch(selectors.invoiceInBasicData.warehouseId, 'Warehouse One');

        await page.waitToClick(selectors.invoiceInBasicData.confirm);
        message = await page.waitForSnackbar();

-        expect(message.text).toContain('The DMS Type can\'t be empty');
-
        await page.clearInput(selectors.invoiceInBasicData.dmsTypeId);
        await page.autocompleteSearch(selectors.invoiceInBasicData.dmsTypeId, 'Ticket');

        await page.waitToClick(selectors.invoiceInBasicData.confirm);
        message = await page.waitForSnackbar();

-        expect(message.text).toContain('The description can\'t be empty');
-
        await page.waitToClick(selectors.invoiceInBasicData.description);
        await page.write(selectors.invoiceInBasicData.description, 'Dms without edition.');

--- a/e2e/paths/11-zone/01_basic-data.spec.js
+++ b/e2e/paths/11-zone/01_basic-data.spec.js
@ -8,7 +8,9 @@ describe('Zone basic data path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone'); // turns up the zone module name and route aint the same lol
+
+        await page.loginAndModule('deliveryAssistant',
+            'zone'); // turns up the zone module name and route aint the same lol
        await page.accessToSearchResult('10');
        await page.accessToSection('zone.card.basicData');
    });
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ b/e2e/paths/11-zone/02_descriptor.spec.js
@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone');
+        await page.loginAndModule('deliveryAssistant', 'zone');
        await page.accessToSearchResult('13');
    });

--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@ -1,20 +1,5 @@
 import getBrowser from '../../helpers/puppeteer';

-const $ = {
-    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
-};
-const $inputs = {
-    province: 'vn-supplier-fiscal-data [name="province"]',
-    country: 'vn-supplier-fiscal-data [name="country"]',
-    postcode: 'vn-supplier-fiscal-data [name="postcode"]',
-    city: 'vn-supplier-fiscal-data [name="city"]',
-    socialName: 'vn-supplier-fiscal-data [name="socialName"]',
-    taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
-    account: 'vn-supplier-fiscal-data [name="account"]',
-    sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
-    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
-};
-
 describe('Supplier fiscal data path', () => {
    let browser;
    let page;
@ -30,7 +15,7 @@ describe('Supplier fiscal data path', () => {
        await browser.close();
    });

-    it('should attempt to edit the fiscal data and check data is saved', async() => {
+    it('should attempt to edit the fiscal data and check data iss saved', async() => {
        await page.accessToSection('supplier.card.fiscalData');

        const form = 'vn-supplier-fiscal-data form';
@ -40,16 +25,16 @@ describe('Supplier fiscal data path', () => {
            postcode: null,
            city: 'Valencia',
            socialName: 'Farmer King SL',
-            taxNumber: 'Wrong tax number',
+            taxNumber: '12345678Z',
            account: '0123456789',
            sageWithholding: 'retencion estimacion objetiva',
            sageTaxType: 'operaciones no sujetas'
        };

-        const errorMessage = await page.sendForm(form, values);
-        const message = await page.sendForm(form, {
-            taxNumber: '12345678Z'
+        const errorMessage = await page.sendForm(form, {
+            taxNumber: 'Wrong tax number'
        });
+        const message = await page.sendForm(form, values);

        await page.reloadSection('supplier.card.fiscalData');

--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@ -39,6 +39,7 @@ import './range';
 import './input-time';
 import './input-file';
 import './label';
+import './link-phone';
 import './list';
 import './popover';
 import './popup';
--- a/front/core/components/link-phone/index.html
+++ b/front/core/components/link-phone/index.html
@ -0,0 +1,14 @@
+<span ng-if="$ctrl.phoneNumber">
+    {{$ctrl.phoneNumber}}
+    <a href="tel:{{$ctrl.phoneNumber}}">
+        <vn-icon
+            flat
+            round
+            icon="phone"
+            title="MicroSIP"
+            ng-click="$event.stopPropagation();"
+        >
+        </vn-icon>
+    </a>
+</span>
+<span ng-if="!$ctrl.phoneNumber">-</span>
--- a/front/core/components/link-phone/index.js
+++ b/front/core/components/link-phone/index.js
@ -0,0 +1,15 @@
+import ngModule from '../../module';
+import './style.scss';
+class Controller {
+    constructor() {
+        this.phoneNumber = null;
+    }
+}
+
+ngModule.vnComponent('vnLinkPhone', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        phoneNumber: '<',
+    }
+});
--- a/front/core/components/link-phone/style.scss
+++ b/front/core/components/link-phone/style.scss
@ -0,0 +1,7 @@
+vn-link-phone {
+    vn-icon {
+    font-size: 1.1em;
+    vertical-align: bottom;
+}
+}
+
--- a/front/core/lib/validator.js
+++ b/front/core/lib/validator.js
@ -5,6 +5,10 @@ export const validators = {
        if (validator.isEmpty(value ? String(value) : ''))
            throw new Error(_($translate, `Value can't be empty`));
    },
+    negative: $translate => {
+        if (validator < 0)
+            throw new Error(_($translate, `Negative numbers are not allowed. Please enter a valid number.`));
+    },
    absence: ($translate, value) => {
        if (!validator.isEmpty(value))
            throw new Error(_($translate, `Value should be empty`));
@ -104,9 +108,8 @@ export function checkNull($translate, value, conf) {
 export function _($translate, text, params = []) {
    text = $translate.instant(text);

-    for (let i = 0; i < params.length; i++) {
+    for (let i = 0; i < params.length; i++)
        text = text.replace('%s', params[i]);
-    }

    return text;
 }
--- a/front/core/locale/es.yml
+++ b/front/core/locale/es.yml
@ -16,6 +16,7 @@ Value can't be empty: El valor no puede estar vacío
 Value should be empty: El valor debe estar vacío
 Value should be integer: El valor debe ser entero
 Value should be a number: El valor debe ser numérico
+Negative numbers are not allowed. Please enter a valid number: No se permiten números negativos. Por favor, ingrese un número válido
 Invalid value: Valor incorrecto
 Value can't be blank: El valor no puede estar en blanco
 Value can't be null: El valor no puede ser nulo
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@ -18,8 +18,8 @@ import './section';
 import './summary';
 import './topbar/topbar';
 import './user-popover';
+import './user-photo';
 import './upload-photo';
 import './bank-entity';
 import './log';
-import './instance-log';
 import './sendSms';
--- a/front/salix/components/instance-log/index.html
+++ b/front/salix/components/instance-log/index.html
@ -1,12 +0,0 @@
-<vn-dialog
-    vn-id="instanceLog">
-    <tpl-body>
-        <vn-log
-            class="vn-instance-log"
-            url="{{$ctrl.url}}"
-            origin-id="$ctrl.originId"
-            changed-model="$ctrl.changedModel"
-            changed-model-id="$ctrl.changedModelId">
-        </vn-log>
-    </tpl-body>
-</vn-dialog>
--- a/front/salix/components/instance-log/index.js
+++ b/front/salix/components/instance-log/index.js
@ -1,21 +0,0 @@
-import ngModule from '../../module';
-import Section from '../section';
-import './style.scss';
-
-export default class Controller extends Section {
-    open() {
-        this.$.instanceLog.show();
-    }
-}
-
-ngModule.vnComponent('vnInstanceLog', {
-    controller: Controller,
-    template: require('./index.html'),
-    bindings: {
-        model: '<',
-        originId: '<',
-        changedModelId: '<',
-        changedModel: '@',
-        url: '@'
-    }
-});
--- a/front/salix/components/instance-log/style.scss
+++ b/front/salix/components/instance-log/style.scss
@ -1,9 +0,0 @@
-vn-log.vn-instance-log {
-    vn-card {
-        width: 900px;
-        visibility: hidden;
-        & > * {
-            visibility: visible;
-        }
-    }
-}
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@ -28,7 +28,7 @@
                    <vn-avatar
                    ng-class="::{system: !userLog.user}"
                    val="{{::userLog.user ? userLog.user.nickname : $ctrl.$t('System')}}"
-                    ng-click="$ctrl.showWorkerDescriptor($event, userLog)">
+                    ng-click="$ctrl.showDescriptor($event, userLog)">
                    <img
                        ng-if="::userLog.user.image"
                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.token}}">
@ -260,3 +260,6 @@
 <vn-worker-descriptor-popover
    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
+<vn-account-descriptor-popover
+    vn-id="account-descriptor">
+</vn-account-descriptor-popover>
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@ -72,6 +72,7 @@ export default class Controller extends Section {

    $postLink() {
        this.resetFilter();
+        this.defaultFilter();
        this.$.$watch(
            () => this.$.filter,
            () => this.applyFilter(),
@ -79,6 +80,14 @@ export default class Controller extends Section {
        );
    }

+    defaultFilter() {
+        const defaultFilters = ['changedModel', 'changedModelId'];
+        for (const defaultFilter of defaultFilters) {
+            if (this[defaultFilter])
+                this.$.filter[defaultFilter] = this[defaultFilter];
+        }
+    }
+
    get logs() {
        return this._logs;
    }
@ -362,9 +371,11 @@ export default class Controller extends Section {
        }
    }

-    showWorkerDescriptor(event, userLog) {
-        if (userLog.user?.worker)
-            this.$.workerDescriptor.show(event.target, userLog.userFk);
+    showDescriptor(event, userLog) {
+        if (userLog.user?.worker && this.$state.current.name.split('.')[0] != 'account')
+            return this.$.workerDescriptor.show(event.target, userLog.userFk);
+
+        this.$.accountDescriptor.show(event.target, userLog.userFk);
    }
 }

--- a/front/salix/components/user-photo/index.html
+++ b/front/salix/components/user-photo/index.html
@ -0,0 +1,15 @@
+<div class="photo" text-center>
+    <img vn-id="photo"
+        ng-src="{{$root.imagePath('user', '520x520', $ctrl.userId)}}"
+        zoom-image="{{$root.imagePath('user', '1600x1600', $ctrl.userId)}}"
+        on-error-src/>
+    <vn-float-button ng-click="uploadPhoto.show('user', $ctrl.userId)"
+        icon="edit"
+        vn-visible-by="userPhotos">
+    </vn-float-button>
+</div>
+<!-- Upload photo dialog -->
+<vn-upload-photo
+    vn-id="uploadPhoto"
+    on-response="$ctrl.onUploadResponse()">
+</vn-upload-photo>
--- a/front/salix/components/user-photo/index.js
+++ b/front/salix/components/user-photo/index.js
@ -0,0 +1,31 @@
+import ngModule from '../../module';
+
+export default class Controller {
+    constructor($element, $, $rootScope) {
+        Object.assign(this, {
+            $element,
+            $,
+            $rootScope,
+        });
+    }
+
+    onUploadResponse() {
+        const timestamp = Date.vnNew().getTime();
+        const src = this.$rootScope.imagePath('user', '520x520', this.userId);
+        const zoomSrc = this.$rootScope.imagePath('user', '1600x1600', this.userId);
+        const newSrc = `${src}&t=${timestamp}`;
+        const newZoomSrc = `${zoomSrc}&t=${timestamp}`;
+
+        this.$.photo.setAttribute('src', newSrc);
+        this.$.photo.setAttribute('zoom-image', newZoomSrc);
+    }
+}
+Controller.$inject = ['$element', '$scope', '$rootScope'];
+
+ngModule.vnComponent('vnUserPhoto', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        userId: '@?',
+    }
+});
--- a/front/salix/components/user-photo/locale/es.yml
+++ b/front/salix/components/user-photo/locale/es.yml
@ -0,0 +1,6 @@
+My account: Mi cuenta
+Local warehouse: Almacén local
+Local bank: Banco local
+Local company: Empresa local
+User warehouse: Almacén del usuario
+User company: Empresa del usuario
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -14,7 +14,7 @@
 	"The default consignee can not be unchecked": "The default consignee can not be unchecked",
 	"Enter an integer different to zero": "Enter an integer different to zero",
 	"Package cannot be blank": "Package cannot be blank",
-	"The new quantity should be smaller than the old one": "The new quantity should be smaller than the old one",
+	"The price of the item changed": "The price of the item changed",
 	"The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
 	"Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
 	"You can't create an order for a frozen client": "You can't create an order for a frozen client",
@ -187,5 +187,8 @@
 	"This ticket is not editable.": "This ticket is not editable.",
 	"The ticket doesn't exist.": "The ticket doesn't exist.",
 	"The sales do not exists": "The sales do not exists",
-	"Ticket without Route": "Ticket without route"
+	"Ticket without Route": "Ticket without route",
+	"Booking completed": "Booking complete",
+	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -35,7 +35,7 @@
 	"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
 	"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
 	"Description cannot be blank": "Se debe rellenar el campo de texto",
-	"The new quantity should be smaller than the old one": "La nueva cantidad debe de ser menor que la anterior",
+	"The price of the item changed": "El precio del artículo cambió",
 	"The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
 	"The value should be a number": "El valor debe ser un numero",
 	"This order is not editable": "Esta orden no se puede modificar",
@ -216,6 +216,7 @@
 	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
 	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
 	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+	"The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
 	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
 	"You don't have privileges to create refund": "No tienes permisos para crear un abono",
 	"The item is required": "El artículo es requerido",
@ -307,14 +308,19 @@
 	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
 	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
 	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
-    "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
 	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
 	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
 	"You don't have enough privileges.": "No tienes suficientes permisos.",
 	"This ticket is locked.": "Este ticket está bloqueado.",
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
-    "Social name should be uppercase": "La razón social debe ir en mayúscula",
+	"Social name should be uppercase": "La razón social debe ir en mayúscula",
 	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
-	"Ticket without Route": "Ticket sin ruta"
+	"The response is not a PDF": "La respuesta no es un PDF",
+	"Ticket without Route": "Ticket sin ruta",
+	"Booking completed": "Reserva completada",
+	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina"
 }
--- a/modules/account/back/models/mail-forward.json
+++ b/modules/account/back/models/mail-forward.json
@ -21,5 +21,16 @@
 			"model": "VnUser",
 			"foreignKey": "account"
 		}
-	}
+	},
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$owner",
+        "permission": "ALLOW"
+    }, {
+        "accessType": "WRITE",
+        "principalType": "ROLE",
+        "principalId": "$owner",
+        "permission": "ALLOW"
+    }]
 }
--- a/modules/account/front/basic-data/index.html
+++ b/modules/account/front/basic-data/index.html
@ -1,9 +1,9 @@
+<mg-ajax path="VnUsers/{{patch.params.id}}/update-user" options="vnPatch"></mg-ajax>
 <vn-watcher
    vn-id="watcher"
-    url="VnUsers"
    data="$ctrl.user"
-    id-value="$ctrl.$params.id"
-    form="form">
+    form="form"
+    save="patch">
 </vn-watcher>
 <form
    name="form"
@ -12,18 +12,18 @@
    <vn-card class="vn-pa-lg">
        <vn-vertical>
            <vn-textfield
-                label="User" 
+                label="User"
                ng-model="$ctrl.user.name"
                rule="VnUser"
                vn-focus>
            </vn-textfield>
            <vn-textfield
-                label="Nickname" 
+                label="Nickname"
                ng-model="$ctrl.user.nickname"
                rule="VnUser">
            </vn-textfield>
            <vn-textfield
-                label="Personal email" 
+                label="Personal email"
                ng-model="$ctrl.user.email"
                rule="VnUser">
            </vn-textfield>
--- a/modules/account/front/basic-data/index.js
+++ b/modules/account/front/basic-data/index.js
@ -18,5 +18,8 @@ ngModule.component('vnUserBasicData', {
    controller: Controller,
    require: {
        card: '^vnUserCard'
+    },
+    bindings: {
+        user: '<'
    }
 });
--- a/modules/account/front/descriptor-popover/index.html
+++ b/modules/account/front/descriptor-popover/index.html
@ -0,0 +1,4 @@
+<slot-descriptor>
+    <vn-user-descriptor>
+    </vn-user-descriptor>
+</slot-descriptor>
--- a/modules/account/front/descriptor-popover/index.js
+++ b/modules/account/front/descriptor-popover/index.js
@ -0,0 +1,9 @@
+import ngModule from '../module';
+import DescriptorPopover from 'salix/components/descriptor-popover';
+
+class Controller extends DescriptorPopover {}
+
+ngModule.vnComponent('vnAccountDescriptorPopover', {
+    slotTemplate: require('./index.html'),
+    controller: Controller
+});
--- a/modules/account/front/descriptor/index.html
+++ b/modules/account/front/descriptor/index.html
@ -2,6 +2,9 @@
    module="account"
    description="$ctrl.user.nickname"
    summary="$ctrl.$.summary">
+    <slot-before>
+        <vn-user-photo user-id="{{$ctrl.id}}"/>
+    </slot-before>
    <slot-menu>
        <vn-item
            ng-click="deleteUser.show()"
--- a/modules/account/front/descriptor/index.js
+++ b/modules/account/front/descriptor/index.js
@ -24,6 +24,28 @@ class Controller extends Descriptor {
            .then(res => this.hasAccount = res.data.exists);
    }

+    loadData() {
+        const filter = {
+            where: {id: this.$params.id},
+            include: {
+                relation: 'role',
+                scope: {
+                    fields: ['id', 'name']
+                }
+            }
+        };
+
+        return Promise.all([
+            this.$http.get(`VnUsers/preview`, {filter})
+                .then(res => {
+                    const [user] = res.data;
+                    this.user = user;
+                }),
+            this.$http.get(`Accounts/${this.$params.id}/exists`)
+                .then(res => this.hasAccount = res.data.exists)
+        ]);
+    }
+
    onDelete() {
        return this.$http.delete(`VnUsers/${this.id}`)
            .then(() => this.$state.go('account.index'))
--- a/modules/account/front/index.js
+++ b/modules/account/front/index.js
@ -9,6 +9,7 @@ import './acl';
 import './summary';
 import './card';
 import './descriptor';
+import './descriptor-popover';
 import './search-panel';
 import './create';
 import './basic-data';
--- a/modules/account/front/routes.json
+++ b/modules/account/front/routes.json
@ -78,7 +78,9 @@
            "state": "account.card.basicData",
            "component": "vn-user-basic-data",
            "description": "Basic data",
-            "acl": ["itManagement"]
+            "params": {
+                "user": "$ctrl.user"
+            }
        },
        {
            "url" : "/log",
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@ -75,7 +75,7 @@ module.exports = Self => {

        try {
            const worker = await models.Worker.findOne({
-                where: {userFk: userId}
+                where: {id: userId}
            }, myOptions);

            const obsevationType = await models.ObservationType.findOne({
--- a/modules/claim/back/methods/claim/getSummary.js
+++ b/modules/claim/back/methods/claim/getSummary.js
@ -35,7 +35,7 @@ module.exports = Self => {
                {
                    relation: 'worker',
                    scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                        include: {
                            relation: 'user',
                            scope: {
@ -109,7 +109,7 @@ module.exports = Self => {
                {
                    relation: 'worker',
                    scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                        include: {
                            relation: 'user',
                            scope: {
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`province` ADD CONSTRAINT `countryName_UN` UNIQUE KEY (`countryFk`,`name`);