Merge branch 'dev' into 6414-testBackClient

2024-02-21 09:29:45 +00:00 · 2024-02-21 09:29:45 +00:00 · 7514348d13
parent f3511d4a43 4d2637764e
commit 7514348d13
87 changed files with 2646 additions and 4121 deletions
--- a/back/methods/collection/getSectors.js
+++ b/back/methods/collection/getSectors.js
@ -1,20 +0,0 @@
 module.exports = Self => {
    Self.remoteMethod('getSectors', {
        description: 'Get all sectors',
        accessType: 'READ',
        returns: {
            type: 'Object',
            root: true
        },
        http: {
            path: `/getSectors`,
            verb: 'GET'
        }
    });
    Self.getSectors = async() => {
        const query = `CALL vn.sector_get()`;
        const [result] = await Self.rawSql(query);
        return result;
    };
 };
--- a/back/methods/collection/spec/getSectors.spec.js
+++ b/back/methods/collection/spec/getSectors.spec.js
@ -1,11 +0,0 @@
 const {models} = require('vn-loopback/server/server');
 describe('getSectors()', () => {
    it('return list of sectors', async() => {
        let response = await models.Collection.getSectors();
        expect(response.length).toBeGreaterThan(0);
        expect(response[0].id).toEqual(1);
        expect(response[0].description).toEqual('First sector');
    });
 });
--- a/back/models/collection.js
+++ b/back/models/collection.js
@ -1,6 +1,5 @@
 module.exports = Self => {
    require('../methods/collection/getCollection')(Self);
    require('../methods/collection/getSectors')(Self);
    require('../methods/collection/setSaleQuantity')(Self);
    require('../methods/collection/previousLabel')(Self);
    require('../methods/collection/getTickets')(Self);
--- a/back/models/specs/mailAliasAccount.spec.js
+++ b/back/models/specs/mailAliasAccount.spec.js
@ -1,23 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 describe('loopback model MailAliasAccount', () => {
    it('should fail to add a mail Alias if the worker doesnt have ACLs', async() => {
        const tx = await models.MailAliasAccount.beginTransaction({});
        let error;
        try {
            const options = {transaction: tx, accessToken: {userId: 57}};
            await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
            await tx.rollback();
        } catch (e) {
            await tx.rollback();
            error = e;
        }
        expect(error.message).toEqual('The alias cant be modified');
    });
    it('should add a mail Alias', async() => {
        const tx = await models.MailAliasAccount.beginTransaction({});
        let error;
--- a/db/.pullinfo.json
+++ b/db/.pullinfo.json
@ -0,0 +1,16 @@
 {
  "lastPull": "2024-02-15T08:58:24.000Z",
  "shaSums": {
    "srt": {
      "view": {
        "routePalletized": "765f8933a6a5a86dfe8f22825cc77351bc8620cdf1be9d3f25abb130460f3a61",
        "ticketPalletized": "c327f3243e717cc607f01d3747967ba68158f90ef1038986b0aa6ae6d5ce7309"
      }
    },
    "vn": {
      "view": {
        "expeditionPallet_Print": "288cbd6e8289df083ed5eb1a2c808f7a82ba4c90c8ad9781104808a7a54471fb"
      }
    }
  }
 }
--- a/db/changes/240404/00-revokeMailAliasAccount.sql
+++ b/db/changes/240404/00-revokeMailAliasAccount.sql
@ -0,0 +1,5 @@
 DELETE FROM salix.ACL
 	WHERE model = 'MailAliasAccount'
 		AND property = 'canEditAlias'
 		AND principalType = 'ROLE'
 		AND principalId = 'marketingBoss';
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -3,8 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-INSERT INTO `version` VALUES ('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL);
+INSERT INTO `version` VALUES ('vn-database','10861','6685a201143a320920bbe04db7f8d0d1bd32d415','2024-02-15 10:04:54','10886');
 INSERT INTO `version` VALUES ('vn-database','10818','b7edbbe12f35d0cbc3e6b83e54977ac1c8acfc74','2024-01-25 10:00:48','10831');
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@ -539,6 +538,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10757','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10758','00-sectorType.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:18',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10758','01-dipole.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:18',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10758','02-agencyMode.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-25 09:00:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10758','03-item.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10761','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:30:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10764','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-04 12:07:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10768','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:37',NULL,NULL);
@ -546,6 +546,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10771','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10773','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10775','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:18:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10778','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10781','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10782','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:18:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10783','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-24 14:49:17',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10784','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-25 09:00:32',NULL,NULL);
@ -574,7 +575,45 @@ INSERT INTO `versionLog` VALUES ('vn-database','10815','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10816','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-25 09:00:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10817','00-invoiceOutConfig_refLen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-24 21:47:35',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10818','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-25 09:00:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10819','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10820','00-grants.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10825','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-01 10:24:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10827','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-23 12:32:13',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10828','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10828','01-RevokeClientes_regalos_lista.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_commit.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_rollback.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_start.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','01-update_procedure_TravelCloneWithEntries.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','02-grant_privileges_util_tx.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10838','00-createInventoryConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-07 22:36:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10845','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10848','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','00-roleLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','01-userLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','02-entryLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','03-clientLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','04-itemLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','05-shelvingLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','06-workerLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','07-deviceProductionLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','08-zoneLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','09-rateLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','10-ticketLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','11-userLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','12-routeLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','13-claimLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','14-supplierLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','15-invoiceInLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','16-travelLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','17-packingSiteDeviceLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10851','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-01-30 13:31:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10853','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:05',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10853','00-secondScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10854','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-30 16:20:34',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10855','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10858','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10861','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@ -631,7 +670,7 @@ INSERT INTO `role` VALUES (57,'deliveryBoss','Jefe de personal de reparto',1,'20
 INSERT INTO `role` VALUES (58,'packager','Departamento encajadores',1,'2019-01-21 13:43:45','2019-01-21 13:43:45',NULL);
 INSERT INTO `role` VALUES (59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 13:44:10','2019-01-21 13:44:10',NULL);
 INSERT INTO `role` VALUES (60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 14:29:01','2019-01-29 14:29:01',NULL);
-INSERT INTO `role` VALUES (61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 08:44:07','2019-07-01 08:44:07',NULL);
+INSERT INTO `role` VALUES (61,'replenisherBoss','Jefe de Complementos/Camara',1,'2019-07-01 08:44:07','2024-02-01 12:07:29',19336);
 INSERT INTO `role` VALUES (62,'noLogin','Role without login access to MySQL',0,'2019-07-01 08:50:19','2019-07-02 15:42:05',NULL);
 INSERT INTO `role` VALUES (64,'balanceSheet','Consulta de Balance',0,'2019-07-16 14:12:08','2019-07-16 14:12:08',NULL);
 INSERT INTO `role` VALUES (65,'officeBoss','Jefe de filial',1,'2019-08-02 08:54:26','2019-08-02 08:54:26',NULL);
@ -669,6 +708,7 @@ INSERT INTO `role` VALUES (124,'hrBuyer','Recursos Humanos con Buyer',1,'2023-10
 INSERT INTO `role` VALUES (125,'claimViewer','Trabajadores que consulta las reclamaciones ',1,'2023-11-16 09:14:46','2023-11-16 09:14:46',10578);
 INSERT INTO `role` VALUES (126,'greenhouseBoss','Jefe de invernadero',1,'2023-11-16 14:32:13','2023-11-16 14:32:13',NULL);
 INSERT INTO `role` VALUES (127,'timeControl','Tablet para fichar',1,'2024-01-09 16:36:56','2024-01-09 16:36:56',NULL);
 INSERT INTO `role` VALUES (129,'buyerAssistant','Comprador que tienes mas permisos para ayudar al buyerBoss en algunas tareas',1,'2024-02-06 06:59:12','2024-02-06 06:59:12',783);
 INSERT INTO `roleInherit` VALUES (1,1,2,NULL);
 INSERT INTO `roleInherit` VALUES (2,1,3,NULL);
@ -932,6 +972,7 @@ INSERT INTO `roleInherit` VALUES (355,127,11,NULL);
 INSERT INTO `roleInherit` VALUES (356,123,125,NULL);
 INSERT INTO `roleInherit` VALUES (357,36,35,NULL);
 INSERT INTO `roleInherit` VALUES (358,36,49,NULL);
 INSERT INTO `roleInherit` VALUES (359,129,35,NULL);
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
@ -1508,7 +1549,7 @@ INSERT INTO `ACL` VALUES (676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','
 INSERT INTO `ACL` VALUES (680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement');
+INSERT INTO `ACL` VALUES (683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','developerBoss');
 INSERT INTO `ACL` VALUES (684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement');
 INSERT INTO `ACL` VALUES (685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement');
 INSERT INTO `ACL` VALUES (686,'MailForward','*','*','ALLOW','ROLE','hr');
@ -1519,7 +1560,6 @@ INSERT INTO `ACL` VALUES (690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss')
 INSERT INTO `ACL` VALUES (691,'Roadmap','*','*','ALLOW','ROLE','productionBoss');
 INSERT INTO `ACL` VALUES (692,'ExpeditionTruck','*','*','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss');
 INSERT INTO `ACL` VALUES (694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss');
 INSERT INTO `ACL` VALUES (695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative');
@ -1610,6 +1650,8 @@ INSERT INTO `ACL` VALUES (783,'WorkerTimeControl','resendWeeklyHourEmail','WRITE
 INSERT INTO `ACL` VALUES (784,'VnRole','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (785,'VnRole','*','WRITE','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (786,'State','isAllEditable','READ','ALLOW','ROLE','delivery');
 INSERT INTO `ACL` VALUES (787,'Ticket','makePdfList','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (788,'Ticket','invoiceTicketsAndPdf','*','ALLOW','ROLE','employee');
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@ -1708,8 +1750,6 @@ USE `vn`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
 INSERT INTO `alertLevel` VALUES ('FREE',0,1);
 INSERT INTO `alertLevel` VALUES ('ON_PREPARATION',1,1);
 INSERT INTO `alertLevel` VALUES ('PACKED',2,0);
@ -1909,6 +1949,7 @@ INSERT INTO `component` VALUES (45,'maná reclamacion',7,4,NULL,0,'manaClaim',0)
 INSERT INTO `component` VALUES (46,'recargo a particular',2,NULL,0.25,0,'individual',0);
 INSERT INTO `component` VALUES (47,'promocion Italia',4,NULL,NULL,1,'italianOffer',0);
 INSERT INTO `component` VALUES (48,'fusión de lineas',4,NULL,NULL,1,'lineFusion',0);
 INSERT INTO `component` VALUES (49,'sustitución',4,NULL,NULL,1,'substitution',0);
 INSERT INTO `componentType` VALUES (1,'coste',1,0,'COST');
 INSERT INTO `componentType` VALUES (2,'com ventas',1,1,NULL);
@ -1929,59 +1970,61 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,106,763,0,0,0,0,28,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,110,763,0,0,0,0,28,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL);
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,33,NULL,72,1,1,1,10,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL);
 INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',34,35,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',36,61,NULL,0,0,0,1,12,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',38,65,NULL,0,0,0,1,13,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',68,69,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',72,73,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL);
 INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',78,81,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',82,85,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (61,NULL,'VNH',86,89,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',92,93,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (80,NULL,'EQUIPO J VALLES',37,38,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (80,NULL,'EQUIPO J VALLES',39,40,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',96,97,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',87,88,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',39,40,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',41,42,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (94,NULL,'EQUIPO J BROCAL',41,42,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (94,NULL,'EQUIPO J BROCAL',43,44,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (95,NULL,'EQUIPO C ZAMBRANO',43,44,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (95,NULL,'EQUIPO C ZAMBRANO',45,46,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'equipoczambrano@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',45,46,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',47,48,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',47,48,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',49,50,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',49,50,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',51,52,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (125,NULL,'EQUIPO MIRIAM MAR',51,52,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (125,NULL,'EQUIPO MIRIAM MAR',53,54,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',79,80,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',83,84,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',53,54,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',55,56,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',55,56,1731,72,0,0,2,0,43,'/1/43/','fra_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',57,58,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'francia@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (134,NULL,'EQUIPO RODRI',57,58,6264,0,0,0,2,0,43,'/1/43/','rhr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',59,60,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',100,101,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',102,103,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (139,NULL,'EQUIPO MIRIAM MAR 2',59,60,3803,0,0,0,2,0,43,'/1/43/','mir2_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (139,NULL,'EQUIPO J SORIA ',61,62,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',63,64,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
@ -108,7 +108,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','item_feature','alexm
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','itemTag','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','itemCategoryL10n','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','warehouse','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Vistas','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','Tipos','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','producer','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','mdbVersion','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -300,7 +299,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','manager','v_botanic_expor
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionPlus','v_Articles_botanical','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Colores','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Clientes','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','clientes_regalos_lista_enc','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','jerarquia','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','warehouse','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerBusinessAgreement','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -335,7 +333,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financialBoss','credit','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
@ -492,8 +489,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','Reservas
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Rutas','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','address','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','Rutas_Master','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Rutas_monitor','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','address','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accountingType','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','itemShelvingStock_byWarehouse','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -588,7 +583,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','saleGoal','al
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleGroup','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','saleGroupDetail','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','account_detail','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_type','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_type','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','employee','accion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','volumeConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','currency','alexm@%','0000-00-00 00:00:00','Select','');
@ -831,7 +826,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','printServerQueue__
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','artificialBoss','buy','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Movimientos','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','buy','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','tarifas','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','receipt','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','producer','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','link','alexm@%','0000-00-00 00:00:00','Select','');
@ -969,7 +963,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','travel','alexm@%',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','travelClonedWeekly','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bi','employee','facturacion_media_anual','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','travelObservation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','tarifas','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','travelThermograph','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','tillConfig','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','till','juan@%','0000-00-00 00:00:00','Select','');
@ -1340,6 +1333,11 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','company','juan@db-p
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','buffer','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','greuge','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','item','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Select,Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','itemShelving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','negativeOrigin','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryBoss','Vehiculos_consumo','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ink','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@ -1659,6 +1657,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','expedition_scan'
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_absoluto','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_multiple','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','client_getDebt','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -1812,7 +1811,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myuser_hasroutine
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionAssi','timebusiness_calculateall','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','timecontrol_geterror','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','travel_weeklyclone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','workerTimeControl_add','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerAssist','itemproposal','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getsuppliersdebt','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','agency','desglose_volume','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
@ -1827,7 +1826,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UTC_TIMESTAMP','F
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_getsaledate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_setState','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','invoicing','invoiceout_new','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_replaceItem','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_replaceItem','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','ledger_next','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','deliveryAssistant','workerjourney_replace','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','account','developerBoss','role_sync','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -1940,7 +1939,12 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemShelving_getinf
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','collection_get','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','item_comparative','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_getBoxPickingList','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','worker_isInDepartment','FUNCTION','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','worker_isInDepartment','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_rollback','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_start','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPrices','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByAwb','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@ -1962,25 +1966,25 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','android','{\"access\":0,\"version_
 INSERT  IGNORE INTO `global_priv` VALUES ('','artificialBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','assetManager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 100707, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryAssistant','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','developerBoss','{\"access\":33554432,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','employee','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 100707, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 100707, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','greenhouseBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','handmadeBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hedera-web','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hr','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
@ -1989,10 +1993,10 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','invoicing','{\"access\":0,\"versio
 INSERT  IGNORE INTO `global_priv` VALUES ('','itBoss','{\"access\": 541165846527, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itManagement','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itemPicker','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','logistic','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','logistic','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','logisticBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenance','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBos','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBos','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','manager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_role\": true}');
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
@ -1,4 +1,4 @@
-- MariaDB dump 10.19  Distrib 10.5.21-MariaDB, for debian-linux-gnu (x86_64)
+-- MariaDB dump 10.19  Distrib 10.5.23-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db.verdnatura.es    Database: account
 -- ------------------------------------------------------
@ -517,7 +517,7 @@ USE `bs`;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`clientNewBorn_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`clientNewBorn_beforeUpdate`
 	BEFORE UPDATE ON `clientNewBorn`
 	FOR EACH ROW
 BEGIN
@ -540,7 +540,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTask_beforeInsert`
 	BEFORE INSERT ON `nightTask`
 	FOR EACH ROW
 BEGIN
@ -566,7 +566,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTask_beforeUpdate`
 	BEFORE UPDATE ON `nightTask`
 	FOR EACH ROW
 BEGIN
@ -610,7 +610,7 @@ USE `edi`;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`item_feature_bi`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`item_feature_beforeInsert`
 	BEFORE INSERT ON `item_feature`
 	FOR EACH ROW
 BEGIN
@ -632,7 +632,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_beforeInsert`
 	BEFORE INSERT ON `putOrder`
 	FOR EACH ROW
 BEGIN
@ -658,7 +658,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`BEFORE UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_beforeUpdate`
 	BEFORE UPDATE ON `putOrder`
 	FOR EACH ROW
 BEGIN
@ -708,7 +708,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_afterUpdate`
 	AFTER UPDATE ON `putOrder`
 	FOR EACH ROW
 BEGIN
@ -795,7 +795,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`supplyResponse_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`supplyResponse_afterUpdate`
 	AFTER UPDATE ON `supplyResponse`
 	FOR EACH ROW
 BEGIN
@ -1412,7 +1412,7 @@ USE `sage`;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `sage`.`movConta_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `sage`.`movConta_beforeUpdate`
 	BEFORE UPDATE ON `movConta`
 	FOR EACH ROW
 BEGIN
@ -1446,7 +1446,7 @@ USE `srt`;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `srt`.`expedition_BU`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `srt`.`expedition_beforeUpdate`
 	BEFORE UPDATE ON `expedition`
 	FOR EACH ROW
 BEGIN 
@ -1464,11 +1464,11 @@ DELIMITER ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `srt`.`moving_AI`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `srt`.`moving_afterInsert`
 	AFTER INSERT ON `moving`
 	FOR EACH ROW
 BEGIN 
@ -1924,7 +1924,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BI`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_beforeInsert`
 	BEFORE INSERT ON `autonomy`
 	FOR EACH ROW
 BEGIN 
@ -1946,7 +1946,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BU`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_beforeUpdate`
 	BEFORE UPDATE ON `autonomy`
 	FOR EACH ROW
 BEGIN
@ -1974,7 +1974,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_AD`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_afterDelete`
 	AFTER DELETE ON `autonomy`
 	FOR EACH ROW
 BEGIN
@ -1994,7 +1994,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`awb_bi`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`awb_beforeInsert`
 	BEFORE INSERT ON `awb`
 	FOR EACH ROW
 BEGIN
@ -2059,7 +2059,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`budgetNotes_BeforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`budgetNotes_beforeInsert`
 	BEFORE INSERT ON `budgetNotes`
 	FOR EACH ROW
 BEGIN
@ -2551,6 +2551,70 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`calendar_beforeInsert`
 	BEFORE INSERT ON `calendar`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`calendar_beforeUpdate`
 	BEFORE UPDATE ON `calendar`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`calendar_afterDelete`
 	AFTER DELETE ON `calendar`
 	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'Calendar',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`claim_beforeInsert`
 	BEFORE INSERT ON `claim`
 	FOR EACH ROW
@ -3026,13 +3090,13 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`client_AfterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`client_afterInsert`
 	AFTER INSERT ON `client`
 	FOR EACH ROW
 BEGIN
@ -3246,15 +3310,15 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER clientCredit_AfterInsert
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`clientCredit_afterInsert`
-AFTER INSERT
+	AFTER INSERT ON `clientCredit`
-ON clientCredit FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	DECLARE vSender VARCHAR(50);
@ -3501,39 +3565,39 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`collection_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`collection_beforeUpdate`
-	BEFORE UPDATE ON `collection`
+	BEFORE UPDATE ON `collection`
-	FOR EACH ROW
+	FOR EACH ROW
-BEGIN
+BEGIN
-	
+	
-	DECLARE vStateFk INT;
+	DECLARE vStateFk INT;
-	DECLARE vTotalLines INT;
+	DECLARE vTotalLines INT;
-	DECLARE vPickedLines INT;
+	DECLARE vPickedLines INT;
-
+
-	IF NEW.saleTotalCount <= NEW.salePickedCount 
+	IF NEW.saleTotalCount <= NEW.salePickedCount 
-		AND (NEW.saleTotalCount != OLD.saleTotalCount 
+		AND (NEW.saleTotalCount != OLD.saleTotalCount 
-			OR NEW.salePickedCount != OLD.salePickedCount)
+			OR NEW.salePickedCount != OLD.salePickedCount)
-		THEN 
+		THEN 
-		
+		
-			SELECT id INTO vStateFk
+			SELECT id INTO vStateFk
-				FROM vn.state 
+				FROM vn.state 
-				WHERE code = 'PREPARED';
+				WHERE code = 'PREPARED';
-			
+			
-			SET NEW.stateFk = vStateFk;
+			SET NEW.stateFk = vStateFk;
-	
+	
-	END IF;
+	END IF;
-
+
-	IF NEW.saleTotalCount > NEW.salePickedCount 
+	IF NEW.saleTotalCount > NEW.salePickedCount 
-		AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN 
+		AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN 
-
+
-		SELECT id INTO vStateFk
+		SELECT id INTO vStateFk
-			FROM vn.state 
+			FROM vn.state 
-			WHERE code = 'ON_PREPARATION';
+			WHERE code = 'ON_PREPARATION';
-		
+		
-		SET NEW.stateFk = vStateFk;
+		SET NEW.stateFk = vStateFk;
-	
+	
-	END IF;
+	END IF;
-
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -3743,7 +3807,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_afterInsert`
 	AFTER INSERT ON `country`
 	FOR EACH ROW
 BEGIN
@ -4414,7 +4478,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_beforeInsert`
 	BEFORE INSERT ON `duaTax`
 	FOR EACH ROW
 BEGIN
@ -4435,7 +4499,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_beforeUpdate`
 	BEFORE UPDATE ON `duaTax`
 	FOR EACH ROW
 BEGIN
@ -4858,7 +4922,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionPallet_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionPallet_beforeInsert`
 	BEFORE INSERT ON `expeditionPallet`
 	FOR EACH ROW
 BEGIN
@ -4886,7 +4950,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionScan_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionScan_beforeInsert`
 	BEFORE INSERT ON `expeditionScan`
 	FOR EACH ROW
 BEGIN
@ -4908,7 +4972,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionState_BeforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionState_beforeInsert`
 	BEFORE INSERT ON `expeditionState`
 	FOR EACH ROW
 BEGIN
@ -4922,15 +4986,15 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER expeditionState_AfterInsert
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionState_afterInsert`
-AFTER INSERT
+	AFTER INSERT ON `expeditionState`
-ON expeditionState FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	UPDATE vn.expedition e
@ -4952,7 +5016,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_beforeInsert`
 	BEFORE INSERT ON `expeditionTruck`
 	FOR EACH ROW
 BEGIN
@ -4974,7 +5038,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_beforeUpdate`
 	BEFORE UPDATE ON `expeditionTruck`
 	FOR EACH ROW
 BEGIN
@ -4996,7 +5060,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`floramondoConfig_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`floramondoConfig_afterInsert`
 	AFTER INSERT ON `floramondoConfig`
 	FOR EACH ROW
 BEGIN
@ -5122,7 +5186,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_bi`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_beforeInsert`
 	BEFORE INSERT ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
@ -5186,7 +5250,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_bu`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_beforeUpdate`
 	BEFORE UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
@ -5227,7 +5291,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_au`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_afterUpdate`
 	AFTER UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
@ -5664,15 +5728,7 @@ BEGIN
 	DECLARE vNewPackingShelve INT;
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	IF ISNULL(NEW.packingShelve) AND NOT ISNULL(NEW.packingOut) THEN
 		SELECT NEW.packingOut * vc.shelveVolume / vc.standardFlowerBox
 			INTO vNewPackingShelve
 			FROM vn.volumeConfig vc;
 		SET NEW.packingShelve = vNewPackingShelve;
 	END IF;
 	IF NEW.itemPackingTypeFk = '' THEN
 		SET NEW.itemPackingTypeFk = NULL;
 	END IF;
@ -5867,7 +5923,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemCategory_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemCategory_afterInsert`
 	AFTER INSERT ON `itemCategory`
 	FOR EACH ROW
 BEGIN
@ -5955,7 +6011,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_beforeInsert`
 	BEFORE INSERT ON `itemShelving`
 	FOR EACH ROW
 BEGIN
@ -5977,7 +6033,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterInsert`
 	AFTER INSERT ON `itemShelving`
 	FOR EACH ROW
 INSERT INTO vn.itemShelvingLog(	itemShelvingFk,
@ -6011,7 +6067,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_beforeUpdate`
 	BEFORE UPDATE ON `itemShelving`
 	FOR EACH ROW
 BEGIN
@ -6034,11 +6090,10 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterUpdate`
 	AFTER UPDATE ON `itemShelving`
 	FOR EACH ROW
-
+INSERT INTO itemShelvingLog
 	INSERT INTO itemShelvingLog
 		SET itemShelvingFk = NEW.id,
 			workerFk = account.myUser_getId(),
 			accion = 'CAMBIO',
@ -6061,7 +6116,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_DELETE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_beforeDelete`
 	BEFORE DELETE ON `itemShelving`
 	FOR EACH ROW
 INSERT INTO vn.itemShelvingLog(itemShelvingFk, 
@ -6106,13 +6161,13 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_afterInsert`
 	AFTER INSERT ON `itemShelvingSale`
 	FOR EACH ROW
 BEGIN
@ -6366,7 +6421,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_BI`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_beforeInsert`
 	BEFORE INSERT ON `machine`
 	FOR EACH ROW
 BEGIN
@ -6584,7 +6639,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_beforeInsert`
 	BEFORE INSERT ON `parking`
 	FOR EACH ROW
 BEGIN
@ -6606,7 +6661,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_beforeUpdate`
 	BEFORE UPDATE ON `parking`
 	FOR EACH ROW
 BEGIN
@ -6935,13 +6990,13 @@ DELIMITER ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER projectNotes_BeforeInsert
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`projectNotes_beforeInsert`
-BEFORE INSERT
+	BEFORE INSERT ON `projectNotes`
-ON projectNotes FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	IF ISNULL(NEW.userFk) THEN
@ -7742,7 +7797,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_BEFORE_DELETE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_beforeDelete`
 	BEFORE DELETE ON `sale`
 	FOR EACH ROW
 BEGIN
@ -7832,7 +7887,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_beforeInsert`
 	BEFORE INSERT ON `saleBuy`
 	FOR EACH ROW
 BEGIN 
@ -7854,31 +7909,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_AI`
 	AFTER INSERT ON `saleBuy`
 	FOR EACH ROW
 BEGIN 
 /* Activar de nuevo cuando volvamos a vender fruta y verdura
 * 
 	UPDATE vn.sale s
 		SET s.concept = CONCAT(s.concept, ' Lote: ', NEW.buyFk)
 		WHERE s.id = NEW.saleFk;
 */	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleGroup_beforeInsert`
 	BEFORE INSERT ON `saleGroup`
 	FOR EACH ROW
@ -7943,7 +7973,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_After_Insert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_afterInsert`
 	AFTER INSERT ON `saleTracking`
 	FOR EACH ROW
 BEGIN
@ -8122,7 +8152,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_beforeUpdate`
 	BEFORE UPDATE ON `shelving`
 	FOR EACH ROW
 BEGIN
@ -8174,7 +8204,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_afterInsert`
 	AFTER INSERT ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
@ -8197,7 +8227,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_afterUpdate`
 	AFTER UPDATE ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
@ -8227,7 +8257,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_BEFORE_DELETE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_beforeDelete`
 	BEFORE DELETE ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
@ -8250,7 +8280,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_beforeInsert`
 	BEFORE INSERT ON `specie`
 	FOR EACH ROW
 BEGIN
@ -8270,7 +8300,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_beforeUpdate`
 	BEFORE UPDATE ON `specie`
 	FOR EACH ROW
 BEGIN
@ -8582,7 +8612,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`tag_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`tag_beforeInsert`
 	BEFORE INSERT ON `tag`
 	FOR EACH ROW
 BEGIN
@ -9051,7 +9081,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_beforeInsert`
 	BEFORE INSERT ON `ticketPackaging`
 	FOR EACH ROW
 BEGIN
@ -9117,7 +9147,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketParking_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketParking_beforeInsert`
 	BEFORE INSERT ON `ticketParking`
 	FOR EACH ROW
 BEGIN
@ -9313,7 +9343,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_ai`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterInsert`
 	AFTER INSERT ON `ticketService`
 	FOR EACH ROW
 BEGIN
@ -9355,7 +9385,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_au`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterUpdate`
 	AFTER UPDATE ON `ticketService`
 	FOR EACH ROW
 BEGIN
@ -9380,7 +9410,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_ad`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterDelete`
 	AFTER DELETE ON `ticketService`
 	FOR EACH ROW
 BEGIN
@ -9450,7 +9480,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_beforeUpdate`
 	BEFORE UPDATE ON `ticketTracking`
@ -9632,7 +9662,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`time_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`time_afterUpdate`
 	AFTER UPDATE ON `time`
 	FOR EACH ROW
 BEGIN
@ -10203,13 +10233,11 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_AI`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_beforeInsert`
-	AFTER INSERT ON `workerTimeControl`
+	BEFORE INSERT ON `workerTimeControl`
-	FOR EACH ROW
+	FOR EACH ROW
-BEGIN
+BEGIN
-	IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN 
+	SET NEW.editorFk = account.myUser_getId();
 		CALL util.throw('date in the future');
 	END IF;            
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10225,7 +10253,73 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workingHoursBeforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_afterInsert`
 	AFTER INSERT ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
 	IF NEW.timed > (util.VN_NOW() + INTERVAL 1 DAY) THEN 
 		CALL util.throw('date in the future');
 	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_beforeUpdate`
 	BEFORE UPDATE ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_afterDelete`
 	AFTER DELETE ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'WorkerTimeControl',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workingHours_beforeInsert`
 	BEFORE INSERT ON `workingHours`
 	FOR EACH ROW
 BEGIN
@ -10375,7 +10469,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BI`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_beforeInsert`
 	BEFORE INSERT ON `zoneExclusion`
 	FOR EACH ROW
 BEGIN 
@ -10397,7 +10491,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BU`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_beforeUpdate`
 	BEFORE UPDATE ON `zoneExclusion`
 	FOR EACH ROW
 BEGIN 
@ -10619,7 +10713,7 @@ USE `vn2008`;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`Conteo_ai`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`Conteo_afterInsert`
 	AFTER INSERT ON `Conteo`
 	FOR EACH ROW
 BEGIN
@ -10645,7 +10739,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`account_conciliacion_BEFORE_INSERT`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`account_conciliacion_beforeInsert`
 	BEFORE INSERT ON `account_conciliacion`
 	FOR EACH ROW
 set new.id_calculated = replace(
@ -10671,7 +10765,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hourBeforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hour_beforeInsert`
 	BEFORE INSERT ON `agency_hour`
 	FOR EACH ROW
 BEGIN
@ -10704,7 +10798,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hour_AFTER_UPDATE`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hour_afterUpdate`
 	AFTER UPDATE ON `agency_hour`
 	FOR EACH ROW
 BEGIN
@ -10734,7 +10828,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`awb_recibida_ad`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`awb_recibida_afterDelete`
 	AFTER DELETE ON `awb_recibida`
 	FOR EACH ROW
 IF (SELECT COUNT(*) FROM recibida_iva where recibida_id = OLD.recibida_id) = 0
@ -10759,10 +10853,9 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`movement_label_au`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`movement_label_afterUpdate`
 	AFTER UPDATE ON `movement_label`
 	FOR EACH ROW
 -- Edit trigger body code below this line. Do not edit lines above this one
 IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
 	UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
 END IF */;;
@ -10777,4 +10870,4 @@ DELIMITER ;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2024-01-25 16:24:46
+-- Dump completed on 2024-02-15 10:21:45
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -653,6 +653,7 @@ INSERT INTO `vn`.`expense`(`id`, `name`, `isWithheld`)
        (7001000000, 'Mercaderia',                       0),
        (7050000000, 'Prestacion de servicios',          1);
 INSERT INTO `vn`.`agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
 INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`)
    VALUES
@ -728,7 +729,7 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`)
    VALUES
        (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1,         1),
-        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2), 
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2),
        (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL,      3),
        (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL,      NULL),
        (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL,      NULL),
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@ -1,5 +1,5 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
 BEGIN
 	DECLARE vLastMonth DATE;
@ -49,5 +49,5 @@ BEGIN
            LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
        WHERE bt.fecha >= vLastMonth AND r.mercancia;
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
 BEGIN
-	
+
 	/**
 	 * Reemplaza las ventas contables del último año.
 	 * Es el origen de datos para el balance de Entradas
@ -13,8 +13,8 @@ BEGIN
 	DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
-	DELETE FROM bs.ventas_contables 
+	DELETE FROM bs.ventas_contables
-		WHERE year = vYear 
+		WHERE year = vYear
 	    	AND month = vMonth;
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
@ -25,7 +25,7 @@ BEGIN
 			FROM vn2008.Tickets t
 				JOIN vn.invoiceOut io ON io.id = t.Factura
 			WHERE year(io.issued) = vYear
-				AND month(io.issued) = vMonth;   
+				AND month(io.issued) = vMonth;
 	INSERT INTO bs.ventas_contables(year
 								  , month
@ -35,7 +35,7 @@ BEGIN
 								  , tipo_id
 								  , empresa_id
 								  , gasto)
-	
+
 		SELECT  vYear
 			  , vMonth
 			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
@ -47,13 +47,13 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , 7000000000 
+			  , a.expenseFk
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
 									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 1000000  
+									  ) * 100000
-				+ tp.reino_id * 10000 as Gasto
+				+ tp.reino_id * 1000 as Gasto
-			FROM vn2008.Movimientos m 
+			FROM vn2008.Movimientos m
 				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
 				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
 				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
@ -67,7 +67,7 @@ BEGIN
 				AND m.Descuento <> 100
 				AND a.tipo_id != TIPO_PATRIMONIAL
 			GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
-		
+
 	INSERT INTO bs.ventas_contables(year
 								  , month
 								  , venta
@ -86,17 +86,17 @@ BEGIN
 				  ) as grupo
 			  , NULL
 			  , NULL
-			  , t.companyFk 
+			  , t.companyFk
 			  , 7050000000
-			FROM vn.ticketService ts 
+			FROM vn.ticketService ts
 				JOIN vn.ticket t ON ts.ticketFk = t.id
-				JOIN vn.address a on a.id = t.addressFk 
+				JOIN vn.address a on a.id = t.addressFk
-				JOIN vn.client cl on cl.id = a.clientFk 
+				JOIN vn.client cl on cl.id = a.clientFk
 				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
-				JOIN vn.company c on c.id = t.companyFk 
+				JOIN vn.company c on c.id = t.companyFk
 				LEFT JOIN vn.company c2 on c2.clientFk = cl.id
-			GROUP BY grupo, t.companyFk ;	
+			GROUP BY grupo, t.companyFk ;
-		
+
 	DROP TEMPORARY TABLE tmp.ticket_list;
 END$$
 DELIMITER ;
--- a/db/routines/util/procedures/tx_commit.sql
+++ b/db/routines/util/procedures/tx_commit.sql
@ -0,0 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
 BEGIN
 /**
 * Confirma los cambios asociados a una transacción.
 *
 * @param isTx es true si existe transacción asociada
 */
    IF isTx THEN
        COMMIT;
    END IF;
 END$$
 DELIMITER ;
--- a/db/routines/util/procedures/tx_rollback.sql
+++ b/db/routines/util/procedures/tx_rollback.sql
@ -0,0 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
 BEGIN
 /**
 * Deshace los cambios asociados a una transacción.
 *
 * @param isTx es true si existe transacción asociada
 */
    IF isTx THEN
        ROLLBACK;
    END IF;
 END$$
 DELIMITER ;
--- a/db/routines/util/procedures/tx_start.sql
+++ b/db/routines/util/procedures/tx_start.sql
@ -0,0 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
 BEGIN
 /**
 * Inicia una transacción.
 *
 * @param isTx es true si existe transacción asociada
 */
    IF isTx THEN
        START TRANSACTION;
    END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/functions/hasAnyNegativeBase.sql
+++ b/db/routines/vn/functions/hasAnyNegativeBase.sql
@ -4,32 +4,25 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`(
 	DETERMINISTIC
 BEGIN
-/*	Calcula si existe alguna base imponible negativa
+/**
-*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+*	Calcula si existe alguna base imponible negativa
 *	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
 */
 	DECLARE hasAnyNegativeBase BOOLEAN;
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+    CALL getTaxBases();
 	CREATE TEMPORARY TABLE tmp.ticket
 		(KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT id ticketFk
 			FROM tmp.ticketToInvoice;
-	CALL ticket_getTax(NULL);
+	SELECT negative INTO hasAnyNegativeBase
        FROM tmp.taxBases
        LIMIT 1;
-	SELECT COUNT(*) INTO hasAnyNegativeBase
+	DROP TEMPORARY TABLE
-		FROM(
+        tmp.ticketTax,
-			SELECT SUM(taxableBase) as taxableBase
+        tmp.ticket,
-				FROM tmp.ticketTax
+        tmp.taxBases;
 				GROUP BY pgcFk
 				HAVING taxableBase < 0
 			) t;
 	DROP TEMPORARY TABLE tmp.ticketTax;
 	DROP TEMPORARY TABLE tmp.ticket;
 	RETURN hasAnyNegativeBase;
--- a/db/routines/vn/functions/hasAnyPositiveBase.sql
+++ b/db/routines/vn/functions/hasAnyPositiveBase.sql
@ -0,0 +1,30 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`()
 	RETURNS tinyint(1)
 	DETERMINISTIC
 BEGIN
 /**
 *	Calcula si existe alguna base imponible positiva
 *	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
 */
 	DECLARE hasAnyPositiveBase BOOLEAN;
    CALL getTaxBases();
 	SELECT positive INTO hasAnyPositiveBase
        FROM tmp.taxBases
        LIMIT 1;
 	DROP TEMPORARY TABLE
        tmp.ticketTax,
        tmp.ticket,
        tmp.taxBases;
 	RETURN hasAnyPositiveBase;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -9,6 +9,7 @@ BEGIN
 	DECLARE v26Month DATE;
 	DECLARE v3Month DATE;
 	DECLARE vTrashId VARCHAR(15);
 	DECLARE v2Years DATE;
 	DECLARE v5Years DATE;
 	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
@ -18,6 +19,7 @@ BEGIN
 	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
 	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
 	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
 	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
 	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
 	DELETE FROM ticketParking WHERE created < vDateShort;
@ -163,7 +165,11 @@ BEGIN
 		FROM tmp.duaToDelete tmp
 		JOIN vn.dua d ON d.id = tmp.id;
-	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+	DELETE a
 		FROM vn.awb a
 			LEFT JOIN vn.travel t ON t.awbFk = a.id
 		WHERE a.created < v2Years
 			AND t.id IS NULL;
 	-- Borra los registros de collection y ticketcollection
 	DELETE FROM vn.collection  WHERE created < vDateShort;
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
-)
+)
 proc:BEGIN   
 /**
 * Comprueba si existen colecciones libres que se ajustan
@ -84,5 +84,5 @@ proc:BEGIN
 		WHERE id = vCollectionFk;
 	DO RELEASE_LOCK('collection_assign');
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/db/routines/vn/procedures/duaInvoiceInBooking.sql
@ -1,70 +1,74 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`duaInvoiceInBooking`(vDuaFk INT)
 BEGIN
-
+/**
 * Genera el asiento de un DUA y marca las entradas como confirmadas
 *
 * @param vDuaFk Id del dua a recalcular
 */
 	DECLARE done BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
-    DECLARE vASIEN BIGINT DEFAULT 0;
+	DECLARE vASIEN BIGINT DEFAULT 0;
-    DECLARE vCounter INT DEFAULT 0;
+	DECLARE vCounter INT DEFAULT 0;
-    
+
 	DECLARE rs CURSOR FOR
-		SELECT e.invoiceInFk
+		SELECT DISTINCT e.invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
-                JOIN invoiceIn ii ON ii.id = e.invoiceInFk
+				JOIN invoiceIn ii ON ii.id = e.invoiceInFk
-            WHERE de.duaFk = vDuaFk
+			WHERE de.duaFk = vDuaFk
 				AND de.customsValue
 				AND ii.isBooked = FALSE;
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 	OPEN rs;
-     
+
 	UPDATE invoiceIn ii
 			JOIN entry e ON e.invoiceInFk = ii.id
-            JOIN duaEntry de ON de.entryFk = e.id
+			JOIN duaEntry de ON de.entryFk = e.id
-            JOIN dua d ON d.id = de.duaFk
+			JOIN dua d ON d.id = de.duaFk
 		SET ii.isBooked = TRUE,
 			ii.booked = IFNULL(ii.booked,d.booked),
 			ii.operated = IFNULL(ii.operated,d.operated),
-            ii.issued = IFNULL(ii.issued,d.issued),
+			ii.issued = IFNULL(ii.issued,d.issued),
-            ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
-            e.isConfirmed = TRUE
+			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
-    
+
-    SELECT IFNULL(ASIEN,0) INTO vASIEN
+	SELECT IFNULL(ASIEN,0) INTO vASIEN
 		FROM dua
 			WHERE id = vDuaFk;
-    
+
 	FETCH rs INTO vInvoiceFk;
-     
+
 	WHILE NOT done DO
 		CALL invoiceIn_booking(vInvoiceFk);
-        
+
-        IF vCounter > 0 OR vASIEN > 0 THEN
+		IF vCounter > 0 OR vASIEN > 0 THEN
-        
+
-			UPDATE vn.XDiario x
+			UPDATE vn2008.XDiario x
-				JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
+				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
-                SET x.ASIEN = vASIEN;
+				SET x.ASIEN = vASIEN;
-        
+
-        ELSE
+		ELSE
-        
+
-			SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig;
+			SELECT lastBookEntry INTO vASIEN FROM ledgerConfig;
-            
+
 		END IF;
-			     
+
-        SET vCounter = vCounter + 1;
+		SET vCounter = vCounter + 1;
-        
+
 		FETCH rs INTO vInvoiceFk;
 	END WHILE;
-    
+
-    CLOSE rs;
+	CLOSE rs;
-    
+
-    UPDATE dua 
+	UPDATE dua
-        SET ASIEN = vASIEN
+		SET ASIEN = vASIEN
-        WHERE id = vDuaFk;
+		WHERE id = vDuaFk;
-        
+
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/getTaxBases.sql
+++ b/db/routines/vn/procedures/getTaxBases.sql
@ -0,0 +1,32 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
 BEGIN
 /**
 *   Calcula y devuelve en número de bases imponibles postivas y negativas
 *	Requiere la tabla temporal tmp.ticketToInvoice(id)
 *
 *	returns tmp.taxBases
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
 		(KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT id ticketFk
 			FROM tmp.ticketToInvoice;
 	CALL ticket_getTax(NULL);
 	DROP TEMPORARY TABLE IF EXISTS tmp.taxBases;
 	CREATE TEMPORARY TABLE tmp.taxBases
 		ENGINE = MEMORY
 		SELECT
                SUM(taxableBase > 0) as positive,
 				SUM(taxableBase < 0) as negative
 			FROM(
 				SELECT SUM(taxableBase) taxableBase
 					FROM tmp.ticketTax
 					GROUP BY pgcFk
 				) t;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/db/routines/vn/procedures/inventoryMake.sql
@ -1,182 +1,175 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vDate DATE, vWh INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vInventoryDate DATE)
-proc: BEGIN
+BEGIN
 /**
-* Recalcula los inventarios de todos los almacenes, si vWh = 0
+* Recalculate the inventories
 *
-* @param vDate Fecha de los nuevos inventarios
+* @param vInventoryDate date for the new inventory
 * @param vWh almacen al cual hacer el inventario
 */
 	DECLARE vDone BOOL;
 	DECLARE vEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vDateLastInventory DATE;
-	DECLARE vDateYesterday DATETIME DEFAULT vDate - INTERVAL 1 SECOND;
+	DECLARE vDateYesterday DATETIME DEFAULT vInventoryDate - INTERVAL 1 SECOND;
 	DECLARE vWarehouseOutFkInventory INT;
 	DECLARE vInventorySupplierFk INT;
 	DECLARE vAgencyModeFkInventory INT;
 	DECLARE vMaxRecentInventories INT;
 	DECLARE vWarehouseFk INT;
 	DECLARE cWarehouses CURSOR FOR
 		SELECT id
 			FROM warehouse
-			WHERE isInventory
+			WHERE isInventory;
-				AND vWh IN (0,id);
+	
 	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	SELECT inventorySupplierFk	INTO vInventorySupplierFk FROM entryConfig LIMIT 1;
 	SELECT inventoried INTO vDateLastInventory FROM config LIMIT 1;
 	SELECT maxRecentInventories,
 			warehouseOutFk,
 			agencyModeFk
 			INTO vMaxRecentInventories,
 				vWarehouseOutFkInventory,
 				vAgencyModeFkInventory
 		FROM inventoryConfig 
 		LIMIT 1;
 	IF vDateLastInventory IS NULL 
 		OR vInventorySupplierFk IS NULL
 		OR vMaxRecentInventories IS NULL 
 		OR vInventoryDate IS NULL 
 		OR vWarehouseOutFkInventory IS NULL
 		OR vAgencyModeFkInventory IS NULL THEN
 		CALL util.throw('Some config parameters are not set');
 	END IF;
 	START TRANSACTION;
 	OPEN cWarehouses;
 	-- Environment variable to disable the triggers of the affected tables
 	SET @isModeInventory := TRUE;
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH cWarehouses INTO vWh;
+		SET vEntryFk = NULL;
 		SET vTravelFk = NULL;
 		FETCH cWarehouses INTO vWarehouseFk;
 		IF vDone THEN
 			LEAVE l;
 		END IF;
-		SELECT w.id INTO vWarehouseOutFkInventory
+		-- Generate travel, if it does not exist
 			FROM warehouse w
 			WHERE w.code = 'inv';
 		SELECT inventorySupplierFk	INTO vInventorySupplierFk
 			FROM entryConfig;
 		SELECT am.id INTO vAgencyModeFkInventory
 				FROM agencyMode am
 					where code = 'inv';
 		SELECT MAX(landed) INTO vDateLastInventory
 			FROM travel tr
 				JOIN entry e ON e.travelFk = tr.id
 				JOIN buy b ON b.entryFk = e.id
 			WHERE warehouseOutFk = vWarehouseOutFkInventory
 				AND landed < vDate
 				AND e.supplierFk = vInventorySupplierFk
 				AND warehouseInFk = vWh
 				AND NOT isRaid;
 		IF vDateLastInventory IS NULL THEN
 			SELECT inventoried INTO vDateLastInventory FROM config;
 		END IF;
 		-- Generamos travel, si no existe.
 		SET vTravelFK = 0;
 		SELECT id INTO vTravelFk
 			FROM travel
 			WHERE warehouseOutFk = vWarehouseOutFkInventory
-				AND warehouseInFk = vWh
+				AND warehouseInFk = vWarehouseFk
-				AND landed = vDate
+				AND landed = vInventoryDate
 				AND agencyModeFk = vAgencyModeFkInventory
 				AND ref = 'inventario'
 			LIMIT 1;
-		IF NOT vTravelFK THEN
+		IF vTravelFk IS NULL THEN
-
+			INSERT INTO travel 
-			INSERT INTO travel SET
+				SET warehouseOutFk = vWarehouseOutFkInventory,
-				warehouseOutFk = vWarehouseOutFkInventory,
+					warehouseInFk = vWarehouseFk,
-				warehouseInFk = vWh,
+					shipped = vInventoryDate,
-				shipped = vDate,
+					landed = vInventoryDate,
-				landed = vDate,
+					agencyModeFk = vAgencyModeFkInventory,
-				agencyModeFk = vAgencyModeFkInventory,
+					ref = 'inventario',
-				ref = 'inventario',
+					isDelivered = TRUE,
-				isDelivered = TRUE,
+					isReceived = TRUE;
 				isReceived = TRUE;
 			SELECT LAST_INSERT_ID() INTO vTravelFk;
 		END IF;
-		-- Generamos entrada si no existe, o la vaciamos.
+		-- Generate an entry if it does not exist, or we empty it
 		SET vEntryFk = 0;
 		SELECT id INTO vEntryFk
 			FROM entry
 			WHERE supplierFk = vInventorySupplierFk
 			AND travelFk = vTravelFk;
-		IF NOT vEntryFk THEN
+		IF vEntryFk IS NULL THEN
-
+			INSERT INTO entry 
-			INSERT INTO entry SET
+				SET supplierFk = vInventorySupplierFk,
-				supplierFk = vInventorySupplierFk,
+					isConfirmed = TRUE,
-				isConfirmed = TRUE,
+					isOrdered = TRUE,
-				isOrdered = TRUE,
+					travelFk = vTravelFk;
 				travelFk = vTravelFk;
 			SELECT LAST_INSERT_ID() INTO vEntryFk;
 		ELSE
 			DELETE FROM buy WHERE entryFk = vEntryFk;
 		END IF;
-		-- Preparamos tabla auxilar
+		-- Prepare the auxiliary table
-		CREATE OR REPLACE TEMPORARY TABLE tmp.inventory (
+		CREATE OR REPLACE TEMPORARY TABLE tInventory (
-				itemFk INT(11) NOT NULL PRIMARY KEY,
+			itemFk INT(11) NOT NULL PRIMARY KEY,
-				quantity int(11) DEFAULT '0',
+			quantity int(11) DEFAULT '0',
-				buyingValue decimal(10,4) DEFAULT '0.0000',
+			buyingValue decimal(10,4) DEFAULT '0.0000',
-				freightValue decimal(10,3) DEFAULT '0.000',
+			freightValue decimal(10,3) DEFAULT '0.000',
-				packing int(11) DEFAULT '0',
+			packing int(11) DEFAULT '0',
-				`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
+			`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
-				groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
+			groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
-				comissionValue decimal(10,3) DEFAULT '0.000',
+			comissionValue decimal(10,3) DEFAULT '0.000',
-				packageValue decimal(10,3) DEFAULT '0.000',
+			packageValue decimal(10,3) DEFAULT '0.000',
-				packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
+			packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
-				price1 decimal(10,2) DEFAULT '0.00',
+			price1 decimal(10,2) DEFAULT '0.00',
-				price2 decimal(10,2) DEFAULT '0.00',
+			price2 decimal(10,2) DEFAULT '0.00',
-				price3 decimal(10,2) DEFAULT '0.00',
+			price3 decimal(10,2) DEFAULT '0.00',
-				minPrice decimal(10,2) DEFAULT '0.00',
+			minPrice decimal(10,2) DEFAULT '0.00',
-				producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+			producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-		INDEX (itemFK)) ENGINE = MEMORY;
+			INDEX (itemFK)
 		) ENGINE = MEMORY;
-		-- Compras
+		-- Buys
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT b.itemFk, SUM(b.quantity)
 				FROM buy b
 					JOIN entry e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
-				WHERE tr.warehouseInFk = vWh
+				WHERE tr.warehouseInFk = vWarehouseFk
-					AND tr.landed BETWEEN vDateLastInventory
+					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
 					AND vDateYesterday
 					AND NOT isRaid
 				GROUP BY b.itemFk;
 	SELECT vDateLastInventory , vDateYesterday;
-		-- Traslados
+		-- Transfers
-		INSERT INTO tmp.inventory(itemFk, quantity)
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, quantityOut
-			FROM (
+				FROM (
 					SELECT b.itemFk,- SUM(b.quantity) quantityOut
 						FROM buy b
 							JOIN entry e ON e.id = b.entryFk
 							JOIN travel tr ON tr.id = e.travelFk
-						WHERE tr.warehouseOutFk = vWh
+						WHERE tr.warehouseOutFk = vWarehouseFk
-							AND tr.shipped BETWEEN vDateLastInventory
+							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
 							AND vDateYesterday
 							AND NOT isRaid
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;
-		-- Ventas
+		-- Sales
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, saleOut
-			FROM (
+				FROM (
 					SELECT s.itemFk, - SUM(s.quantity) saleOut
 						FROM sale s
 							JOIN ticket t ON t.id = s.ticketFk
-						WHERE t.warehouseFk = vWh
+						WHERE t.warehouseFk = vWarehouseFk
 							AND t.shipped BETWEEN vDateLastInventory AND vDateYesterday
 						GROUP BY s.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity,0) + sub.saleOut;
-		-- Actualiza valores de la ultima compra
+		-- Update values of the last purchase
-		UPDATE tmp.inventory inv
+		UPDATE tInventory inv
-				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWh
+				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWarehouseFk
 				JOIN buy b ON b.id = lb.buy_id
 				JOIN item i ON i.id = b.itemFk
 				LEFT JOIN producer p ON p.id = i.producerFk
@ -194,7 +187,7 @@ proc: BEGIN
 				inv.minPrice = b.minPrice,
 				inv.producer = p.name;
-		INSERT INTO buy( itemFk,
+		INSERT INTO buy(itemFk,
 				quantity,
 				buyingValue,
 				freightValue,
@ -224,42 +217,53 @@ proc: BEGIN
 					price3,
 					minPrice,
 					vEntryFk
-				FROM tmp.inventory;
+				FROM tInventory;
-		SELECT vWh, COUNT(*), util.VN_NOW() FROM tmp.inventory;
+		-- Update the 'lastUsed' field of the item
-
+		UPDATE item i
-	-- Actualizamos el campo lastUsed de item
+				JOIN tInventory i2 ON i2.itemFk = i.id
-	UPDATE item i
+			SET i.lastUsed = NOW()
-			JOIN tmp.inventory i2 ON i2.itemFk = i.id
+			WHERE i2.quantity;
-		SET i.lastUsed = NOW()
+	
-		WHERE i2.quantity;
+		DROP TEMPORARY TABLE tInventory;
 	-- DROP TEMPORARY TABLE tmp.inventory;
 	END LOOP;
-
+	
 	CLOSE cWarehouses;
-	UPDATE config SET inventoried = vDate;
+	UPDATE config SET inventoried = vInventoryDate;
 	SET @isModeInventory := FALSE;
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	SET @isModeInventory := FALSE;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
+	
-		(INDEX(entryId) USING BTREE) ENGINE = MEMORY
+	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
-		SELECT e.id as entryId,
+		(INDEX(entryId)) ENGINE = MEMORY
-				t.id as travelId
+		SELECT e.id entryId,
 				t.id travelId
 			FROM travel t
 				JOIN `entry` e ON e.travelFk = t.id
 				JOIN (
 					SELECT t.shipped
 						FROM travel t
 							JOIN `entry` e ON e.travelFk = t.id
 						WHERE e.supplierFk = vInventorySupplierFk
 							AND t.shipped <= vInventoryDate
 						GROUP BY t.shipped
 						ORDER BY t.shipped DESC
 						OFFSET vMaxRecentInventories ROWS
 				) sub
 			WHERE e.supplierFk = vInventorySupplierFk
-				AND t.shipped <= util.VN_CURDATE() - INTERVAL 12 DAY
+				AND t.shipped IN (sub.shipped);
 				AND (DAY(t.shipped) <> 1 OR shipped < util.VN_CURDATE() - INTERVAL 12 DAY);
-	DELETE e
+	DELETE e 
 		FROM `entry` e
-			JOIN tmp.entryToDelete tmp ON tmp.entryId = e.id;
+			JOIN tEntryToDelete tmp ON tmp.entryId = e.id;
 	DELETE IGNORE t
 		FROM travel t
-			JOIN tmp.entryToDelete tmp ON tmp.travelId = t.id;
+			JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
 	DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
 	COMMIT;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/inventoryMakeLauncher.sql
+++ b/db/routines/vn/procedures/inventoryMakeLauncher.sql
@ -2,10 +2,11 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMakeLauncher`()
 BEGIN
 /**
- * Recalcula los inventarios de todos los almacenes.
+ * Recalculate the inventories of all warehouses
 */
-
+	CALL inventoryMake(
-	call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0);
+		util.VN_CURDATE() - 
-
+		INTERVAL (SELECT daysInPastForInventory FROM inventoryConfig LIMIT 1) DAY
 	);
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql
+++ b/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql
@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(vDuaFk INT)
 BEGIN
-
+/**
-	DECLARE done BOOL DEFAULT FALSE;
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
 *  
 * @param vDuaFk Id del dua a recalcular
 */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
-	DECLARE rs CURSOR FOR
+	DECLARE vInvoices CURSOR FOR
-			SELECT invoiceInFk
+		SELECT DISTINCT invoiceInFk
-				FROM entry e
+			FROM entry e
-					JOIN duaEntry de ON de.entryFk = e.id
+				JOIN duaEntry de ON de.entryFk = e.id
-				WHERE de.duaFk = vDuaFk;
+			WHERE de.duaFk = vDuaFk;
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	OPEN rs;
+	OPEN vInvoices;
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vInvoices INTO vInvoiceInFk;
-	FETCH rs INTO vInvoiceInFk;
+		IF vDone THEN
-
+			LEAVE l;
-	WHILE NOT done DO
+		END IF;
 		CALL vn2008.recibidaIvaInsert(vInvoiceInFk);
 		CALL invoiceInDueDay_recalc(vInvoiceInFk);
-		FETCH rs INTO vInvoiceInFk;
+	END LOOP;
-
+	CLOSE vInvoices;
 	END WHILE;
 	CLOSE rs;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/invoiceInTax_getFromDua.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromDua.sql
@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromDua`(vDuaFk INT)
 BEGIN
-
+/**
-	DECLARE done BOOL DEFAULT FALSE;
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
 *  
 * @param vDuaFk Id del dua a recalcular
 */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
-	DECLARE rs CURSOR FOR
+	DECLARE vInvoices CURSOR FOR
-		SELECT invoiceInFk
+		SELECT DISTINCT invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
 			WHERE de.duaFk = vDuaFk;
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	OPEN rs;
+	OPEN vInvoices;
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vInvoices INTO vInvoiceInFk;
-	FETCH rs INTO vInvoiceInFk;
+		IF vDone THEN
-
+			LEAVE l;
-	WHILE NOT done DO
+		END IF;
 		CALL invoiceInTax_getFromEntries(vInvoiceInFk);
 		CALL invoiceInDueDay_calculate(vInvoiceInFk);
 		FETCH rs INTO vInvoiceInFk;
 	END WHILE;
 	CLOSE rs;
 	END LOOP;
 	CLOSE vInvoices;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
@ -1,13 +1,22 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vId INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vInvoiceInFk INT)
 BEGIN
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);
 	DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
 	SELECT isBooked INTO vIsBooked  
 		FROM invoiceIn ii 
 		WHERE id = vInvoiceInFk;
 	IF vIsBooked THEN 
 		CALL util.throw('A booked invoice cannot be modified');
 	END IF;
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
-			JOIN invoiceIn ii ON ii.id = vId
+			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued 
 			AND rr.currencyFk = ii.currencyFk ;
@ -24,7 +33,7 @@ BEGIN
 		LIMIT 1;
 	DELETE FROM invoiceInTax 
-		WHERE invoiceInFk = vId;
+		WHERE invoiceInFk = vInvoiceInFk;
 	INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk)
 		SELECT ii.id,
@ -39,7 +48,7 @@ BEGIN
 				JOIN buy b ON b.entryFk = e.id
 				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk 
 					AND rr.dated = ii.issued
-			WHERE ii.id = vId 
+			WHERE ii.id = vInvoiceInFk 
 			HAVING taxableBase IS NOT NULL;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemProposal_Add.sql
+++ b/db/routines/vn/procedures/itemProposal_Add.sql
@ -1,70 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal_Add`(vSaleFk INT, vMateFk INT, vQuantity INT)
 BEGIN
 /**
 * Añade un nuevo articulo para sustituir a otro, y actualiza la memoria de sustituciones.
 *
 * @param vSaleFk id de la tabla sale
 * @param vMateFk articulo sustituto
 * @ param vQuantity cantidad que se va a sustituir
 */ 
 	DECLARE vTicketFk INT;
 	DECLARE vItemFk INT;
 	DECLARE vWarehouseFk SMALLINT;
 	DECLARE vDate DATE;
 	DECLARE vGrouping INT;
 	DECLARE vBox INT;
 	DECLARE vPacking INT;
 	DECLARE vRoundQuantity INT DEFAULT 1;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
 	SELECT s.ticketFk, LEAST(s.quantity, vQuantity), s.itemFk,t.shipped,t.warehouseFk
 		INTO vTicketFk, vQuantity, vItemFk,vDate,vWarehouseFk
 		FROM sale s
 			JOIN ticket t ON t.id = s.ticketFk
 		WHERE s.id = vSaleFk;
 	CALL buyUltimate(vWarehouseFk, vDate);
 	SELECT `grouping`, groupingMode, packing INTO vGrouping, vBox, vPacking
 		FROM buy b
 			JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
 		WHERE tmp.itemFk = vMateFk AND tmp.WarehouseFk = vWarehouseFk;
 	IF vBox = 2 AND vPacking > 0 THEN
 		SET vRoundQuantity = vPacking;
 	END IF;
 	IF  vBox = 1 AND vGrouping > 0 THEN
 		SET vRoundQuantity = vGrouping;
 	END IF;
 	START TRANSACTION;
 	UPDATE sale
 		SET quantity = quantity - vQuantity
 		WHERE id = vSaleFk;
 	INSERT INTO sale(ticketFk, itemFk, quantity, concept)
 		SELECT vTicketFk,
 				vMateFk,
 				CEIL(vQuantity / vRoundQuantity) * vRoundQuantity,
 				CONCAT('+ ',i.longName)
 		FROM item i
 			WHERE id = vMateFk;
 	SELECT LAST_INSERT_ID() INTO vSaleFk;
 	CALL sale_calculateComponent(vSaleFk, NULL);
 	INSERT INTO itemProposal(itemFk, mateFk, counter)
 		VALUES(vItemFk, vMateFk, 1)
 		ON DUPLICATE KEY UPDATE counter = counter + 1;
 	COMMIT;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@ -19,6 +19,10 @@ BEGIN
 	DECLARE vItemFk INT;
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
 	SET vQuantity = vQuantity * vPacking;
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
--- a/db/routines/vn/procedures/itemShelving_selfConsumption.sql
+++ b/db/routines/vn/procedures/itemShelving_selfConsumption.sql
@ -20,20 +20,23 @@ BEGIN
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
 	DECLARE vItemShelvingFk INT;
 	DECLARE vAddressFk INT;
 	SELECT c.id,
 			pc.clientSelfConsumptionFk,
-			s.warehouseFk
+			s.warehouseFk,
 			pc.addressSelfConsumptionFk
 			INTO vCompanyFk,
 			vClientFk,
-			vWarehouseFk
+			vWarehouseFk,
 			vAddressFk
 		FROM company c
 			JOIN address a ON a.clientFk = c.clientFk
 			JOIN warehouse w ON w.addressFk = a.id
 			JOIN sector s ON s.warehouseFk = w.id
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
-			JOIN productionConfig pc ON TRUE
+			JOIN productionConfig pc
 		WHERE s2.code = vShelvingFk;
 	IF vClientFk IS NULL THEN
@ -65,7 +68,7 @@ BEGIN
 			vClientFk,
 			vWarehouseFk,
 			CURDATE(),
-			NULL,
+			vAddressFk,
 			vCompanyFk,
 			NULL,
 			vTicketFk
--- a/db/routines/vn/procedures/sale_getBoxPickingList.sql
+++ b/db/routines/vn/procedures/sale_getBoxPickingList.sql
@ -17,7 +17,6 @@ BEGIN
 	CALL productionControl(vWarehouseFk, 0);
 	-- Products with vn.item.isBoxPickingMode = TRUE, pay atention to vn.itemShelving.packing
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 	(saleFk INT PRIMARY KEY)
 	SELECT
@ -29,7 +28,7 @@ BEGIN
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		pb.routeFk,
 		FLOOR(s.quantity / ish.packing) stickers,
-		ish.packing,
+		IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
 		b.packagingFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk
@ -52,8 +51,8 @@ BEGIN
 			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN buy b ON b.id = lb.buy_id
-		WHERE s.quantity BETWEEN ish.packing AND (ish.visible - IFNULL(tISS.reserve,0))
+		WHERE IF(i.isBoxPickingMode, ish.packing, i.packingOut) 
-			AND i.isBoxPickingMode
+				<= LEAST(s.quantity, ish.visible - IFNULL(tISS.reserve,0))
 			AND NOT pb.problem
 			AND sgd.saleFk IS NULL
 			AND p.sectorFk = vSectorFk
@ -64,47 +63,13 @@ BEGIN
 		GROUP BY s.id
 		ORDER BY etd;
-	-- Remaining products, vn.item.packingOut
+	SELECT *
-	INSERT IGNORE INTO tmp.sale
+		FROM tmp.sale
-	SELECT
+		WHERE stickers;
 		s.ticketFk,	
 		s.id saleFk,
 		s.itemFk,
 		s.concept,
 		s.quantity,
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		pb.routeFk,
 		s.quantity / i.packingOut stickers,
 		i.packingOut,
 		pc.defaultBigPackageFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk
 			JOIN itemShelving ish ON ish.itemFk = s.itemFk
 			JOIN shelving sh ON sh.code = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
 			JOIN agencyMode am ON am.id = pb.agencyModeFk
 			JOIN packagingConfig pc
 			LEFT JOIN routesMonitor rm ON rm.routeFk = pb.routeFk
 			LEFT JOIN itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = p.sectorFk
 			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
 			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
 		WHERE s.quantity >= i.packingOut 
 			AND NOT pb.problem
 			AND s.quantity > 0
 			AND sgd.saleFk IS NULL
 			AND p.sectorFk = vSectorFk
 			AND ts.isPreviousPreparable
 			AND iss.visible >= s.quantity
 			AND ((rm.bufferFk AND rm.isPickingAllowed)
 				OR am.code = 'REC_ALG') 
 			AND pb.shipped = vDated
 		GROUP BY s.id
 		ORDER BY etd;
 	SELECT * FROM tmp.sale;
 	DROP TEMPORARY TABLE tmp.productionBuffer;
 	DROP TEMPORARY TABLE tmp.sale;
 	END$$
 DELIMITER ;
 CALL `vn`.`sale_getBoxPickingList`(1, curdate());
--- a/db/routines/vn/procedures/sector_get.sql
+++ b/db/routines/vn/procedures/sector_get.sql
@ -1,13 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sector_get`()
 BEGIN
 /**
 * Obtiene los sectores
 */
 	SELECT s.id,s.description,s.warehouseFk
 		FROM vn.sector s;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/test.sql
+++ b/db/routines/vn/procedures/test.sql
@ -1,6 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`test`()
 BEGIN
 select 'procedimiento ejecutado con éxito';
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_getMovable.sql
+++ b/db/routines/vn/procedures/ticket_getMovable.sql
@ -1,44 +1,55 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(
 	vTicketFk INT,
 	vNewShipped DATETIME,
 	vWarehouseFk INT
 )
 BEGIN
 /**
 * Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * vNewShipped debe ser menor que vOldShipped, en los otros casos se
 * asume que siempre es posible
 *
 * @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
+ * @param vNewShipped -> Nueva fecha
 * @return Sales con Movible
-*/    
+*/
-    DECLARE vDatedOld DATETIME;
+    DECLARE vOldShipped DATETIME;
 	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
-    SELECT t.shipped INTO vDatedOld
+    SELECT t.shipped INTO vOldShipped
-        FROM ticket t 
+        FROM ticket t
        WHERE t.id = vTicketFk;
-    CALL item_getStock(vWarehouseFk, vDatedNew, NULL); 
+	-- Añadimos un dia más para calcular el stock hasta vNewShipped inclusive
-    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
+    CALL item_getStock(vWarehouseFk, DATE_ADD(vNewShipped, INTERVAL 1 DAY), NULL);
-	
+    CALL item_getMinacum(
-    SELECT s.id, 
+		vWarehouseFk,
-			s.itemFk, 
+		vNewShipped,
-			s.quantity, 
+		DATEDIFF(DATE_SUB(vOldShipped, INTERVAL 1 DAY), vNewShipped),
-			s.concept, 
+		NULL
-			s.price, 
+	);
    SELECT s.id,
 			s.itemFk,
 			s.quantity,
 			s.concept,
 			s.price,
 			s.reserved,
-			s.discount,  
+			s.discount,
-			i.image, 
+			i.image,
-			i.subName, 
+			i.subName,
 			il.stock + IFNULL(im.amount, 0) AS movable
        FROM ticket t
            JOIN sale s ON s.ticketFk = t.id
-            JOIN item i ON i.id = s.itemFk 
+            JOIN item i ON i.id = s.itemFk
-            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk
 				AND im.warehouseFk = vWarehouseFk
            LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
        WHERE t.id = vTicketFk;
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
+    DROP TEMPORARY TABLE IF EXISTS
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum; 
+		tmp.itemList,
-    
+		tmp.itemMinacum;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_getTax.sql
+++ b/db/routines/vn/procedures/ticket_getTax.sql
@ -9,6 +9,8 @@ BEGIN
 * @return tmp.ticketAmount (ticketFk, taxableBase, tax, code)
 * @return tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) Impuesto desglosado para cada ticket.
 */
 	-- Mantengo el drop porque si no da error en los tests de back de salix
 	-- Table 'addressCompany' was locked with a READ lock and can't be updated'
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
@ -17,24 +19,24 @@ BEGIN
 			FROM tmp.ticket tmpTicket
 				JOIN ticket t ON t.id = tmpTicket.ticketFk;
-	CALL addressTaxArea ();
+	CALL addressTaxArea();
 	IF vTaxArea IS NOT NULL THEN
 		UPDATE tmp.addressTaxArea
 			SET areaFk = vTaxArea;
 	END IF;
-	/* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente
+	-- Solo se calcula la base imponible (taxableBase) y
-	* No se debería cambiar el sistema por problemas con los decimales
+	-- el impuesto se calculará posteriormente
-	*/
+	-- No se debería cambiar el sistema por problemas con los decimales
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
+
-	CREATE TEMPORARY TABLE tmp.ticketTax
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT * FROM (
 			SELECT tmpTicket.ticketFk,
 					bp.pgcFk,
-					SUM(s.quantity * s.price * (100 - s.discount)/100 ) taxableBase,
+					SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
 					pgc.rate,
 					tc.code,
 					bp.priority
@ -43,22 +45,21 @@ BEGIN
 					JOIN item i ON i.id = s.itemFk
 					JOIN ticket t ON t.id = tmpTicket.ticketFk
 					JOIN supplier su ON su.id = t.companyFk
-					JOIN tmp.addressTaxArea ata
+					JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
-						ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
+						AND ata.companyFk = t.companyFk
-					JOIN itemTaxCountry itc
+					JOIN itemTaxCountry itc ON itc.itemFk = i.id
-						ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+						AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp
+					JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
-						ON bp.countryFk = su.countryFk
+						AND bp.taxAreaFk = ata.areaFk
-							AND bp.taxAreaFk = ata.areaFk
+						AND bp.taxClassFk = itc.taxClassFk
 							AND bp.taxClassFk = itc.taxClassFk
 					JOIN pgc ON pgc.code = bp.pgcFk
 					JOIN taxClass tc ON tc.id = bp.taxClassFk
 				GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
-				HAVING taxableBase <> 0) t3
+				HAVING taxableBase
 			) t3
 			ORDER BY priority;
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax
 	CREATE TEMPORARY TABLE tmp.ticketServiceTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT tt.ticketFk,
@ -70,24 +71,22 @@ BEGIN
 				JOIN ticketService ts ON ts.ticketFk = tt.ticketFk
 				JOIN ticket t ON t.id = tt.ticketFk
 				JOIN supplier su ON su.id = t.companyFk
-				JOIN tmp.addressTaxArea ata
+				JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
-					ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
+					AND ata.companyFk = t.companyFk
-				JOIN bookingPlanner bp
+				JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
-					ON bp.countryFk = su.countryFk
+					AND bp.taxAreaFk = ata.areaFk
-						AND bp.taxAreaFk = ata.areaFk
+					AND bp.taxClassFk = ts.taxClassFk
 						AND bp.taxClassFk = ts.taxClassFk
 				JOIN pgc ON pgc.code = bp.pgcFk
 				JOIN taxClass tc ON tc.id = bp.taxClassFk
 			GROUP BY tt.ticketFk, pgc.code
-			HAVING taxableBase <> 0;
+			HAVING taxableBase;
 	INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code)
 		SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code
 			FROM tmp.ticketServiceTax ts
 	ON DUPLICATE KEY UPDATE ticketTax.taxableBase = VALUES (taxableBase) + ticketTax.taxableBase ;
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketAmount
 	CREATE TEMPORARY TABLE tmp.ticketAmount
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
 		SELECT ticketFk, 
@ -97,7 +96,8 @@ BEGIN
 			FROM tmp.ticketTax
 			GROUP BY ticketFk, code;
-	DROP TEMPORARY TABLE tmp.addressCompany;
+	DROP TEMPORARY TABLE
-	DROP TEMPORARY TABLE tmp.addressTaxArea;
+		tmp.addressCompany,
 		tmp.addressTaxArea;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/travel_cloneWithEntries.sql
+++ b/db/routines/vn/procedures/travel_cloneWithEntries.sql
@ -1,21 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_cloneWithEntries`(
-	IN vTravelFk INT, 
+	IN vTravelFk INT,
-	IN vDateStart DATE, 
+	IN vDateStart DATE,
 	IN vDateEnd DATE,
 	IN vWarehouseOutFk INT,
-	IN vWarehouseInFk INT, 
+	IN vWarehouseInFk INT,
-	IN vRef VARCHAR(255), 
+	IN vRef VARCHAR(255),
-	IN vAgencyModeFk INT, 
+	IN vAgencyModeFk INT,
 	OUT vNewTravelFk INT)
 BEGIN
 /**
 * Clona un travel junto con sus entradas y compras
 *
 * @param vTravelFk travel plantilla a clonar
 * @param vDateStart fecha del shipment del nuevo travel
 * @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
 * @param vWarehouseInFk warehouse de landing del nuevo travel
 * @param vRef referencia del nuevo travel
 * @param vAgencyModeFk del nuevo travel
@ -25,34 +24,35 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
 				JOIN travel t ON t.id = e.travelFk
 			WHERE e.travelFk = vTravelFk;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN 
+	BEGIN
-		ROLLBACK;
+		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-	
+
-	START TRANSACTION;
+    CALL util.tx_start(vTx);
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
 			FROM travel
 			WHERE id = vTravelFk;
-	
+
 	SET vNewTravelFk = LAST_INSERT_ID();
 	SET vDone = FALSE;
 	SET @isModeInventory = TRUE;
 	OPEN vRsEntry;
-	
+
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vRsEntry INTO vAuxEntryFk;
@ -62,7 +62,7 @@ BEGIN
 		END IF;
 		CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
-		CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+        CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
 		SELECT evaNotes INTO vEvaNotes
 			FROM entry
@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
-	COMMIT;
+    CALL util.tx_commit(vTx);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/calendar_afterDelete.sql
+++ b/db/routines/vn/triggers/calendar_afterDelete.sql
@ -1,12 +1,12 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_afterDelete`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_afterDelete`
-	AFTER DELETE ON `calendar`
+	AFTER DELETE ON `calendar`
-	FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'Calendar',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/triggers/calendar_beforeInsert.sql
+++ b/db/routines/vn/triggers/calendar_beforeInsert.sql
@ -5,4 +5,4 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeInsert
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/triggers/calendar_beforeUpdate.sql
+++ b/db/routines/vn/triggers/calendar_beforeUpdate.sql
@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeUpdate`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeUpdate`
-	BEFORE UPDATE ON `calendar`
+	BEFORE UPDATE ON `calendar`
-	FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/triggers/saleGroup_beforeInsert.sql
+++ b/db/routines/vn/triggers/saleGroup_beforeInsert.sql
--- a/db/routines/vn/triggers/ticket_beforeUpdate.sql
+++ b/db/routines/vn/triggers/ticket_beforeUpdate.sql
@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeUpdate`
 	FOR EACH ROW
 BEGIN
 	DECLARE vNewTime TIME;
 	DECLARE vHasTicketRefund BOOL;
 	SET NEW.editorFk = account.myUser_getId();
@ -64,14 +63,5 @@ BEGIN
 		CALL vn.routeUpdateM3(NEW.routeFk);
 	END IF;
 	SELECT COUNT(*) INTO vHasTicketRefund 
 		FROM ticketRefund 
 		WHERE originalTicketFk = NEW.id 
 			OR refundTicketFk = NEW.id;
 	IF vHasTicketRefund AND NEW.clientFk <> OLD.clientFk THEN
 		CALL util.throw('The ticket has a refund associated');
 	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
+++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
@ -1,12 +1,12 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete`
-	AFTER DELETE ON `workerTimeControl`
+	AFTER DELETE ON `workerTimeControl`
-	FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'WorkerTimeControl',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql
+++ b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql
@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert`
-	BEFORE INSERT ON `workerTimeControl`
+	BEFORE INSERT ON `workerTimeControl`
-	FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql
+++ b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql
@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate`
-	BEFORE UPDATE ON `workerTimeControl`
+	BEFORE UPDATE ON `workerTimeControl`
-	FOR EACH ROW
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/views/__coolerPathDetail.sql
+++ b/db/routines/vn/views/__coolerPathDetail.sql
@ -1,7 +0,0 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`__coolerPathDetail`
 AS SELECT `c`.`cooler_path_detail_id` AS `id`,
 	`c`.`cooler_path_id` AS `coolerPathFk`,
 	`c`.`pasillo` AS `hallway`
 FROM `vn2008`.`cooler_path_detail` `c`
--- a/db/routines/vn/views/awbVolume.sql
+++ b/db/routines/vn/views/awbVolume.sql
@ -28,4 +28,4 @@ FROM (
 		JOIN `vn`.`volumeConfig` `vc`
 	)
 WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
-	AND t.awbFk	
+	AND `t`.`awbFk` <> 0
--- a/db/routines/vn/views/expeditionPallet_Print.sql
+++ b/db/routines/vn/views/expeditionPallet_Print.sql
@ -9,7 +9,7 @@ AS SELECT `et2`.`description` AS `truck`,
 	`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
-		`r`.`created` > util.VN_CURDATE() + INTERVAL 1 DAY,
+		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
 		ucase(dayname(`r`.`created`)),
 		NULL
 	) AS `nombreDia`
--- a/db/routines/vn/views/itemShelvingAvailable.sql
+++ b/db/routines/vn/views/itemShelvingAvailable.sql
@ -1,7 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`itemShelvingAvailable`
-AS SELECT `s`.`id` `saleFk`,
+AS SELECT `s`.`id` AS `saleFk`,
 	`tst`.`updated` AS `Modificado`,
 	`s`.`ticketFk` AS `ticketFk`,
 	0 AS `isPicked`,
--- a/db/routines/vn/views/ticketStateToday.sql
+++ b/db/routines/vn/views/ticketStateToday.sql
@ -1,8 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`ticketStateToday`
-AS SELECT
+AS SELECT `ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`state` AS `state`,
 	`ts`.`productionOrder` AS `productionOrder`,
 	`ts`.`alertLevel` AS `alertLevel`,
@ -10,6 +9,8 @@ AS SELECT
 	`ts`.`code` AS `code`,
 	`ts`.`updated` AS `updated`,
 	`ts`.`isPicked` AS `isPicked`
-FROM `ticketState` `ts`
+FROM (
-	JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
+		`vn`.`ticketState` `ts`
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
+		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
 	)
 WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
--- a/db/routines/vn/views/zoneEstimatedDelivery.sql
+++ b/db/routines/vn/views/zoneEstimatedDelivery.sql
@ -1,24 +1,45 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`zoneEstimatedDelivery`
-	AS SELECT t.zoneFk,
+AS SELECT `t`.`zoneFk` AS `zoneFk`,
-		zc.`hour` zoneClosureHour,
+	`zc`.`hour` AS `zoneClosureHour`,
-		z.`hour` zoneHour,
+	`z`.`hour` AS `zoneHour`,
-		sv.volume volume,
+	`sv`.`volume` AS `volume`,
-		al.hasToRecalcPrice,
+	`al`.`hasToRecalcPrice` AS `hasToRecalcPrice`,
-		lhp.m3,
+	`lhp`.`m3` AS `m3`,
-		dl.minSpeed
+	`dl`.`minSpeed` AS `minSpeed`
-	FROM ticket t
+FROM (
-		JOIN ticketStateToday tst ON tst.ticketFk = t.id
+		(
-		JOIN state s ON	s.id = tst.state
+			(
-		JOIN saleVolume sv ON sv.ticketFk = t.id
+				(
-		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
+					(
-		JOIN warehouse w ON w.id = t.warehouseFk
+						(
-		STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
+							(
-		LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+								(
-			AND zc.dated = util.VN_CURDATE()
+									(
-		LEFT JOIN cache.departure_limit dl ON dl.warehouse_id = t.warehouseFk
+										`vn`.`ticket` `t`
-			AND dl.fecha = util.VN_CURDATE()
+										JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
-		JOIN alertLevel al ON al.id = s.alertLevel
+									)
-	WHERE w.hasProduction
+									JOIN `vn`.`state` `s` ON(`s`.`id` = `tst`.`state`)
-		AND DATE(t.shipped) = util.VN_CURDATE()
+								)
 								JOIN `vn`.`saleVolume` `sv` ON(`sv`.`ticketFk` = `t`.`id`)
 							)
 							LEFT JOIN `vn`.`lastHourProduction` `lhp` ON(`lhp`.`warehouseFk` = `t`.`warehouseFk`)
 						)
 						JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`)
 						)
 					) STRAIGHT_JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
 				)
 				LEFT JOIN `vn`.`zoneClosure` `zc` ON(
 					`zc`.`zoneFk` = `t`.`zoneFk`
 					AND `zc`.`dated` = `util`.`VN_CURDATE`()
 				)
 			)
 			LEFT JOIN `cache`.`departure_limit` `dl` ON(
 				`dl`.`warehouse_id` = `t`.`warehouseFk`
 				AND `dl`.`fecha` = `util`.`VN_CURDATE`()
 			)
 		)
 		JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `s`.`alertLevel`)
 WHERE `w`.`hasProduction` <> 0
 	AND cast(`t`.`shipped` AS date) = `util`.`VN_CURDATE`()
--- a/db/routines/vn2008/procedures/recobro_credito.sql
+++ b/db/routines/vn2008/procedures/recobro_credito.sql
@ -42,4 +42,4 @@ BEGIN
 	DROP TEMPORARY TABLE clientes_credit;
 	COMMIT;
 END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
+++ b/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
@ -27,7 +27,7 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT !@@in_transaction;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
@ -41,8 +41,8 @@ BEGIN
 		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-
+   
-	CALL util.tx_start(vTx);
+    CALL util.tx_start(vTx);  
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
--- a/db/versions/10835-brownCarnation/12-account_conciliacion.sql
+++ b/db/versions/10835-brownCarnation/12-account_conciliacion.sql
@ -1,4 +1,4 @@
-DROP TRIGGER IF EXISTS vn2008.account_conciliacion_BEFORE_INSERT;
+DROP TRIGGER IF EXISTS vn2008.account_conciliacion_beforeInsert;
 ALTER TABLE IF EXISTS `vn2008`.`account_conciliacion` RENAME `vn`.`accountReconciliation`;
--- a/db/versions/10835-brownCarnation/25-awb_recibida.sql
+++ b/db/versions/10835-brownCarnation/25-awb_recibida.sql
@ -1,4 +1,4 @@
-DROP TRIGGER IF EXISTS vn2008.awb_recibida_ad;
+DROP TRIGGER IF EXISTS vn2008.awb_recibida_afterDelete;
 ALTER TABLE IF EXISTS `vn2008`.`awb_recibida` RENAME `vn`.`awbInvoiceIn`;
--- a/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql
+++ b/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql
@ -0,0 +1,3 @@
 USE vn;
 ALTER TABLE vn.agencyTermConfig
    ADD CONSTRAINT agencyTermConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql
+++ b/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql
@ -0,0 +1,11 @@
 USE vn;
 ALTER TABLE vn2008.gastos_resumen MODIFY COLUMN Id_Gasto varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
 DELETE gr.*
    FROM vn2008.gastos_resumen gr LEFT JOIN vn.expense e ON gr.Id_Gasto = e.id
    WHERE e.id IS NULL;
 ALTER TABLE vn2008.gastos_resumen
 	ADD CONSTRAINT gastos_resumen_expense_FK
 	FOREIGN KEY (Id_Gasto) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
--- a/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql
+++ b/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql
@ -0,0 +1,5 @@
 USE vn;
 ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
 ALTER TABLE vn.invoiceOutTaxConfig
    ADD CONSTRAINT invoiceOutTaxConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql
+++ b/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql
@ -0,0 +1,5 @@
 USE edi;
 ALTER TABLE edi.item_groupToOffer MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7001000000' NULL;
 ALTER TABLE edi.item_groupToOffer
    ADD CONSTRAINT item_groupToOffer_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql
+++ b/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql
@ -0,0 +1,14 @@
 USE vn;
 -- Eliminar la clave primaria actual
 ALTER TABLE bs.ventas_contables DROP PRIMARY KEY;
 -- Agregar la nueva clave primaria incluyendo el campo `gasto`
 ALTER TABLE bs.ventas_contables ADD PRIMARY KEY (`year`, `month`, `grupo`, `reino_id`, `tipo_id`, `empresa_id`, `gasto`);
 DELETE vc.* FROM bs.ventas_contables vc LEFT JOIN vn.expense e ON e.id = vc.gasto WHERE e.id IS NULL;
 ALTER TABLE bs.ventas_contables
    MODIFY COLUMN gasto VARCHAR(10)
    CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
 ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_expense_FK FOREIGN KEY (gasto) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql
+++ b/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql
@ -0,0 +1,8 @@
 DELETE FROM vn.expense
 	WHERE id ='' AND id IS NULL AND isWithheld = FALSE;
 UPDATE vn.expense
 	SET id='7002090000'
 	WHERE id='7002009000';
 UPDATE vn.expense
 	SET id='7001090000'
 	WHERE id='7001009000';
--- a/db/versions/10862-navyHydrangea/03-updateExpense.sql
+++ b/db/versions/10862-navyHydrangea/03-updateExpense.sql
@ -0,0 +1,44 @@
 UPDATE vn.expense
 SET id = CASE id
    WHEN 7000010000 THEN 7001001000
    WHEN 7000020000 THEN 7001002000
    WHEN 7000030000 THEN 7001003000
    WHEN 7000040000 THEN 7001004000
    WHEN 7000050000 THEN 7001005000
    WHEN 7000060000 THEN 7001006000
    WHEN 7000070000 THEN 7001007000
    WHEN 7002060000 THEN 7001206000
    WHEN 7002070000 THEN 7001207000
    WHEN 7002030000 THEN 7001203000
    WHEN 7002040000 THEN 7001204000
    WHEN 7002050000 THEN 7001205000
    WHEN 7002020000 THEN 7001202000
    WHEN 7002010000 THEN 7001201000
    WHEN 7001060000 THEN 7001106000
    WHEN 7001070000 THEN 7001107000
    WHEN 7001030000 THEN 7001103000
    WHEN 7001040000 THEN 7001104000
    WHEN 7001050000 THEN 7001105000
    WHEN 7001020000 THEN 7001102000
    WHEN 7001010000 THEN 7001101000
    WHEN 7000080000 THEN 7040008000
    WHEN 7001080000 THEN 7000108000
    WHEN 7002080000 THEN 7001208000
    WHEN 7000090000 THEN 7001009000
    WHEN 7002090000 THEN 7001209000
    WHEN 7002100000 THEN 7001210000
    WHEN 7001090000 THEN 7001109000
    WHEN 7001100000 THEN 7001110000
    WHEN 7000120000 THEN 7001012000
    WHEN 7002120000 THEN 7001212000
    WHEN 7000130000 THEN 7001013000
    WHEN 7000140000 THEN 7001014000
    ELSE id
 END
 WHERE id IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
             7000060000, 7000070000, 7002060000, 7002070000, 7002030000,
             7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
             7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
 			7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
 			7002090000, 7002100000, 7001090000, 7001100000,
 			7000120000, 7002120000, 7000130000, 7000140000);
--- a/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql
+++ b/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql
@ -0,0 +1,6 @@
 UPDATE vn.expense
 SET id = CASE id
    WHEN 7000100000 THEN 7001010000
    ELSE id
 END
 WHERE id IN (7000100000);
--- a/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql
+++ b/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql
@ -0,0 +1,37 @@
 REVOKE UPDATE ON vn.ticket FROM employee;
 GRANT UPDATE (id,
            warehouseFk,
            shipped,
            nickname,
            refFk,
            addressFk,
            workerFk,
            observations,
            isSigned,
            isLabeled,
            isPrinted,
            packages,
            location,
            hour,
            created,
            isBlocked,
            solution,
            routeFk,
            priority,
            hasPriority,
            companyFk,
            agencyModeFk,
            landed,
            isBoxed,
            isDeleted,
            zoneFk,
            zonePrice,
            zoneBonus,
            totalWithVat,
            totalWithoutVat,
            weight,
            clonedFrom,
            cmrFk,
            editorFk)
        ON vn.ticket TO employee;
--- a/db/versions/10890-redOrchid/00-firstScript.sql
+++ b/db/versions/10890-redOrchid/00-firstScript.sql
@ -0,0 +1,3 @@
 -- Place your SQL code here
 INSERT INTO salix.ACL  (model, property, accessType, permission, principalType, principalId) 
 VALUES( 'Ticket', 'myLastModified', '*', 'ALLOW', 'ROLE', 'production');
--- a/gulpfile.js
+++ b/gulpfile.js
@ -256,7 +256,7 @@ async function dockerStart() {
    await myt.run(Start);
    await myt.deinit();
 }
-dockerStart.description = `Starts the salix-db container`;
+dockerStart.description = `Starts the DB container`;
 async function docker() {
    const myt = new Myt();
@ -264,7 +264,7 @@ async function docker() {
    await myt.run(Run);
    await myt.deinit();
 }
-docker.description = `Runs the salix-db container`;
+docker.description = `Builds and starts the DB container`;
 module.exports = {
    default: defaultTask,
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -1,211 +1,213 @@
 {
-	"State cannot be blank": "State cannot be blank",
+    "State cannot be blank": "State cannot be blank",
-	"Cannot be blank": "Cannot be blank",
+    "Cannot be blank": "Cannot be blank",
-	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+    "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
-	"The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
+    "The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
-	"Invalid email": "Invalid email",
+    "Invalid email": "Invalid email",
-	"Name cannot be blank": "Name cannot be blank",
+    "Name cannot be blank": "Name cannot be blank",
-	"Phone cannot be blank": "Phone cannot be blank",
+    "Phone cannot be blank": "Phone cannot be blank",
-	"Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
+    "Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
-	"Period cannot be blank": "Period cannot be blank",
+    "Period cannot be blank": "Period cannot be blank",
-	"Sample type cannot be blank": "Sample type cannot be blank",
+    "Sample type cannot be blank": "Sample type cannot be blank",
-	"That payment method requires an IBAN": "That payment method requires an IBAN",
+    "That payment method requires an IBAN": "That payment method requires an IBAN",
-	"That payment method requires a BIC": "That payment method requires a BIC",
+    "That payment method requires a BIC": "That payment method requires a BIC",
-	"The default consignee can not be unchecked": "The default consignee can not be unchecked",
+    "The default consignee can not be unchecked": "The default consignee can not be unchecked",
-	"Enter an integer different to zero": "Enter an integer different to zero",
+    "Enter an integer different to zero": "Enter an integer different to zero",
-	"Package cannot be blank": "Package cannot be blank",
+    "Package cannot be blank": "Package cannot be blank",
-	"The price of the item changed": "The price of the item changed",
+    "The price of the item changed": "The price of the item changed",
-	"The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
+    "The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
-	"Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
+    "Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
-	"You can't create an order for a frozen client": "You can't create an order for a frozen client",
+    "You can't create an order for a frozen client": "You can't create an order for a frozen client",
-	"This address doesn't exist": "This address doesn't exist",
+    "This address doesn't exist": "This address doesn't exist",
-	"Warehouse cannot be blank": "Warehouse cannot be blank",
+    "Warehouse cannot be blank": "Warehouse cannot be blank",
-	"Agency cannot be blank": "Agency cannot be blank",
+    "Agency cannot be blank": "Agency cannot be blank",
-	"The IBAN does not have the correct format": "The IBAN does not have the correct format",
+    "The IBAN does not have the correct format": "The IBAN does not have the correct format",
-	"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
+    "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
-	"You can't create a ticket for an inactive client": "You can't create a ticket for an inactive client",
+    "You can't create a ticket for an inactive client": "You can't create a ticket for an inactive client",
-	"Worker cannot be blank": "Worker cannot be blank",
+    "Worker cannot be blank": "Worker cannot be blank",
-	"You must delete the claim id %d first": "You must delete the claim id %d first",
+    "You must delete the claim id %d first": "You must delete the claim id %d first",
-	"You don't have enough privileges": "You don't have enough privileges",
+    "You don't have enough privileges": "You don't have enough privileges",
-	"Tag value cannot be blank": "Tag value cannot be blank",
+    "Tag value cannot be blank": "Tag value cannot be blank",
-	"A client with that Web User name already exists": "A client with that Web User name already exists",
+    "A client with that Web User name already exists": "A client with that Web User name already exists",
-	"The warehouse can't be repeated": "The warehouse can't be repeated",
+    "The warehouse can't be repeated": "The warehouse can't be repeated",
-	"Barcode must be unique": "Barcode must be unique",
+    "Barcode must be unique": "Barcode must be unique",
-	"You don't have enough privileges to do that": "You don't have enough privileges to do that",
+    "You don't have enough privileges to do that": "You don't have enough privileges to do that",
-	"You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
+    "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
-	"can't be blank": "can't be blank",
+    "can't be blank": "can't be blank",
-	"Street cannot be empty": "Street cannot be empty",
+    "Street cannot be empty": "Street cannot be empty",
-	"City cannot be empty": "City cannot be empty",
+    "City cannot be empty": "City cannot be empty",
-	"EXTENSION_INVALID_FORMAT": "Invalid extension",
+    "EXTENSION_INVALID_FORMAT": "Invalid extension",
-	"The secret can't be blank": "The secret can't be blank",
+    "The secret can't be blank": "The secret can't be blank",
-	"Invalid TIN": "Invalid Tax number",
+    "Invalid TIN": "Invalid Tax number",
-	"This ticket can't be invoiced": "This ticket can't be invoiced",
+    "This ticket can't be invoiced": "This ticket can't be invoiced",
-	"The value should be a number": "The value should be a number",
+    "The value should be a number": "The value should be a number",
-	"The current ticket can't be modified": "The current ticket can't be modified",
+    "The current ticket can't be modified": "The current ticket can't be modified",
-	"Extension format is invalid": "Extension format is invalid",
+    "Extension format is invalid": "Extension format is invalid",
-	"NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
+    "NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
-	"This client can't be invoiced": "This client can't be invoiced",
+    "This client can't be invoiced": "This client can't be invoiced",
-	"You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
+    "You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
-	"The introduced hour already exists": "The introduced hour already exists",
+    "The introduced hour already exists": "The introduced hour already exists",
-	"Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
+    "Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
-	"Concept cannot be blank": "Concept cannot be blank",
+    "Concept cannot be blank": "Concept cannot be blank",
-	"Ticket id cannot be blank": "Ticket id cannot be blank",
+    "Ticket id cannot be blank": "Ticket id cannot be blank",
-	"Weekday cannot be blank": "Weekday cannot be blank",
+    "Weekday cannot be blank": "Weekday cannot be blank",
-	"This ticket can not be modified": "This ticket can not be modified",
+    "This ticket can not be modified": "This ticket can not be modified",
-	"You can't delete a confirmed order": "You can't delete a confirmed order",
+    "You can't delete a confirmed order": "You can't delete a confirmed order",
-	"Value has an invalid format": "Value has an invalid format",
+    "Value has an invalid format": "Value has an invalid format",
-	"The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
+    "The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
-	"Swift / BIC can't be empty": "Swift / BIC can't be empty",
+    "Swift / BIC can't be empty": "Swift / BIC can't be empty",
-	"Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+    "Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
-	"Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+    "Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
+    "Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
-	"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
+    "MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
-	"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
-	"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
+    "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
+    "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-	"Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
-	"Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
+    "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
-	"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
+    "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
-	"Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
+    "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
-	"Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
+    "Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
-	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+    "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
+    "NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
-	"Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
+    "Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
-	"Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
+    "Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
-	"I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
+    "I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
-	"I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
+    "I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
-	"Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"The grade must be similar to the last one": "The grade must be similar to the last one",
+    "The grade must be similar to the last one": "The grade must be similar to the last one",
-	"agencyModeFk": "Agency",
+    "agencyModeFk": "Agency",
-	"clientFk": "Client",
+    "clientFk": "Client",
-	"zoneFk": "Zone",
+    "zoneFk": "Zone",
-	"warehouseFk": "Warehouse",
+    "warehouseFk": "Warehouse",
-	"shipped": "Shipped",
+    "shipped": "Shipped",
-	"landed": "Landed",
+    "landed": "Landed",
-	"addressFk": "Address",
+    "addressFk": "Address",
-	"companyFk": "Company",
+    "companyFk": "Company",
-	"You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
+    "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
-	"The social name cannot be empty": "The social name cannot be empty",
+    "The social name cannot be empty": "The social name cannot be empty",
-	"The nif cannot be empty": "The nif cannot be empty",
+    "The nif cannot be empty": "The nif cannot be empty",
-	"Amount cannot be zero": "Amount cannot be zero",
+    "Amount cannot be zero": "Amount cannot be zero",
-	"Company has to be official": "Company has to be official",
+    "Company has to be official": "Company has to be official",
-	"Unable to clone this travel": "Unable to clone this travel",
+    "Unable to clone this travel": "Unable to clone this travel",
-	"The observation type can't be repeated": "The observation type can't be repeated",
+    "The observation type can't be repeated": "The observation type can't be repeated",
-	"New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
+    "New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
-	"New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
+    "New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
-	"There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
+    "There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
-	"Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
+    "Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
-	"Role name must be written in camelCase": "Role name must be written in camelCase",
+    "Role name must be written in camelCase": "Role name must be written in camelCase",
-	"Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
-	"None": "None",
+    "None": "None",
-	"error densidad = 0": "error densidad = 0",
+    "error densidad = 0": "error densidad = 0",
-	"This document already exists on this ticket": "This document already exists on this ticket",
+    "This document already exists on this ticket": "This document already exists on this ticket",
-	"serial non editable": "This serial doesn't allow to set a reference",
+    "serial non editable": "This serial doesn't allow to set a reference",
-	"nickname": "nickname",
+    "nickname": "nickname",
-	"State": "State",
+    "State": "State",
-	"regular": "regular",
+    "regular": "regular",
-	"reserved": "reserved",
+    "reserved": "reserved",
-	"Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
+    "Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
-	"A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
+    "A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
-	"This client is not invoiceable": "This client is not invoiceable",
+    "This client is not invoiceable": "This client is not invoiceable",
-	"INACTIVE_PROVIDER": "Inactive provider",
+    "INACTIVE_PROVIDER": "Inactive provider",
-	"reference duplicated": "reference duplicated",
+    "reference duplicated": "reference duplicated",
-	"The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
+    "The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
-	"This item is not available": "This item is not available",
+    "This item is not available": "This item is not available",
-	"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
+    "Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
-	"The type of business must be filled in basic data": "The type of business must be filled in basic data",
+    "The type of business must be filled in basic data": "The type of business must be filled in basic data",
-	"The worker has hours recorded that day": "The worker has hours recorded that day",
+    "The worker has hours recorded that day": "The worker has hours recorded that day",
-	"isWithoutNegatives": "isWithoutNegatives",
+    "isWithoutNegatives": "isWithoutNegatives",
-	"routeFk": "routeFk",
+    "routeFk": "routeFk",
-	"Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
+    "Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
-	"Can't change the password of another worker": "Can't change the password of another worker",
+    "Can't change the password of another worker": "Can't change the password of another worker",
-	"No hay un contrato en vigor": "There is no existing contract",
+    "No hay un contrato en vigor": "There is no existing contract",
-	"No está permitido trabajar": "Not allowed to work",
+    "No está permitido trabajar": "Not allowed to work",
-	"Dirección incorrecta": "Wrong direction",
+    "Dirección incorrecta": "Wrong direction",
-	"No se permite fichar a futuro": "It is not allowed to sign in the future",
+    "No se permite fichar a futuro": "It is not allowed to sign in the future",
-	"Descanso diario 12h.": "Daily rest 12h.",
+    "Descanso diario 12h.": "Daily rest 12h.",
-	"Fichadas impares": "Odd signs",
+    "Fichadas impares": "Odd signs",
-	"Descanso diario 9h.": "Daily rest 9h.",
+    "Descanso diario 9h.": "Daily rest 9h.",
-	"Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
+    "Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
-	"Verify email": "Verify email",
+    "Verify email": "Verify email",
-	"Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
+    "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
-	"Password does not meet requirements": "Password does not meet requirements",
+    "Password does not meet requirements": "Password does not meet requirements",
-	"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
+    "You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
-	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
+    "Not enough privileges to edit a client": "Not enough privileges to edit a client",
-	"Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+    "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
-	"You don't have grant privilege": "You don't have grant privilege",
+    "You don't have grant privilege": "You don't have grant privilege",
-	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
+    "You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
-	"Email verify": "Email verify",
+    "Email verify": "Email verify",
-	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+    "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-	"App locked": "App locked by user {{userId}}",
+    "App locked": "App locked by user {{userId}}",
-	"The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+    "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
-	"Receipt's bank was not found": "Receipt's bank was not found",
+    "Receipt's bank was not found": "Receipt's bank was not found",
-	"This receipt was not compensated": "This receipt was not compensated",
+    "This receipt was not compensated": "This receipt was not compensated",
-	"Client's email was not found": "Client's email was not found",
+    "Client's email was not found": "Client's email was not found",
-	"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
+    "Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
-	"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
+    "It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
-	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
+    "It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
-	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
+    "It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
-	"Warehouse inventory not set": "Almacén inventario no está establecido",
+    "Warehouse inventory not set": "Almacén inventario no está establecido",
-	"Component cost not set": "Componente coste no está estabecido",
+    "Component cost not set": "Componente coste no está estabecido",
-	"Description cannot be blank": "Description cannot be blank",
+    "Description cannot be blank": "Description cannot be blank",
-	"company": "Company",
+    "company": "Company",
-	"country": "Country",
+    "country": "Country",
-	"clientId": "Id client",
+    "clientId": "Id client",
-	"clientSocialName": "Client",
+    "clientSocialName": "Client",
-	"amount": "Amount",
+    "amount": "Amount",
-	"taxableBase": "Taxable base",
+    "taxableBase": "Taxable base",
-	"ticketFk": "Id ticket",
+    "ticketFk": "Id ticket",
-	"isActive": "Active",
+    "isActive": "Active",
-	"hasToInvoice": "Invoice",
+    "hasToInvoice": "Invoice",
-	"isTaxDataChecked": "Data checked",
+    "isTaxDataChecked": "Data checked",
-	"comercialId": "Id Comercial",
+    "comercialId": "Id Comercial",
-	"comercialName": "Comercial",
+    "comercialName": "Comercial",
-	"Added observation": "Added observation",
+    "Added observation": "Added observation",
-	"Comment added to client": "Comment added to client",
+    "Comment added to client": "Comment added to client",
-	"This ticket is already a refund": "This ticket is already a refund",
+    "This ticket is already a refund": "This ticket is already a refund",
-	"A claim with that sale already exists": "A claim with that sale already exists",
+    "A claim with that sale already exists": "A claim with that sale already exists",
-	"Pass expired": "The password has expired, change it from Salix",
+    "Pass expired": "The password has expired, change it from Salix",
-	"Can't transfer claimed sales": "Can't transfer claimed sales",
+    "Can't transfer claimed sales": "Can't transfer claimed sales",
-	"Invalid quantity": "Invalid quantity",
+    "Invalid quantity": "Invalid quantity",
-	"Failed to upload delivery note": "Error to upload delivery note {{id}}",
+    "Failed to upload delivery note": "Error to upload delivery note {{id}}",
-	"Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
+    "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
-	"The renew period has not been exceeded": "The renew period has not been exceeded",
+    "The renew period has not been exceeded": "The renew period has not been exceeded",
-	"You can not use the same password": "You can not use the same password",
+    "You can not use the same password": "You can not use the same password",
-	"Valid priorities": "Valid priorities: %d",
+    "Valid priorities": "Valid priorities: %d",
-	"hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
+    "hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
-	"hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
+    "hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
-	"This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
+    "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
-	"Social name should be uppercase": "Social name should be uppercase",
+    "Social name should be uppercase": "Social name should be uppercase",
-	"Street should be uppercase": "Street should be uppercase",
+    "Street should be uppercase": "Street should be uppercase",
-	"You don't have enough privileges.": "You don't have enough privileges.",
+    "You don't have enough privileges.": "You don't have enough privileges.",
-	"This ticket is locked": "This ticket is locked",
+    "This ticket is locked": "This ticket is locked",
-	"This ticket is not editable.": "This ticket is not editable.",
+    "This ticket is not editable.": "This ticket is not editable.",
-	"The ticket doesn't exist.": "The ticket doesn't exist.",
+    "The ticket doesn't exist.": "The ticket doesn't exist.",
-	"The sales do not exists": "The sales do not exists",
+    "The sales do not exists": "The sales do not exists",
-	"Ticket without Route": "Ticket without route",
+    "Ticket without Route": "Ticket without route",
-	"Select a different client": "Select a different client",
+    "Select a different client": "Select a different client",
-	"Fill all the fields": "Fill all the fields",
+    "Fill all the fields": "Fill all the fields",
-	"Error while generating PDF": "Error while generating PDF",
+    "Error while generating PDF": "Error while generating PDF",
-	"Can't invoice to future": "Can't invoice to future",
+    "Can't invoice to future": "Can't invoice to future",
-	"This ticket is already invoiced": "This ticket is already invoiced",
+    "This ticket is already invoiced": "This ticket is already invoiced",
-	"Negative basis of tickets: 23": "Negative basis of tickets: 23",
+    "Negative basis of tickets: 23": "Negative basis of tickets: 23",
-	"Booking completed": "Booking complete",
+    "Booking completed": "Booking complete",
-	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+    "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
-	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+    "You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
-	"Bank entity must be specified": "Bank entity must be specified",
+    "Bank entity must be specified": "Bank entity must be specified",
-	"Try again": "Try again",
+    "Try again": "Try again",
-	"keepPrice": "keepPrice",
+    "keepPrice": "keepPrice",
-	"Cannot past travels with entries": "Cannot past travels with entries",
+    "Cannot past travels with entries": "Cannot past travels with entries",
-	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
+    "It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
-	"Incorrect pin": "Incorrect pin.",
+    "Incorrect pin": "Incorrect pin.",
-	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
+    "The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
-	"Name should be uppercase": "Name should be uppercase",
+    "Name should be uppercase": "Name should be uppercase",
-	"You cannot update these fields": "You cannot update these fields",
+    "You cannot update these fields": "You cannot update these fields",
-	"CountryFK cannot be empty": "Country cannot be empty"
+    "CountryFK cannot be empty": "Country cannot be empty",
-}
+    "You are not allowed to modify the alias": "You are not allowed to modify the alias",
    "You already have the mailAlias": "You already have the mailAlias"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -1,347 +1,348 @@
 {
-	"Phone format is invalid": "El formato del teléfono no es correcto",
+    "Phone format is invalid": "El formato del teléfono no es correcto",
-	"You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
+    "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
-	"Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
+    "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
-	"The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
+    "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
-	"Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
+    "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
-	"Can't be blank": "No puede estar en blanco",
+    "Can't be blank": "No puede estar en blanco",
-	"Invalid TIN": "NIF/CIF inválido",
+    "Invalid TIN": "NIF/CIF inválido",
-	"TIN must be unique": "El NIF/CIF debe ser único",
+    "TIN must be unique": "El NIF/CIF debe ser único",
-	"A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
+    "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
-	"Is invalid": "Es inválido",
+    "Is invalid": "Es inválido",
-	"Quantity cannot be zero": "La cantidad no puede ser cero",
+    "Quantity cannot be zero": "La cantidad no puede ser cero",
-	"Enter an integer different to zero": "Introduce un entero distinto de cero",
+    "Enter an integer different to zero": "Introduce un entero distinto de cero",
-	"Package cannot be blank": "El embalaje no puede estar en blanco",
+    "Package cannot be blank": "El embalaje no puede estar en blanco",
-	"The company name must be unique": "La razón social debe ser única",
+    "The company name must be unique": "La razón social debe ser única",
-	"Invalid email": "Correo electrónico inválido",
+    "Invalid email": "Correo electrónico inválido",
-	"The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
+    "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
-	"That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
+    "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
-	"That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
+    "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
-	"State cannot be blank": "El estado no puede estar en blanco",
+    "State cannot be blank": "El estado no puede estar en blanco",
-	"Worker cannot be blank": "El trabajador no puede estar en blanco",
+    "Worker cannot be blank": "El trabajador no puede estar en blanco",
-	"Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
+    "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
-	"can't be blank": "El campo no puede estar vacío",
+    "can't be blank": "El campo no puede estar vacío",
-	"Observation type must be unique": "El tipo de observación no puede repetirse",
+    "Observation type must be unique": "El tipo de observación no puede repetirse",
-	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+    "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
-	"The grade must be similar to the last one": "El grade debe ser similar al último",
+    "The grade must be similar to the last one": "El grade debe ser similar al último",
-	"Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
+    "Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
-	"Name cannot be blank": "El nombre no puede estar en blanco",
+    "Name cannot be blank": "El nombre no puede estar en blanco",
-	"Phone cannot be blank": "El teléfono no puede estar en blanco",
+    "Phone cannot be blank": "El teléfono no puede estar en blanco",
-	"Period cannot be blank": "El periodo no puede estar en blanco",
+    "Period cannot be blank": "El periodo no puede estar en blanco",
-	"Choose a company": "Selecciona una empresa",
+    "Choose a company": "Selecciona una empresa",
-	"Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
+    "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
-	"Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
+    "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
-	"Cannot be blank": "El campo no puede estar en blanco",
+    "Cannot be blank": "El campo no puede estar en blanco",
-	"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
+    "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
-	"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
+    "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
-	"Description cannot be blank": "Se debe rellenar el campo de texto",
+    "Description cannot be blank": "Se debe rellenar el campo de texto",
-	"The price of the item changed": "El precio del artículo cambió",
+    "The price of the item changed": "El precio del artículo cambió",
-	"The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
+    "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
-	"The value should be a number": "El valor debe ser un numero",
+    "The value should be a number": "El valor debe ser un numero",
-	"This order is not editable": "Esta orden no se puede modificar",
+    "This order is not editable": "Esta orden no se puede modificar",
-	"You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
+    "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
-	"You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
+    "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
-	"is not a valid date": "No es una fecha valida",
+    "is not a valid date": "No es una fecha valida",
-	"Barcode must be unique": "El código de barras debe ser único",
+    "Barcode must be unique": "El código de barras debe ser único",
-	"The warehouse can't be repeated": "El almacén no puede repetirse",
+    "The warehouse can't be repeated": "El almacén no puede repetirse",
-	"The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
+    "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
-	"The observation type can't be repeated": "El tipo de observación no puede repetirse",
+    "The observation type can't be repeated": "El tipo de observación no puede repetirse",
-	"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
+    "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
-	"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
+    "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
-	"Warehouse cannot be blank": "El almacén no puede quedar en blanco",
+    "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
-	"Agency cannot be blank": "La agencia no puede quedar en blanco",
+    "Agency cannot be blank": "La agencia no puede quedar en blanco",
-	"Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
+    "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
-	"This address doesn't exist": "Este consignatario no existe",
+    "This address doesn't exist": "Este consignatario no existe",
-	"You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
+    "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
-	"You don't have enough privileges": "No tienes suficientes permisos",
+    "You don't have enough privileges": "No tienes suficientes permisos",
-	"Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
+    "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
-	"You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
+    "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
-	"INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
+    "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
-	"You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
+    "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
-	"You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
+    "You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
-	"Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
+    "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
-	"ORDER_EMPTY": "Cesta vacía",
+    "ORDER_EMPTY": "Cesta vacía",
-	"You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
+    "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
-	"NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
+    "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
-	"Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
+    "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
-	"Street cannot be empty": "Dirección no puede estar en blanco",
+    "Street cannot be empty": "Dirección no puede estar en blanco",
-	"City cannot be empty": "Ciudad no puede estar en blanco",
+    "City cannot be empty": "Ciudad no puede estar en blanco",
-	"Code cannot be blank": "Código no puede estar en blanco",
+    "Code cannot be blank": "Código no puede estar en blanco",
-	"You cannot remove this department": "No puedes eliminar este departamento",
+    "You cannot remove this department": "No puedes eliminar este departamento",
-	"The extension must be unique": "La extensión debe ser unica",
+    "The extension must be unique": "La extensión debe ser unica",
-	"The secret can't be blank": "La contraseña no puede estar en blanco",
+    "The secret can't be blank": "La contraseña no puede estar en blanco",
-	"We weren't able to send this SMS": "No hemos podido enviar el SMS",
+    "We weren't able to send this SMS": "No hemos podido enviar el SMS",
-	"This client can't be invoiced": "Este cliente no puede ser facturado",
+    "This client can't be invoiced": "Este cliente no puede ser facturado",
-	"You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
+    "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
-	"This ticket can't be invoiced": "Este ticket no puede ser facturado",
+    "This ticket can't be invoiced": "Este ticket no puede ser facturado",
-	"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
+    "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
-	"This ticket can not be modified": "Este ticket no puede ser modificado",
+    "This ticket can not be modified": "Este ticket no puede ser modificado",
-	"The introduced hour already exists": "Esta hora ya ha sido introducida",
+    "The introduced hour already exists": "Esta hora ya ha sido introducida",
-	"INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
+    "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
-	"The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
+    "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
-	"NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
+    "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
-	"ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
+    "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
-	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
+    "The current ticket can't be modified": "El ticket actual no puede ser modificado",
-	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
+    "The current claim can't be modified": "La reclamación actual no puede ser modificada",
-	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+    "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-	"The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
+    "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
-	"Please select at least one sale": "Por favor selecciona al menos una linea",
+    "Please select at least one sale": "Por favor selecciona al menos una linea",
-	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
+    "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
-	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+    "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"This item doesn't exists": "El artículo no existe",
+    "This item doesn't exists": "El artículo no existe",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+    "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"Extension format is invalid": "El formato de la extensión es inválido",
+    "Extension format is invalid": "El formato de la extensión es inválido",
-	"Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
+    "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
-	"This item is not available": "Este artículo no está disponible",
+    "This item is not available": "Este artículo no está disponible",
-	"This postcode already exists": "Este código postal ya existe",
+    "This postcode already exists": "Este código postal ya existe",
-	"Concept cannot be blank": "El concepto no puede quedar en blanco",
+    "Concept cannot be blank": "El concepto no puede quedar en blanco",
-	"File doesn't exists": "El archivo no existe",
+    "File doesn't exists": "El archivo no existe",
-	"You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
+    "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
-	"This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
+    "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
-	"Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
+    "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
-	"Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
+    "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
-	"You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
+    "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
-	"The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
+    "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
-	"Invalid quantity": "Cantidad invalida",
+    "Invalid quantity": "Cantidad invalida",
-	"This postal code is not valid": "Este código postal no es válido",
+    "This postal code is not valid": "Este código postal no es válido",
-	"is invalid": "es inválido",
+    "is invalid": "es inválido",
-	"The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
+    "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
-	"The department name can't be repeated": "El nombre del departamento no puede repetirse",
+    "The department name can't be repeated": "El nombre del departamento no puede repetirse",
-	"This phone already exists": "Este teléfono ya existe",
+    "This phone already exists": "Este teléfono ya existe",
-	"You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
+    "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
-	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
+    "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
-	"You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
+    "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
-	"You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
+    "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
-	"You should specify a date": "Debes especificar una fecha",
+    "You should specify a date": "Debes especificar una fecha",
-	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
+    "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
-	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
+    "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
-	"You should mark at least one week day": "Debes marcar al menos un día de la semana",
+    "You should mark at least one week day": "Debes marcar al menos un día de la semana",
-	"Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
+    "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
-	"Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
+    "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
-	"Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
+    "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
-	"Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+    "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
-	"Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+    "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"State": "Estado",
+    "State": "Estado",
-	"regular": "normal",
+    "regular": "normal",
-	"reserved": "reservado",
+    "reserved": "reservado",
-	"Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
+    "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
-	"Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
+    "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
-	"MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
+    "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
-	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
+    "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
+    "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
-	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
+    "Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
-	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
+    "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
-	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
+    "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
-	"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
+    "Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
-	"This ticket is deleted": "Este ticket está eliminado",
+    "This ticket is deleted": "Este ticket está eliminado",
-	"Unable to clone this travel": "No ha sido posible clonar este travel",
+    "Unable to clone this travel": "No ha sido posible clonar este travel",
-	"This thermograph id already exists": "La id del termógrafo ya existe",
+    "This thermograph id already exists": "La id del termógrafo ya existe",
-	"Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
+    "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
-	"ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
+    "ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
-	"Invalid password": "Invalid password",
+    "Invalid password": "Invalid password",
-	"Password does not meet requirements": "La contraseña no cumple los requisitos",
+    "Password does not meet requirements": "La contraseña no cumple los requisitos",
-	"Role already assigned": "Rol ya asignado",
+    "Role already assigned": "Rol ya asignado",
-	"Invalid role name": "Nombre de rol no válido",
+    "Invalid role name": "Nombre de rol no válido",
-	"Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
+    "Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
-	"Email already exists": "El correo ya existe",
+    "Email already exists": "El correo ya existe",
-	"User already exists": "El/La usuario/a ya existe",
+    "User already exists": "El/La usuario/a ya existe",
-	"Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
+    "Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
-	"Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
+    "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
-	"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
+    "Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
-	"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
+    "Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
-	"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
+    "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
-	"I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
+    "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
-	"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
+    "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
-	"Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"agencyModeFk": "Agencia",
+    "agencyModeFk": "Agencia",
-	"clientFk": "Cliente",
+    "clientFk": "Cliente",
-	"zoneFk": "Zona",
+    "zoneFk": "Zona",
-	"warehouseFk": "Almacén",
+    "warehouseFk": "Almacén",
-	"shipped": "F. envío",
+    "shipped": "F. envío",
-	"landed": "F. entrega",
+    "landed": "F. entrega",
-	"addressFk": "Consignatario",
+    "addressFk": "Consignatario",
-	"companyFk": "Empresa",
+    "companyFk": "Empresa",
-	"The social name cannot be empty": "La razón social no puede quedar en blanco",
+    "The social name cannot be empty": "La razón social no puede quedar en blanco",
-	"The nif cannot be empty": "El NIF no puede quedar en blanco",
+    "The nif cannot be empty": "El NIF no puede quedar en blanco",
-	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
+    "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
-	"ASSIGN_ZONE_FIRST": "Asigna una zona primero",
+    "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
-	"Amount cannot be zero": "El importe no puede ser cero",
+    "Amount cannot be zero": "El importe no puede ser cero",
-	"Company has to be official": "Empresa inválida",
+    "Company has to be official": "Empresa inválida",
-	"You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
+    "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
-	"Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
+    "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
-	"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
+    "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
-	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
+    "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
-	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
+    "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
-	"Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
+    "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
-	"This BIC already exist.": "Este BIC ya existe.",
+    "This BIC already exist.": "Este BIC ya existe.",
-	"That item doesn't exists": "Ese artículo no existe",
+    "That item doesn't exists": "Ese artículo no existe",
-	"There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
+    "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
-	"Invalid account": "Cuenta inválida",
+    "Invalid account": "Cuenta inválida",
-	"Compensation account is empty": "La cuenta para compensar está vacia",
+    "Compensation account is empty": "La cuenta para compensar está vacia",
-	"This genus already exist": "Este genus ya existe",
+    "This genus already exist": "Este genus ya existe",
-	"This specie already exist": "Esta especie ya existe",
+    "This specie already exist": "Esta especie ya existe",
-	"Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"None": "Ninguno",
+    "None": "Ninguno",
-	"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
+    "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
-	"Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
+    "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
-	"This document already exists on this ticket": "Este documento ya existe en el ticket",
+    "This document already exists on this ticket": "Este documento ya existe en el ticket",
-	"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
+    "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
-	"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
+    "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
-	"nickname": "nickname",
+    "nickname": "nickname",
-	"INACTIVE_PROVIDER": "Proveedor inactivo",
+    "INACTIVE_PROVIDER": "Proveedor inactivo",
-	"This client is not invoiceable": "Este cliente no es facturable",
+    "This client is not invoiceable": "Este cliente no es facturable",
-	"serial non editable": "Esta serie no permite asignar la referencia",
+    "serial non editable": "Esta serie no permite asignar la referencia",
-	"Max shipped required": "La fecha límite es requerida",
+    "Max shipped required": "La fecha límite es requerida",
-	"Can't invoice to future": "No se puede facturar a futuro",
+    "Can't invoice to future": "No se puede facturar a futuro",
-	"Can't invoice to past": "No se puede facturar a pasado",
+    "Can't invoice to past": "No se puede facturar a pasado",
-	"This ticket is already invoiced": "Este ticket ya está facturado",
+    "This ticket is already invoiced": "Este ticket ya está facturado",
-	"A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
+    "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
-	"A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
+    "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
-	"Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
+    "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
-	"Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
+    "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
-	"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
+    "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
-	"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
+    "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
-	"You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
+    "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
-	"Amounts do not match": "Las cantidades no coinciden",
+    "Amounts do not match": "Las cantidades no coinciden",
-	"The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
+    "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
-	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
+    "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
-	"You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
+    "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
-	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
+    "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
-	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
+    "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
-	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+    "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
-	"The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
+    "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
-	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
+    "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
-	"You don't have privileges to create refund": "No tienes permisos para crear un abono",
+    "You don't have privileges to create refund": "No tienes permisos para crear un abono",
-	"The item is required": "El artículo es requerido",
+    "The item is required": "El artículo es requerido",
-	"The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
+    "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
-	"date in the future": "Fecha en el futuro",
+    "date in the future": "Fecha en el futuro",
-	"reference duplicated": "Referencia duplicada",
+    "reference duplicated": "Referencia duplicada",
-	"This ticket is already a refund": "Este ticket ya es un abono",
+    "This ticket is already a refund": "Este ticket ya es un abono",
-	"isWithoutNegatives": "Sin negativos",
+    "isWithoutNegatives": "Sin negativos",
-	"routeFk": "routeFk",
+    "routeFk": "routeFk",
-	"Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
+    "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
-	"No hay un contrato en vigor": "No hay un contrato en vigor",
+    "No hay un contrato en vigor": "No hay un contrato en vigor",
-	"No se permite fichar a futuro": "No se permite fichar a futuro",
+    "No se permite fichar a futuro": "No se permite fichar a futuro",
-	"No está permitido trabajar": "No está permitido trabajar",
+    "No está permitido trabajar": "No está permitido trabajar",
-	"Fichadas impares": "Fichadas impares",
+    "Fichadas impares": "Fichadas impares",
-	"Descanso diario 12h.": "Descanso diario 12h.",
+    "Descanso diario 12h.": "Descanso diario 12h.",
-	"Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
+    "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
-	"Dirección incorrecta": "Dirección incorrecta",
+    "Dirección incorrecta": "Dirección incorrecta",
-	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
+    "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
-	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
+    "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
-	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+    "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
-	"This route does not exists": "Esta ruta no existe",
+    "This route does not exists": "Esta ruta no existe",
-	"Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
+    "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
-	"You don't have grant privilege": "No tienes privilegios para dar privilegios",
+    "You don't have grant privilege": "No tienes privilegios para dar privilegios",
-	"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+    "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
-	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+    "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-	"Already has this status": "Ya tiene este estado",
+    "Already has this status": "Ya tiene este estado",
-	"There aren't records for this week": "No existen registros para esta semana",
+    "There aren't records for this week": "No existen registros para esta semana",
-	"Empty data source": "Origen de datos vacio",
+    "Empty data source": "Origen de datos vacio",
-	"App locked": "Aplicación bloqueada por el usuario {{userId}}",
+    "App locked": "Aplicación bloqueada por el usuario {{userId}}",
-	"Email verify": "Correo de verificación",
+    "Email verify": "Correo de verificación",
-	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+    "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"Receipt's bank was not found": "No se encontró el banco del recibo",
+    "Receipt's bank was not found": "No se encontró el banco del recibo",
-	"This receipt was not compensated": "Este recibo no ha sido compensado",
+    "This receipt was not compensated": "Este recibo no ha sido compensado",
-	"Client's email was not found": "No se encontró el email del cliente",
+    "Client's email was not found": "No se encontró el email del cliente",
-	"Negative basis": "Base negativa",
+    "Negative basis": "Base negativa",
-	"This worker code already exists": "Este codigo de trabajador ya existe",
+    "This worker code already exists": "Este codigo de trabajador ya existe",
-	"This personal mail already exists": "Este correo personal ya existe",
+    "This personal mail already exists": "Este correo personal ya existe",
-	"This worker already exists": "Este trabajador ya existe",
+    "This worker already exists": "Este trabajador ya existe",
-	"App name does not exist": "El nombre de aplicación no es válido",
+    "App name does not exist": "El nombre de aplicación no es válido",
-	"Try again": "Vuelve a intentarlo",
+    "Try again": "Vuelve a intentarlo",
-	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
+    "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
-	"Failed to upload delivery note": "Error al subir albarán {{id}}",
+    "Failed to upload delivery note": "Error al subir albarán {{id}}",
-	"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+    "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
-	"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+    "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
-	"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+    "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
-	"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+    "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
-	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
+    "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
-	"There is no assigned email for this client": "No hay correo asignado para este cliente",
+    "There is no assigned email for this client": "No hay correo asignado para este cliente",
-	"Exists an invoice with a future date": "Existe una factura con fecha posterior",
+    "Exists an invoice with a future date": "Existe una factura con fecha posterior",
-	"Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+    "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
-	"Warehouse inventory not set": "El almacén inventario no está establecido",
+    "Warehouse inventory not set": "El almacén inventario no está establecido",
-	"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
+    "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
-	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
+    "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
-	"Not exist this branch": "La rama no existe",
+    "Not exist this branch": "La rama no existe",
-	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
+    "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
-	"Collection does not exist": "La colección no existe",
+    "Collection does not exist": "La colección no existe",
-	"Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
+    "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
-	"Insert a date range": "Inserte un rango de fechas",
+    "Insert a date range": "Inserte un rango de fechas",
-	"Added observation": "{{user}} añadió esta observacion: {{text}}",
+    "Added observation": "{{user}} añadió esta observacion: {{text}}",
-	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
+    "Comment added to client": "Observación añadida al cliente {{clientFk}}",
-	"Invalid auth code": "Código de verificación incorrecto",
+    "Invalid auth code": "Código de verificación incorrecto",
-	"Invalid or expired verification code": "Código de verificación incorrecto o expirado",
+    "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
-	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
+    "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
-	"company": "Compañía",
+    "company": "Compañía",
-	"country": "País",
+    "country": "País",
-	"clientId": "Id cliente",
+    "clientId": "Id cliente",
-	"clientSocialName": "Cliente",
+    "clientSocialName": "Cliente",
-	"amount": "Importe",
+    "amount": "Importe",
-	"taxableBase": "Base",
+    "taxableBase": "Base",
-	"ticketFk": "Id ticket",
+    "ticketFk": "Id ticket",
-	"isActive": "Activo",
+    "isActive": "Activo",
-	"hasToInvoice": "Facturar",
+    "hasToInvoice": "Facturar",
-	"isTaxDataChecked": "Datos comprobados",
+    "isTaxDataChecked": "Datos comprobados",
-	"comercialId": "Id comercial",
+    "comercialId": "Id comercial",
-	"comercialName": "Comercial",
+    "comercialName": "Comercial",
-	"Pass expired": "La contraseña ha caducado, cambiela desde Salix",
+    "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
-	"Invalid NIF for VIES": "Invalid NIF for VIES",
+    "Invalid NIF for VIES": "Invalid NIF for VIES",
-	"Ticket does not exist": "Este ticket no existe",
+    "Ticket does not exist": "Este ticket no existe",
-	"Ticket is already signed": "Este ticket ya ha sido firmado",
+    "Ticket is already signed": "Este ticket ya ha sido firmado",
-	"Authentication failed": "Autenticación fallida",
+    "Authentication failed": "Autenticación fallida",
-	"You can't use the same password": "No puedes usar la misma contraseña",
+    "You can't use the same password": "No puedes usar la misma contraseña",
-	"You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
+    "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
-	"Fecha fuera de rango": "Fecha fuera de rango",
+    "Fecha fuera de rango": "Fecha fuera de rango",
-	"Error while generating PDF": "Error al generar PDF",
+    "Error while generating PDF": "Error al generar PDF",
-	"Error when sending mail to client": "Error al enviar el correo al cliente",
+    "Error when sending mail to client": "Error al enviar el correo al cliente",
-	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+    "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
-	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+    "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
-	"Valid priorities": "Prioridades válidas: %d",
+    "Valid priorities": "Prioridades válidas: %d",
-	"hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+    "hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
-	"hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
+    "hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
-	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
+    "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
-	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
+    "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
-	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+    "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
-	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+    "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
-	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
+    "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
-	"You don't have enough privileges.": "No tienes suficientes permisos.",
+    "You don't have enough privileges.": "No tienes suficientes permisos.",
-	"This ticket is locked": "Este ticket está bloqueado.",
+    "This ticket is locked": "Este ticket está bloqueado.",
-	"This ticket is not editable.": "Este ticket no es editable.",
+    "This ticket is not editable.": "Este ticket no es editable.",
-	"The ticket doesn't exist.": "No existe el ticket.",
+    "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",
+    "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
-	"Ticket without Route": "Ticket sin ruta",
+    "Ticket without Route": "Ticket sin ruta",
-	"Select a different client": "Seleccione un cliente distinto",
+    "Select a different client": "Seleccione un cliente distinto",
-	"Fill all the fields": "Rellene todos los campos",
+    "Fill all the fields": "Rellene todos los campos",
-	"The response is not a PDF": "La respuesta no es un PDF",
+    "The response is not a PDF": "La respuesta no es un PDF",
-	"Booking completed": "Reserva completada",
+    "Booking completed": "Reserva completada",
-	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+    "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-	"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
+    "Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
-	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+    "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
-	"User disabled": "Usuario desactivado",
+    "User disabled": "Usuario desactivado",
-	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+    "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+    "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
-	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
+    "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-	"This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
+    "This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
-	"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
-	"Incorrect pin": "Pin incorrecto",
+    "Incorrect pin": "Pin incorrecto",
-	"You already have the mailAlias": "Ya tienes este alias de correo",
+    "You already have the mailAlias": "Ya tienes este alias de correo",
-	"The alias cant be modified": "Este alias de correo no puede ser modificado",
+    "The alias cant be modified": "Este alias de correo no puede ser modificado",
-	"No tickets to invoice": "No hay tickets para facturar",
+    "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
-	"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
+    "Name should be uppercase": "El nombre debe ir en mayúscula",
-	"Name should be uppercase": "El nombre debe ir en mayúscula",
+    "Bank entity must be specified": "La entidad bancaria es obligatoria",
-	"Bank entity must be specified": "La entidad bancaria es obligatoria",
+    "An email is necessary": "Es necesario un email",
-	"An email is necessary": "Es necesario un email",
+    "You cannot update these fields": "No puedes actualizar estos campos",
-	"You cannot update these fields": "No puedes actualizar estos campos",
+    "CountryFK cannot be empty": "El país no puede estar vacío",
-	"CountryFK cannot be empty": "El país no puede estar vacío",
+    "Cmr file does not exist": "El archivo del cmr no existe",
-	"Cmr file does not exist": "El archivo del cmr no existe"
+    "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
-}
+    "No tickets to invoice": "No hay tickets para facturar"
 }
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@ -1,5 +1,5 @@
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
 module.exports = Self => {
    Self.rewriteDbError(function(err) {
@ -8,38 +8,38 @@ module.exports = Self => {
        return err;
    });
-    Self.observe('before save', async ctx => {
+    Self.beforeRemote('create', async function(ctx) {
-        const changes = ctx.currentInstance || ctx.instance;
+        const mailAlias = ctx.args.data?.mailAlias;
-
+        if (!mailAlias) return;
-        await checkModifyPermission(ctx, changes.mailAlias);
+        await checkModifyPermission(ctx, mailAlias);
    });
-
+    Self.beforeRemote('deleteById', async function(ctx) {
-    Self.observe('before delete', async ctx => {
+        const instance = await Self.findById(ctx.args.id,
-        const mailAliasAccount = await Self.findById(ctx.where.id);
+            {fields: ['mailAlias']}
-
+        );
-        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
+        await checkModifyPermission(ctx, instance.mailAlias);
    });
    async function checkModifyPermission(ctx, mailAliasFk) {
        const userId = ctx.options.accessToken.userId;
        const models = Self.app.models;
        const userId = ctx.req.accessToken.userId;
-        const roles = await models.RoleMapping.find({
+        const canEditAlias = await models.ACL.checkAccessAcl(ctx,
-            fields: ['roleId'],
+            'MailAliasAccount', 'canEditAlias', 'WRITE');
-            where: {principalId: userId}
+        if (canEditAlias) return;
        const allowedRoles = await models.MailAliasAcl.find({
            fields: ['roleFk'],
            where: {mailAliasFk}
        });
        const nRoles = allowedRoles.length &&
            await models.RoleMapping.count({
                principalId: userId,
                principalType: 'USER',
                roleId: {inq: allowedRoles.map(x => x.roleFk)}
            });
-        const availableMailAlias = await models.MailAliasAcl.findOne({
+        if (!nRoles)
-            fields: ['mailAliasFk'],
+            throw new ForbiddenError('You are not allowed to modify the alias');
            include: {relation: 'mailAlias'},
            where: {
                roleFk: {
                    inq: roles.map(role => role.roleId),
                },
                mailAliasFk
            }
        });
        if (!availableMailAlias) throw new UserError('The alias cant be modified');
    }
 };
--- a/modules/account/front/descriptor/index.js
+++ b/modules/account/front/descriptor/index.js
@ -71,7 +71,7 @@ class Controller extends Descriptor {
        const params = {newPassword: this.newPassword};
        if (this.askOldPass) {
-            method = 'changePassword';
+            method = 'change-password';
            params.oldPassword = this.oldPassword;
        } else
            method = 'setPassword';
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
@ -46,23 +46,19 @@ module.exports = Self => {
        const stmts = [];
        let stmt;
        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.ticket`);
        stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.ticket
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
                (KEY (ticketFk))
                ENGINE = MEMORY
                SELECT id ticketFk
                    FROM ticket t
-                    WHERE shipped BETWEEN ? AND ?
+                    WHERE shipped BETWEEN ? AND util.dayEnd(?)
                        AND refFk IS NULL`, [args.from, args.to]));
        stmts.push(`CALL vn.ticket_getTax(NULL)`);
        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.filter`);
        stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.filter
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                ENGINE = MEMORY
-                SELECT
+                SELECT co.code company,
                        co.code company,
                        cou.country,
                        c.id clientId,
                        c.socialName clientSocialName,
@ -75,28 +71,26 @@ module.exports = Self => {
                        c.isTaxDataChecked,
                        w.id comercialId,
                        CONCAT(w.firstName, ' ', w.lastName) comercialName
-                        FROM vn.ticket t
+                    FROM vn.ticket t
-                            JOIN vn.company co ON co.id = t.companyFk
+                        JOIN vn.company co ON co.id = t.companyFk
-                            JOIN vn.sale s ON s.ticketFk = t.id
+                        JOIN vn.sale s ON s.ticketFk = t.id
-                            JOIN vn.client c ON c.id = t.clientFk
+                        JOIN vn.client c ON c.id = t.clientFk
-                            JOIN vn.country cou ON cou.id = c.countryFk
+                        JOIN vn.country cou ON cou.id = c.countryFk
-                            LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+                        LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
-                            JOIN account.user u ON u.id = w.id
+                        JOIN account.user u ON u.id = w.id
-                            LEFT JOIN (
+                        LEFT JOIN (
-                                SELECT ticketFk, taxableBase
+                            SELECT ticketFk, taxableBase
-                                    FROM tmp.ticketAmount
+                                FROM tmp.ticketAmount
-                                    GROUP BY ticketFk
+                                GROUP BY ticketFk
-                                    HAVING taxableBase < 0
+                                HAVING taxableBase < 0
-                            ) negativeBase ON negativeBase.ticketFk = t.id
+                        ) negativeBase ON negativeBase.ticketFk = t.id
-                        WHERE t.shipped BETWEEN ? AND ?
+                    WHERE t.shipped BETWEEN ? AND util.dayEnd(?)
-                            AND t.refFk IS NULL
+                        AND t.refFk IS NULL
-                            AND c.typeFk IN ('normal','trust')
+                        AND c.typeFk IN ('normal','trust')
-                        GROUP BY t.clientFk, negativeBase.taxableBase
+                    GROUP BY t.clientFk, negativeBase.taxableBase
-                        HAVING amount < 0`, [args.from, args.to]));
+                    HAVING amount < 0`, [args.from, args.to]));
-        stmt = new ParameterizedSQL(`
+        stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
            SELECT f.*
            FROM tmp.filter f`);
        if (args.filter) {
            stmt.merge(conn.makeWhere(args.filter.where));
--- a/modules/item/back/methods/item-shelving/specs/addListByItem.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/addListByItem.spec.js
@ -0,0 +1,55 @@
 const {models} = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 describe('ItemShelving upsertItem()', () => {
    const warehouseFk = 1;
    let ctx;
    let options;
    let tx;
    beforeEach(async() => {
        ctx = {
            req: {
                accessToken: {userId: 9},
                headers: {origin: 'http://localhost'}
            },
            args: {}
        };
        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
            active: ctx.req
        });
        options = {transaction: tx};
        tx = await models.ItemShelving.beginTransaction({});
        options.transaction = tx;
    });
    afterEach(async() => {
        await tx.rollback();
    });
    it('should add two new records', async() => {
        const shelvingFk = 'ZPP';
        const items = [1, 1, 1, 2];
        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
        const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
        expect(itemShelvings.length).toEqual(2);
    });
    it('should update the visible items', async() => {
        const shelvingFk = 'GVC';
        const items = [2, 2];
        const {visible: itemsBefore} = await models.ItemShelving.findOne({
            where: {shelvingFk, itemFk: items[0]}
        }, options);
        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
        const {visible: itemsAfter} = await models.ItemShelving.findOne({
            where: {shelvingFk, itemFk: items[0]}
        }, options);
        expect(itemsAfter).toEqual(itemsBefore + 2);
    });
 });
--- a/modules/item/back/methods/item-shelving/upsertItem.js
+++ b/modules/item/back/methods/item-shelving/upsertItem.js
@ -0,0 +1,64 @@
 module.exports = Self => {
    Self.remoteMethodCtx('upsertItem', {
        description: 'Add a record or update it if it already exists.',
        accessType: 'WRITE',
        accepts: [{
            arg: 'shelvingFk',
            type: 'string',
            required: true,
        },
        {
            arg: 'items',
            type: ['number'],
            required: true,
            description: 'array of item foreign keys'
        },
        {
            arg: 'warehouseFk',
            type: 'number',
            required: true
        }],
        http: {
            path: `/upsertItem`,
            verb: 'POST'
        }
    });
    Self.upsertItem = async(ctx, shelvingFk, items, warehouseFk, options) => {
        const myOptions = {userId: ctx.req.accessToken.userId};
        let tx;
        if (typeof options == 'object')
            Object.assign(myOptions, options);
        if (!myOptions.transaction) {
            tx = await Self.beginTransaction({});
            myOptions.transaction = tx;
        }
        const discardItems = new Set();
        const itemCounts = items.reduce((acc, item) => {
            acc[item] = (acc[item] || 0) + 1;
            return acc;
        }, {});
        try {
            for (let item of items) {
                if (!discardItems.has(item)) {
                    let quantity = itemCounts[item];
                    discardItems.add(item);
                    await Self.rawSql('CALL vn.itemShelving_add(?, ?, ?, NULL, NULL, NULL, ?)',
                        [shelvingFk, item, quantity, warehouseFk], myOptions
                    );
                }
            }
            if (tx) await tx.commit();
        } catch (e) {
            if (tx) await tx.rollback();
            throw e;
        }
    };
 };
--- a/modules/item/back/models/item-shelving.js
+++ b/modules/item/back/models/item-shelving.js
@ -1,4 +1,5 @@
 module.exports = Self => {
    require('../methods/item-shelving/deleteItemShelvings')(Self);
    require('../methods/item-shelving/upsertItem')(Self);
    require('../methods/item-shelving/getInventory')(Self);
 };
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@ -22,16 +22,16 @@ module.exports = Self => {
    require('../methods/route/getByWorker')(Self);
    Self.validate('kmStart', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
    });
    Self.validate('kmEnd', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
    });
    function validateDistance(err) {
        const routeTotalKm = this.kmEnd - this.kmStart;
-        const routeMaxKm = 1000;
+        const routeMaxKm = 4000;
        if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
            err();
    }
--- a/modules/route/front/create/index.html
+++ b/modules/route/front/create/index.html
@ -22,7 +22,6 @@
                label="Vehicle"
                ng-model="$ctrl.route.vehicleFk"
                url="Vehicles"
                where="{warehouseFk: $ctrl.vnConfig.warehouseFk}"
                show-field="numberPlate">
            </vn-autocomplete>
            <vn-autocomplete
--- a/modules/ticket/back/methods/ticket/myLastModified.js
+++ b/modules/ticket/back/methods/ticket/myLastModified.js
@ -0,0 +1,25 @@
 module.exports = Self => {
    Self.remoteMethodCtx('myLastModified', {
        description: 'Get list of last tickets which user has modified',
        accessType: 'READ',
        returns: {
            type: 'object',
            root: true
        },
        http: {
            path: `/myLastModified`,
            verb: 'GET'
        }
    });
    Self.myLastModified = async ctx => {
        const userId = ctx.req.accessToken.userId;
        const query =
            `SELECT ticketFk, MAX(created) created
                FROM ticketTracking tt 
                WHERE tt.userFk = ?
                GROUP BY ticketFk
                LIMIT 5;`;
        return await Self.rawSql(query, [userId]);
    };
 };
--- a/modules/ticket/back/methods/ticket/specs/myLastModified.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/myLastModified.spec.js
@ -0,0 +1,10 @@
 const {models} = require('vn-loopback/server/server');
 describe('myLastModified()', () => {
    it('return list of last tickets which user has modified', async() => {
        let ctx = {req: {accessToken: {userId: 100}}};
        let response = await models.Ticket.myLastModified(ctx);
        expect(response.length).toBeGreaterThan(0);
    });
 });
--- a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
@ -1,49 +1,60 @@
 const models = require('vn-loopback/server/server').models;
 describe('Ticket transferClient()', () => {
-    const userId = 9;
+    const originalTicketId = 8;
-    const activeCtx = {
+    const refundTicketId = 24;
-        accessToken: {userId: userId},
+    const clientId = 1;
-    };
+    let ctx;
-    const ctx = {req: activeCtx};
+    let options;
    let tx;
    beforeEach(async() => {
        ctx = {
            req: {
                accessToken: {userId: 9},
                headers: {origin: 'http://localhost'}
            },
            args: {}
        };
        options = {transaction: tx};
        tx = await models.Ticket.beginTransaction({});
        options.transaction = tx;
    });
    afterEach(async() => {
        await tx.rollback();
    });
    it('should throw an error as the ticket is not editable', async() => {
        const tx = await models.Ticket.beginTransaction({});
        let error;
        try {
            const options = {transaction: tx};
            const ticketId = 4;
            const clientId = 1;
            await models.Ticket.transferClient(ctx, ticketId, clientId, options);
            await tx.rollback();
        } catch (e) {
-            await tx.rollback();
+            expect(e.message).toEqual(`This ticket is locked`);
            error = e;
        }
        expect(error.message).toEqual(`This ticket is locked`);
    });
-    it('should be assigned a different clientFk', async() => {
+    it('should be assigned a different clientFk in the original ticket', async() => {
-        const tx = await models.Ticket.beginTransaction({});
+        await models.Ticket.transferClient(ctx, 2, clientId, options);
-        let updatedTicket;
+        const afterTransfer = await models.Ticket.findById(2, null, options);
        const ticketId = 10;
        const clientId = 1;
-        try {
+        expect(afterTransfer.clientFk).toEqual(clientId);
-            const options = {transaction: tx};
+    });
-            await models.Ticket.transferClient(ctx, ticketId, clientId, options);
+    it('should be assigned a different clientFk in the original and refund ticket and claim', async() => {
-            updatedTicket = await models.Ticket.findById(ticketId, {fields: ['clientFk']}, options);
+        await models.Ticket.transferClient(ctx, originalTicketId, clientId, options);
-            await tx.rollback();
+        const [originalTicket, refundTicket] = await models.Ticket.find({
-        } catch (e) {
+            where: {id: {inq: [originalTicketId, refundTicketId]}}
-            await tx.rollback();
+        }, options);
            throw e;
        }
-        expect(updatedTicket.clientFk).toEqual(clientId);
+        const claim = await models.Claim.findOne({
            where: {ticketFk: originalTicketId}
        }, options);
        expect(originalTicket.clientFk).toEqual(clientId);
        expect(refundTicket.clientFk).toEqual(clientId);
        expect(claim.clientFk).toEqual(clientId);
    });
 });
--- a/modules/ticket/back/methods/ticket/transferClient.js
+++ b/modules/ticket/back/methods/ticket/transferClient.js
@ -2,20 +2,17 @@ module.exports = Self => {
    Self.remoteMethodCtx('transferClient', {
        description: 'Transfering ticket to another client',
        accessType: 'WRITE',
-        accepts: [
+        accepts: [{
-            {
+            arg: 'id',
-                arg: 'id',
+            type: 'number',
-                type: 'number',
+            required: true,
-                required: true,
+            description: 'the ticket id',
-                description: 'the ticket id',
+            http: {source: 'path'}
-                http: {source: 'path'}
+        }, {
-            },
+            arg: 'clientFk',
-            {
+            type: 'number',
-                arg: 'clientFk',
+            required: true,
-                type: 'number',
+        }],
                required: true,
            },
        ],
        http: {
            path: `/:id/transferClient`,
            verb: 'PATCH'
@ -25,21 +22,51 @@ module.exports = Self => {
    Self.transferClient = async(ctx, id, clientFk, options) => {
        const models = Self.app.models;
        const myOptions = {};
        let tx;
        if (typeof options == 'object')
            Object.assign(myOptions, options);
-        await Self.isEditableOrThrow(ctx, id, myOptions);
+        if (!myOptions.transaction) {
            tx = await Self.beginTransaction({});
            myOptions.transaction = tx;
        }
-        const ticket = await models.Ticket.findById(
+        try {
-            id,
+            await Self.isEditableOrThrow(ctx, id, myOptions);
            {fields: ['id', 'shipped', 'clientFk', 'addressFk']},
            myOptions
        );
        const client = await models.Client.findById(clientFk, {fields: ['id', 'defaultAddressFk']}, myOptions);
-        await ticket.updateAttributes({
+            const ticketRefund = await models.TicketRefund.findOne({
-            clientFk,
+                where: {or: [{originalTicketFk: id}, {refundTicketFk: id}]},
-            addressFk: client.defaultAddressFk,
+                include: [{relation: 'refundTicket'}, {relation: 'originalTicket'}]
-        });
+            }, myOptions);
            const {defaultAddressFk: addressFk} = await models.Client.findById(clientFk,
                {fields: ['id', 'defaultAddressFk']}, myOptions);
            const attributes = {clientFk, addressFk};
            const tickets = [];
            const ticketIds = [];
            if (ticketRefund) {
                const {refundTicket, originalTicket} = ticketRefund;
                tickets.push(refundTicket(), originalTicket());
                for (const ticket of tickets) {
                    await ticket.updateAttributes(attributes, myOptions);
                    ticketIds.push(ticket.id);
                }
            } else {
                await Self.updateAll({id}, attributes, myOptions);
                ticketIds.push(id);
            }
            await models.Claim.updateAll({ticketFk: {inq: ticketIds}}, {clientFk}, myOptions);
            if (tx) await tx.commit();
        } catch (e) {
            if (tx) await tx.rollback();
            throw e;
        }
    };
 };
--- a/modules/ticket/back/models/ticket-methods.js
+++ b/modules/ticket/back/models/ticket-methods.js
@ -45,4 +45,5 @@ module.exports = function(Self) {
    require('../methods/ticket/invoiceTickets')(Self);
    require('../methods/ticket/invoiceTicketsAndPdf')(Self);
    require('../methods/ticket/docuwareDownload')(Self);
    require('../methods/ticket/myLastModified')(Self);
 };
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@ -27,7 +27,10 @@ describe('Travel cloneWithEntries()', () => {
            expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
            expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
            expect(travelEntries.length).toBeGreaterThan(0);
-
+            await models.Entry.destroyAll({
                travelFk: newTravelId
            }, options);
            await models.Travel.destroyById(newTravelId, options);
            await tx.rollback();
            const travelRemoved = await models.Travel.findById(newTravelId, options);
--- a/myt.config.yml
+++ b/myt.config.yml
@ -44,7 +44,6 @@ fixtures:
    - module
    - defaultViewConfig
  vn:
    - agencyTermConfig
    - alertLevel
    - bookingPlanner
    - businessType
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "24.8.0",
+    "version": "24.10.0",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
@ -42,7 +42,8 @@
        "mysql": "2.18.1",
        "node-ssh": "^11.0.0",
        "object.pick": "^1.3.0",
-        "puppeteer": "^21.10.0",
+        "puppeteer": "^21.11.0",
        "read-chunk": "^3.2.0",
        "require-yaml": "0.0.1",
        "smbhash": "0.0.1",
        "strong-error-handler": "^2.3.2",
@ -55,7 +56,7 @@
        "@babel/plugin-syntax-dynamic-import": "^7.7.4",
        "@babel/preset-env": "^7.11.0",
        "@babel/register": "^7.7.7",
-        "@verdnatura/myt": "^1.6.6",
+        "@verdnatura/myt": "^1.6.7",
        "angular-mocks": "^1.7.9",
        "babel-jest": "^26.0.1",
        "babel-loader": "^8.2.4",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -93,8 +93,11 @@ dependencies:
    specifier: ^1.3.0
    version: 1.3.0
  puppeteer:
-    specifier: ^21.10.0
+    specifier: ^21.11.0
-    version: 21.10.0
+    version: 21.11.0
  read-chunk:
    specifier: ^3.2.0
    version: 3.2.0
  require-yaml:
    specifier: 0.0.1
    version: 0.0.1
@ -128,8 +131,8 @@ devDependencies:
    specifier: ^7.7.7
    version: 7.23.7(@babel/core@7.23.9)
  '@verdnatura/myt':
-    specifier: ^1.6.6
+    specifier: ^1.6.7
-    version: 1.6.6
+    version: 1.6.7
  angular-mocks:
    specifier: ^1.7.9
    version: 1.8.3
@ -2630,8 +2633,8 @@ packages:
    dev: false
    optional: true
-  /@verdnatura/myt@1.6.6:
+  /@verdnatura/myt@1.6.7:
-    resolution: {integrity: sha512-5KHi9w1baEQ6Oe/pAR8pl0oD5yyJJuPirE+ZhygreUGGURfig4VekjhlGE3WEbWquDiIAMi89J1VQ+1Ba0+jQw==}
+    resolution: {integrity: sha512-t/Q1T3QzHpZFdxwIyQL/CV5g+HJvWE6Q65VeA9k0svZdX/vezgnQ21nkI+wuvIurIl6BXqq2Arx7EWYkAhGNNA==}
    hasBin: true
    dependencies:
      '@sqltools/formatter': 1.2.5
@ -4057,8 +4060,8 @@ packages:
    engines: {node: '>=6.0'}
    dev: true
-  /chromium-bidi@0.5.6(devtools-protocol@0.0.1232444):
+  /chromium-bidi@0.5.8(devtools-protocol@0.0.1232444):
-    resolution: {integrity: sha512-ber8smgoAs4EqSUHRb0I8fpx371ZmvsdQav8HRM9oO4fk5Ox16vQiNYXlsZkRj4FfvVL2dCef+zBFQixp+79CA==}
+    resolution: {integrity: sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==}
    peerDependencies:
      devtools-protocol: '*'
    dependencies:
@ -10680,7 +10683,6 @@ packages:
  /p-try@2.2.0:
    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
    engines: {node: '>=6'}
    dev: true
  /pac-proxy-agent@7.0.1:
    resolution: {integrity: sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==}
@ -11220,12 +11222,12 @@ packages:
    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
    engines: {node: '>=6'}
-  /puppeteer-core@21.10.0:
+  /puppeteer-core@21.11.0:
-    resolution: {integrity: sha512-NVaqO3K462qwMuLO4Gurs/Mau1Wss+08QgNYzF0dIqZWMvpskrt/TbxbmHU+7zMTUOvPEq/lR4BLJmjMBgBGfQ==}
+    resolution: {integrity: sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==}
    engines: {node: '>=16.13.2'}
    dependencies:
      '@puppeteer/browsers': 1.9.1
-      chromium-bidi: 0.5.6(devtools-protocol@0.0.1232444)
+      chromium-bidi: 0.5.8(devtools-protocol@0.0.1232444)
      cross-fetch: 4.0.0
      debug: 4.3.4(supports-color@6.1.0)
      devtools-protocol: 0.0.1232444
@ -11237,15 +11239,15 @@ packages:
      - utf-8-validate
    dev: false
-  /puppeteer@21.10.0:
+  /puppeteer@21.11.0:
-    resolution: {integrity: sha512-Y1yQjcLE00hHTDAmv3M3A6hhW0Ytjdp6xr6nyjl7FZ7E7hzp/6Rsw80FbaTJzJHFCplBNi082wrgynbmD7RlYw==}
+    resolution: {integrity: sha512-9jTHuYe22TD3sNxy0nEIzC7ZrlRnDgeX3xPkbS7PnbdwYjl2o/z/YuCrRBwezdKpbTDTJ4VqIggzNyeRcKq3cg==}
    engines: {node: '>=16.13.2'}
    hasBin: true
    requiresBuild: true
    dependencies:
      '@puppeteer/browsers': 1.9.1
      cosmiconfig: 9.0.0
-      puppeteer-core: 21.10.0
+      puppeteer-core: 21.11.0
    transitivePeerDependencies:
      - bufferutil
      - encoding
@ -11367,6 +11369,14 @@ packages:
    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
    dev: true
  /read-chunk@3.2.0:
    resolution: {integrity: sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==}
    engines: {node: '>=6'}
    dependencies:
      pify: 4.0.1
      with-open-file: 0.1.7
    dev: false
  /read-pkg-up@1.0.1:
    resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
    engines: {node: '>=0.10.0'}
@ -14119,6 +14129,15 @@ packages:
    resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
    dev: true
  /with-open-file@0.1.7:
    resolution: {integrity: sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==}
    engines: {node: '>=6'}
    dependencies:
      p-finally: 1.0.0
      p-try: 2.2.0
      pify: 4.0.1
    dev: false
  /word-count@0.2.2:
    resolution: {integrity: sha512-tPRTbQ+nTCPY3F0z1f/y0PX22ScE6l/4/8j9KqA3h77JhlZ/w6cbVS8LIO5Pq/aV96SWBOoiE2IEgzxF0Cn+kA==}
    dev: false
--- a/print/core/cluster.js
+++ b/print/core/cluster.js
@ -6,7 +6,7 @@ module.exports = {
    init() {
        if (this.pool) return;
        Cluster.launch({
-            concurrency: Cluster.CONCURRENCY_CONTEXT,
+            concurrency: Cluster.CONCURRENCY_PAGE,
            maxConcurrency: cpus().length,
            puppeteerOptions: {
                headless: 'new',
--- a/print/templates/reports/driver-route/assets/css/style.css
+++ b/print/templates/reports/driver-route/assets/css/style.css
@ -46,6 +46,9 @@ section.text-area {
    padding-left: 1em;
    padding-right: 1em;
    background-color: #e5e5e5;
    & > p {
        word-break: break-all;
    }
 }
 .route-block {
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@ -5,7 +5,6 @@ module.exports = {
    mixins: [vnReport],
    async serverPrefetch() {
        let ids = this.id;
        const hasMultipleRoutes = String(this.id).includes(',');
        if (hasMultipleRoutes)
            ids = this.id.split(',');
@ -30,7 +29,7 @@ module.exports = {
    },
    props: {
        id: {
-            type: Number,
+            type: String,
            required: true,
            description: 'The route id'
        }
`@ -1,4 +1,4 @@`
	`DROP TRIGGER IF EXISTS vn2008.account_conciliacion_BEFORE_INSERT;`	`DROP TRIGGER IF EXISTS vn2008.account_conciliacion_beforeInsert;`

	ALTER TABLE IF EXISTS `vn2008`.`account_conciliacion` RENAME `vn`.`accountReconciliation`;	ALTER TABLE IF EXISTS `vn2008`.`account_conciliacion` RENAME `vn`.`accountReconciliation`;
`@ -1,4 +1,4 @@`
	`DROP TRIGGER IF EXISTS vn2008.awb_recibida_ad;`	`DROP TRIGGER IF EXISTS vn2008.awb_recibida_afterDelete;`

	ALTER TABLE IF EXISTS `vn2008`.`awb_recibida` RENAME `vn`.`awbInvoiceIn`;	ALTER TABLE IF EXISTS `vn2008`.`awb_recibida` RENAME `vn`.`awbInvoiceIn`;