diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0573a6790..d677b80e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,18 +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
-### Changed
+- (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
 
diff --git a/back/methods/collection/getTickets.js b/back/methods/collection/getTickets.js
new file mode 100644
index 000000000..445fc070d
--- /dev/null
+++ 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;
+    };
+};
diff --git a/back/methods/collection/spec/getTickets.spec.js b/back/methods/collection/spec/getTickets.spec.js
new file mode 100644
index 000000000..e6b9e6a17
--- /dev/null
+++ 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;
+        }
+    });
+});
diff --git a/back/models/collection.js b/back/models/collection.js
index a41742ee7..bfa906af6 100644
--- 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);
 };
diff --git a/back/models/vn-user.json b/back/models/vn-user.json
index 9131c9134..9e3f8df89 100644
--- a/back/models/vn-user.json
+++ b/back/models/vn-user.json
@@ -84,7 +84,7 @@
 		"worker": {
 			"type": "hasOne",
 			"model": "Worker",
-			"foreignKey": "userFk"
+			"foreignKey": "id"
 		},
 		"userConfig": {
 			"type": "hasOne",
diff --git a/db/.archive/224903/00-timeBusiness_calculate.sql b/db/.archive/224903/00-timeBusiness_calculate.sql
index ea13c4a8a..6345475dd 100644
--- 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
diff --git a/db/changes/231401/00-clientBeforeUpdate.sql b/db/changes/231401/00-clientBeforeUpdate.sql
index 8f9f70dd5..6bae98f61 100644
--- 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;
diff --git a/db/changes/233801/01-deviceLog_acl.sql b/db/changes/233801/01-deviceLog_acl.sql
index ebe3f8ed5..2b646a6a3 100644
--- a/db/changes/233801/01-deviceLog_acl.sql
+++ b/db/changes/233801/01-deviceLog_acl.sql
@@ -1,6 +1,6 @@
 
-ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+-- 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');
+-- INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
+-- VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
 
diff --git a/db/changes/233401/.gitkeep b/db/changes/233802/.gitkeep
similarity index 100%
rename from db/changes/233401/.gitkeep
rename to db/changes/233802/.gitkeep
diff --git a/db/changes/233802/00-collectionGetTicketsACL.sql b/db/changes/233802/00-collectionGetTicketsACL.sql
new file mode 100644
index 000000000..06b584386
--- /dev/null
+++ 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');
diff --git a/db/changes/234001/00-aclClient.sql b/db/changes/234001/00-aclClient.sql
new file mode 100644
index 000000000..109b3a4fb
--- /dev/null
+++ 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');
diff --git a/db/changes/234001/00-dropUserFk.sql b/db/changes/234001/00-dropUserFk.sql
new file mode 100644
index 000000000..d6ce328a8
--- /dev/null
+++ 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`;
+
diff --git a/db/changes/233801/00-item_setVisibleDiscard.sql b/db/changes/234001/00-item_setVisibleDiscard.sql
similarity index 100%
rename from db/changes/233801/00-item_setVisibleDiscard.sql
rename to db/changes/234001/00-item_setVisibleDiscard.sql
diff --git a/db/changes/234001/00-models.sql b/db/changes/234001/00-models.sql
new file mode 100644
index 000000000..abf1e3ea5
--- /dev/null
+++ 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');
diff --git a/db/changes/233801/00-ticketConfig.sql b/db/changes/234001/00-ticketConfig.sql
similarity index 100%
rename from db/changes/233801/00-ticketConfig.sql
rename to db/changes/234001/00-ticketConfig.sql
diff --git a/db/changes/234001/00-timeBusiness_calculate.sql b/db/changes/234001/00-timeBusiness_calculate.sql
new file mode 100644
index 000000000..599dba74a
--- /dev/null
+++ 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 ;
diff --git a/db/changes/234001/00-updateAfterBusinnesInsert.sql b/db/changes/234001/00-updateAfterBusinnesInsert.sql
new file mode 100644
index 000000000..71356db80
--- /dev/null
+++ 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 ;
diff --git a/db/changes/234001/01-aclAccount.sql b/db/changes/234001/01-aclAccount.sql
new file mode 100644
index 000000000..d749b52ab
--- /dev/null
+++ 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');
diff --git a/db/changes/234001/01-deliveryAssistantACL.sql b/db/changes/234001/01-deliveryAssistantACL.sql
index 44459c432..0f273325f 100644
--- a/db/changes/234001/01-deliveryAssistantACL.sql
+++ b/db/changes/234001/01-deliveryAssistantACL.sql
@@ -1,16 +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)
+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';
+        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;
 
-
-CALL `account`.`role_syncPrivileges`();
+UPDATE `salix`.`ACL`
+    SET principalId='deliveryAssistant'
+        WHERE principalId='deliveryBoss';
diff --git a/db/changes/234001/01-workerCreate.sql b/db/changes/234001/01-workerCreate.sql
new file mode 100644
index 000000000..166c65a26
--- /dev/null
+++ 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 ;
diff --git a/db/changes/234001/02-roleSync.sql b/db/changes/234001/02-roleSync.sql
new file mode 100644
index 000000000..6fe47f691
--- /dev/null
+++ 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`();
diff --git a/modules/claim/front/development/style.scss b/db/changes/234002/.gitkeep
similarity index 100%
rename from modules/claim/front/development/style.scss
rename to db/changes/234002/.gitkeep
diff --git a/db/changes/234002/01-itemShelvingSale.sql b/db/changes/234002/01-itemShelvingSale.sql
new file mode 100644
index 000000000..817c6317a
--- /dev/null
+++ 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 ;
diff --git a/db/changes/234201/.gitkeep b/db/changes/234201/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index 383cc4722..2e1511b59 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -78,7 +78,7 @@ USE `account`;
 
 LOCK TABLES `role` WRITE;
 /*!40000 ALTER TABLE `role` DISABLE KEYS */;
-INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2023-06-08 16:47:57',NULL),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2023-06-02 20:33:28',NULL),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35',NULL),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30',NULL),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10',NULL),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27',NULL),(20,'manager','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15',NULL),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52',NULL),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12',NULL),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36',NULL),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27',NULL),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20',NULL),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34',NULL),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53',NULL),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42',NULL),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08',NULL),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53',NULL),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09',NULL),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41',NULL),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12',NULL),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26',NULL),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59',NULL),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16',NULL),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12',NULL),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23',NULL),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18',NULL),(48,'coolerBoss','Jefe de cámara',1,'2018-02-23 13:12:01','2023-03-13 08:49:43',NULL),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35',NULL),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12',NULL),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39',NULL),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57',NULL),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57',NULL),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17',NULL),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31',NULL),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02',NULL),(57,'deliveryAssistant','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19',NULL),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45',NULL),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10',NULL),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01',NULL),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07',NULL),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05',NULL),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08',NULL),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26',NULL),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56',NULL),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23',NULL),(69,'coolerAssist','Asistente de cámara con permiso compras',1,'2020-02-05 12:36:09','2023-03-13 08:50:07',NULL),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25',NULL),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07',NULL),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46',NULL),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27',NULL),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41',NULL),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07',NULL),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17',NULL),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37',NULL),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22',NULL),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49',NULL),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09',NULL),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16',NULL),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10',NULL),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51',NULL),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56',NULL),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30',NULL),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55',NULL),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35',NULL),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-05-17 11:07:21',NULL),(115,'itManagement','TI management',1,'2023-03-29 07:27:55','2023-03-29 07:28:04',NULL),(119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 11:51:54','2023-06-07 11:51:54',NULL),(120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 07:07:21','2023-06-19 07:07:21',21709),(121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 14:48:19','2023-06-23 14:48:19',NULL),(122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 07:21:15','2023-06-26 07:21:15',NULL);
+INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2023-06-08 16:47:57',NULL),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2023-06-02 20:33:28',NULL),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35',NULL),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30',NULL),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10',NULL),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27',NULL),(20,'manager','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15',NULL),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52',NULL),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12',NULL),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36',NULL),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27',NULL),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20',NULL),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34',NULL),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53',NULL),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42',NULL),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08',NULL),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53',NULL),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09',NULL),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41',NULL),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12',NULL),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26',NULL),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59',NULL),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16',NULL),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12',NULL),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23',NULL),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18',NULL),(48,'coolerBoss','Jefe de cámara',1,'2018-02-23 13:12:01','2023-03-13 08:49:43',NULL),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35',NULL),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12',NULL),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39',NULL),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57',NULL),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57',NULL),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17',NULL),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31',NULL),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02',NULL),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19',NULL),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45',NULL),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10',NULL),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01',NULL),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07',NULL),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05',NULL),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08',NULL),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26',NULL),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56',NULL),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23',NULL),(69,'coolerAssist','Asistente de cámara con permiso compras',1,'2020-02-05 12:36:09','2023-03-13 08:50:07',NULL),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25',NULL),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07',NULL),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46',NULL),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27',NULL),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41',NULL),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07',NULL),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17',NULL),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37',NULL),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22',NULL),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49',NULL),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09',NULL),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16',NULL),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10',NULL),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51',NULL),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56',NULL),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30',NULL),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55',NULL),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35',NULL),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-05-17 11:07:21',NULL),(115,'itManagement','TI management',1,'2023-03-29 07:27:55','2023-03-29 07:28:04',NULL),(119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 11:51:54','2023-06-07 11:51:54',NULL),(120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 07:07:21','2023-06-19 07:07:21',21709),(121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 14:48:19','2023-06-23 14:48:19',NULL),(122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 07:21:15','2023-06-26 07:21:15',NULL);
 /*!40000 ALTER TABLE `role` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -164,7 +164,7 @@ USE `salix`;
 
 LOCK TABLES `ACL` WRITE;
 /*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','logisticBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryAssistant'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryAssistant'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','find','READ','ALLOW','ROLE','hr'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','READ','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'),(429,'ItemConfig','*','READ','ALLOW','ROLE','employee'),(431,'Tag','onSubmit','WRITE','ALLOW','ROLE','employee'),(432,'Worker','updateAttributes','WRITE','ALLOW','ROLE','hr'),(433,'Worker','createAbsence','*','ALLOW','ROLE','employee'),(434,'Worker','updateAbsence','WRITE','ALLOW','ROLE','employee'),(435,'Worker','deleteAbsence','*','ALLOW','ROLE','employee'),(436,'Worker','new','WRITE','ALLOW','ROLE','hr'),(438,'Client','getClientOrSupplierReference','READ','ALLOW','ROLE','employee'),(439,'NotificationSubscription','*','*','ALLOW','ROLE','employee'),(440,'NotificationAcl','*','READ','ALLOW','ROLE','employee'),(441,'MdbApp','*','READ','ALLOW','ROLE','$everyone'),(442,'MdbApp','*','*','ALLOW','ROLE','developer'),(443,'ItemConfig','*','*','ALLOW','ROLE','employee'),(444,'DeviceProduction','*','*','ALLOW','ROLE','hr'),(445,'DeviceProductionModels','*','*','ALLOW','ROLE','hr'),(446,'DeviceProductionState','*','*','ALLOW','ROLE','hr'),(447,'DeviceProductionUser','*','*','ALLOW','ROLE','hr'),(448,'DeviceProduction','*','*','ALLOW','ROLE','productionAssi'),(449,'DeviceProductionModels','*','*','ALLOW','ROLE','productionAssi'),(450,'DeviceProductionState','*','*','ALLOW','ROLE','productionAssi'),(451,'DeviceProductionUser','*','*','ALLOW','ROLE','productionAssi'),(452,'Worker','deallocatePDA','*','ALLOW','ROLE','hr'),(453,'Worker','allocatePDA','*','ALLOW','ROLE','hr'),(454,'Worker','deallocatePDA','*','ALLOW','ROLE','productionAssi'),(455,'Worker','allocatePDA','*','ALLOW','ROLE','productionAssi'),(456,'Zone','*','*','ALLOW','ROLE','deliveryAssistant'),(457,'Account','setPassword','WRITE','ALLOW','ROLE','itManagement'),(458,'Operator','*','READ','ALLOW','ROLE','employee'),(459,'Operator','*','WRITE','ALLOW','ROLE','employee'),(460,'InvoiceIn','getSerial','READ','ALLOW','ROLE','administrative'),(461,'Ticket','saveSign','WRITE','ALLOW','ROLE','employee'),(462,'InvoiceOut','negativeBases','READ','ALLOW','ROLE','administrative'),(463,'InvoiceOut','negativeBasesCsv','READ','ALLOW','ROLE','administrative'),(464,'WorkerObservation','*','*','ALLOW','ROLE','hr'),(465,'ClientInforma','*','READ','ALLOW','ROLE','employee'),(466,'ClientInforma','*','WRITE','ALLOW','ROLE','financial'),(467,'Receipt','receiptEmail','*','ALLOW','ROLE','salesAssistant'),(468,'Client','setRating','WRITE','ALLOW','ROLE','financial'),(469,'Client','*','READ','ALLOW','ROLE','employee'),(470,'Client','addressesPropagateRe','*','ALLOW','ROLE','employee'),(471,'Client','canBeInvoiced','*','ALLOW','ROLE','employee'),(472,'Client','canCreateTicket','*','ALLOW','ROLE','employee'),(473,'Client','consumption','*','ALLOW','ROLE','employee'),(474,'Client','createAddress','*','ALLOW','ROLE','employee'),(475,'Client','createWithUser','*','ALLOW','ROLE','employee'),(476,'Client','extendedListFilter','*','ALLOW','ROLE','employee'),(477,'Client','getAverageInvoiced','*','ALLOW','ROLE','employee'),(478,'Client','getCard','*','ALLOW','ROLE','employee'),(479,'Client','getDebt','*','ALLOW','ROLE','employee'),(480,'Client','getMana','*','ALLOW','ROLE','employee'),(481,'Client','transactions','*','ALLOW','ROLE','employee'),(482,'Client','hasCustomerRole','*','ALLOW','ROLE','employee'),(483,'Client','isValidClient','*','ALLOW','ROLE','employee'),(484,'Client','lastActiveTickets','*','ALLOW','ROLE','employee'),(485,'Client','sendSms','*','ALLOW','ROLE','employee'),(486,'Client','setPassword','*','ALLOW','ROLE','employee'),(487,'Client','summary','*','ALLOW','ROLE','employee'),(488,'Client','updateAddress','*','ALLOW','ROLE','employee'),(489,'Client','updateFiscalData','*','ALLOW','ROLE','employee'),(491,'Client','uploadFile','*','ALLOW','ROLE','employee'),(492,'Client','campaignMetricsPdf','*','ALLOW','ROLE','employee'),(493,'Client','campaignMetricsEmail','*','ALLOW','ROLE','employee'),(494,'Client','clientWelcomeHtml','*','ALLOW','ROLE','employee'),(495,'Client','clientWelcomeEmail','*','ALLOW','ROLE','employee'),(496,'Client','printerSetupHtml','*','ALLOW','ROLE','employee'),(497,'Client','printerSetupEmail','*','ALLOW','ROLE','employee'),(498,'Client','sepaCoreEmail','*','ALLOW','ROLE','employee'),(499,'Client','letterDebtorPdf','*','ALLOW','ROLE','employee'),(500,'Client','letterDebtorStHtml','*','ALLOW','ROLE','employee'),(501,'Client','letterDebtorStEmail','*','ALLOW','ROLE','employee'),(502,'Client','letterDebtorNdHtml','*','ALLOW','ROLE','employee'),(503,'Client','letterDebtorNdEmail','*','ALLOW','ROLE','employee'),(504,'Client','clientDebtStatementPdf','*','ALLOW','ROLE','employee'),(505,'Client','clientDebtStatementHtml','*','ALLOW','ROLE','employee'),(506,'Client','clientDebtStatementEmail','*','ALLOW','ROLE','employee'),(507,'Client','creditRequestPdf','*','ALLOW','ROLE','employee'),(508,'Client','creditRequestHtml','*','ALLOW','ROLE','employee'),(509,'Client','creditRequestEmail','*','ALLOW','ROLE','employee'),(510,'Client','incotermsAuthorizationPdf','*','ALLOW','ROLE','employee'),(511,'Client','incotermsAuthorizationHtml','*','ALLOW','ROLE','employee'),(512,'Client','incotermsAuthorizationEmail','*','ALLOW','ROLE','employee'),(513,'Client','consumptionSendQueued','*','ALLOW','ROLE','employee'),(514,'Client','filter','*','ALLOW','ROLE','employee'),(515,'Client','getClientOrSupplierReference','*','ALLOW','ROLE','employee'),(516,'Client','upsert','*','ALLOW','ROLE','employee'),(517,'Client','create','*','ALLOW','ROLE','employee'),(518,'Client','replaceById','*','ALLOW','ROLE','employee'),(519,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(520,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(521,'Client','deleteById','*','ALLOW','ROLE','employee'),(522,'Client','replaceOrCreate','*','ALLOW','ROLE','employee'),(523,'Client','updateAll','*','ALLOW','ROLE','employee'),(524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee'),(525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee'),(527,'VnUser','acl','READ','ALLOW','ROLE','account'),(528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),(530,'Account','exists','READ','ALLOW','ROLE','account'),(531,'Account','exists','READ','ALLOW','ROLE','account'),(532,'UserLog','*','READ','ALLOW','ROLE','employee'),(533,'RoleLog','*','READ','ALLOW','ROLE','employee'),(534,'WagonType','*','*','ALLOW','ROLE','productionAssi'),(535,'WagonTypeColor','*','*','ALLOW','ROLE','productionAssi'),(536,'WagonTypeTray','*','*','ALLOW','ROLE','productionAssi'),(537,'WagonConfig','*','*','ALLOW','ROLE','productionAssi'),(538,'CollectionWagon','*','*','ALLOW','ROLE','productionAssi'),(539,'CollectionWagonTicket','*','*','ALLOW','ROLE','productionAssi'),(540,'Wagon','*','*','ALLOW','ROLE','productionAssi'),(541,'WagonType','createWagonType','*','ALLOW','ROLE','productionAssi'),(542,'WagonType','deleteWagonType','*','ALLOW','ROLE','productionAssi'),(543,'WagonType','editWagonType','*','ALLOW','ROLE','productionAssi'),(544,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(545,'Agency','find','READ','ALLOW','ROLE','employee'),(546,'Agency','seeExpired','READ','ALLOW','ROLE','coolerAssist'),(547,'WorkerLog','models','READ','ALLOW','ROLE','hr'),(548,'Ticket','editDiscount','WRITE','ALLOW','ROLE','claimManager'),(549,'Ticket','editDiscount','WRITE','ALLOW','ROLE','salesPerson'),(550,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','salesAssistant'),(551,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','deliveryAssistant'),(552,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','buyer'),(553,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','claimManager'),(554,'Ticket','deleteTicketWithPartPrepared','WRITE','ALLOW','ROLE','salesAssistant'),(555,'Ticket','editZone','WRITE','ALLOW','ROLE','deliveryAssistant'),(556,'State','editableStates','READ','ALLOW','ROLE','employee'),(557,'State','seeEditableStates','READ','ALLOW','ROLE','administrative'),(558,'State','seeEditableStates','READ','ALLOW','ROLE','production'),(559,'State','isSomeEditable','READ','ALLOW','ROLE','salesPerson'),(560,'State','isAllEditable','READ','ALLOW','ROLE','production'),(561,'State','isAllEditable','READ','ALLOW','ROLE','administrative'),(562,'Agency','seeExpired','READ','ALLOW','ROLE','administrative'),(563,'Agency','seeExpired','READ','ALLOW','ROLE','productionBoss'),(564,'Claim','createAfterDeadline','WRITE','ALLOW','ROLE','claimManager'),(565,'Client','editAddressLogifloraAllowed','WRITE','ALLOW','ROLE','salesAssistant'),(566,'Client','editFiscalDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(567,'Client','editVerifiedDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(568,'Client','editCredit','WRITE','ALLOW','ROLE','financialBoss'),(569,'Client','zeroCreditEditor','WRITE','ALLOW','ROLE','financialBoss'),(570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE','invoicing'),(571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial'),(572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss'),(573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr'),(574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager'),(575,'Claim','find','READ','ALLOW','ROLE','salesPerson'),(576,'Claim','findById','READ','ALLOW','ROLE','salesPerson'),(577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson'),(578,'Claim','getSummary','READ','ALLOW','ROLE','salesPerson'),(579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson'),(580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager'),(581,'Claim','updateClaimDestination','WRITE','ALLOW','ROLE','claimManager'),(582,'Claim','downloadFile','READ','ALLOW','ROLE','claimManager'),(583,'Claim','deleteById','WRITE','ALLOW','ROLE','claimManager'),(584,'Claim','filter','READ','ALLOW','ROLE','salesPerson'),(585,'Claim','logs','READ','ALLOW','ROLE','claimManager'),(586,'Ticket','find','READ','ALLOW','ROLE','employee'),(587,'Ticket','findById','READ','ALLOW','ROLE','employee'),(588,'Ticket','findOne','READ','ALLOW','ROLE','employee'),(589,'Ticket','getVolume','READ','ALLOW','ROLE','employee'),(590,'Ticket','getTotalVolume','READ','ALLOW','ROLE','employee'),(591,'Ticket','summary','READ','ALLOW','ROLE','employee'),(592,'Ticket','priceDifference','READ','ALLOW','ROLE','employee'),(593,'Ticket','componentUpdate','WRITE','ALLOW','ROLE','employee'),(594,'Ticket','new','WRITE','ALLOW','ROLE','employee'),(595,'Ticket','isEditable','READ','ALLOW','ROLE','employee'),(596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson'),(597,'Ticket','restore','WRITE','ALLOW','ROLE','employee'),(598,'Ticket','getSales','READ','ALLOW','ROLE','employee'),(599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee'),(600,'Ticket','filter','READ','ALLOW','ROLE','employee'),(601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee'),(602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee'),(603,'Ticket','updateDiscount','WRITE','ALLOW','ROLE','employee'),(604,'Ticket','transferSales','WRITE','ALLOW','ROLE','employee'),(605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employee'),(606,'Ticket','isLocked','READ','ALLOW','ROLE','employee'),(607,'Ticket','freightCost','READ','ALLOW','ROLE','employee'),(608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee'),(609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery'),(610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee'),(611,'State','find','READ','ALLOW','ROLE','employee'),(612,'State','findById','READ','ALLOW','ROLE','employee'),(613,'State','findOne','READ','ALLOW','ROLE','employee'),(614,'Worker','find','READ','ALLOW','ROLE','employee'),(615,'Worker','findById','READ','ALLOW','ROLE','employee'),(616,'Worker','findOne','READ','ALLOW','ROLE','employee'),(617,'Worker','filter','READ','ALLOW','ROLE','employee'),(618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee'),(619,'Worker','active','READ','ALLOW','ROLE','employee'),(620,'Worker','activeWithRole','READ','ALLOW','ROLE','employee'),(621,'Worker','uploadFile','WRITE','ALLOW','ROLE','hr'),(622,'Worker','contracts','READ','ALLOW','ROLE','employee'),(623,'Worker','holidays','READ','ALLOW','ROLE','employee'),(624,'Worker','activeContract','READ','ALLOW','ROLE','employee'),(625,'Worker','activeWithInheritedRole','READ','ALLOW','ROLE','employee'),(626,'Ticket','collectionLabel','READ','ALLOW','ROLE','employee'),(628,'Ticket','expeditionPalletLabel','READ','ALLOW','ROLE','employee'),(629,'Ticket','editDiscount','WRITE','ALLOW','ROLE','artificialBoss'),(630,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesTeamBoss'),(635,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','administrative'),(636,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesPerson'),(637,'Claim','downloadFile','READ','ALLOW','ROLE','salesPerson'),(638,'Agency','seeExpired','READ','ALLOW','ROLE','artificialBoss'),(639,'Agency','seeExpired','READ','ALLOW','ROLE','logisticAssistant'),(640,'Claim','filter','READ','ALLOW','ROLE','buyer'),(641,'Claim','find','READ','ALLOW','ROLE','buyer'),(642,'Claim','findById','READ','ALLOW','ROLE','buyer'),(643,'Claim','getSummary','READ','ALLOW','ROLE','buyer'),(644,'Claim','filter','READ','ALLOW','ROLE','handmadeBoss'),(645,'Claim','find','READ','ALLOW','ROLE','handmadeBoss'),(646,'Claim','findById','READ','ALLOW','ROLE','handmadeBoss'),(647,'Claim','getSummary','READ','ALLOW','ROLE','handmadeBoss'),(648,'Claim','__get__lines','READ','ALLOW','ROLE','claimManager'),(649,'Claim','__get__lines','READ','ALLOW','ROLE','salesPerson'),(650,'Claim','getSummary','READ','ALLOW','ROLE','deliveryAssistant'),(651,'Claim','findById','READ','ALLOW','ROLE','deliveryAssistant'),(652,'Claim','find','READ','ALLOW','ROLE','deliveryAssistant'),(653,'Claim','filter','READ','ALLOW','ROLE','deliveryAssistant'),(654,'Ticket','editZone','WRITE','ALLOW','ROLE','logisticAssistant'),(655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production'),(656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production'),(657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production'),(658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system'),(659,'Account','*','*','ALLOW','ROLE','itManagement'),(660,'Account','*','READ','ALLOW','ROLE','employee'),(664,'MailForward','*','*','ALLOW','ROLE','itManagement'),(665,'Role','*','READ','ALLOW','ROLE','employee'),(666,'Role','*','WRITE','ALLOW','ROLE','it'),(667,'VnUser','*','*','ALLOW','ROLE','itManagement'),(668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee'),(669,'VnUser','preview','*','ALLOW','ROLE','employee'),(670,'VnUser','create','*','ALLOW','ROLE','itManagement'),(671,'VnUser','renewToken','WRITE','ALLOW','ROLE','employee'),(672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production'),(673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing'),(674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing'),(676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee'),(680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee'),(681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee'),(682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee'),(683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement'),(684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement'),(685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement'),(686,'MailForward','*','*','ALLOW','ROLE','hr'),(687,'ClientSms','find','READ','ALLOW','ROLE','employee'),(688,'ClientSms','create','WRITE','ALLOW','ROLE','employee'),(689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee'),(690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss'),(691,'Roadmap','*','*','ALLOW','ROLE','productionBoss'),(692,'ExpeditionTruck','*','*','ALLOW','ROLE','palletizerBoss'),(693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss'),(694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss'),(695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee'),(696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee'),(697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative'),(698,'Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer'),(699,'TicketSms','find','READ','ALLOW','ROLE','salesPerson'),(701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryAssistant'),(702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson');
+INSERT INTO `ACL` VALUES (3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','logisticBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','find','READ','ALLOW','ROLE','hr'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','READ','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryBoss'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'),(429,'ItemConfig','*','READ','ALLOW','ROLE','employee'),(431,'Tag','onSubmit','WRITE','ALLOW','ROLE','employee'),(432,'Worker','updateAttributes','WRITE','ALLOW','ROLE','hr'),(433,'Worker','createAbsence','*','ALLOW','ROLE','employee'),(434,'Worker','updateAbsence','WRITE','ALLOW','ROLE','employee'),(435,'Worker','deleteAbsence','*','ALLOW','ROLE','employee'),(436,'Worker','new','WRITE','ALLOW','ROLE','hr'),(438,'Client','getClientOrSupplierReference','READ','ALLOW','ROLE','employee'),(439,'NotificationSubscription','*','*','ALLOW','ROLE','employee'),(440,'NotificationAcl','*','READ','ALLOW','ROLE','employee'),(441,'MdbApp','*','READ','ALLOW','ROLE','$everyone'),(442,'MdbApp','*','*','ALLOW','ROLE','developer'),(443,'ItemConfig','*','*','ALLOW','ROLE','employee'),(444,'DeviceProduction','*','*','ALLOW','ROLE','hr'),(445,'DeviceProductionModels','*','*','ALLOW','ROLE','hr'),(446,'DeviceProductionState','*','*','ALLOW','ROLE','hr'),(447,'DeviceProductionUser','*','*','ALLOW','ROLE','hr'),(448,'DeviceProduction','*','*','ALLOW','ROLE','productionAssi'),(449,'DeviceProductionModels','*','*','ALLOW','ROLE','productionAssi'),(450,'DeviceProductionState','*','*','ALLOW','ROLE','productionAssi'),(451,'DeviceProductionUser','*','*','ALLOW','ROLE','productionAssi'),(452,'Worker','deallocatePDA','*','ALLOW','ROLE','hr'),(453,'Worker','allocatePDA','*','ALLOW','ROLE','hr'),(454,'Worker','deallocatePDA','*','ALLOW','ROLE','productionAssi'),(455,'Worker','allocatePDA','*','ALLOW','ROLE','productionAssi'),(456,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(457,'Account','setPassword','WRITE','ALLOW','ROLE','itManagement'),(458,'Operator','*','READ','ALLOW','ROLE','employee'),(459,'Operator','*','WRITE','ALLOW','ROLE','employee'),(460,'InvoiceIn','getSerial','READ','ALLOW','ROLE','administrative'),(461,'Ticket','saveSign','WRITE','ALLOW','ROLE','employee'),(462,'InvoiceOut','negativeBases','READ','ALLOW','ROLE','administrative'),(463,'InvoiceOut','negativeBasesCsv','READ','ALLOW','ROLE','administrative'),(464,'WorkerObservation','*','*','ALLOW','ROLE','hr'),(465,'ClientInforma','*','READ','ALLOW','ROLE','employee'),(466,'ClientInforma','*','WRITE','ALLOW','ROLE','financial'),(467,'Receipt','receiptEmail','*','ALLOW','ROLE','salesAssistant'),(468,'Client','setRating','WRITE','ALLOW','ROLE','financial'),(469,'Client','*','READ','ALLOW','ROLE','employee'),(470,'Client','addressesPropagateRe','*','ALLOW','ROLE','employee'),(471,'Client','canBeInvoiced','*','ALLOW','ROLE','employee'),(472,'Client','canCreateTicket','*','ALLOW','ROLE','employee'),(473,'Client','consumption','*','ALLOW','ROLE','employee'),(474,'Client','createAddress','*','ALLOW','ROLE','employee'),(475,'Client','createWithUser','*','ALLOW','ROLE','employee'),(476,'Client','extendedListFilter','*','ALLOW','ROLE','employee'),(477,'Client','getAverageInvoiced','*','ALLOW','ROLE','employee'),(478,'Client','getCard','*','ALLOW','ROLE','employee'),(479,'Client','getDebt','*','ALLOW','ROLE','employee'),(480,'Client','getMana','*','ALLOW','ROLE','employee'),(481,'Client','transactions','*','ALLOW','ROLE','employee'),(482,'Client','hasCustomerRole','*','ALLOW','ROLE','employee'),(483,'Client','isValidClient','*','ALLOW','ROLE','employee'),(484,'Client','lastActiveTickets','*','ALLOW','ROLE','employee'),(485,'Client','sendSms','*','ALLOW','ROLE','employee'),(486,'Client','setPassword','*','ALLOW','ROLE','employee'),(487,'Client','summary','*','ALLOW','ROLE','employee'),(488,'Client','updateAddress','*','ALLOW','ROLE','employee'),(489,'Client','updateFiscalData','*','ALLOW','ROLE','employee'),(491,'Client','uploadFile','*','ALLOW','ROLE','employee'),(492,'Client','campaignMetricsPdf','*','ALLOW','ROLE','employee'),(493,'Client','campaignMetricsEmail','*','ALLOW','ROLE','employee'),(494,'Client','clientWelcomeHtml','*','ALLOW','ROLE','employee'),(495,'Client','clientWelcomeEmail','*','ALLOW','ROLE','employee'),(496,'Client','printerSetupHtml','*','ALLOW','ROLE','employee'),(497,'Client','printerSetupEmail','*','ALLOW','ROLE','employee'),(498,'Client','sepaCoreEmail','*','ALLOW','ROLE','employee'),(499,'Client','letterDebtorPdf','*','ALLOW','ROLE','employee'),(500,'Client','letterDebtorStHtml','*','ALLOW','ROLE','employee'),(501,'Client','letterDebtorStEmail','*','ALLOW','ROLE','employee'),(502,'Client','letterDebtorNdHtml','*','ALLOW','ROLE','employee'),(503,'Client','letterDebtorNdEmail','*','ALLOW','ROLE','employee'),(504,'Client','clientDebtStatementPdf','*','ALLOW','ROLE','employee'),(505,'Client','clientDebtStatementHtml','*','ALLOW','ROLE','employee'),(506,'Client','clientDebtStatementEmail','*','ALLOW','ROLE','employee'),(507,'Client','creditRequestPdf','*','ALLOW','ROLE','employee'),(508,'Client','creditRequestHtml','*','ALLOW','ROLE','employee'),(509,'Client','creditRequestEmail','*','ALLOW','ROLE','employee'),(510,'Client','incotermsAuthorizationPdf','*','ALLOW','ROLE','employee'),(511,'Client','incotermsAuthorizationHtml','*','ALLOW','ROLE','employee'),(512,'Client','incotermsAuthorizationEmail','*','ALLOW','ROLE','employee'),(513,'Client','consumptionSendQueued','*','ALLOW','ROLE','employee'),(514,'Client','filter','*','ALLOW','ROLE','employee'),(515,'Client','getClientOrSupplierReference','*','ALLOW','ROLE','employee'),(516,'Client','upsert','*','ALLOW','ROLE','employee'),(517,'Client','create','*','ALLOW','ROLE','employee'),(518,'Client','replaceById','*','ALLOW','ROLE','employee'),(519,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(520,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(521,'Client','deleteById','*','ALLOW','ROLE','employee'),(522,'Client','replaceOrCreate','*','ALLOW','ROLE','employee'),(523,'Client','updateAll','*','ALLOW','ROLE','employee'),(524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee'),(525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee'),(527,'VnUser','acl','READ','ALLOW','ROLE','account'),(528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),(530,'Account','exists','READ','ALLOW','ROLE','account'),(531,'Account','exists','READ','ALLOW','ROLE','account'),(532,'UserLog','*','READ','ALLOW','ROLE','employee'),(533,'RoleLog','*','READ','ALLOW','ROLE','employee'),(534,'WagonType','*','*','ALLOW','ROLE','productionAssi'),(535,'WagonTypeColor','*','*','ALLOW','ROLE','productionAssi'),(536,'WagonTypeTray','*','*','ALLOW','ROLE','productionAssi'),(537,'WagonConfig','*','*','ALLOW','ROLE','productionAssi'),(538,'CollectionWagon','*','*','ALLOW','ROLE','productionAssi'),(539,'CollectionWagonTicket','*','*','ALLOW','ROLE','productionAssi'),(540,'Wagon','*','*','ALLOW','ROLE','productionAssi'),(541,'WagonType','createWagonType','*','ALLOW','ROLE','productionAssi'),(542,'WagonType','deleteWagonType','*','ALLOW','ROLE','productionAssi'),(543,'WagonType','editWagonType','*','ALLOW','ROLE','productionAssi'),(544,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(545,'Agency','find','READ','ALLOW','ROLE','employee'),(546,'Agency','seeExpired','READ','ALLOW','ROLE','coolerAssist'),(547,'WorkerLog','models','READ','ALLOW','ROLE','hr'),(548,'Ticket','editDiscount','WRITE','ALLOW','ROLE','claimManager'),(549,'Ticket','editDiscount','WRITE','ALLOW','ROLE','salesPerson'),(550,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','salesAssistant'),(551,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','deliveryBoss'),(552,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','buyer'),(553,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','claimManager'),(554,'Ticket','deleteTicketWithPartPrepared','WRITE','ALLOW','ROLE','salesAssistant'),(555,'Ticket','editZone','WRITE','ALLOW','ROLE','deliveryBoss'),(556,'State','editableStates','READ','ALLOW','ROLE','employee'),(557,'State','seeEditableStates','READ','ALLOW','ROLE','administrative'),(558,'State','seeEditableStates','READ','ALLOW','ROLE','production'),(559,'State','isSomeEditable','READ','ALLOW','ROLE','salesPerson'),(560,'State','isAllEditable','READ','ALLOW','ROLE','production'),(561,'State','isAllEditable','READ','ALLOW','ROLE','administrative'),(562,'Agency','seeExpired','READ','ALLOW','ROLE','administrative'),(563,'Agency','seeExpired','READ','ALLOW','ROLE','productionBoss'),(564,'Claim','createAfterDeadline','WRITE','ALLOW','ROLE','claimManager'),(565,'Client','editAddressLogifloraAllowed','WRITE','ALLOW','ROLE','salesAssistant'),(566,'Client','editFiscalDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(567,'Client','editVerifiedDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(568,'Client','editCredit','WRITE','ALLOW','ROLE','financialBoss'),(569,'Client','zeroCreditEditor','WRITE','ALLOW','ROLE','financialBoss'),(570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE','invoicing'),(571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial'),(572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss'),(573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr'),(574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager'),(575,'Claim','find','READ','ALLOW','ROLE','salesPerson'),(576,'Claim','findById','READ','ALLOW','ROLE','salesPerson'),(577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson'),(578,'Claim','getSummary','READ','ALLOW','ROLE','salesPerson'),(579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson'),(580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager'),(581,'Claim','updateClaimDestination','WRITE','ALLOW','ROLE','claimManager'),(582,'Claim','downloadFile','READ','ALLOW','ROLE','claimManager'),(583,'Claim','deleteById','WRITE','ALLOW','ROLE','claimManager'),(584,'Claim','filter','READ','ALLOW','ROLE','salesPerson'),(585,'Claim','logs','READ','ALLOW','ROLE','claimManager'),(586,'Ticket','find','READ','ALLOW','ROLE','employee'),(587,'Ticket','findById','READ','ALLOW','ROLE','employee'),(588,'Ticket','findOne','READ','ALLOW','ROLE','employee'),(589,'Ticket','getVolume','READ','ALLOW','ROLE','employee'),(590,'Ticket','getTotalVolume','READ','ALLOW','ROLE','employee'),(591,'Ticket','summary','READ','ALLOW','ROLE','employee'),(592,'Ticket','priceDifference','READ','ALLOW','ROLE','employee'),(593,'Ticket','componentUpdate','WRITE','ALLOW','ROLE','employee'),(594,'Ticket','new','WRITE','ALLOW','ROLE','employee'),(595,'Ticket','isEditable','READ','ALLOW','ROLE','employee'),(596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson'),(597,'Ticket','restore','WRITE','ALLOW','ROLE','employee'),(598,'Ticket','getSales','READ','ALLOW','ROLE','employee'),(599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee'),(600,'Ticket','filter','READ','ALLOW','ROLE','employee'),(601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee'),(602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee'),(603,'Ticket','updateDiscount','WRITE','ALLOW','ROLE','employee'),(604,'Ticket','transferSales','WRITE','ALLOW','ROLE','employee'),(605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employee'),(606,'Ticket','isLocked','READ','ALLOW','ROLE','employee'),(607,'Ticket','freightCost','READ','ALLOW','ROLE','employee'),(608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee'),(609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery'),(610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee'),(611,'State','find','READ','ALLOW','ROLE','employee'),(612,'State','findById','READ','ALLOW','ROLE','employee'),(613,'State','findOne','READ','ALLOW','ROLE','employee'),(614,'Worker','find','READ','ALLOW','ROLE','employee'),(615,'Worker','findById','READ','ALLOW','ROLE','employee'),(616,'Worker','findOne','READ','ALLOW','ROLE','employee'),(617,'Worker','filter','READ','ALLOW','ROLE','employee'),(618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee'),(619,'Worker','active','READ','ALLOW','ROLE','employee'),(620,'Worker','activeWithRole','READ','ALLOW','ROLE','employee'),(621,'Worker','uploadFile','WRITE','ALLOW','ROLE','hr'),(622,'Worker','contracts','READ','ALLOW','ROLE','employee'),(623,'Worker','holidays','READ','ALLOW','ROLE','employee'),(624,'Worker','activeContract','READ','ALLOW','ROLE','employee'),(625,'Worker','activeWithInheritedRole','READ','ALLOW','ROLE','employee'),(626,'Ticket','collectionLabel','READ','ALLOW','ROLE','employee'),(628,'Ticket','expeditionPalletLabel','READ','ALLOW','ROLE','employee'),(629,'Ticket','editDiscount','WRITE','ALLOW','ROLE','artificialBoss'),(630,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesTeamBoss'),(635,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','administrative'),(636,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesPerson'),(637,'Claim','downloadFile','READ','ALLOW','ROLE','salesPerson'),(638,'Agency','seeExpired','READ','ALLOW','ROLE','artificialBoss'),(639,'Agency','seeExpired','READ','ALLOW','ROLE','logisticAssistant'),(640,'Claim','filter','READ','ALLOW','ROLE','buyer'),(641,'Claim','find','READ','ALLOW','ROLE','buyer'),(642,'Claim','findById','READ','ALLOW','ROLE','buyer'),(643,'Claim','getSummary','READ','ALLOW','ROLE','buyer'),(644,'Claim','filter','READ','ALLOW','ROLE','handmadeBoss'),(645,'Claim','find','READ','ALLOW','ROLE','handmadeBoss'),(646,'Claim','findById','READ','ALLOW','ROLE','handmadeBoss'),(647,'Claim','getSummary','READ','ALLOW','ROLE','handmadeBoss'),(648,'Claim','__get__lines','READ','ALLOW','ROLE','claimManager'),(649,'Claim','__get__lines','READ','ALLOW','ROLE','salesPerson'),(650,'Claim','getSummary','READ','ALLOW','ROLE','deliveryBoss'),(651,'Claim','findById','READ','ALLOW','ROLE','deliveryBoss'),(652,'Claim','find','READ','ALLOW','ROLE','deliveryBoss'),(653,'Claim','filter','READ','ALLOW','ROLE','deliveryBoss'),(654,'Ticket','editZone','WRITE','ALLOW','ROLE','logisticAssistant'),(655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production'),(656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production'),(657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production'),(658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system'),(659,'Account','*','*','ALLOW','ROLE','itManagement'),(660,'Account','*','READ','ALLOW','ROLE','employee'),(664,'MailForward','*','*','ALLOW','ROLE','itManagement'),(665,'Role','*','READ','ALLOW','ROLE','employee'),(666,'Role','*','WRITE','ALLOW','ROLE','it'),(667,'VnUser','*','*','ALLOW','ROLE','itManagement'),(668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee'),(669,'VnUser','preview','*','ALLOW','ROLE','employee'),(670,'VnUser','create','*','ALLOW','ROLE','itManagement'),(671,'VnUser','renewToken','WRITE','ALLOW','ROLE','employee'),(672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production'),(673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing'),(674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing'),(676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee'),(680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee'),(681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee'),(682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee'),(683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement'),(684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement'),(685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement'),(686,'MailForward','*','*','ALLOW','ROLE','hr'),(687,'ClientSms','find','READ','ALLOW','ROLE','employee'),(688,'ClientSms','create','WRITE','ALLOW','ROLE','employee'),(689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee'),(690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss'),(691,'Roadmap','*','*','ALLOW','ROLE','productionBoss'),(692,'ExpeditionTruck','*','*','ALLOW','ROLE','palletizerBoss'),(693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss'),(694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss'),(695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee'),(696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee'),(697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative'),(698,'Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer'),(699,'TicketSms','find','READ','ALLOW','ROLE','salesPerson'),(701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryBoss'),(702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson');
 /*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index bd5bed897..87da97fe4 100644
--- 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
@@ -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);
 
@@ -2974,3 +2972,7 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU
         (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);
+
+INSERT INTO `vn`.`mistakeType` (`id`, `description`)
+    VALUES
+        (1, 'Incorrect quantity');
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 73f6e92cb..08df0541c 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -26556,6 +26556,7 @@ CREATE TABLE `deviceLog` (
   `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `nameApp` varchar(45) DEFAULT NULL,
   `versionApp` varchar(45) DEFAULT NULL,
+  `serialNumber` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `deviceLog_FK` (`userFk`),
   CONSTRAINT `deviceLog_FK` FOREIGN KEY (`userFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 5c0caffe4..5e071911e 100644
--- 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"]',
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index a9cce2ead..74febfd01 100644
--- 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() => {
diff --git a/e2e/paths/06-claim/03_detail.spec.js b/e2e/paths/06-claim/02_detail.spec.js
similarity index 98%
rename from e2e/paths/06-claim/03_detail.spec.js
rename to e2e/paths/06-claim/02_detail.spec.js
index ddcfd9302..eb4ac5d71 100644
--- a/e2e/paths/06-claim/03_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', () => {
diff --git a/e2e/paths/06-claim/02_development.spec.js b/e2e/paths/06-claim/02_development.spec.js
deleted file mode 100644
index b7352dcc2..000000000
--- a/e2e/paths/06-claim/02_development.spec.js
+++ /dev/null
@@ -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');
-    });
-});
diff --git a/e2e/paths/06-claim/04_claim_action.spec.js b/e2e/paths/06-claim/03_claim_action.spec.js
similarity index 97%
rename from e2e/paths/06-claim/04_claim_action.spec.js
rename to e2e/paths/06-claim/03_claim_action.spec.js
index 62a0ac232..ac6f72e37 100644
--- a/e2e/paths/06-claim/04_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;
diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/04_summary.spec.js
similarity index 98%
rename from e2e/paths/06-claim/05_summary.spec.js
rename to e2e/paths/06-claim/04_summary.spec.js
index 1333ed01a..dda8484a6 100644
--- a/e2e/paths/06-claim/05_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;
diff --git a/e2e/paths/06-claim/06_descriptor.spec.js b/e2e/paths/06-claim/05_descriptor.spec.js
similarity index 97%
rename from e2e/paths/06-claim/06_descriptor.spec.js
rename to e2e/paths/06-claim/05_descriptor.spec.js
index 059bd68dd..49912b26a 100644
--- a/e2e/paths/06-claim/06_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;
diff --git a/e2e/paths/06-claim/07_note.spec.js b/e2e/paths/06-claim/06_note.spec.js
similarity index 100%
rename from e2e/paths/06-claim/07_note.spec.js
rename to e2e/paths/06-claim/06_note.spec.js
diff --git a/front/salix/components/index.js b/front/salix/components/index.js
index 555a18450..f632904c4 100644
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@@ -18,6 +18,7 @@ import './section';
 import './summary';
 import './topbar/topbar';
 import './user-popover';
+import './user-photo';
 import './upload-photo';
 import './bank-entity';
 import './log';
diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index 6a1367e28..c75030100 100644
--- 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>
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 176815eef..1edaa72ae 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -362,9 +362,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);
     }
 }
 
diff --git a/front/salix/components/user-photo/index.html b/front/salix/components/user-photo/index.html
new file mode 100644
index 000000000..2d7bbcb82
--- /dev/null
+++ 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>
diff --git a/front/salix/components/user-photo/index.js b/front/salix/components/user-photo/index.js
new file mode 100644
index 000000000..23190c1b6
--- /dev/null
+++ 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: '@?',
+    }
+});
diff --git a/front/salix/components/user-photo/locale/es.yml b/front/salix/components/user-photo/locale/es.yml
new file mode 100644
index 000000000..7518a98bc
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index fb4e72bd6..645a874e8 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -187,5 +187,7 @@
 	"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"
 }
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 756ce301a..8c50cd9d8 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -314,8 +314,10 @@
 	"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",
 	"The response is not a PDF": "La respuesta no es un PDF",
-	"Ticket without Route": "Ticket sin ruta"
+	"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"
 }
diff --git a/modules/account/front/descriptor-popover/index.html b/modules/account/front/descriptor-popover/index.html
new file mode 100644
index 000000000..f3131a84b
--- /dev/null
+++ b/modules/account/front/descriptor-popover/index.html
@@ -0,0 +1,4 @@
+<slot-descriptor>
+    <vn-user-descriptor>
+    </vn-user-descriptor>
+</slot-descriptor>
diff --git a/modules/account/front/descriptor-popover/index.js b/modules/account/front/descriptor-popover/index.js
new file mode 100644
index 000000000..d7b052473
--- /dev/null
+++ 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
+});
diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html
index 381b2991c..94497aaa9 100644
--- 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()"
diff --git a/modules/account/front/descriptor/index.js b/modules/account/front/descriptor/index.js
index 150c9d660..786870d36 100644
--- 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'))
diff --git a/modules/account/front/index.js b/modules/account/front/index.js
index 695f36967..4d6aedcae 100644
--- 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';
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index cdf3fc2c3..be3baccd7 100644
--- 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({
diff --git a/modules/claim/back/methods/claim/getSummary.js b/modules/claim/back/methods/claim/getSummary.js
index d384f7ebb..2731f1e8f 100644
--- 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: {
diff --git a/modules/claim/back/methods/claim/logs.js b/modules/claim/back/methods/claim/logs.js
index f47513e9e..4d1b37822 100644
--- a/modules/claim/back/methods/claim/logs.js
+++ b/modules/claim/back/methods/claim/logs.js
@@ -1,7 +1,7 @@
 
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const buildFilter = require('vn-loopback/util/filter').buildFilter;
-const { mergeFilters, mergeWhere } = require('vn-loopback/util/filter');
+const {mergeFilters, mergeWhere} = require('vn-loopback/util/filter');
 
 module.exports = Self => {
     Self.remoteMethodCtx('logs', {
@@ -12,27 +12,27 @@ module.exports = Self => {
                 arg: 'id',
                 type: 'Number',
                 description: 'The claim id',
-                http: { source: 'path' }
+                http: {source: 'path'}
             },
             {
                 arg: 'filter',
                 type: 'object',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'search',
                 type: 'string',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'userFk',
                 type: 'number',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'created',
                 type: 'date',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
         ],
         returns: {
@@ -45,7 +45,7 @@ module.exports = Self => {
         }
     });
 
-    Self.logs = async (ctx, id, filter, options) => {
+    Self.logs = async(ctx, id, filter, options) => {
         const conn = Self.dataSource.connector;
         const args = ctx.args;
         const myOptions = {};
@@ -56,25 +56,25 @@ module.exports = Self => {
 
         let where = buildFilter(args, (param, value) => {
             switch (param) {
-                case 'search':
-                    return {
-                        or: [
-                            { changedModel: { like: `%${value}%` } },
-                            { oldInstance: { like: `%${value}%` } }
-                        ]
-                    };
-                case 'userFk':
-                    return { 'cl.userFk': value };
-                case 'created':
-                    value.setHours(0, 0, 0, 0);
-                    to = new Date(value);
-                    to.setHours(23, 59, 59, 999);
+            case 'search':
+                return {
+                    or: [
+                        {changedModel: {like: `%${value}%`}},
+                        {oldInstance: {like: `%${value}%`}}
+                    ]
+                };
+            case 'userFk':
+                return {'cl.userFk': value};
+            case 'created':
+                value.setHours(0, 0, 0, 0);
+                to = new Date(value);
+                to.setHours(23, 59, 59, 999);
 
-                    return { creationDate: { between: [value, to] } };
+                return {creationDate: {between: [value, to]}};
             }
         });
-        where = mergeWhere(where, { ['cl.originFk']: id });
-        filter = mergeFilters(args.filter, { where });
+        where = mergeWhere(where, {['cl.originFk']: id});
+        filter = mergeFilters(args.filter, {where});
 
         const stmts = [];
 
diff --git a/modules/claim/front/card/index.js b/modules/claim/front/card/index.js
index 4a8677c90..5dad0dfc2 100644
--- a/modules/claim/front/card/index.js
+++ b/modules/claim/front/card/index.js
@@ -8,7 +8,7 @@ class Controller extends ModuleCard {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 5fd198440..8ff1fd791 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -45,7 +45,7 @@
             <vn-label-value
                 label="Attended by">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.claim.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.claim.worker.id)"
                     class="link">
                     {{$ctrl.claim.worker.user.name}}
                 </span>
diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html
index 1684541ea..7fb3b870e 100644
--- a/modules/claim/front/development/index.html
+++ b/modules/claim/front/development/index.html
@@ -1,116 +1,2 @@
-<vn-crud-model
-    vn-id="model"
-    url="ClaimDevelopments"
-    fields="['id', 'claimFk', 'claimReasonFk', 'claimResultFk', 'claimResponsibleFk', 'workerFk', 'claimRedeliveryFk']"
-    link="{claimFk: $ctrl.$params.id}"
-    filter="$ctrl.filter"
-    data="claimDevelopments"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimReasons"
-    data="claimReasons"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimResults"
-    data="claimResults"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimResponsibles"
-    data="claimResponsibles"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimRedeliveries"
-    data="claimRedeliveries"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-watcher
-    vn-id="watcher"
-    data="claimDevelopments"
-    form="form">
-</vn-watcher>
-<vn-vertical class="vn-w-lg">
-    <vn-card class="vn-pa-lg">
-        <vn-vertical>
-            <form name="form">
-                <vn-horizontal ng-repeat="claimDevelopment in claimDevelopments">
-                    <vn-autocomplete
-                        vn-focus
-                        label="Reason"
-                        ng-model="claimDevelopment.claimReasonFk"
-                        data="claimReasons"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-autocomplete
-                        label="Result"
-                        ng-model="claimDevelopment.claimResultFk"
-                        data="claimResults"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-autocomplete
-                        label="Responsible"
-                        ng-model="claimDevelopment.claimResponsibleFk"
-                        data="claimResponsibles"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-worker-autocomplete
-                        ng-model="claimDevelopment.workerFk"
-                        show-field="nickname"
-                        rule>
-                    </vn-worker-autocomplete>
-                    <vn-autocomplete
-                        label="Redelivery"
-                        ng-model="claimDevelopment.claimRedeliveryFk"
-                        data="claimRedeliveries"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-icon-button
-                        vn-none
-                        class="vn-my-md"
-                        vn-tooltip="Remove sale"
-                        icon="delete"
-                        ng-click="model.remove($index)"
-                        tabindex="-1">
-                    </vn-icon-button>
-                </vn-horizontal>
-            </form>
-            <vn-one class="vn-pt-md">
-                <vn-icon-button
-                    vn-bind="+"
-                    vn-tooltip="Add sale"
-                    icon="add_circle"
-                    ng-click="model.insert()">
-                </vn-icon-button>
-            </vn-one>
-        </vn-vertical>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!watcher.dataChanged()"
-            ng-click="$ctrl.onSubmit()"
-            label="Save">
-        </vn-submit>
-        <!-- # #2680 Undo changes button bugs -->
-        <!-- <vn-button
-            class="cancel"
-            label="Undo changes"
-            disabled="!watcher.dataChanged()"
-            ng-click="watcher.loadOriginalData()">
-        </vn-button> -->
-    </vn-button-bar>
-</vn-vertical>
+<vn-card>
+</vn-card>
diff --git a/modules/claim/front/development/index.js b/modules/claim/front/development/index.js
index 04569f0aa..7b31bd17f 100644
--- a/modules/claim/front/development/index.js
+++ b/modules/claim/front/development/index.js
@@ -1,17 +1,14 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
 class Controller extends Section {
-    onSubmit() {
-        this.$.watcher.check();
-        this.$.model.save().then(() => {
-            this.$.watcher.notifySaved();
-            this.$.watcher.updateOriginalData();
+    constructor($element, $) {
+        super($element, $);
+    }
 
-            if (this.aclService.hasAny(['claimManager']))
-                this.$state.go('claim.card.action');
-        });
+    async $onInit() {
+        this.$state.go('claim.card.summary', {id: this.$params.id});
+        window.location.href = await this.vnApp.getUrl(`claim/${this.$params.id}/development`);
     }
 }
 
diff --git a/modules/claim/front/development/index.spec.js b/modules/claim/front/development/index.spec.js
deleted file mode 100644
index e2574ccb9..000000000
--- a/modules/claim/front/development/index.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import './index.js';
-import watcher from 'core/mocks/watcher';
-import crudModel from 'core/mocks/crud-model';
-
-describe('Claim', () => {
-    describe('Component vnClaimDevelopment', () => {
-        let controller;
-        let $scope;
-
-        beforeEach(ngModule('claim'));
-
-        beforeEach(inject(($componentController, $rootScope) => {
-            $scope = $rootScope.$new();
-            $scope.watcher = watcher;
-            $scope.model = crudModel;
-            const $element = angular.element('<vn-claim-development></vn-claim-development>');
-            controller = $componentController('vnClaimDevelopment', {$element, $scope});
-        }));
-
-        describe('onSubmit()', () => {
-            it(`should redirect to 'claim.card.action' state`, () => {
-                jest.spyOn(controller.aclService, 'hasAny').mockReturnValue(true);
-                jest.spyOn(controller.$state, 'go');
-
-                controller.onSubmit();
-
-                expect(controller.$state.go).toHaveBeenCalledWith('claim.card.action');
-            });
-        });
-    });
-});
diff --git a/modules/claim/front/development/locale/es.yml b/modules/claim/front/development/locale/es.yml
deleted file mode 100644
index c0c4ed184..000000000
--- a/modules/claim/front/development/locale/es.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-Destination: Destino
-Development: Trazabilidad
-Reason: Motivo
-Result: Consecuencia
-Responsible: Responsable
-Worker: Trabajador
-Redelivery: Devolución
-Add line: Añadir Linea
\ No newline at end of file
diff --git a/modules/client/back/methods/client/creditRequestEmail.js b/modules/client/back/methods/client/creditRequestEmail.js
index 0255949e0..60047de77 100644
--- a/modules/client/back/methods/client/creditRequestEmail.js
+++ b/modules/client/back/methods/client/creditRequestEmail.js
@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx('clientCreditEmail', {
+    Self.remoteMethodCtx('creditRequestEmail', {
         description: 'Sends the credit request email with an attached PDF',
         accessType: 'WRITE',
         accepts: [
@@ -40,5 +40,5 @@ module.exports = Self => {
         },
     });
 
-    Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
+    Self.creditRequestEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
 };
diff --git a/modules/client/back/methods/receipt/filter.js b/modules/client/back/methods/receipt/filter.js
index 6df5e73f8..7b5d73dae 100644
--- a/modules/client/back/methods/receipt/filter.js
+++ b/modules/client/back/methods/receipt/filter.js
@@ -60,7 +60,7 @@ module.exports = Self => {
                     at2.id IS NOT NULL as isCompensation
                 FROM vn.receipt r
                     LEFT JOIN vn.worker w ON w.id = r.workerFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN account.user u ON u.id = w.id
                     JOIN vn.company c ON c.id = r.companyFk
                     LEFT JOIN vn.accounting a ON a.id = r.bankFk
 				    LEFT JOIN vn.accountingType at2 ON at2.id = a.accountingTypeFk AND at2.code = 'compensation'
diff --git a/modules/client/back/models/client-observation.js b/modules/client/back/models/client-observation.js
index f208cb552..e34eedca9 100644
--- a/modules/client/back/models/client-observation.js
+++ b/modules/client/back/models/client-observation.js
@@ -9,7 +9,7 @@ module.exports = function(Self) {
         let token = ctx.options.accessToken;
         let userId = token && token.userId;
 
-        Self.app.models.Worker.findOne({where: {userFk: userId}}, (err, user) => {
+        Self.app.models.Worker.findOne({where: {id: userId}}, (err, user) => {
             if (err) return next(err);
             ctx.instance.workerFk = user.id;
             next();
diff --git a/modules/client/back/models/client-observation.json b/modules/client/back/models/client-observation.json
index b8852b186..95d00d374 100644
--- a/modules/client/back/models/client-observation.json
+++ b/modules/client/back/models/client-observation.json
@@ -41,7 +41,7 @@
 		"include": {
 			"relation": "worker",
 			"scope": {
-				"fields": ["userFk"],
+				"fields": ["id"],
 				"include": {
 					"relation": "user",
 					"scope": {
diff --git a/modules/client/front/credit-management/index.js b/modules/client/front/credit-management/index.js
index 856acd27b..7733319e8 100644
--- a/modules/client/front/credit-management/index.js
+++ b/modules/client/front/credit-management/index.js
@@ -9,7 +9,7 @@ export default class Controller extends Section {
             include: [{
                 relation: 'worker',
                 scope: {
-                    fields: ['userFk'],
+                    fields: ['id'],
                     include: {
                         relation: 'user',
                         scope: {
diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html
index 989a0129f..d11449268 100644
--- a/modules/client/front/credit/index/index.html
+++ b/modules/client/front/credit/index/index.html
@@ -24,8 +24,8 @@
             <vn-tr ng-repeat="credit in credits track by credit.id">
                 <vn-td shrink-datetime>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td>
-                    <span 
-                        ng-click="workerDescriptor.show($event, credit.worker.userFk)"
+                    <span
+                        ng-click="workerDescriptor.show($event, credit.worker.id)"
                         class="link">
                         {{::credit.worker.user.name}}
                     </span>
@@ -41,10 +41,10 @@
     ui-sref="client.card.credit.create"
     vn-acl="teamBoss"
     vn-acl-action="remove"
-    vn-tooltip="New credit" 
+    vn-tooltip="New credit"
     vn-bind="+"
     fixed-bottom-right>
 </vn-float-button>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
\ No newline at end of file
+</vn-worker-descriptor-popover>
diff --git a/modules/client/front/credit/index/index.js b/modules/client/front/credit/index/index.js
index 28160dfeb..3083ac598 100644
--- a/modules/client/front/credit/index/index.js
+++ b/modules/client/front/credit/index/index.js
@@ -9,7 +9,7 @@ class Controller extends Section {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/client/front/dms/index/index.js b/modules/client/front/dms/index/index.js
index a18f195bb..aff64aa4f 100644
--- a/modules/client/front/dms/index/index.js
+++ b/modules/client/front/dms/index/index.js
@@ -28,7 +28,7 @@ class Controller extends Section {
                     }, {
                         relation: 'worker',
                         scope: {
-                            fields: ['userFk'],
+                            fields: ['id'],
                             include: {
                                 relation: 'user',
                                 scope: {
diff --git a/modules/invoiceOut/back/models/printer.json b/modules/invoiceOut/back/models/printer.json
index 99003560d..46a031f65 100644
--- a/modules/invoiceOut/back/models/printer.json
+++ b/modules/invoiceOut/back/models/printer.json
@@ -18,6 +18,13 @@
         "isLabeler": {
             "type": "boolean"
         }
+    },
+   	"relations": {
+        "sector": {
+            "type": "belongsTo",
+            "model": "Sector",
+            "foreignKey": "sectorFk"
+        }
     },
     "acls": [{
         "accessType": "READ",
diff --git a/modules/item/back/methods/item-shelving-sale/itemShelvingSaleByCollection.js b/modules/item/back/methods/item-shelving-sale/itemShelvingSaleByCollection.js
new file mode 100644
index 000000000..2059c28c9
--- /dev/null
+++ b/modules/item/back/methods/item-shelving-sale/itemShelvingSaleByCollection.js
@@ -0,0 +1,28 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('itemShelvingSaleByCollection', {
+        description: 'Insert sales of the collection in itemShelvingSale',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The collection id',
+                required: true,
+                http: {source: 'path'}
+            }
+        ],
+        http: {
+            path: `/:id/itemShelvingSaleByCollection`,
+            verb: 'POST'
+        }
+    });
+
+    Self.itemShelvingSaleByCollection = async(ctx, id, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        await Self.rawSql(`CALL vn.itemShelvingSale_addByCollection(?)`, [id], myOptions);
+    };
+};
diff --git a/modules/item/back/methods/item-shelving-sale/itemShelvingSaleSetQuantity.js b/modules/item/back/methods/item-shelving-sale/itemShelvingSaleSetQuantity.js
new file mode 100644
index 000000000..90e66c066
--- /dev/null
+++ b/modules/item/back/methods/item-shelving-sale/itemShelvingSaleSetQuantity.js
@@ -0,0 +1,41 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('itemShelvingSaleSetQuantity', {
+        description: 'Set quanitity of a sale in itemShelvingSale',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The sale id',
+            },
+            {
+                arg: 'quantity',
+                type: 'number',
+                required: true,
+                description: 'The quantity to set',
+            },
+            {
+                arg: 'isItemShelvingSaleEmpty',
+                type: 'boolean',
+                required: true,
+                description: 'True if the shelvingFk is empty ',
+            }
+        ],
+        http: {
+            path: `/itemShelvingSaleSetQuantity`,
+            verb: 'POST'
+        }
+    });
+
+    Self.itemShelvingSaleSetQuantity = async(ctx, id, quantity, isItemShelvingSaleEmpty, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        await Self.rawSql(`CALL vn.itemShelvingSale_setQuantity(?, ?, ? )`,
+            [id, quantity, isItemShelvingSaleEmpty],
+            myOptions);
+    };
+};
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index d5de6a954..909b3dff8 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -180,7 +180,7 @@ module.exports = Self => {
                     LEFT JOIN itemType it ON it.id = i.typeFk
                     LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
                     LEFT JOIN worker w ON w.id = it.workerFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN account.user u ON u.id = w.id
                     LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
                     LEFT JOIN producer pr ON pr.id = i.producerFk
                     LEFT JOIN origin ori ON ori.id = i.originFk
diff --git a/modules/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js
index c4ee09d95..49ce3636f 100644
--- a/modules/item/back/methods/item/getCard.js
+++ b/modules/item/back/methods/item/getCard.js
@@ -34,7 +34,7 @@ module.exports = Self => {
                         include: [{
                             relation: 'worker',
                             scope: {
-                                fields: ['userFk'],
+                                fields: ['id'],
                                 include: {
                                     relation: 'user',
                                     scope: {
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index 6cd9d9511..17a38cf07 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -38,7 +38,7 @@ module.exports = Self => {
                         include: [{
                             relation: 'worker',
                             scope: {
-                                fields: ['userFk'],
+                                fields: ['id'],
                                 include: {
                                     relation: 'user',
                                     scope: {
diff --git a/modules/item/back/methods/item/setVisibleDiscard.js b/modules/item/back/methods/item/setVisibleDiscard.js
index bcdda1ced..08cc507c3 100644
--- a/modules/item/back/methods/item/setVisibleDiscard.js
+++ b/modules/item/back/methods/item/setVisibleDiscard.js
@@ -32,6 +32,6 @@ module.exports = Self => {
 
     Self.setVisibleDiscard = async(ctx, itemFk, warehouseFk, quantity, addressFk) => {
         const query = `CALL vn.item_setVisibleDiscard(?, ?, ?, ?)`;
-        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk]);
+        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk], {userId: ctx.req.accessToken.userId});
     };
 };
diff --git a/modules/item/back/models/item-shelving-placement-supply.json b/modules/item/back/models/item-shelving-placement-supply.json
index a54013e05..18d0a8d56 100644
--- a/modules/item/back/models/item-shelving-placement-supply.json
+++ b/modules/item/back/models/item-shelving-placement-supply.json
@@ -26,11 +26,17 @@
         "shelving": {
             "type": "string"
         },
+        "subName": {
+            "type": "string"
+        },
         "packing": {
             "type": "number"
         },
         "stock": {
             "type": "number"
+        },
+          "size": {
+            "type": "number"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/item/back/models/item-shelving-sale.js b/modules/item/back/models/item-shelving-sale.js
index b89be9f00..e2d27564a 100644
--- a/modules/item/back/models/item-shelving-sale.js
+++ b/modules/item/back/models/item-shelving-sale.js
@@ -1,3 +1,5 @@
 module.exports = Self => {
     require('../methods/item-shelving-sale/filter')(Self);
+    require('../methods/item-shelving-sale/itemShelvingSaleByCollection')(Self);
+    require('../methods/item-shelving-sale/itemShelvingSaleSetQuantity')(Self);
 };
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index ff9ecabe3..34773e34c 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -20,10 +20,16 @@
         },
 		"created": {
 			"type": "date"
+        },
+		"grouping": {
+			"type": "number"
         },
         "isChecked": {
             "type": "boolean"
 		},
+		"packing": {
+			"type": "number"
+        },
         "visible": {
             "type": "number"
 		},
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 7c442d364..82dfa3c9f 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -1,6 +1,6 @@
 <vn-crud-model
-    auto-load="true" 
-    url="Warehouses" 
+    auto-load="true"
+    url="Warehouses"
     data="warehouses">
 </vn-crud-model>
 <vn-descriptor-content
@@ -58,7 +58,7 @@
             <vn-label-value
                 label="Buyer">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.id)"
                     class="link">
                     {{$ctrl.item.itemType.worker.user.name}}
                 </span>
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index fcc267b4d..6ec738c7e 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -70,7 +70,7 @@
             </vn-label-value>
             <vn-label-value label="Buyer">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.id)"
                     class="link">
                     {{$ctrl.summary.item.itemType.worker.user.name}}
                 </span>
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 4f9edd11c..693ae122f 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -215,7 +215,7 @@ module.exports = Self => {
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.userFk
+                        LEFT JOIN account.user u ON u.id = wk.id
                         LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
 
         if (args.orderFk) {
diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index 10185af7e..44d8ccb10 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -169,7 +169,7 @@ module.exports = Self => {
                 LEFT JOIN agencyMode am ON am.id = o.agency_id
                 LEFT JOIN client c ON c.id = o.customer_id
                 LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                LEFT JOIN account.user u ON u.id = wk.userFk
+                LEFT JOIN account.user u ON u.id = wk.id
                 LEFT JOIN company co ON co.id = o.company_id
                 LEFT JOIN orderTicket ot ON ot.orderFk = o.id
                 LEFT JOIN ticket t ON t.id = ot.ticketFk
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index fdec84d4d..fc35e979f 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -111,7 +111,7 @@ module.exports = Self => {
         let stmt;
 
         stmt = new ParameterizedSQL(
-            `SELECT 
+            `SELECT
                 r.id,
                 r.workerFk,
                 r.created,
@@ -134,7 +134,7 @@ module.exports = Self => {
                 LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
                 LEFT JOIN vehicle v ON v.id = r.vehicleFk
                 LEFT JOIN worker w ON w.id = r.workerFk
-                LEFT JOIN account.user u ON u.id = w.userFk`
+                LEFT JOIN account.user u ON u.id = w.id`
         );
 
         stmt.merge(conn.makeSuffix(filter));
diff --git a/modules/route/back/methods/route/summary.js b/modules/route/back/methods/route/summary.js
index 10cfe38ee..acd17759d 100644
--- a/modules/route/back/methods/route/summary.js
+++ b/modules/route/back/methods/route/summary.js
@@ -33,7 +33,7 @@ module.exports = Self => {
                 }, {
                     relation: 'worker',
                     scope: {
-                        fields: ['id', 'userFk'],
+                        fields: ['id'],
                         include: [
                             {
                                 relation: 'user',
diff --git a/modules/route/back/models/roadmap.json b/modules/route/back/models/roadmap.json
index 7ca8fe0f6..2f6bb8c02 100644
--- a/modules/route/back/models/roadmap.json
+++ b/modules/route/back/models/roadmap.json
@@ -47,7 +47,7 @@
 		"worker": {
             "type": "belongsTo",
             "model": "Worker",
-            "foreignKey": "userFk"
+            "foreignKey": "id"
         },
         "supplier": {
             "type": "belongsTo",
diff --git a/modules/route/front/card/index.js b/modules/route/front/card/index.js
index 6bf233c0a..07b5a547c 100644
--- a/modules/route/front/card/index.js
+++ b/modules/route/front/card/index.js
@@ -41,7 +41,7 @@ class Controller extends ModuleCard {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/route/front/descriptor/index.js b/modules/route/front/descriptor/index.js
index aa47044b1..4377ac617 100644
--- a/modules/route/front/descriptor/index.js
+++ b/modules/route/front/descriptor/index.js
@@ -79,7 +79,7 @@ class Controller extends Descriptor {
                 }, {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/shelving/back/methods/shelving/getSummary.js b/modules/shelving/back/methods/shelving/getSummary.js
index da357c7bf..7488511d0 100644
--- a/modules/shelving/back/methods/shelving/getSummary.js
+++ b/modules/shelving/back/methods/shelving/getSummary.js
@@ -35,7 +35,7 @@ module.exports = Self => {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['id', 'userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/shelving/back/model-config.json b/modules/shelving/back/model-config.json
index c26c39d38..89a0832b0 100644
--- a/modules/shelving/back/model-config.json
+++ b/modules/shelving/back/model-config.json
@@ -10,5 +10,8 @@
     },
     "Sector": {
         "dataSource": "vn"
+    },
+    "Train": {
+        "dataSource": "vn"
     }
 }
\ No newline at end of file
diff --git a/modules/shelving/back/models/shelving.json b/modules/shelving/back/models/shelving.json
index 5f60318a5..3103b5a4a 100644
--- a/modules/shelving/back/models/shelving.json
+++ b/modules/shelving/back/models/shelving.json
@@ -9,12 +9,11 @@
     "properties": {
         "id": {
             "type": "number",
-            "id": true,
-            "description": "Identifier"
+            "description": "Identifier",
+            "id": true
         },
         "code": {
-            "type": "string",
-            "required": true
+            "type": "string"
         },
         "parkingFk": {
             "type": "number"
@@ -41,7 +40,7 @@
         "worker": {
             "type": "belongsTo",
             "model": "Worker",
-            "foreignKey": "userFk"
+            "foreignKey": "id"
         }
     }
 }
diff --git a/modules/shelving/back/models/train.json b/modules/shelving/back/models/train.json
new file mode 100644
index 000000000..cc819664b
--- /dev/null
+++ b/modules/shelving/back/models/train.json
@@ -0,0 +1,19 @@
+{
+    "name": "Train",
+    "options": {
+        "mysql": {
+            "table": "train"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "name": {
+            "type": "string",
+            "required": true
+        }
+        
+    }
+}
diff --git a/modules/shelving/front/card/index.js b/modules/shelving/front/card/index.js
index 5e2ea9b12..4f571d876 100644
--- a/modules/shelving/front/card/index.js
+++ b/modules/shelving/front/card/index.js
@@ -7,7 +7,7 @@ class Controller extends ModuleCard {
             include: [
                 {relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/shelving/front/summary/index.js b/modules/shelving/front/summary/index.js
index 10a905f1d..91f8e2aa7 100644
--- a/modules/shelving/front/summary/index.js
+++ b/modules/shelving/front/summary/index.js
@@ -12,7 +12,7 @@ class Controller extends Summary {
             include: [
                 {relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/supplier/back/methods/supplier/getSummary.js b/modules/supplier/back/methods/supplier/getSummary.js
index bf3fa56f5..bc869725c 100644
--- a/modules/supplier/back/methods/supplier/getSummary.js
+++ b/modules/supplier/back/methods/supplier/getSummary.js
@@ -91,7 +91,7 @@ module.exports = Self => {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
index 98743d8cc..fbc855501 100644
--- a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
+++ b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
@@ -41,7 +41,7 @@ module.exports = Self => {
             FROM saleTracking st
                 JOIN sale s ON s.id = st.saleFk
                 JOIN worker w ON w.id = st.workerFk
-                JOIN account.user u ON u.id = w.userFk
+                JOIN account.user u ON u.id = w.id
                 JOIN state ste ON ste.id = st.stateFk`);
 
         stmt.merge(Self.makeSuffix(filter));
diff --git a/modules/ticket/back/methods/ticket-request/deny.js b/modules/ticket/back/methods/ticket-request/deny.js
index 35de765d7..92f020083 100644
--- a/modules/ticket/back/methods/ticket-request/deny.js
+++ b/modules/ticket/back/methods/ticket-request/deny.js
@@ -39,7 +39,7 @@ module.exports = Self => {
 
         try {
             const userId = ctx.req.accessToken.userId;
-            const worker = await Self.app.models.Worker.findOne({where: {userFk: userId}}, myOptions);
+            const worker = await Self.app.models.Worker.findOne({where: {id: userId}}, myOptions);
 
             const params = {
                 isOk: false,
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 921598b57..f27ea5018 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -153,9 +153,9 @@ module.exports = Self => {
                 LEFT JOIN item i ON i.id = tr.itemFk
                 LEFT JOIN sale s ON s.id = tr.saleFk
                 LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                LEFT JOIN account.user u ON u.id = wk.userFk
+                LEFT JOIN account.user u ON u.id = wk.id
                 LEFT JOIN worker wka ON wka.id = tr.attenderFk
-                LEFT JOIN account.user ua ON ua.id = wka.userFk`);
+                LEFT JOIN account.user ua ON ua.id = wka.id`);
         stmt.merge(conn.makeSuffix(filter));
 
         return conn.executeStmt(stmt, myOptions);
diff --git a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
index ae004a024..9ab89f009 100644
--- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
@@ -14,7 +14,7 @@ describe('ticket-request filter()', () => {
 
             const result = await models.TicketRequest.filter(ctx, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(5);
 
             await tx.rollback();
         } catch (e) {
@@ -93,7 +93,7 @@ describe('ticket-request filter()', () => {
             const result = await models.TicketRequest.filter(ctx, options);
             const requestId = result[0].id;
 
-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);
 
             await tx.rollback();
         } catch (e) {
@@ -113,7 +113,7 @@ describe('ticket-request filter()', () => {
             const result = await models.TicketRequest.filter(ctx, options);
             const requestId = result[0].id;
 
-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);
 
             await tx.rollback();
         } catch (e) {
@@ -153,7 +153,7 @@ describe('ticket-request filter()', () => {
             const result = await models.TicketRequest.filter(ctx, {order: 'id'}, options);
             const requestId = result[0].id;
 
-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);
 
             await tx.rollback();
         } catch (e) {
@@ -173,7 +173,7 @@ describe('ticket-request filter()', () => {
             const result = await models.TicketRequest.filter(ctx, options);
             const requestId = result[0].id;
 
-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/back/methods/ticket-tracking/changeState.js b/modules/ticket/back/methods/ticket-tracking/changeState.js
index 4ae9ab40c..dbef8762e 100644
--- a/modules/ticket/back/methods/ticket-tracking/changeState.js
+++ b/modules/ticket/back/methods/ticket-tracking/changeState.js
@@ -53,7 +53,7 @@ module.exports = Self => {
 
             if (!params.workerFk) {
                 const worker = await models.Worker.findOne({
-                    where: {userFk: userId}
+                    where: {id: userId}
                 }, myOptions);
 
                 params.workerFk = worker.id;
diff --git a/modules/ticket/back/methods/ticket-tracking/setDelivered.js b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
index bd6e32dcf..df482fd01 100644
--- a/modules/ticket/back/methods/ticket-tracking/setDelivered.js
+++ b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
@@ -43,7 +43,7 @@ module.exports = Self => {
                 fields: ['id', 'name', 'alertLevel', 'code']
             }, myOptions);
 
-            const worker = await models.Worker.findOne({where: {userFk: userId}}, myOptions);
+            const worker = await models.Worker.findOne({where: {id: userId}}, myOptions);
 
             const promises = [];
             for (const id of ticketIds) {
diff --git a/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js b/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
index 2587b6657..453b7924f 100644
--- a/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
@@ -16,8 +16,8 @@ describe('ticket-weekly filter()', () => {
 
             const firstRow = result[0];
 
-            expect(firstRow.ticketFk).toEqual(1);
-            expect(result.length).toEqual(6);
+            expect(firstRow.ticketFk).toEqual(2);
+            expect(result.length).toEqual(4);
 
             await tx.rollback();
         } catch (e) {
@@ -52,12 +52,12 @@ describe('ticket-weekly filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'bruce'}};
+            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'max'}};
 
             const result = await models.TicketWeekly.filter(ctx, null, options);
             const firstRow = result[0];
 
-            expect(firstRow.clientName).toEqual('Bruce Wayne');
+            expect(firstRow.clientName).toEqual('Max Eisenhardt');
 
             await tx.rollback();
         } catch (e) {
@@ -72,13 +72,13 @@ describe('ticket-weekly filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
+            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1105}};
 
             const result = await models.TicketWeekly.filter(ctx, null, options);
             const firstRow = result[0];
 
-            expect(firstRow.clientFk).toEqual(1101);
-            expect(firstRow.clientName).toEqual('Bruce Wayne');
+            expect(firstRow.clientFk).toEqual(1105);
+            expect(firstRow.clientName).toEqual('Max Eisenhardt');
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index eb3da39af..899fe05cd 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -272,7 +272,7 @@ module.exports = Self => {
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.userFk
+                        LEFT JOIN account.user u ON u.id = wk.id
                         LEFT JOIN route r ON r.id = t.routeFk`);
 
         if (args.orderFk) {
diff --git a/modules/ticket/back/methods/ticket/isEditableOrThrow.js b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
index 6a8bafa2c..f8285cecd 100644
--- a/modules/ticket/back/methods/ticket/isEditableOrThrow.js
+++ b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
@@ -40,7 +40,7 @@ module.exports = Self => {
         if (!isEditable && !isRoleAdvanced)
             throw new ForbiddenError(`This ticket is not editable.`);
 
-        if (isLocked)
+        if (isLocked && !isWeekly)
             throw new ForbiddenError(`This ticket is locked.`);
 
         if (isWeekly && !canEditWeeklyTicket)
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 2f8c402da..fcd9972fe 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -118,7 +118,7 @@ module.exports = Self => {
 
             // Send notification to salesPerson
             const salesPersonUser = ticket.client().salesPersonUser();
-            if (salesPersonUser) {
+            if (salesPersonUser && sales.length) {
                 const origin = ctx.req.headers.origin;
                 const message = $t(`I have deleted the ticket id`, {
                     id: id,
diff --git a/modules/ticket/back/methods/ticket/specs/isEditable.spec.js b/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
index 301745ed3..9dd1f8544 100644
--- a/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
@@ -8,7 +8,7 @@ describe('isEditable()', () => {
         try {
             const options = {transaction: tx};
             const ctx = {req: {accessToken: {userId: 35}}};
-            result = await models.Ticket.isEditable(ctx, 5, options);
+            result = await models.Ticket.isEditable(ctx, 19, options);
             await tx.rollback();
         } catch (error) {
             await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 3be6b8bac..646b9739f 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -49,7 +49,7 @@ describe('ticket merge()', () => {
 
             expect(deletedTicket.isDeleted).toEqual(true);
             expect(salesTicketFuture.length).toEqual(2);
-            expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 2);
+            expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 1);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 83d7303b7..76a289cc3 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -17,6 +17,12 @@
     "Expedition": {
         "dataSource": "vn"
     },
+    "ExpeditionPallet": {
+        "dataSource": "vn"
+    },
+    "ExpeditionScan": {
+        "dataSource": "vn"
+    },
     "ExpeditionState": {
         "dataSource": "vn"
     },
@@ -32,6 +38,9 @@
     "ExpeditionMistake": {
         "dataSource": "vn"
     },
+    "ExpeditionMistakeType": {
+        "dataSource": "vn"
+    },
     "PrintServerQueue": {
         "dataSource": "vn"
     },
@@ -47,6 +56,9 @@
     "SaleGroup": {
         "dataSource": "vn"
     },
+    "SaleMistake": {
+        "dataSource": "vn"
+    },
     "SaleGroupDetail": {
         "dataSource": "vn"
     },
diff --git a/modules/ticket/back/models/expeditionMistake.json b/modules/ticket/back/models/expeditionMistake.json
index 43033194a..aeed2aa3a 100644
--- a/modules/ticket/back/models/expeditionMistake.json
+++ b/modules/ticket/back/models/expeditionMistake.json
@@ -24,7 +24,7 @@
       },
       "type": {
         "type": "belongsTo",
-        "model": "MistakeType",
+        "model": "ExpeditionMistakeType",
         "foreignKey": "typeFk"
       }
     }
diff --git a/modules/ticket/back/models/expeditionMistakeType.json b/modules/ticket/back/models/expeditionMistakeType.json
new file mode 100644
index 000000000..c7eaa3cac
--- /dev/null
+++ b/modules/ticket/back/models/expeditionMistakeType.json
@@ -0,0 +1,19 @@
+{
+    "name": "ExpeditionMistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "expeditionMistakeType"
+        }
+    },
+    "properties": {
+      "code": {
+        "id":true,
+        "type": "string"
+    },
+      "description": {
+        "type": "string"
+      }
+    }
+  }
+  
\ No newline at end of file
diff --git a/modules/ticket/back/models/expeditionPallet.json b/modules/ticket/back/models/expeditionPallet.json
new file mode 100644
index 000000000..c5a38df75
--- /dev/null
+++ b/modules/ticket/back/models/expeditionPallet.json
@@ -0,0 +1,22 @@
+{
+    "name": "ExpeditionPallet",
+    "options": {
+        "mysql": {
+          "table": "expeditionPallet"
+        }
+    },
+	"properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"description": "Identifier"
+		}
+    },
+    "acls": [{
+        "accessType": "WRITE",
+        "principalType": "ROLE",
+        "principalId": "production",
+        "permission": "ALLOW"
+    }]
+}
+  
diff --git a/modules/ticket/back/models/expeditionScan.json b/modules/ticket/back/models/expeditionScan.json
new file mode 100644
index 000000000..1db2c1238
--- /dev/null
+++ b/modules/ticket/back/models/expeditionScan.json
@@ -0,0 +1,47 @@
+{
+    "name": "ExpeditionScan",
+    "options": {
+        "mysql": {
+          "table": "expeditionScan"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "description": "Identifier"
+        },
+        "expeditionFk": {
+            "type": "number",
+            "description": "Identifier",
+            "id": true
+        },
+        "palletFk": {
+            "type": "number",
+            "description": "Identifier",
+            "id": true
+        },
+        "scanned": {
+            "type": "date",
+            "default": "$now"
+        }
+    },
+    "relations": {
+        "expedition": {
+            "type": "belongsTo",
+            "model": "Expedition",
+            "foreignKey": "expeditionFk"
+        },
+        "pallet": {
+            "type": "belongsTo",
+            "model": "expeditionPallet",
+            "foreignKey": "palletFk"
+        }
+    },
+    "acls": [{
+        "accessType": "WRITE",
+        "principalType": "ROLE",
+        "principalId": "production",
+        "permission": "ALLOW"
+    }]
+}
+  
diff --git a/modules/ticket/back/models/sale-mistake.json b/modules/ticket/back/models/sale-mistake.json
new file mode 100644
index 000000000..b1cd989e0
--- /dev/null
+++ b/modules/ticket/back/models/sale-mistake.json
@@ -0,0 +1,49 @@
+{
+    "name": "SaleMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "saleMistake"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "description": "Identifier"
+        },
+        "created": {
+            "type": "date"
+        },
+        "saleFk": {
+            "type": "number",
+            "required": true
+        },
+        "userFk": {
+            "type": "number",
+            "required": true
+        },
+          "typeFk": {
+            "type": "number",
+            "required": true
+        }
+    },
+    "relations": {
+        "sale": {
+            "type": "belongsTo",
+            "model": "Sale",
+            "foreignKey": "saleFk"
+        },
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "userFk"
+        },
+        "mistakeType": {
+            "type": "belongsTo",
+            "model": "MistakeType",
+            "foreignKey": "typeFk"
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/modules/ticket/back/models/ticket-request.js b/modules/ticket/back/models/ticket-request.js
index 4125126dc..d133f85d5 100644
--- a/modules/ticket/back/models/ticket-request.js
+++ b/modules/ticket/back/models/ticket-request.js
@@ -10,7 +10,7 @@ module.exports = function(Self) {
     Self.observe('before save', async function(ctx) {
         if (ctx.isNewInstance) {
             const loopBackContext = LoopBackContext.getCurrentContext();
-            const filter = {where: {userFk: loopBackContext.active.accessToken.userId}};
+            const filter = {where: {id: loopBackContext.active.accessToken.userId}};
             const models = Self.app.models;
             const worker = await models.Worker.findOne(filter);
 
diff --git a/modules/ticket/front/dms/index/index.js b/modules/ticket/front/dms/index/index.js
index 2ec7e03c0..676a28db8 100644
--- a/modules/ticket/front/dms/index/index.js
+++ b/modules/ticket/front/dms/index/index.js
@@ -29,7 +29,7 @@ class Controller extends Section {
                     {
                         relation: 'worker',
                         scope: {
-                            fields: ['userFk'],
+                            fields: ['id'],
                             include: {
                                 relation: 'user',
                                 scope: {
diff --git a/modules/ticket/front/tracking/index/index.js b/modules/ticket/front/tracking/index/index.js
index 38abcd8ab..95665b071 100644
--- a/modules/ticket/front/tracking/index/index.js
+++ b/modules/ticket/front/tracking/index/index.js
@@ -9,7 +9,7 @@ class Controller extends Section {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
diff --git a/modules/worker/back/methods/calendar/specs/absences.spec.js b/modules/worker/back/methods/calendar/specs/absences.spec.js
index 365773182..b27c9549c 100644
--- a/modules/worker/back/methods/calendar/specs/absences.spec.js
+++ b/modules/worker/back/methods/calendar/specs/absences.spec.js
@@ -50,7 +50,7 @@ describe('Worker absences()', () => {
         }
     });
 
-    it('should give the same holidays as worked days since the holidays amount matches the amount of days in a year', async() => {
+    it('Should have an equal number of holidays and workdays, as they both total the days in a year', async() => {
         const businessId = 1106;
         const workerId = 1106;
 
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 66fb7cc23..2c5143612 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -102,7 +102,7 @@ module.exports = Self => {
 
             stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
             stmts.push(stmt);
-            stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.userFk WHERE userFk IS NOT NULL');
+            stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT id as userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.id WHERE id IS NOT NULL');
             stmts.push(stmt);
         }
 
diff --git a/modules/worker/back/methods/worker/activeWithInheritedRole.js b/modules/worker/back/methods/worker/activeWithInheritedRole.js
index 19038405b..9bd02fec8 100644
--- a/modules/worker/back/methods/worker/activeWithInheritedRole.js
+++ b/modules/worker/back/methods/worker/activeWithInheritedRole.js
@@ -23,7 +23,7 @@ module.exports = Self => {
         const query =
             `SELECT DISTINCT w.id, w.firstName, w.lastName, u.name, u.nickname
                 FROM worker w
-                    JOIN account.user u ON u.id = w.userFk
+                    JOIN account.user u ON u.id = w.id
                     JOIN account.roleRole i ON i.role = u.role
                     JOIN account.role r ON r.id = i.inheritsFrom`;
 
diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index 71a8da96f..2f328d28f 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -95,8 +95,6 @@ module.exports = Self => {
                     ]};
             case 'id':
                 return {'w.id': value};
-            case 'userFk':
-                return {'w.userFk': value};
             case 'firstName':
                 return {'w.firstName': {like: `%${value}%`}};
             case 'lastName':
@@ -123,8 +121,8 @@ module.exports = Self => {
                 FROM worker w
                     LEFT JOIN workerDepartment wd ON wd.workerFk = w.id
                     LEFT JOIN department d ON d.id = wd.departmentFk
-                    LEFT JOIN client c ON c.id = w.userFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN client c ON c.id = w.id
+                    LEFT JOIN account.user u ON u.id = w.id
                     LEFT JOIN pbx.sip p ON p.user_id = u.id
                     LEFT JOIN account.emailUser mu ON mu.userFk = u.id`
         );
diff --git a/modules/worker/back/methods/worker/getWorkedHours.js b/modules/worker/back/methods/worker/getWorkedHours.js
index 44f3eca3a..cac74a416 100644
--- a/modules/worker/back/methods/worker/getWorkedHours.js
+++ b/modules/worker/back/methods/worker/getWorkedHours.js
@@ -38,12 +38,12 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
 
         const worker = await models.Worker.findById(id);
-        const userId = worker.userFk;
+        const userId = worker.id;
 
         const stmts = [];
 
         stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS 
+            DROP TEMPORARY TABLE IF EXISTS
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);
@@ -54,7 +54,7 @@ module.exports = Self => {
 
         const resultIndex = stmts.push(new ParameterizedSQL(`
             SELECT tcc.dated, tbc.timeWorkSeconds expectedHours, tcc.timeWorkSeconds workedHours
-                FROM tmp.timeControlCalculate tcc 
+                FROM tmp.timeControlCalculate tcc
                     LEFT JOIN tmp.timeBusinessCalculate tbc ON tcc.dated = tbc.dated
                     WHERE tcc.dated BETWEEN DATE(?) AND DATE(?)
         `, [started, ended])) - 1;
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index b261f895e..8352eb070 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -43,6 +43,9 @@
     },
     "EducationLevel": {
         "dataSource": "vn"
+    },
+     "MistakeType": {
+        "dataSource": "vn"
     },
     "ProfileType":{
         "dataSource": "vn"
@@ -83,6 +86,12 @@
     "WorkerMana": {
         "dataSource": "vn"
     },
+    "WorkerMistake": {
+        "dataSource": "vn"
+    },
+    "WorkerMistakeType": {
+        "dataSource": "vn"
+    },
     "WorkerMedia": {
         "dataSource": "vn"
     },
diff --git a/modules/worker/back/models/device-log.json b/modules/worker/back/models/device-log.json
index 9278b9038..2b55e9474 100644
--- a/modules/worker/back/models/device-log.json
+++ b/modules/worker/back/models/device-log.json
@@ -28,6 +28,9 @@
         },
         "deviceProductionFk": {
             "type": "number"
+        },
+        "serialNumber": {
+            "type": "string"
         }
     },
     "relations": {
diff --git a/modules/worker/back/models/mistakeType.json b/modules/worker/back/models/mistakeType.json
new file mode 100644
index 000000000..e999b3e28
--- /dev/null
+++ b/modules/worker/back/models/mistakeType.json
@@ -0,0 +1,20 @@
+{
+    "name": "MistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "mistakeType"
+        }
+    },
+    "properties": {
+      "id": {
+        "id":true,
+        "type": "number"
+    },
+      "description": {
+        "type": "string"
+      }
+       
+    }
+  }
+  
\ No newline at end of file
diff --git a/modules/worker/back/models/worker-time-control.json b/modules/worker/back/models/worker-time-control.json
index b045946e7..c40989d84 100644
--- a/modules/worker/back/models/worker-time-control.json
+++ b/modules/worker/back/models/worker-time-control.json
@@ -36,7 +36,7 @@
 		"worker": {
 			"type": "hasOne",
 			"model": "Worker",
-			"foreignKey": "userFk"
+			"foreignKey": "id"
         },
         "warehouse": {
             "type": "belongsTo",
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 6e1371055..dbb3ed23f 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -24,9 +24,6 @@
         "phone": {
             "type" : "string"
         },
-        "userFk": {
-            "type" : "number"
-        },
         "bossFk": {
             "type" : "number"
         },
@@ -66,12 +63,12 @@
         "client": {
             "type": "belongsTo",
             "model": "Client",
-            "foreignKey": "userFk"
+            "foreignKey": "id"
         },
         "sip": {
             "type": "belongsTo",
             "model": "Sip",
-            "foreignKey": "userFk"
+            "foreignKey": "id"
         },
         "department": {
             "type": "belongsTo",
diff --git a/modules/worker/back/models/workerMistake.json b/modules/worker/back/models/workerMistake.json
new file mode 100644
index 000000000..00978761e
--- /dev/null
+++ b/modules/worker/back/models/workerMistake.json
@@ -0,0 +1,25 @@
+{
+    "name": "WorkerMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "workerMistake"
+        }
+    },
+    "properties": {
+      "id": {
+        "id":true,
+        "type": "number"
+      },
+      "userFk": {
+        "type": "number"
+      },
+        "workerMistakeTypeFk": {
+        "type": "string"
+      },
+        "created": {
+        "type": "date"
+      }
+    }
+  }
+  
\ No newline at end of file
diff --git a/modules/worker/back/models/workerMistakeType.json b/modules/worker/back/models/workerMistakeType.json
new file mode 100644
index 000000000..c5e6e6383
--- /dev/null
+++ b/modules/worker/back/models/workerMistakeType.json
@@ -0,0 +1,26 @@
+{
+    "name": "WorkerMistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "workerMistakeType"
+        }
+    },
+    "properties": {
+      "code": {
+        "id":true,
+        "type": "string"
+    },
+      "description": {
+        "type": "string"
+      }
+    },
+       "relations": {
+        "type": {
+        "type": "belongsTo",
+        "model": "WorkerMistakeType",
+        "foreignKey": "code"
+      }
+    }
+  }
+  
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index ea005e1a2..05e883533 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -3,16 +3,7 @@
     description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName"
     summary="$ctrl.$.summary">
     <slot-before>
-        <div class="photo" text-center>
-            <img vn-id="photo"
-                ng-src="{{$root.imagePath('user', '520x520', $ctrl.worker.id)}}"
-                zoom-image="{{$root.imagePath('user', '1600x1600', $ctrl.worker.id)}}"
-                on-error-src/>
-            <vn-float-button ng-click="uploadPhoto.show('user', $ctrl.worker.id)"
-                icon="edit"
-                vn-visible-by="userPhotos">
-            </vn-float-button>
-        </div>
+        <vn-user-photo user-id="{{$ctrl.worker.id}}"/>
     </slot-before>
     <slot-menu>
         <vn-item ng-click="$ctrl.handleExcluded()" translate>
@@ -76,8 +67,3 @@
     <vn-worker-summary worker="$ctrl.worker"></vn-worker-summary>
 </vn-popup>
 
-<!-- Upload photo dialog -->
-<vn-upload-photo
-    vn-id="uploadPhoto"
-    on-response="$ctrl.onUploadResponse()">
-</vn-upload-photo>
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index a53528ef2..0214f8500 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -71,17 +71,6 @@ class Controller extends Descriptor {
         return this.getData(`Workers/${this.id}`, {filter})
             .then(res => this.entity = res.data);
     }
-
-    onUploadResponse() {
-        const timestamp = Date.vnNew().getTime();
-        const src = this.$rootScope.imagePath('user', '520x520', this.worker.id);
-        const zoomSrc = this.$rootScope.imagePath('user', '1600x1600', this.worker.id);
-        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'];
diff --git a/modules/worker/front/search-panel/index.html b/modules/worker/front/search-panel/index.html
index 2adb56587..c93eef78b 100644
--- a/modules/worker/front/search-panel/index.html
+++ b/modules/worker/front/search-panel/index.html
@@ -18,7 +18,7 @@
             <vn-textfield
                 vn-one
                 label="User id"
-                ng-model="filter.userFk">
+                ng-model="filter.id">
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
@@ -64,4 +64,4 @@
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 2607d9b2f..6604ef6ca 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -58,7 +58,7 @@
         <vn-one>
             <h4 translate>User data</h4>
             <vn-label-value label="User id"
-                value="{{worker.userFk}}">
+                value="{{worker.id}}">
             </vn-label-value>
             <vn-label-value label="User"
                 value="{{worker.user.name}}">
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 38e6721d6..71de1cef4 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -52,6 +52,28 @@ class Controller extends Section {
 
     set worker(value) {
         this._worker = value;
+        this.fetchHours();
+    }
+
+    /**
+     * Worker hours data
+     */
+    get hours() {
+        return this._hours;
+    }
+
+    set hours(value) {
+        this._hours = value;
+
+        for (const weekDay of this.weekDays) {
+            if (value) {
+                let day = weekDay.dated.getDay();
+                weekDay.hours = value
+                    .filter(hour => new Date(hour.timed).getDay() == day)
+                    .sort((a, b) => new Date(a.timed) - new Date(b.timed));
+            } else
+                weekDay.hours = null;
+        }
     }
 
     /**
@@ -87,10 +109,18 @@ class Controller extends Section {
             dayIndex.setDate(dayIndex.getDate() + 1);
         }
 
-        this.fetchHours();
+        if (!this.weekTotalHours) this.fetchHours();
         this.getWeekData();
     }
 
+    set weekTotalHours(totalHours) {
+        this._weekTotalHours = this.formatHours(totalHours);
+    }
+
+    get weekTotalHours() {
+        return this._weekTotalHours;
+    }
+
     getWeekData() {
         const filter = {
             where: {
@@ -101,38 +131,19 @@ class Controller extends Section {
         };
         this.$http.get('WorkerTimeControlMails', {filter})
             .then(res => {
-                const workerTimeControlMail = res.data;
-                if (!workerTimeControlMail.length) {
+                const mail = res.data;
+                if (!mail.length) {
                     this.state = null;
                     return;
                 }
-                this.state = workerTimeControlMail[0].state;
-                this.reason = workerTimeControlMail[0].reason;
+                this.state = mail[0].state;
+                this.reason = mail[0].reason;
             });
     }
 
-    /**
-     * Worker hours data
-     */
-    get hours() {
-        return this._hours;
-    }
-
-    set hours(value) {
-        this._hours = value;
-
-        for (const weekDay of this.weekDays) {
-            if (value) {
-                let day = weekDay.dated.getDay();
-                weekDay.hours = value
-                    .filter(hour => new Date(hour.timed).getDay() == day)
-                    .sort((a, b) => new Date(a.timed) - new Date(b.timed));
-            } else
-                weekDay.hours = null;
-        }
-    }
-
     fetchHours() {
+        if (!this.worker || !this.date) return;
+
         const params = {workerFk: this.$params.id};
         const filter = {
             where: {and: [
@@ -148,58 +159,6 @@ class Controller extends Section {
         });
     }
 
-    hasEvents(day) {
-        return day >= this.started && day < this.ended;
-    }
-
-    getAbsences() {
-        const fullYear = this.started.getFullYear();
-        let params = {
-            workerFk: this.$params.id,
-            businessFk: null,
-            year: fullYear
-        };
-
-        return this.$http.get(`Calendars/absences`, {params})
-            .then(res => this.onData(res.data));
-    }
-
-    onData(data) {
-        const events = {};
-
-        const addEvent = (day, event) => {
-            events[new Date(day).getTime()] = event;
-        };
-
-        if (data.holidays) {
-            data.holidays.forEach(holiday => {
-                const holidayDetail = holiday.detail && holiday.detail.description;
-                const holidayType = holiday.type && holiday.type.name;
-                const holidayName = holidayDetail || holidayType;
-
-                addEvent(holiday.dated, {
-                    name: holidayName,
-                    color: '#ff0'
-                });
-            });
-        }
-        if (data.absences) {
-            data.absences.forEach(absence => {
-                const type = absence.absenceType;
-                addEvent(absence.dated, {
-                    name: type.name,
-                    color: type.rgb
-                });
-            });
-        }
-
-        this.weekDays.forEach(day => {
-            const timestamp = day.dated.getTime();
-            if (events[timestamp])
-                day.event = events[timestamp];
-        });
-    }
-
     getWorkedHours(from, to) {
         this.weekTotalHours = null;
         let weekTotalHours = 0;
@@ -239,6 +198,58 @@ class Controller extends Section {
         });
     }
 
+    getAbsences() {
+        const fullYear = this.started.getFullYear();
+        let params = {
+            workerFk: this.$params.id,
+            businessFk: null,
+            year: fullYear
+        };
+
+        return this.$http.get(`Calendars/absences`, {params})
+            .then(res => this.onData(res.data));
+    }
+
+    hasEvents(day) {
+        return day >= this.started && day < this.ended;
+    }
+
+    onData(data) {
+        const events = {};
+
+        const addEvent = (day, event) => {
+            events[new Date(day).getTime()] = event;
+        };
+
+        if (data.holidays) {
+            data.holidays.forEach(holiday => {
+                const holidayDetail = holiday.detail && holiday.detail.description;
+                const holidayType = holiday.type && holiday.type.name;
+                const holidayName = holidayDetail || holidayType;
+
+                addEvent(holiday.dated, {
+                    name: holidayName,
+                    color: '#ff0'
+                });
+            });
+        }
+        if (data.absences) {
+            data.absences.forEach(absence => {
+                const type = absence.absenceType;
+                addEvent(absence.dated, {
+                    name: type.name,
+                    color: type.rgb
+                });
+            });
+        }
+
+        this.weekDays.forEach(day => {
+            const timestamp = day.dated.getTime();
+            if (events[timestamp])
+                day.event = events[timestamp];
+        });
+    }
+
     getFinishTime() {
         if (!this.weekDays) return;
 
@@ -267,14 +278,6 @@ class Controller extends Section {
         }
     }
 
-    set weekTotalHours(totalHours) {
-        this._weekTotalHours = this.formatHours(totalHours);
-    }
-
-    get weekTotalHours() {
-        return this._weekTotalHours;
-    }
-
     formatHours(timestamp = 0) {
         let hour = Math.floor(timestamp / 3600);
         let min = Math.floor(timestamp / 60 - 60 * hour);
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 6d8510ba8..10e8aba0d 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -22,7 +22,7 @@ describe('Component vnWorkerTimeControl', () => {
     }));
 
     describe('date() setter', () => {
-        it(`should set the weekDays, the date in the controller and call fetchHours`, () => {
+        it(`should set the weekDays and the date in the controller`, () => {
             let today = Date.vnNew();
             jest.spyOn(controller, 'fetchHours').mockReturnThis();
 
@@ -32,7 +32,6 @@ describe('Component vnWorkerTimeControl', () => {
             expect(controller.started).toBeDefined();
             expect(controller.ended).toBeDefined();
             expect(controller.weekDays.length).toEqual(7);
-            expect(controller.fetchHours).toHaveBeenCalledWith();
         });
     });
 
diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index bcfb91e3d..13d45428c 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -54,7 +54,7 @@ module.exports = Self => {
             const ticketList = await models.Ticket.find(filter, myOptions);
             const fixingState = await models.State.findOne({where: {code: 'FIXING'}}, myOptions);
             const worker = await models.Worker.findOne({
-                where: {userFk: userId}
+                where: {id: userId}
             }, myOptions);
 
             await models.Ticket.rawSql('UPDATE ticket SET zoneFk = NULL WHERE zoneFk = ?', [id], myOptions);
diff --git a/package-lock.json b/package-lock.json
index 10b5e6b02..c3f88bc2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.32.02",
+    "version": "23.42.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.26.01",
+            "version": "23.42.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
diff --git a/package.json b/package.json
index d250071a6..3320705f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.40.01",
+    "version": "23.42.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",
diff --git a/print/templates/email/client-welcome/sql/client.sql b/print/templates/email/client-welcome/sql/client.sql
index 49e1d4bf6..59bdeae4a 100644
--- a/print/templates/email/client-welcome/sql/client.sql
+++ b/print/templates/email/client-welcome/sql/client.sql
@@ -7,5 +7,5 @@ SELECT
 FROM client c
     JOIN account.user u ON u.id = c.id
     LEFT JOIN worker w ON w.id = c.salesPersonFk
-    LEFT JOIN account.user wu ON wu.id = w.userFk
-WHERE c.id = ?
\ No newline at end of file
+    LEFT JOIN account.user wu ON wu.id = w.id
+WHERE c.id = ?
diff --git a/print/templates/email/printer-setup/sql/client.sql b/print/templates/email/printer-setup/sql/client.sql
index 2a8a751e0..31454408f 100644
--- a/print/templates/email/printer-setup/sql/client.sql
+++ b/print/templates/email/printer-setup/sql/client.sql
@@ -8,5 +8,5 @@ SELECT
 FROM client c
     JOIN account.user u ON u.id = c.id
     LEFT JOIN worker w ON w.id = c.salesPersonFk
-    LEFT JOIN account.user wu ON wu.id = w.userFk
-WHERE c.id = ?
\ No newline at end of file
+    LEFT JOIN account.user wu ON wu.id = w.id
+WHERE c.id = ?
diff --git a/print/templates/reports/driver-route/sql/routes.sql b/print/templates/reports/driver-route/sql/routes.sql
index 4b6f6a318..79bede5b2 100644
--- a/print/templates/reports/driver-route/sql/routes.sql
+++ b/print/templates/reports/driver-route/sql/routes.sql
@@ -1,4 +1,4 @@
-SELECT 
+SELECT
     r.id,
     r.m3,
     r.created,
@@ -11,9 +11,9 @@ SELECT
 FROM route r
     LEFT JOIN vehicle v ON v.id = r.vehicleFk
     LEFT JOIN worker w ON w.id = r.workerFk
-    LEFT JOIN account.user u ON u.id = w.userFk
+    LEFT JOIN account.user u ON u.id = w.id
     LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
     LEFT JOIN agency a ON a.id = am.agencyFk
     LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
     LEFT JOIN supplier s ON s.id = sa.supplierFk
-WHERE r.id IN(?)
\ No newline at end of file
+WHERE r.id IN(?)
diff --git a/print/templates/reports/invoice/assets/css/style.css b/print/templates/reports/invoice/assets/css/style.css
index d4526ce56..f9f6f220f 100644
--- a/print/templates/reports/invoice/assets/css/style.css
+++ b/print/templates/reports/invoice/assets/css/style.css
@@ -44,3 +44,7 @@ h2 {
 .phytosanitary-info {
     margin-top: 10px
 }
+
+.panel {
+    margin-bottom: 0px;
+}