diff --git a/back/methods/image/specs/upload.spec.js b/back/methods/image/specs/upload.spec.js
index 144770bcf..63c5cfb65 100644
--- a/back/methods/image/specs/upload.spec.js
+++ b/back/methods/image/specs/upload.spec.js
@@ -95,10 +95,7 @@ describe('image upload()', () => {
             spyOn(containerModel, 'upload');
 
             const ctx = {req: {accessToken: {userId: hhrrId}},
-                args: {
-                    id: itemId,
-                    collection: 'user'
-                }
+                args: {id: itemId, collection: 'user'}
             };
 
             try {
@@ -109,7 +106,7 @@ describe('image upload()', () => {
         });
 
         it('should try to upload a file for the collection "catalog" and throw a privilege error', async() => {
-            const ctx = {req: {accessToken: {userId: hhrrId}},
+            const ctx = {req: {accessToken: {userId: 1}},
                 args: {
                     id: workerId,
                     collection: 'catalog'
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 39e7008ca..3a416d7e3 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -79,10 +79,10 @@ module.exports = function(Self) {
     Self.getRoles = async(userId, options) => {
         const result = await Self.rawSql(
             `SELECT r.name
-                FROM account.user u
-                    JOIN account.roleRole rr ON rr.role = u.role
-                    JOIN account.role r ON r.id = rr.inheritsFrom
-                WHERE u.id = ?`, [userId], options);
+            FROM account.user u
+            JOIN account.roleRole rr ON rr.role = u.role
+            JOIN account.role r ON r.id = rr.inheritsFrom
+            WHERE u.id = ?`, [userId], options);
 
         const roles = [];
         for (const role of result)
@@ -142,7 +142,7 @@ module.exports = function(Self) {
                 ip: ctx.req.ip,
                 owner: isOwner
             });
-        throw new UserError('Try again');
+            throw new UserError('Try again');
         }
     };
 
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index 3e46c8e04..0b9ac605b 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -4,7 +4,7 @@ USE `util`;
 --
 -- Host: db2.static.verdnatura.es    Database: util
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -22,7 +22,7 @@ USE `util`;
 
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'234604',0,'production',NULL,'2001-01-01 11:00:00',NULL,0);
+INSERT INTO `config` VALUES (1,'240203',0,'production',NULL,'2001-01-01 11:00:00',NULL,0);
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -32,7 +32,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `version` WRITE;
 /*!40000 ALTER TABLE `version` DISABLE KEYS */;
-INSERT INTO `version` VALUES ('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL),('vn-database','10761','6c1146271aa71f7c3332e11d50d6812752391ea4','2023-11-20 11:55:47','10778');
+INSERT INTO `version` VALUES ('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL),('vn-database','10827','7dcc0ea3642cfa81a4cf7192bb38f89af02c220a','2024-01-23 12:32:14','10829');
 /*!40000 ALTER TABLE `version` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -42,7 +42,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `versionLog` WRITE;
 /*!40000 ALTER TABLE `versionLog` DISABLE KEYS */;
-INSERT INTO `versionLog` VALUES ('vn-database','00001','00-test.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','00003','00-sage.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10008','00-alterRoleConfig.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10014','00-rolePrefix.sql','jenkins@10.0.2.68','2022-02-11 00:13:25',NULL,NULL),('vn-database','10017','01-firstScript.sql','jenkins@10.0.2.70','2022-03-09 11:36:54',NULL,NULL),('vn-database','10021','00-bankAccount.sql','jenkins@10.0.2.69','2022-03-16 14:11:22',NULL,NULL),('vn-database','10023','00-firstScript.sql','jenkins@10.0.2.69','2022-03-16 15:05:29',NULL,NULL),('vn-database','10026','00-invoiceInIntrastat.sql','jenkins@10.0.2.69','2022-03-21 15:10:53',NULL,NULL),('vn-database','10027','00-Clientes_cedidos.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10028','00-item_last_buy_.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10029','00-bankToViewAccountingToTable.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10030','00-KkejarNiche.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10036','00-updateBuyConfig.sql','jenkins@10.0.2.69','2022-03-29 12:36:54',NULL,NULL),('vn-database','10037','00-firstScript.sql','jenkins@10.0.2.69','2022-03-28 11:14:26',NULL,NULL),('vn-database','10038','00-printServerQueue.sql','jenkins@10.0.2.69','2022-03-29 08:13:24',NULL,NULL),('vn-database','10048','00-firstScript.sql','jenkins@10.0.2.69','2022-03-30 12:29:06',NULL,NULL),('vn-database','10058','00-vehicleAddFields.sql','jenkins@10.0.2.69','2022-04-06 08:48:34',NULL,NULL),('vn-database','10060','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:11',NULL,NULL),('vn-database','10062','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 10:51:45',NULL,NULL),('vn-database','10064','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 13:57:11',NULL,NULL),('vn-database','10066','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:12',NULL,NULL),('vn-database','10067','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 10:18:20',NULL,NULL),('vn-database','10071','00-packingSiteLog.sql','jenkins@10.0.2.69','2022-04-08 09:37:30',NULL,NULL),('vn-database','10072','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 11:01:46',NULL,NULL),('vn-database','10073','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 13:40:56',NULL,NULL),('vn-database','10074','00-firstScript.sql','jenkins@10.0.2.69','2022-04-10 13:15:05',NULL,NULL),('vn-database','10077','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 08:07:15',NULL,NULL),('vn-database','10078','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 07:44:21',NULL,NULL),('vn-database','10079','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 12:01:37',NULL,NULL),('vn-database','10086','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 08:58:34',NULL,NULL),('vn-database','10087','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 09:39:49',NULL,NULL),('vn-database','10088','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 15:05:12',NULL,NULL),('vn-database','10089','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:12:52',NULL,NULL),('vn-database','10090','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:34:46',NULL,NULL),('vn-database','10092','00-firstScript.sql','jenkins@10.0.2.69','2022-04-19 14:45:46',NULL,NULL),('vn-database','10093','00-autoradioConfig.sql','jenkins@10.0.2.69','2022-05-03 09:16:47',NULL,NULL),('vn-database','10094','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 10:57:30',NULL,NULL),('vn-database','10097','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10099','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10100','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10101','00-firstScript.sql','jenkins@10.0.2.69','2022-04-21 14:59:31',NULL,NULL),('vn-database','10103','00-awbVolume.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10104','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10105','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL),('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL),('vn-database','10113','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10114','00-updateConfig.sql','jenkins@10.0.2.69','2022-04-27 13:37:25',NULL,NULL),('vn-database','10116','00-firstScript.sql','jenkins@10.0.2.69','2022-04-28 11:10:14',NULL,NULL),('vn-database','10118','00-firstScript.sql','jenkins@10.0.2.69','2022-04-29 08:10:15',NULL,NULL),('vn-database','10119','00-AfegirFKPart1.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10119','01-AfegirFkPart2.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10125','00-firstScript.sql','jenkins@10.0.2.68','2022-05-18 18:44:30',NULL,NULL),('vn-database','10127','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 11:04:46',NULL,NULL),('vn-database','10128','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 13:04:31',NULL,NULL),('vn-database','10129','00-firstScript.sql','jenkins@10.0.2.69','2022-05-03 08:21:01',NULL,NULL),('vn-database','10132','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10133','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 14:32:30',NULL,NULL),('vn-database','10134','00-firstScript.sql','jenkins@10.0.2.69','2022-05-06 07:45:25',NULL,NULL),('vn-database','10135','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10136','00-workerTimeControl.sql','jenkins@10.0.2.69','2022-05-09 13:51:12',NULL,NULL),('vn-database','10138','00-firstScript.sql','jenkins@10.0.2.69','2022-05-10 13:58:05',NULL,NULL),('vn-database','10139','00-firstScript.sql','jenkins@10.0.2.68','2022-05-16 14:32:37',NULL,NULL),('vn-database','10139','01-secondScript.sql','jenkins@10.0.2.68','2022-05-17 12:16:13',NULL,NULL),('vn-database','10141','00-firstScript.sql','jenkins@10.0.2.70','2022-05-12 08:27:31',NULL,NULL),('vn-database','10142','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10143','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10144','00-AfegirFKPArt1.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10144','00-firstScript.sql','jenkins@10.0.2.68','2022-05-13 09:44:25',NULL,NULL),('vn-database','10147','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10149','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10150','00-firstScript.sql','jenkins@10.0.2.68','2022-05-17 09:57:16',NULL,NULL),('vn-database','10152','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10153','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10154','00-compressionKk.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10157','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:35',NULL,NULL),('vn-database','10158','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10160','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:30:50',NULL,NULL),('vn-database','10163','00-firstScript.sql','jenkins@10.0.2.68','2022-05-23 08:17:14',NULL,NULL),('vn-database','10164','00-borrarSectorsDesus.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10165','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10166','00-firstScript.sql','jenkins@10.0.2.68','2022-05-24 16:11:21',NULL,NULL),('vn-database','10167','00-renameVnActiveContrat.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10168','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','00-createTableBankEntityConfig.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','02-addNotNullToBankEntityBic.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10171','00-volumeConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 14:11:11',NULL,NULL),('vn-database','10171','01-itemWeight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10171','02-agencymode.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10172','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10174','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10175','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10177','00-crearTablaSpecialLabels.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10178','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10179','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10183','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10184','00-firstScript.sql','jenkins@10.0.2.68','2022-06-03 08:05:34',NULL,NULL),('vn-database','10185','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 09:07:45',NULL,NULL),('vn-database','10186','00-desactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:31:23',NULL,NULL),('vn-database','10186','01-alter_Table_buy.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','02-alter_table_entryConfig.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','04-regularizar_Sticker_Inventario.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10186','09-reactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10187','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 12:37:31',NULL,NULL),('vn-database','10188','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 14:03:36',NULL,NULL),('vn-database','10189','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10191','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10193','00-delete.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:35',NULL,NULL),('vn-database','10193','01-botanicExport.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:43',NULL,NULL),('vn-database','10193','02-item.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-autonomy.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-turn.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','04-country.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10194','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10195','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10200','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10201','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10202','00-Remove_FK_to_ediGenus.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10203','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10204','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10205','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:21',NULL,NULL),('vn-database','10207','00-Alter_table_entry.sql','jenkins@10.0.2.69','2022-06-16 07:22:50',NULL,NULL),('vn-database','10207','01-Update_invoiceAmount.sql','jenkins@10.0.2.69','2022-06-16 07:23:00',NULL,NULL),('vn-database','10208','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10209','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 08:47:40',NULL,NULL),('vn-database','10210','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 17:39:17',1046,'Base de datos no seleccionada'),('vn-database','10211','01-firstScript.sql','jenkins@10.0.2.69','2022-06-17 07:11:27',NULL,NULL),('vn-database','10215','00-renameIsInventory.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10216','00-firstScript.sql','jenkins@10.0.2.69','2022-06-23 11:15:28',NULL,NULL),('vn-database','10216','01-batchIndex.sql','jenkins@10.0.2.70','2022-06-27 18:10:55',NULL,NULL),('vn-database','10219','00-AddCollectionFkOnPackingSite.sql','jenkins@10.0.2.70','2022-06-29 09:23:42',NULL,NULL),('vn-database','10219','01-AddFkToCollectionFk.sql','jenkins@10.0.2.70','2022-06-29 09:23:43',NULL,NULL),('vn-database','10220','00-createPersonalProtectionEquipment.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10222','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:12:40',NULL,NULL),('vn-database','10223','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:52',NULL,NULL),('vn-database','10224','00-cosetes.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-21 12:03:45',NULL,NULL),('vn-database','10229','00-firstScript.sql','jenkins@10.0.2.69','2022-07-01 11:59:34',NULL,NULL),('vn-database','10231','01-tablaEktConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:25:39',NULL,NULL),('vn-database','10233','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10235','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10236','00-firstScript.sql','jenkins@10.0.2.69','2022-07-05 12:11:40',NULL,NULL),('vn-database','10237','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10238','00-worker_mobileExtension.sql','jenkins@10.0.2.69','2022-07-14 09:14:09',NULL,NULL),('vn-database','10239','00-firstScript.sql','jenkins@10.0.2.69','2022-07-07 21:51:58',NULL,NULL),('vn-database','10241','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-29 08:14:01',NULL,NULL),('vn-database','10242','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10243','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10245','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10247','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10248','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-20 17:27:51',NULL,NULL),('vn-database','10250','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:40',NULL,NULL),('vn-database','10253','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:57',NULL,NULL),('vn-database','10254','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10256','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10258','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10259','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-02 08:54:56',NULL,NULL),('vn-database','10261','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-22 08:42:20',NULL,NULL),('vn-database','10262','00-createTablepackagingWithFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','01-alterTablePackagingConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','02-insertsInicials.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','03-createTablepackingWithoutFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10263','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10265','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10267','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10267','01-fixMerge.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10275','00-improvedGeneralLog.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 09:55:56',NULL,NULL),('vn-database','10277','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10278','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 17:51:41',NULL,NULL),('vn-database','10279','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10281','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10282','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10283','00-alterTable.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10284','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-04 16:59:08',NULL,NULL),('vn-database','10285','00-firstScript.sql','jenkins@swarm-worker3.static.verdnatura.es','2022-08-05 09:19:33',NULL,NULL),('vn-database','10287','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10288','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10289','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:36',NULL,NULL),('vn-database','10291','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-10 14:19:34',NULL,NULL),('vn-database','10293','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10297','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-16 12:43:36',NULL,NULL),('vn-database','10298','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-13 21:04:13',NULL,NULL),('vn-database','10299','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','00-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','01-drop.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','02-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','00-CreateTableEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','01-insertDataEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','02-alterTableEntry.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:22',NULL,NULL),('vn-database','10303','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:23',NULL,NULL),('vn-database','10304','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:48',NULL,NULL),('vn-database','10304','01-altertableticket.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:51',NULL,NULL),('vn-database','10305','00-ektAssign.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:24:52',NULL,NULL),('vn-database','10306','00-deliveryInformation.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:25',NULL,NULL),('vn-database','10307','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:26',NULL,NULL),('vn-database','10308','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:26:43',NULL,NULL),('vn-database','10309','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:54',NULL,NULL),('vn-database','10310','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10311','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:55',NULL,NULL),('vn-database','10312','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10313','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:27:21',NULL,NULL),('vn-database','10314','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:19',NULL,NULL),('vn-database','10315','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10317','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10318','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10319','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:41',NULL,NULL),('vn-database','10320','00-operator.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','01-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','02-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10321','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 11:11:12',NULL,NULL),('vn-database','10322','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-09 09:19:05',NULL,NULL),('vn-database','10326','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10328','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10329','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10330','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10332','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','00-collectionHotbed.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','01-saleGroupDetail.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10335','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10336','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10337','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10339','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-19 09:41:19',NULL,NULL),('vn-database','10340','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10341','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10342','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10343','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:35:30',NULL,NULL),('vn-database','10345','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10347','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10347','01-addVirtualField.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10349','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10350','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-30 10:11:56',NULL,NULL),('vn-database','10352','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10353','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10354','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10356','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','01-orderConfigFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','02-orderConfigDrop.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10357','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10359','00-improvedGeneralLog_collate.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10360','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10361','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 11:16:07',NULL,NULL),('vn-database','10362','00-dropUdfs.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-10 11:01:15',NULL,NULL),('vn-database','10363','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10365','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-13 19:30:46',NULL,NULL),('vn-database','10368','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10369','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-14 13:38:06',NULL,NULL),('vn-database','10370','00-deleteForeignKey.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:41',NULL,NULL),('vn-database','10370','01-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:47',NULL,NULL),('vn-database','10370','02-deleteTable.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','03-accion.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','04-inter.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10371','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10372','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10373','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-19 08:31:58',NULL,NULL),('vn-database','10378','00-rename_routeUserPercentage.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10379','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:16',NULL,NULL),('vn-database','10382','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10383','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10384','00-business_workcenterFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10385','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10386','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10387','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-16 14:05:33',NULL,NULL),('vn-database','10388','00-resizeUtilVerionLogCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10388','01-resizeUtilVersionCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10390','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:16',NULL,NULL),('vn-database','10391','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10394','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:24',NULL,NULL),('vn-database','10395','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10396','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 15:36:38',NULL,NULL),('vn-database','10397','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10399','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10400','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10402','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-21 14:11:31',NULL,NULL),('vn-database','10404','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10405','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:22',NULL,NULL),('vn-database','10407','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10408','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10409','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10412','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-30 12:45:44',NULL,NULL),('vn-database','10413','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10416','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10420','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:25',NULL,NULL),('vn-database','10421','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:26',NULL,NULL),('vn-database','10426','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:40',NULL,NULL),('vn-database','10428','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10431','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:22',NULL,NULL),('vn-database','10433','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10434','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10435','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-13 07:30:10',NULL,NULL),('vn-database','10436','00-createFkWorker.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:59',NULL,NULL),('vn-database','10436','01-addStateToWorkerProductivity.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','02-DeprecateVnSaleTrackingState.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','03-DeprecateColumnVnSaleTrackingActionFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','04-DropSchemaVnControl.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','05-RemoveFkWorkerProductivity.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-17 14:51:19',NULL,NULL),('vn-database','10439','00-fixRole.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:26',NULL,NULL),('vn-database','10440','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10444','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10445','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10448','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10450','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-27 08:28:04',NULL,NULL),('vn-database','10451','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-06 08:08:32',NULL,NULL),('vn-database','10452','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10453','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 14:04:37',NULL,NULL),('vn-database','10454','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10455','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10456','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:30',NULL,NULL),('vn-database','10457','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:33',NULL,NULL),('vn-database','10458','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10459','00-alterTableUtilConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','01-createFunctionCurdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','02-createFunctionMockTime.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','03-createFunctionMockTimeBase.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','04-createFunctionNow.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10460','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10461','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10463','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-03 12:59:26',NULL,NULL),('vn-database','10468','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10469','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10470','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10471','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10472','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10477','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:31',NULL,NULL),('vn-database','10478','00-dropBasket.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','01-orderConfigured.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:16',NULL,NULL),('vn-database','10478','02-configuredUpdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10478','99-privileges.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10480','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 15:09:26',NULL,NULL),('vn-database','10481','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 16:37:22',NULL,NULL),('vn-database','10482','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-21 10:00:28',NULL,NULL),('vn-database','10485','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10488','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10491','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10492','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10493','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10495','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:19',NULL,NULL),('vn-database','10498','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:38',NULL,NULL),('vn-database','10500','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 07:06:03',NULL,NULL),('vn-database','10501','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 10:52:24',NULL,NULL),('vn-database','10502','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10504','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10506','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10506','01-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','02-secondScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','03-thirdScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10507','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:35:23',NULL,NULL),('vn-database','10508','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:43',NULL,NULL),('vn-database','10510','00-dropBusinessFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','01-createTableProfessionalCategory.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','02-exportToNewTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','03-RecreateFK.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10510','04-kkPostgresqlTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10511','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10512','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:52',NULL,NULL),('vn-database','10513','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:56',NULL,NULL),('vn-database','10514','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10516','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10521','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 06:58:13',NULL,NULL),('vn-database','10522','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10523','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10524','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10524','01-rateEditorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10525','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 12:42:50',NULL,NULL),('vn-database','10526','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:57',NULL,NULL),('vn-database','10528','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:00',NULL,NULL),('vn-database','10530','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-23 14:49:30',NULL,NULL),('vn-database','10531','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:47:10',NULL,NULL),('vn-database','10532','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:17:38',NULL,NULL),('vn-database','10533','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:04',NULL,NULL),('vn-database','10537','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-29 15:18:36',NULL,NULL),('vn-database','10538','00-createChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','01-createChronopostService.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','02-createChronopostExpedition.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','03-createChronopostSenderAddress.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','04-addgrantPrivilegies.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','05-updateChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 11:54:57',NULL,NULL),('vn-database','10539','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:07',NULL,NULL),('vn-database','10540','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10545','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-11 08:31:03',NULL,NULL),('vn-database','10546','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10547','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:21:58',NULL,NULL),('vn-database','10549','00-updateUpdateLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:29:22',NULL,NULL),('vn-database','10549','01-updateInsertLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:11',NULL,NULL),('vn-database','10549','02-updateDeleteLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:51',NULL,NULL),('vn-database','10549','03-deleteEmptyLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:31:34',NULL,NULL),('vn-database','10549','04-optimizeLogTables.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:33:58',NULL,NULL),('vn-database','10550','00-editorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:42:33',NULL,NULL),('vn-database','10550','01-originFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10552','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-13 08:25:10',NULL,NULL),('vn-database','10554','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10557','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-17 07:45:56',NULL,NULL),('vn-database','10559','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-18 10:53:50',NULL,NULL),('vn-database','10560','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-17 09:19:31',NULL,NULL),('vn-database','10562','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10563','00-delivery_ticketFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 09:30:53',NULL,NULL),('vn-database','10566','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:08:41',NULL,NULL),('vn-database','10567','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:18:06',NULL,NULL),('vn-database','10568','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10569','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-24 09:14:35',NULL,NULL),('vn-database','10570','00-createSendingConfig.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','01-createSendingServiceWeekday.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','02-createSendingService.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','03-permisos.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10571','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10573','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:23',NULL,NULL),('vn-database','10575','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-26 11:27:32',NULL,NULL),('vn-database','10577','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-27 14:00:12',NULL,NULL),('vn-database','10578','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10579','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-28 11:27:36',NULL,NULL),('vn-database','10580','00-itemTypeDropConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:18:52',NULL,NULL),('vn-database','10580','01-itemTypeAddConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:19:10',NULL,NULL),('vn-database','10581','00-itemTypeAutoIncrement.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 19:06:46',NULL,NULL),('vn-database','10582','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10583','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10584','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10585','00-ticketLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:20:10',NULL,NULL),('vn-database','10585','01-entryLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:21:12',NULL,NULL),('vn-database','10585','02-claimLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:36',NULL,NULL),('vn-database','10585','03-clientLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:54',NULL,NULL),('vn-database','10585','04-invoiceInLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:55',NULL,NULL),('vn-database','10585','05-itemLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:29:46',NULL,NULL),('vn-database','10585','06-routeLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:18',NULL,NULL),('vn-database','10585','07-shelvingLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','08-supplierLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','09-travelLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:41',NULL,NULL),('vn-database','10585','10-workerLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:42',NULL,NULL),('vn-database','10585','11-zoneLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:43',NULL,NULL),('vn-database','10585','12-userLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10585','13-roleLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10587','00-arcRead_addMinimum.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-16 13:13:15',NULL,NULL),('vn-database','10593','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10596','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10597','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10598','00-workerLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','01-supplierLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','02-workerTimeControlLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','03-workerClockLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10599','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10601','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-17 09:26:26',NULL,NULL),('vn-database','10602','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 08:52:15',NULL,NULL),('vn-database','10606','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 09:26:00',NULL,NULL),('vn-database','10608','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 12:36:31',NULL,NULL),('vn-database','10609','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 08:28:07',NULL,NULL),('vn-database','10610','00-updateCompanyId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:07',NULL,NULL),('vn-database','10610','01-updateSupplierId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:39',NULL,NULL),('vn-database','10610','02-invoiceOutCompany.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 09:49:55',NULL,NULL),('vn-database','10611','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-19 14:39:41',NULL,NULL),('vn-database','10613','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10614','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10615','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10616','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10616','01-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10617','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:41',NULL,NULL),('vn-database','10618','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 12:55:56',NULL,NULL),('vn-database','10619','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10620','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:20:53',NULL,NULL),('vn-database','10624','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-30 19:01:10',NULL,NULL),('vn-database','10625','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10626','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 13:32:32',NULL,NULL),('vn-database','10628','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10630','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-02 13:30:58',NULL,NULL),('vn-database','10631','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-05 08:37:25',NULL,NULL),('vn-database','10632','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10633','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10634','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-06 12:15:55',NULL,NULL),('vn-database','10637','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:19',NULL,NULL),('vn-database','10640','00-companyFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','00-updateCompany.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-07 14:22:13',1205,'Tiempo de espera de bloqueo excedido; intente rearrancar la transacción'),('vn-database','10640','01-companyFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','02-companyFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:47:04',NULL,NULL),('vn-database','10640','04-supplierFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:48:30',NULL,NULL),('vn-database','10640','05-supplierFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:53:17',NULL,NULL),('vn-database','10640','06-supplierFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 15:06:00',NULL,NULL),('vn-database','10642','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10643','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-09 15:04:35',NULL,NULL),('vn-database','10644','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:18',NULL,NULL),('vn-database','10645','00-addNewFields.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:11',NULL,NULL),('vn-database','10645','01-updateCollectionWagonPrimaryKey.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:11',NULL,NULL),('vn-database','10645','02-updateWagonPrimaryKey.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10645','03-addFieldToPackingSite.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10647','00-renombrarTabla.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10648','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10649','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-16 10:59:06',NULL,NULL),('vn-database','10652','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10653','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:20',NULL,NULL),('vn-database','10655','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:24',NULL,NULL),('vn-database','10656','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10657','00-renameErrorProduction.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','01-changeNightTask.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','02-addCodeToClaimResponsible.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','03-grantSelectGrafana.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10658','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:27',NULL,NULL),('vn-database','10659','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10661','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:27:50',NULL,NULL),('vn-database','10662','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:33',NULL,NULL),('vn-database','10663','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10665','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-30 08:52:51',NULL,NULL),('vn-database','10666','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10667','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10668','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10671','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-25 14:56:50',NULL,NULL),('vn-database','10675','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10676','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10677','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:22',NULL,NULL),('vn-database','10678','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10679','00-tables.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10680','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-18 14:58:36',NULL,NULL),('vn-database','10682','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10683','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10684','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10685','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-05 09:53:55',NULL,NULL),('vn-database','10690','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-27 10:52:26',NULL,NULL),('vn-database','10691','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-31 13:37:21',NULL,NULL),('vn-database','10692','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10693','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10694','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 09:50:53',NULL,NULL),('vn-database','10695','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 13:40:16',NULL,NULL),('vn-database','10696','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 16:54:57',NULL,NULL),('vn-database','10698','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-03 08:53:12',NULL,NULL),('vn-database','10699','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 15:24:30',NULL,NULL),('vn-database','10700','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:11',NULL,NULL),('vn-database','10701','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10702','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 12:50:46',NULL,NULL),('vn-database','10704','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:14',NULL,NULL),('vn-database','10705','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-16 14:16:05',NULL,NULL),('vn-database','10707','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-21 12:31:18',NULL,NULL),('vn-database','10708','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:13',NULL,NULL),('vn-database','10712','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:13',NULL,NULL),('vn-database','10714','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-28 13:01:45',NULL,NULL),('vn-database','10716','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:27:50',NULL,NULL),('vn-database','10717','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:28:54',NULL,NULL),('vn-database','10718','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10719','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-01 12:53:30',NULL,NULL),('vn-database','10720','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:22',NULL,NULL),('vn-database','10721','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10722','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-09 13:00:29',NULL,NULL),('vn-database','10725','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-12 14:15:14',NULL,NULL),('vn-database','10726','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 15:32:20',NULL,NULL),('vn-database','10727','00-addPrinterField.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','01-createTableScreenModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','02-createTableScreen.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','03-createTableScreenModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','04-createTableScanner.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','05-createTablePackingSiteDeviceLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','06-alterTablePrinterModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','07-AddFieldsToPackingSite.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:30',NULL,NULL),('vn-database','10730','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-15 11:42:48',NULL,NULL),('vn-database','10733','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-05 09:54:00',NULL,NULL),('vn-database','10736','00-workerBossNull.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-22 00:02:05',NULL,NULL),('vn-database','10739','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-10 10:19:07',NULL,NULL),('vn-database','10740','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10741','01-refactorCplusTrascendency472.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','02-refactorCplusTrascendency477.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','03-refactorCplusInvoiceType477.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','04-refactorCplusInvoiceType472.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','05-fixes.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10744','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-13 09:23:19',NULL,NULL),('vn-database','10746','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-16 18:22:46',NULL,NULL),('vn-database','10747','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:32',NULL,NULL),('vn-database','10748','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:32',NULL,NULL),('vn-database','10748','01-SecondScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10749','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-22 16:08:17',NULL,NULL),('vn-database','10750','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-23 13:04:17',NULL,NULL),('vn-database','10750','00-ticket_addGrants.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10751','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10752','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-24 14:07:54',NULL,NULL),('vn-database','10753','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-24 14:37:21',NULL,NULL),('vn-database','10754','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10755','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:35',NULL,NULL),('vn-database','10756','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-03 07:14:38',NULL,NULL),('vn-database','10757','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:30:57',NULL,NULL),('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','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL),('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL),('vn-database','10113','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10114','00-updateConfig.sql','jenkins@10.0.2.69','2022-04-27 13:37:25',NULL,NULL),('vn-database','10116','00-firstScript.sql','jenkins@10.0.2.69','2022-04-28 11:10:14',NULL,NULL),('vn-database','10118','00-firstScript.sql','jenkins@10.0.2.69','2022-04-29 08:10:15',NULL,NULL),('vn-database','10119','00-AfegirFKPart1.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10119','01-AfegirFkPart2.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10125','00-firstScript.sql','jenkins@10.0.2.68','2022-05-18 18:44:30',NULL,NULL),('vn-database','10127','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 11:04:46',NULL,NULL),('vn-database','10128','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 13:04:31',NULL,NULL),('vn-database','10129','00-firstScript.sql','jenkins@10.0.2.69','2022-05-03 08:21:01',NULL,NULL),('vn-database','10132','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10133','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 14:32:30',NULL,NULL),('vn-database','10134','00-firstScript.sql','jenkins@10.0.2.69','2022-05-06 07:45:25',NULL,NULL),('vn-database','10135','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10136','00-workerTimeControl.sql','jenkins@10.0.2.69','2022-05-09 13:51:12',NULL,NULL),('vn-database','10138','00-firstScript.sql','jenkins@10.0.2.69','2022-05-10 13:58:05',NULL,NULL),('vn-database','10139','00-firstScript.sql','jenkins@10.0.2.68','2022-05-16 14:32:37',NULL,NULL),('vn-database','10139','01-secondScript.sql','jenkins@10.0.2.68','2022-05-17 12:16:13',NULL,NULL),('vn-database','10141','00-firstScript.sql','jenkins@10.0.2.70','2022-05-12 08:27:31',NULL,NULL),('vn-database','10142','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10143','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10144','00-AfegirFKPArt1.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10147','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10149','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10150','00-firstScript.sql','jenkins@10.0.2.68','2022-05-17 09:57:16',NULL,NULL),('vn-database','10152','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10153','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10154','00-compressionKk.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10157','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:35',NULL,NULL),('vn-database','10158','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10160','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:30:50',NULL,NULL),('vn-database','10163','00-firstScript.sql','jenkins@10.0.2.68','2022-05-23 08:17:14',NULL,NULL),('vn-database','10164','00-borrarSectorsDesus.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10165','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10166','00-firstScript.sql','jenkins@10.0.2.68','2022-05-24 16:11:21',NULL,NULL),('vn-database','10167','00-renameVnActiveContrat.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10168','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','00-createTableBankEntityConfig.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','02-addNotNullToBankEntityBic.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10171','00-volumeConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 14:11:11',NULL,NULL),('vn-database','10171','01-itemWeight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10171','02-agencymode.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10172','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10174','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10175','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10177','00-crearTablaSpecialLabels.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10178','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10179','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10183','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10184','00-firstScript.sql','jenkins@10.0.2.68','2022-06-03 08:05:34',NULL,NULL),('vn-database','10185','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 09:07:45',NULL,NULL),('vn-database','10186','00-desactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:31:23',NULL,NULL),('vn-database','10186','01-alter_Table_buy.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','02-alter_table_entryConfig.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','04-regularizar_Sticker_Inventario.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10186','09-reactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10187','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 12:37:31',NULL,NULL),('vn-database','10188','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 14:03:36',NULL,NULL),('vn-database','10189','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10191','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10193','00-delete.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:35',NULL,NULL),('vn-database','10193','01-botanicExport.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:43',NULL,NULL),('vn-database','10193','02-item.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-autonomy.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-turn.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','04-country.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10194','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10195','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10200','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10201','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10202','00-Remove_FK_to_ediGenus.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10203','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10204','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10205','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:21',NULL,NULL),('vn-database','10207','00-Alter_table_entry.sql','jenkins@10.0.2.69','2022-06-16 07:22:50',NULL,NULL),('vn-database','10207','01-Update_invoiceAmount.sql','jenkins@10.0.2.69','2022-06-16 07:23:00',NULL,NULL),('vn-database','10208','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10209','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 08:47:40',NULL,NULL),('vn-database','10211','01-firstScript.sql','jenkins@10.0.2.69','2022-06-17 07:11:27',NULL,NULL),('vn-database','10215','00-renameIsInventory.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10216','00-firstScript.sql','jenkins@10.0.2.69','2022-06-23 11:15:28',NULL,NULL),('vn-database','10216','01-batchIndex.sql','jenkins@10.0.2.70','2022-06-27 18:10:55',NULL,NULL),('vn-database','10219','00-AddCollectionFkOnPackingSite.sql','jenkins@10.0.2.70','2022-06-29 09:23:42',NULL,NULL),('vn-database','10219','01-AddFkToCollectionFk.sql','jenkins@10.0.2.70','2022-06-29 09:23:43',NULL,NULL),('vn-database','10220','00-createPersonalProtectionEquipment.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10222','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:12:40',NULL,NULL),('vn-database','10223','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:52',NULL,NULL),('vn-database','10224','00-cosetes.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-21 12:03:45',NULL,NULL),('vn-database','10229','00-firstScript.sql','jenkins@10.0.2.69','2022-07-01 11:59:34',NULL,NULL),('vn-database','10231','01-tablaEktConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:25:39',NULL,NULL),('vn-database','10233','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10235','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10236','00-firstScript.sql','jenkins@10.0.2.69','2022-07-05 12:11:40',NULL,NULL),('vn-database','10237','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10238','00-worker_mobileExtension.sql','jenkins@10.0.2.69','2022-07-14 09:14:09',NULL,NULL),('vn-database','10239','00-firstScript.sql','jenkins@10.0.2.69','2022-07-07 21:51:58',NULL,NULL),('vn-database','10241','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-29 08:14:01',NULL,NULL),('vn-database','10242','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10243','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10245','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10247','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10248','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-20 17:27:51',NULL,NULL),('vn-database','10250','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:40',NULL,NULL),('vn-database','10253','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:57',NULL,NULL),('vn-database','10254','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10256','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10258','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10259','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-02 08:54:56',NULL,NULL),('vn-database','10261','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-22 08:42:20',NULL,NULL),('vn-database','10262','00-createTablepackagingWithFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','01-alterTablePackagingConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','02-insertsInicials.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','03-createTablepackingWithoutFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10263','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10265','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10267','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10267','01-fixMerge.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10275','00-improvedGeneralLog.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 09:55:56',NULL,NULL),('vn-database','10277','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10278','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 17:51:41',NULL,NULL),('vn-database','10279','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10281','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10282','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10283','00-alterTable.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10284','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-04 16:59:08',NULL,NULL),('vn-database','10285','00-firstScript.sql','jenkins@swarm-worker3.static.verdnatura.es','2022-08-05 09:19:33',NULL,NULL),('vn-database','10287','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10288','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10289','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:36',NULL,NULL),('vn-database','10291','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-10 14:19:34',NULL,NULL),('vn-database','10293','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10297','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-16 12:43:36',NULL,NULL),('vn-database','10298','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-13 21:04:13',NULL,NULL),('vn-database','10299','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','00-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','01-drop.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','02-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','00-CreateTableEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','01-insertDataEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','02-alterTableEntry.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:22',NULL,NULL),('vn-database','10303','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:23',NULL,NULL),('vn-database','10304','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:48',NULL,NULL),('vn-database','10304','01-altertableticket.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:51',NULL,NULL),('vn-database','10305','00-ektAssign.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:24:52',NULL,NULL),('vn-database','10306','00-deliveryInformation.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:25',NULL,NULL),('vn-database','10307','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:26',NULL,NULL),('vn-database','10308','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:26:43',NULL,NULL),('vn-database','10309','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:54',NULL,NULL),('vn-database','10310','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10311','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:55',NULL,NULL),('vn-database','10312','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10313','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:27:21',NULL,NULL),('vn-database','10314','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:19',NULL,NULL),('vn-database','10315','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10317','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10318','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10319','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:41',NULL,NULL),('vn-database','10320','00-operator.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','01-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','02-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10321','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 11:11:12',NULL,NULL),('vn-database','10322','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-09 09:19:05',NULL,NULL),('vn-database','10326','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10328','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10329','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10330','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10332','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','00-collectionHotbed.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','01-saleGroupDetail.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10335','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10336','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10337','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10339','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-19 09:41:19',NULL,NULL),('vn-database','10340','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10341','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10342','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10343','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:35:30',NULL,NULL),('vn-database','10345','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10347','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10347','01-addVirtualField.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10349','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10350','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-30 10:11:56',NULL,NULL),('vn-database','10352','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10353','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10354','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10356','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','01-orderConfigFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','02-orderConfigDrop.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10357','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10359','00-improvedGeneralLog_collate.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10360','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10361','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 11:16:07',NULL,NULL),('vn-database','10362','00-dropUdfs.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-10 11:01:15',NULL,NULL),('vn-database','10363','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10365','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-13 19:30:46',NULL,NULL),('vn-database','10368','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10369','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-14 13:38:06',NULL,NULL),('vn-database','10370','00-deleteForeignKey.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:41',NULL,NULL),('vn-database','10370','01-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:47',NULL,NULL),('vn-database','10370','02-deleteTable.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','03-accion.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','04-inter.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10371','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10372','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10373','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-19 08:31:58',NULL,NULL),('vn-database','10378','00-rename_routeUserPercentage.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10379','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:16',NULL,NULL),('vn-database','10382','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10383','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10384','00-business_workcenterFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10385','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10386','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10387','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-16 14:05:33',NULL,NULL),('vn-database','10388','00-resizeUtilVerionLogCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10388','01-resizeUtilVersionCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10390','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:16',NULL,NULL),('vn-database','10391','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10394','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:24',NULL,NULL),('vn-database','10395','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10396','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 15:36:38',NULL,NULL),('vn-database','10397','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10399','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10400','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10402','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-21 14:11:31',NULL,NULL),('vn-database','10404','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10405','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:22',NULL,NULL),('vn-database','10407','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10408','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10409','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10412','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-30 12:45:44',NULL,NULL),('vn-database','10413','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10416','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10420','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:25',NULL,NULL),('vn-database','10421','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:26',NULL,NULL),('vn-database','10426','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:40',NULL,NULL),('vn-database','10428','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10431','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:22',NULL,NULL),('vn-database','10433','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10434','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10435','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-13 07:30:10',NULL,NULL),('vn-database','10436','00-createFkWorker.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:59',NULL,NULL),('vn-database','10436','01-addStateToWorkerProductivity.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','02-DeprecateVnSaleTrackingState.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','03-DeprecateColumnVnSaleTrackingActionFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','04-DropSchemaVnControl.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','05-RemoveFkWorkerProductivity.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-17 14:51:19',NULL,NULL),('vn-database','10439','00-fixRole.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:26',NULL,NULL),('vn-database','10440','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10444','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10445','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10448','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10450','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-27 08:28:04',NULL,NULL),('vn-database','10451','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-06 08:08:32',NULL,NULL),('vn-database','10452','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10453','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 14:04:37',NULL,NULL),('vn-database','10454','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10455','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10456','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:30',NULL,NULL),('vn-database','10457','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:33',NULL,NULL),('vn-database','10458','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10459','00-alterTableUtilConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','01-createFunctionCurdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','02-createFunctionMockTime.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','03-createFunctionMockTimeBase.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','04-createFunctionNow.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10460','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10461','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10463','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-03 12:59:26',NULL,NULL),('vn-database','10468','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10469','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10470','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10471','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10472','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10477','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:31',NULL,NULL),('vn-database','10478','00-dropBasket.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','01-orderConfigured.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:16',NULL,NULL),('vn-database','10478','02-configuredUpdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10478','99-privileges.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10480','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 15:09:26',NULL,NULL),('vn-database','10481','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 16:37:22',NULL,NULL),('vn-database','10482','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-21 10:00:28',NULL,NULL),('vn-database','10485','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10488','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10491','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10492','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10493','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10495','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:19',NULL,NULL),('vn-database','10498','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:38',NULL,NULL),('vn-database','10500','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 07:06:03',NULL,NULL),('vn-database','10501','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 10:52:24',NULL,NULL),('vn-database','10502','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10504','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10506','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10506','01-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','02-secondScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','03-thirdScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10507','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:35:23',NULL,NULL),('vn-database','10508','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:43',NULL,NULL),('vn-database','10510','00-dropBusinessFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','01-createTableProfessionalCategory.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','02-exportToNewTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','03-RecreateFK.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10510','04-kkPostgresqlTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10511','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10512','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:52',NULL,NULL),('vn-database','10513','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:56',NULL,NULL),('vn-database','10514','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10516','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10521','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 06:58:13',NULL,NULL),('vn-database','10522','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10523','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10524','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10524','01-rateEditorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10525','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 12:42:50',NULL,NULL),('vn-database','10526','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:57',NULL,NULL),('vn-database','10528','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:00',NULL,NULL),('vn-database','10530','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-23 14:49:30',NULL,NULL),('vn-database','10531','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:47:10',NULL,NULL),('vn-database','10532','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:17:38',NULL,NULL),('vn-database','10533','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:04',NULL,NULL),('vn-database','10537','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-29 15:18:36',NULL,NULL),('vn-database','10538','00-createChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','01-createChronopostService.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','02-createChronopostExpedition.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','03-createChronopostSenderAddress.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','04-addgrantPrivilegies.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','05-updateChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 11:54:57',NULL,NULL),('vn-database','10539','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:07',NULL,NULL),('vn-database','10540','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10545','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-11 08:31:03',NULL,NULL),('vn-database','10546','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10547','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:21:58',NULL,NULL),('vn-database','10549','00-updateUpdateLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:29:22',NULL,NULL),('vn-database','10549','01-updateInsertLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:11',NULL,NULL),('vn-database','10549','02-updateDeleteLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:51',NULL,NULL),('vn-database','10549','03-deleteEmptyLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:31:34',NULL,NULL),('vn-database','10549','04-optimizeLogTables.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:33:58',NULL,NULL),('vn-database','10550','00-editorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:42:33',NULL,NULL),('vn-database','10550','01-originFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10552','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-13 08:25:10',NULL,NULL),('vn-database','10554','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10557','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-17 07:45:56',NULL,NULL),('vn-database','10559','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-18 10:53:50',NULL,NULL),('vn-database','10560','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-17 09:19:31',NULL,NULL),('vn-database','10562','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10563','00-delivery_ticketFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 09:30:53',NULL,NULL),('vn-database','10566','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:08:41',NULL,NULL),('vn-database','10567','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:18:06',NULL,NULL),('vn-database','10568','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10569','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-24 09:14:35',NULL,NULL),('vn-database','10570','00-createSendingConfig.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','01-createSendingServiceWeekday.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','02-createSendingService.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','03-permisos.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10571','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10573','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:23',NULL,NULL),('vn-database','10575','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-26 11:27:32',NULL,NULL),('vn-database','10577','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-27 14:00:12',NULL,NULL),('vn-database','10578','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10579','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-28 11:27:36',NULL,NULL),('vn-database','10580','00-itemTypeDropConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:18:52',NULL,NULL),('vn-database','10580','01-itemTypeAddConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:19:10',NULL,NULL),('vn-database','10581','00-itemTypeAutoIncrement.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 19:06:46',NULL,NULL),('vn-database','10582','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10583','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10584','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10585','00-ticketLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:20:10',NULL,NULL),('vn-database','10585','01-entryLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:21:12',NULL,NULL),('vn-database','10585','02-claimLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:36',NULL,NULL),('vn-database','10585','03-clientLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:54',NULL,NULL),('vn-database','10585','04-invoiceInLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:55',NULL,NULL),('vn-database','10585','05-itemLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:29:46',NULL,NULL),('vn-database','10585','06-routeLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:18',NULL,NULL),('vn-database','10585','07-shelvingLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','08-supplierLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','09-travelLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:41',NULL,NULL),('vn-database','10585','10-workerLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:42',NULL,NULL),('vn-database','10585','11-zoneLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:43',NULL,NULL),('vn-database','10585','12-userLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10585','13-roleLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10587','00-arcRead_addMinimum.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-16 13:13:15',NULL,NULL),('vn-database','10593','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10596','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10597','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10598','00-workerLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','01-supplierLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','02-workerTimeControlLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','03-workerClockLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10599','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10601','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-17 09:26:26',NULL,NULL),('vn-database','10602','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 08:52:15',NULL,NULL),('vn-database','10606','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 09:26:00',NULL,NULL),('vn-database','10608','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 12:36:31',NULL,NULL),('vn-database','10609','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 08:28:07',NULL,NULL),('vn-database','10610','00-updateCompanyId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:07',NULL,NULL),('vn-database','10610','01-updateSupplierId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:39',NULL,NULL),('vn-database','10610','02-invoiceOutCompany.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 09:49:55',NULL,NULL),('vn-database','10611','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-19 14:39:41',NULL,NULL),('vn-database','10613','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10614','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10615','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10616','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10616','01-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10617','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:41',NULL,NULL),('vn-database','10618','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 12:55:56',NULL,NULL),('vn-database','10619','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10620','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:20:53',NULL,NULL),('vn-database','10624','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-30 19:01:10',NULL,NULL),('vn-database','10625','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10626','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 13:32:32',NULL,NULL),('vn-database','10628','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10630','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-02 13:30:58',NULL,NULL),('vn-database','10631','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-05 08:37:25',NULL,NULL),('vn-database','10632','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10633','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10634','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-06 12:15:55',NULL,NULL),('vn-database','10637','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:19',NULL,NULL),('vn-database','10640','00-companyFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','01-companyFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','02-companyFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:47:04',NULL,NULL),('vn-database','10640','04-supplierFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:48:30',NULL,NULL),('vn-database','10640','05-supplierFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:53:17',NULL,NULL),('vn-database','10640','06-supplierFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 15:06:00',NULL,NULL),('vn-database','10642','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10643','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-09 15:04:35',NULL,NULL),('vn-database','10644','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:18',NULL,NULL),('vn-database','10645','00-addNewFields.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:11',NULL,NULL),('vn-database','10645','01-updateCollectionWagonPrimaryKey.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:11',NULL,NULL),('vn-database','10645','02-updateWagonPrimaryKey.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10645','03-addFieldToPackingSite.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10647','00-renombrarTabla.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10648','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10649','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-16 10:59:06',NULL,NULL),('vn-database','10651','00-comparativeCountryFk.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:16',NULL,NULL),('vn-database','10651','01-comparativeAddConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:16',NULL,NULL),('vn-database','10651','02-nightTaskAddNewTask.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:16',NULL,NULL),('vn-database','10652','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10653','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:20',NULL,NULL),('vn-database','10655','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:24',NULL,NULL),('vn-database','10656','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10657','00-renameErrorProduction.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','01-changeNightTask.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','02-addCodeToClaimResponsible.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10657','03-grantSelectGrafana.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10658','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:27',NULL,NULL),('vn-database','10659','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10661','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:27:50',NULL,NULL),('vn-database','10662','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:33',NULL,NULL),('vn-database','10663','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10665','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-30 08:52:51',NULL,NULL),('vn-database','10666','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10667','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10668','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10671','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-25 14:56:50',NULL,NULL),('vn-database','10675','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10676','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10677','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:22',NULL,NULL),('vn-database','10678','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10679','00-tables.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10680','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-18 14:58:36',NULL,NULL),('vn-database','10682','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10683','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10684','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10685','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-05 09:53:55',NULL,NULL),('vn-database','10690','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-27 10:52:26',NULL,NULL),('vn-database','10691','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-31 13:37:21',NULL,NULL),('vn-database','10692','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10693','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10694','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 09:50:53',NULL,NULL),('vn-database','10695','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 13:40:16',NULL,NULL),('vn-database','10696','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 16:54:57',NULL,NULL),('vn-database','10698','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-03 08:53:12',NULL,NULL),('vn-database','10699','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 15:24:30',NULL,NULL),('vn-database','10700','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:11',NULL,NULL),('vn-database','10701','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:12',NULL,NULL),('vn-database','10702','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 12:50:46',NULL,NULL),('vn-database','10704','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:14',NULL,NULL),('vn-database','10705','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-16 14:16:05',NULL,NULL),('vn-database','10707','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-21 12:31:18',NULL,NULL),('vn-database','10708','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:13',NULL,NULL),('vn-database','10712','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-07 10:43:13',NULL,NULL),('vn-database','10714','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-28 13:01:45',NULL,NULL),('vn-database','10716','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:27:50',NULL,NULL),('vn-database','10717','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:28:54',NULL,NULL),('vn-database','10718','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10719','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-01 12:53:30',NULL,NULL),('vn-database','10720','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:22',NULL,NULL),('vn-database','10721','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10725','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-09-12 14:15:14',NULL,NULL),('vn-database','10726','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 15:32:20',NULL,NULL),('vn-database','10727','00-addPrinterField.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','01-createTableScreenModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','02-createTableScreen.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','03-createTableScreenModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','04-createTableScanner.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','05-createTablePackingSiteDeviceLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','06-alterTablePrinterModel.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:29',NULL,NULL),('vn-database','10727','07-AddFieldsToPackingSite.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-21 09:42:30',NULL,NULL),('vn-database','10730','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-15 11:42:48',NULL,NULL),('vn-database','10733','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-05 09:54:00',NULL,NULL),('vn-database','10736','00-workerBossNull.sql','jenkins@db-proxy1.static.verdnatura.es','2023-09-22 00:02:05',NULL,NULL),('vn-database','10739','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-10 10:19:07',NULL,NULL),('vn-database','10740','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:26',NULL,NULL),('vn-database','10741','01-refactorCplusTrascendency472.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','02-refactorCplusTrascendency477.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','03-refactorCplusInvoiceType477.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','04-refactorCplusInvoiceType472.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10741','05-fixes.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:27',NULL,NULL),('vn-database','10744','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-13 09:23:19',NULL,NULL),('vn-database','10746','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-16 18:22:46',NULL,NULL),('vn-database','10747','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:32',NULL,NULL),('vn-database','10748','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:32',NULL,NULL),('vn-database','10748','01-SecondScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10749','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-22 16:08:17',NULL,NULL),('vn-database','10750','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-23 13:04:17',NULL,NULL),('vn-database','10750','00-ticket_addGrants.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10751','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10752','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-10-24 14:07:54',NULL,NULL),('vn-database','10753','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-10-24 14:37:21',NULL,NULL),('vn-database','10754','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:34',NULL,NULL),('vn-database','10755','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-02 09:13:35',NULL,NULL),('vn-database','10756','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-03 07:14:38',NULL,NULL),('vn-database','10757','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:30:57',NULL,NULL),('vn-database','10758','00-sectorType.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:18',NULL,NULL),('vn-database','10758','01-dipole.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:17:18',NULL,NULL),('vn-database','10761','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-16 09:30:58',NULL,NULL),('vn-database','10764','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-04 12:07:59',NULL,NULL),('vn-database','10768','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:37',NULL,NULL),('vn-database','10771','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:37',NULL,NULL),('vn-database','10773','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:38',NULL,NULL),('vn-database','10775','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:18:16',NULL,NULL),('vn-database','10778','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-11-30 13:11:38',NULL,NULL),('vn-database','10782','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:18:16',NULL,NULL),('vn-database','10783','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-11-24 14:49:17',NULL,NULL),('vn-database','10785','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:33:38',NULL,NULL),('vn-database','10785','02-invoiceIn.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:33:38',NULL,NULL),('vn-database','10785','02-invoiceInTax.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:33:39',NULL,NULL),('vn-database','10785','02-item.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:33:39',NULL,NULL),('vn-database','10789','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-14 12:33:39',NULL,NULL),('vn-database','10792','00-buy.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:20:15',NULL,NULL),('vn-database','10798','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:21:14',NULL,NULL),('vn-database','10799','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-12-26 12:00:59',NULL,NULL),('vn-database','10800','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2024-01-03 10:21:16',NULL,NULL),('vn-database','10801','00-firstScript.sql','jenkins@test-db-proxy1.servers.dc.verdnatura.es','2024-01-11 05:53:13',NULL,NULL),('vn-database','10806','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2024-01-03 11:56:05',NULL,NULL),('vn-database','10810','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2024-01-04 14:29:30',NULL,NULL),('vn-database','10815','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2024-01-09 18:11:57',NULL,NULL),('vn-database','10827','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-23 12:32:13',NULL,NULL);
 /*!40000 ALTER TABLE `versionLog` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -54,13 +54,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:25
 USE `account`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: account
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -78,7 +78,7 @@ USE `account`;
 
 LOCK TABLES `role` WRITE;
 /*!40000 ALTER TABLE `role` DISABLE KEYS */;
-INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2023-06-08 16:47:57',NULL),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2023-06-02 20:33:28',NULL),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35',NULL),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30',NULL),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10',NULL),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27',NULL),(20,'manager','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15',NULL),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52',NULL),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12',NULL),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36',NULL),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27',NULL),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20',NULL),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34',NULL),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53',NULL),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42',NULL),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08',NULL),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53',NULL),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09',NULL),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41',NULL),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12',NULL),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26',NULL),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59',NULL),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16',NULL),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12',NULL),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23',NULL),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18',NULL),(48,'coolerBoss','Jefe de cámara',1,'2018-02-23 13:12:01','2023-03-13 08:49:43',NULL),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35',NULL),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12',NULL),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39',NULL),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57',NULL),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57',NULL),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17',NULL),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31',NULL),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02',NULL),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19',NULL),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45',NULL),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10',NULL),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01',NULL),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07',NULL),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05',NULL),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08',NULL),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26',NULL),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56',NULL),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23',NULL),(69,'coolerAssist','Asistente de cámara con permiso compras',1,'2020-02-05 12:36:09','2023-03-13 08:50:07',NULL),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25',NULL),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07',NULL),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46',NULL),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27',NULL),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41',NULL),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07',NULL),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17',NULL),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37',NULL),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22',NULL),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49',NULL),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09',NULL),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16',NULL),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10',NULL),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51',NULL),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56',NULL),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30',NULL),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55',NULL),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35',NULL),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-05-17 11:07:21',NULL),(115,'itManagement','TI management',1,'2023-03-29 07:27:55','2023-03-29 07:28:04',NULL),(119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 11:51:54','2023-06-07 11:51:54',NULL),(120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 07:07:21','2023-06-19 07:07:21',21709),(121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 14:48:19','2023-06-23 14:48:19',NULL),(122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 07:21:15','2023-06-26 07:21:15',NULL),(123,'deliveryAssistant','Jefe auxiliar repartos',1,'2023-10-05 06:47:48','2023-10-05 06:47:48',10578),(124,'hrBuyer','Recursos Humanos con Buyer',1,'2023-10-23 11:50:43','2023-10-23 11:50:43',NULL),(125,'claimViewer','Trabajadores que consulta las reclamaciones ',1,'2023-11-16 08:14:46','2023-11-16 08:14:46',10578),(126,'greenhouseBoss','Jefe de invernadero',1,'2023-11-16 13:32:13','2023-11-16 13:32:13',NULL);
+INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2023-06-08 16:47:57',NULL),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2023-06-02 20:33:28',NULL),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35',NULL),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30',NULL),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10',NULL),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27',NULL),(20,'manager','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15',NULL),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52',NULL),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12',NULL),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36',NULL),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27',NULL),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20',NULL),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34',NULL),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53',NULL),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42',NULL),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08',NULL),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53',NULL),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09',NULL),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41',NULL),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12',NULL),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26',NULL),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59',NULL),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16',NULL),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12',NULL),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23',NULL),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18',NULL),(48,'coolerBoss','Jefe de cámara',1,'2018-02-23 13:12:01','2023-03-13 08:49:43',NULL),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35',NULL),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12',NULL),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39',NULL),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57',NULL),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57',NULL),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17',NULL),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31',NULL),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02',NULL),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19',NULL),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45',NULL),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10',NULL),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01',NULL),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07',NULL),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05',NULL),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08',NULL),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26',NULL),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56',NULL),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23',NULL),(69,'coolerAssist','Asistente de cámara con permiso compras',1,'2020-02-05 12:36:09','2023-03-13 08:50:07',NULL),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25',NULL),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07',NULL),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46',NULL),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27',NULL),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41',NULL),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07',NULL),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17',NULL),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37',NULL),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22',NULL),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49',NULL),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09',NULL),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16',NULL),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10',NULL),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51',NULL),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56',NULL),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30',NULL),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55',NULL),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35',NULL),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-05-17 11:07:21',NULL),(115,'itManagement','TI management',1,'2023-03-29 07:27:55','2023-03-29 07:28:04',NULL),(119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 11:51:54','2023-06-07 11:51:54',NULL),(120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 07:07:21','2023-06-19 07:07:21',21709),(121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 14:48:19','2023-06-23 14:48:19',NULL),(122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 07:21:15','2023-06-26 07:21:15',NULL),(123,'deliveryAssistant','Jefe auxiliar repartos',1,'2023-10-05 06:47:48','2023-10-05 06:47:48',10578),(124,'hrBuyer','Recursos Humanos con Buyer',1,'2023-10-23 11:50:43','2023-10-23 11:50:43',NULL),(125,'claimViewer','Trabajadores que consulta las reclamaciones ',1,'2023-11-16 08:14:46','2023-11-16 08:14:46',10578),(126,'greenhouseBoss','Jefe de invernadero',1,'2023-11-16 13:32:13','2023-11-16 13:32:13',NULL),(127,'timeControl','Tablet para fichar',1,'2024-01-09 15:36:56','2024-01-09 15:36:56',NULL);
 /*!40000 ALTER TABLE `role` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -88,7 +88,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleInherit` WRITE;
 /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */;
-INSERT INTO `roleInherit` VALUES (1,1,2,NULL),(2,1,3,NULL),(3,1,70,NULL),(4,2,11,NULL),(5,3,11,NULL),(6,5,1,NULL),(8,5,33,NULL),(10,11,6,NULL),(11,13,1,NULL),(12,15,35,NULL),(16,17,20,NULL),(17,17,37,NULL),(18,17,39,NULL),(19,17,64,NULL),(20,18,1,NULL),(21,19,21,NULL),(22,20,13,NULL),(23,20,16,NULL),(24,20,65,NULL),(25,21,13,NULL),(26,21,18,NULL),(27,21,53,NULL),(28,22,13,NULL),(29,22,21,NULL),(30,30,5,NULL),(31,30,20,NULL),(32,30,22,NULL),(33,30,53,NULL),(34,30,64,NULL),(35,31,1,NULL),(36,32,1,NULL),(37,34,1,NULL),(38,34,13,NULL),(39,34,33,NULL),(40,35,1,NULL),(41,36,44,NULL),(42,36,47,NULL),(43,37,1,NULL),(44,38,37,NULL),(45,38,64,NULL),(46,39,5,NULL),(47,39,21,NULL),(48,39,57,NULL),(49,40,1,NULL),(50,40,49,NULL),(51,41,13,NULL),(52,41,35,NULL),(53,41,40,NULL),(54,42,35,NULL),(55,42,49,NULL),(56,43,13,NULL),(57,43,42,NULL),(58,44,1,NULL),(59,45,13,NULL),(60,45,44,NULL),(61,47,1,NULL),(62,48,13,NULL),(63,48,47,NULL),(64,49,36,NULL),(65,49,58,NULL),(66,50,13,NULL),(67,50,21,NULL),(70,50,57,NULL),(72,51,1,NULL),(73,52,13,NULL),(74,52,19,NULL),(76,52,51,NULL),(77,53,1,NULL),(78,54,1,NULL),(79,55,13,NULL),(80,55,54,NULL),(81,56,1,NULL),(84,58,1,NULL),(85,59,13,NULL),(87,60,5,NULL),(91,61,13,NULL),(92,61,36,NULL),(94,65,35,NULL),(97,67,5,NULL),(98,67,37,NULL),(99,69,35,NULL),(101,70,11,NULL),(102,71,1,NULL),(103,71,58,NULL),(105,72,18,NULL),(106,73,5,NULL),(107,73,64,NULL),(108,73,19,NULL),(109,59,50,NULL),(115,39,76,NULL),(117,65,76,NULL),(118,30,76,NULL),(124,5,76,NULL),(125,37,76,NULL),(126,38,76,NULL),(128,42,76,NULL),(129,35,76,NULL),(130,60,76,NULL),(131,21,76,NULL),(132,18,76,NULL),(133,50,76,NULL),(134,20,76,NULL),(135,41,76,NULL),(136,17,76,NULL),(137,52,76,NULL),(139,37,74,NULL),(140,51,74,NULL),(141,51,75,NULL),(142,35,75,NULL),(143,15,49,NULL),(145,17,67,NULL),(146,38,13,NULL),(147,101,35,NULL),(148,101,13,NULL),(150,15,56,NULL),(152,69,47,NULL),(153,48,35,NULL),(154,102,1,NULL),(167,9,103,NULL),(168,66,9,NULL),(169,104,100,NULL),(172,103,76,NULL),(173,103,1,NULL),(174,103,44,NULL),(175,103,45,NULL),(176,103,11,NULL),(177,103,39,NULL),(178,103,17,NULL),(179,103,5,NULL),(180,103,67,NULL),(181,103,3,NULL),(182,103,34,NULL),(183,103,42,NULL),(184,103,43,NULL),(185,103,64,NULL),(186,103,35,NULL),(187,103,101,NULL),(188,103,75,NULL),(189,103,71,NULL),(190,103,72,NULL),(191,103,47,NULL),(192,103,69,NULL),(193,103,48,NULL),(194,103,2,NULL),(195,103,56,NULL),(196,103,57,NULL),(197,103,32,NULL),(198,103,73,NULL),(199,103,30,NULL),(200,103,31,NULL),(201,103,6,NULL),(202,103,40,NULL),(203,103,41,NULL),(204,103,37,NULL),(205,103,38,NULL),(206,103,53,NULL),(207,103,33,NULL),(210,103,54,NULL),(211,103,55,NULL),(212,103,15,NULL),(213,103,16,NULL),(215,103,51,NULL),(216,103,52,NULL),(218,103,65,NULL),(219,103,58,NULL),(220,103,59,NULL),(221,103,102,NULL),(222,103,49,NULL),(223,103,60,NULL),(224,103,50,NULL),(225,103,36,NULL),(226,103,61,NULL),(228,103,21,NULL),(229,103,19,NULL),(230,103,18,NULL),(231,103,13,NULL),(232,103,22,NULL),(233,103,70,NULL),(234,103,74,NULL),(237,66,103,NULL),(238,103,20,NULL),(239,106,11,NULL),(240,107,60,NULL),(241,21,72,NULL),(242,20,9,NULL),(246,102,35,NULL),(247,108,1,NULL),(248,102,13,NULL),(249,109,18,NULL),(250,109,13,NULL),(251,51,21,NULL),(253,48,49,NULL),(254,110,1,NULL),(255,110,76,NULL),(256,48,69,NULL),(257,47,111,NULL),(258,43,111,NULL),(259,72,111,NULL),(260,35,111,NULL),(261,5,111,NULL),(262,112,1,NULL),(263,114,112,NULL),(264,51,35,NULL),(265,72,49,NULL),(266,101,18,NULL),(268,65,57,NULL),(269,65,59,NULL),(270,65,49,NULL),(271,65,18,NULL),(272,65,13,NULL),(273,60,35,NULL),(275,50,59,NULL),(276,60,49,NULL),(280,5,53,NULL),(281,5,18,NULL),(282,50,60,NULL),(283,5,21,NULL),(285,58,76,NULL),(287,69,58,NULL),(288,115,66,NULL),(290,104,115,NULL),(291,115,103,NULL),(297,21,33,NULL),(298,49,54,NULL),(299,112,49,NULL),(300,114,13,NULL),(302,5,35,NULL),(303,69,49,NULL),(306,119,110,NULL),(307,1,76,NULL),(309,120,9,NULL),(310,120,66,NULL),(311,120,13,25508),(312,115,120,NULL),(314,43,18,NULL),(315,121,35,NULL),(316,121,21,NULL),(317,122,15,NULL),(318,16,122,NULL),(319,37,49,NULL),(320,37,18,NULL),(328,57,123,10578),(329,123,33,NULL),(330,123,56,NULL),(332,103,112,NULL),(333,57,13,NULL),(334,60,123,NULL),(335,124,37,NULL),(336,124,35,NULL),(337,103,124,NULL),(338,35,125,10578),(339,57,125,10578),(340,41,125,10578),(341,18,125,10578),(346,126,15,NULL),(347,102,49,NULL);
+INSERT INTO `roleInherit` VALUES (1,1,2,NULL),(2,1,3,NULL),(3,1,70,NULL),(4,2,11,NULL),(5,3,11,NULL),(6,5,1,NULL),(8,5,33,NULL),(10,11,6,NULL),(11,13,1,NULL),(12,15,35,NULL),(16,17,20,NULL),(17,17,37,NULL),(18,17,39,NULL),(19,17,64,NULL),(20,18,1,NULL),(21,19,21,NULL),(22,20,13,NULL),(23,20,16,NULL),(24,20,65,NULL),(25,21,13,NULL),(26,21,18,NULL),(27,21,53,NULL),(28,22,13,NULL),(29,22,21,NULL),(30,30,5,NULL),(31,30,20,NULL),(32,30,22,NULL),(33,30,53,NULL),(34,30,64,NULL),(35,31,1,NULL),(36,32,1,NULL),(37,34,1,NULL),(38,34,13,NULL),(39,34,33,NULL),(40,35,1,NULL),(42,36,47,NULL),(43,37,1,NULL),(44,38,37,NULL),(45,38,64,NULL),(46,39,5,NULL),(47,39,21,NULL),(48,39,57,NULL),(49,40,1,NULL),(50,40,49,NULL),(51,41,13,NULL),(52,41,35,NULL),(53,41,40,NULL),(54,42,35,NULL),(55,42,49,NULL),(56,43,13,NULL),(57,43,42,NULL),(58,44,1,NULL),(59,45,13,NULL),(60,45,44,NULL),(61,47,1,NULL),(62,48,13,NULL),(63,48,47,NULL),(64,49,36,NULL),(65,49,58,NULL),(66,50,13,NULL),(67,50,21,NULL),(70,50,57,NULL),(72,51,1,NULL),(73,52,13,NULL),(74,52,19,NULL),(76,52,51,NULL),(77,53,1,NULL),(78,54,1,NULL),(79,55,13,NULL),(80,55,54,NULL),(81,56,1,NULL),(84,58,1,NULL),(85,59,13,NULL),(87,60,5,NULL),(91,61,13,NULL),(92,61,36,NULL),(94,65,35,NULL),(97,67,5,NULL),(98,67,37,NULL),(99,69,35,NULL),(101,70,11,NULL),(102,71,1,NULL),(103,71,58,NULL),(105,72,18,NULL),(106,73,5,NULL),(107,73,64,NULL),(108,73,19,NULL),(109,59,50,NULL),(115,39,76,NULL),(117,65,76,NULL),(118,30,76,NULL),(124,5,76,NULL),(125,37,76,NULL),(126,38,76,NULL),(128,42,76,NULL),(129,35,76,NULL),(130,60,76,NULL),(131,21,76,NULL),(132,18,76,NULL),(133,50,76,NULL),(134,20,76,NULL),(135,41,76,NULL),(136,17,76,NULL),(137,52,76,NULL),(139,37,74,NULL),(140,51,74,NULL),(141,51,75,NULL),(142,35,75,NULL),(143,15,49,NULL),(145,17,67,NULL),(146,38,13,NULL),(147,101,35,NULL),(148,101,13,NULL),(150,15,56,NULL),(152,69,47,NULL),(153,48,35,NULL),(154,102,1,NULL),(167,9,103,NULL),(168,66,9,NULL),(169,104,100,NULL),(172,103,76,NULL),(173,103,1,NULL),(174,103,44,NULL),(175,103,45,NULL),(176,103,11,NULL),(177,103,39,NULL),(178,103,17,NULL),(179,103,5,NULL),(180,103,67,NULL),(181,103,3,NULL),(182,103,34,NULL),(183,103,42,NULL),(184,103,43,NULL),(185,103,64,NULL),(186,103,35,NULL),(187,103,101,NULL),(188,103,75,NULL),(189,103,71,NULL),(190,103,72,NULL),(191,103,47,NULL),(192,103,69,NULL),(193,103,48,NULL),(194,103,2,NULL),(195,103,56,NULL),(196,103,57,NULL),(197,103,32,NULL),(198,103,73,NULL),(199,103,30,NULL),(200,103,31,NULL),(201,103,6,NULL),(202,103,40,NULL),(203,103,41,NULL),(204,103,37,NULL),(205,103,38,NULL),(206,103,53,NULL),(207,103,33,NULL),(210,103,54,NULL),(211,103,55,NULL),(212,103,15,NULL),(213,103,16,NULL),(215,103,51,NULL),(216,103,52,NULL),(218,103,65,NULL),(219,103,58,NULL),(220,103,59,NULL),(221,103,102,NULL),(222,103,49,NULL),(223,103,60,NULL),(224,103,50,NULL),(225,103,36,NULL),(226,103,61,NULL),(228,103,21,NULL),(229,103,19,NULL),(230,103,18,NULL),(231,103,13,NULL),(232,103,22,NULL),(233,103,70,NULL),(234,103,74,NULL),(237,66,103,NULL),(238,103,20,NULL),(239,106,11,NULL),(240,107,60,NULL),(241,21,72,NULL),(242,20,9,NULL),(246,102,35,NULL),(247,108,1,NULL),(248,102,13,NULL),(249,109,18,NULL),(250,109,13,NULL),(251,51,21,NULL),(253,48,49,NULL),(254,110,1,NULL),(255,110,76,NULL),(256,48,69,NULL),(257,47,111,NULL),(258,43,111,NULL),(259,72,111,NULL),(260,35,111,NULL),(261,5,111,NULL),(262,112,1,NULL),(263,114,112,NULL),(264,51,35,NULL),(265,72,49,NULL),(266,101,18,NULL),(268,65,57,NULL),(269,65,59,NULL),(270,65,49,NULL),(271,65,18,NULL),(272,65,13,NULL),(273,60,35,NULL),(275,50,59,NULL),(276,60,49,NULL),(280,5,53,NULL),(281,5,18,NULL),(282,50,60,NULL),(283,5,21,NULL),(285,58,76,NULL),(288,115,66,NULL),(290,104,115,NULL),(291,115,103,NULL),(297,21,33,NULL),(298,49,54,NULL),(299,112,49,NULL),(300,114,13,NULL),(302,5,35,NULL),(303,69,49,NULL),(306,119,110,NULL),(307,1,76,NULL),(309,120,9,NULL),(310,120,66,NULL),(311,120,13,25508),(312,115,120,NULL),(314,43,18,NULL),(315,121,35,NULL),(316,121,21,NULL),(317,122,15,NULL),(318,16,122,NULL),(319,37,49,NULL),(320,37,18,NULL),(328,57,123,10578),(329,123,33,NULL),(330,123,56,NULL),(332,103,112,NULL),(333,57,13,NULL),(334,60,123,NULL),(335,124,37,NULL),(336,124,35,NULL),(337,103,124,NULL),(338,35,125,10578),(339,57,125,10578),(340,41,125,10578),(341,18,125,10578),(346,126,15,NULL),(347,102,49,NULL),(350,49,75,NULL),(351,72,35,NULL),(353,110,49,NULL),(354,103,119,NULL),(355,127,11,NULL),(356,123,125,NULL),(357,36,35,NULL),(358,36,49,NULL);
 /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -98,7 +98,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleRole` WRITE;
 /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */;
-INSERT INTO `roleRole` VALUES (326595,1,1),(326596,1,2),(326597,1,3),(326601,1,6),(326600,1,11),(326598,1,70),(326599,1,76),(326602,2,2),(326604,2,6),(326603,2,11),(326605,3,3),(326607,3,6),(326606,3,11),(326609,5,1),(326623,5,2),(326622,5,3),(326608,5,5),(326629,5,6),(326625,5,11),(326619,5,13),(326610,5,18),(326611,5,21),(326612,5,33),(326613,5,35),(326628,5,36),(326631,5,44),(326630,5,47),(326624,5,49),(326614,5,53),(326627,5,54),(326626,5,58),(326621,5,70),(326618,5,72),(326617,5,75),(326615,5,76),(326616,5,111),(326620,5,125),(326632,6,6),(326635,9,1),(326636,9,2),(326637,9,3),(326638,9,5),(326639,9,6),(326633,9,9),(326640,9,11),(326641,9,13),(326642,9,15),(326643,9,16),(326644,9,17),(326645,9,18),(326646,9,19),(326647,9,20),(326648,9,21),(326649,9,22),(326650,9,30),(326651,9,31),(326652,9,32),(326653,9,33),(326654,9,34),(326655,9,35),(326656,9,36),(326657,9,37),(326658,9,38),(326659,9,39),(326660,9,40),(326661,9,41),(326662,9,42),(326663,9,43),(326664,9,44),(326665,9,45),(326666,9,47),(326667,9,48),(326668,9,49),(326669,9,50),(326670,9,51),(326671,9,52),(326672,9,53),(326673,9,54),(326674,9,55),(326675,9,56),(326676,9,57),(326677,9,58),(326678,9,59),(326679,9,60),(326680,9,61),(326681,9,64),(326682,9,65),(326683,9,67),(326684,9,69),(326685,9,70),(326686,9,71),(326687,9,72),(326688,9,73),(326689,9,74),(326690,9,75),(326691,9,76),(326692,9,101),(326693,9,102),(326634,9,103),(326699,9,111),(326694,9,112),(326698,9,122),(326696,9,123),(326695,9,124),(326697,9,125),(326701,11,6),(326700,11,11),(326703,13,1),(326704,13,2),(326705,13,3),(326709,13,6),(326708,13,11),(326702,13,13),(326706,13,70),(326707,13,76),(326716,15,1),(326726,15,2),(326725,15,3),(326728,15,6),(326727,15,11),(326710,15,15),(326711,15,35),(326719,15,36),(326723,15,44),(326722,15,47),(326712,15,49),(326720,15,54),(326713,15,56),(326721,15,58),(326724,15,70),(326715,15,75),(326714,15,76),(326717,15,111),(326718,15,125),(326737,16,1),(326747,16,2),(326746,16,3),(326749,16,6),(326748,16,11),(326731,16,15),(326729,16,16),(326732,16,35),(326740,16,36),(326744,16,44),(326743,16,47),(326733,16,49),(326741,16,54),(326734,16,56),(326742,16,58),(326745,16,70),(326736,16,75),(326735,16,76),(326738,16,111),(326730,16,122),(326739,16,125),(326758,17,1),(326774,17,2),(326773,17,3),(326765,17,5),(326799,17,6),(326762,17,9),(326798,17,11),(326761,17,13),(326797,17,15),(326760,17,16),(326750,17,17),(326757,17,18),(326796,17,19),(326751,17,20),(326766,17,21),(326795,17,22),(326794,17,30),(326793,17,31),(326792,17,32),(326779,17,33),(326791,17,34),(326776,17,35),(326770,17,36),(326752,17,37),(326790,17,38),(326753,17,39),(326789,17,40),(326788,17,41),(326787,17,42),(326786,17,43),(326785,17,44),(326784,17,45),(326800,17,47),(326801,17,48),(326763,17,49),(326802,17,50),(326803,17,51),(326804,17,52),(326780,17,53),(326769,17,54),(326805,17,55),(326806,17,56),(326767,17,57),(326768,17,58),(326775,17,59),(326807,17,60),(326808,17,61),(326754,17,64),(326759,17,65),(326755,17,67),(326809,17,69),(326772,17,70),(326810,17,71),(326782,17,72),(326811,17,73),(326764,17,74),(326812,17,75),(326756,17,76),(326813,17,101),(326814,17,102),(326778,17,103),(326781,17,111),(326815,17,112),(326777,17,122),(326783,17,123),(326816,17,124),(326771,17,125),(326818,18,1),(326823,18,2),(326822,18,3),(326825,18,6),(326824,18,11),(326817,18,18),(326821,18,70),(326819,18,76),(326820,18,125),(326837,19,1),(326843,19,2),(326842,19,3),(326847,19,6),(326846,19,11),(326828,19,13),(326829,19,18),(326826,19,19),(326827,19,21),(326830,19,33),(326840,19,36),(326845,19,44),(326844,19,47),(326835,19,49),(326831,19,53),(326839,19,54),(326838,19,58),(326841,19,70),(326832,19,72),(326833,19,76),(326834,19,111),(326836,19,125),(326857,20,1),(326869,20,2),(326868,20,3),(326867,20,5),(326866,20,6),(326849,20,9),(326865,20,11),(326850,20,13),(326864,20,15),(326851,20,16),(326863,20,17),(326855,20,18),(326862,20,19),(326848,20,20),(326870,20,21),(326871,20,22),(326872,20,30),(326873,20,31),(326874,20,32),(326875,20,33),(326876,20,34),(326854,20,35),(326877,20,36),(326878,20,37),(326879,20,38),(326880,20,39),(326881,20,40),(326882,20,41),(326883,20,42),(326884,20,43),(326885,20,44),(326886,20,45),(326887,20,47),(326888,20,48),(326859,20,49),(326889,20,50),(326890,20,51),(326891,20,52),(326892,20,53),(326893,20,54),(326894,20,55),(326895,20,56),(326860,20,57),(326896,20,58),(326861,20,59),(326897,20,60),(326898,20,61),(326899,20,64),(326852,20,65),(326900,20,67),(326901,20,69),(326902,20,70),(326903,20,71),(326904,20,72),(326905,20,73),(326906,20,74),(326907,20,75),(326853,20,76),(326908,20,101),(326909,20,102),(326858,20,103),(326913,20,111),(326910,20,112),(326856,20,122),(326914,20,123),(326911,20,124),(326912,20,125),(326925,21,1),(326931,21,2),(326930,21,3),(326935,21,6),(326934,21,11),(326916,21,13),(326917,21,18),(326915,21,21),(326918,21,33),(326928,21,36),(326933,21,44),(326932,21,47),(326923,21,49),(326919,21,53),(326927,21,54),(326926,21,58),(326929,21,70),(326920,21,72),(326921,21,76),(326922,21,111),(326924,21,125),(326940,22,1),(326950,22,2),(326949,22,3),(326957,22,6),(326954,22,11),(326937,22,13),(326939,22,18),(326938,22,21),(326936,22,22),(326941,22,33),(326953,22,36),(326956,22,44),(326955,22,47),(326946,22,49),(326942,22,53),(326952,22,54),(326951,22,58),(326948,22,70),(326943,22,72),(326944,22,76),(326945,22,111),(326947,22,125),(326970,30,1),(326984,30,2),(326983,30,3),(326959,30,5),(326995,30,6),(326971,30,9),(326996,30,11),(326972,30,13),(326994,30,15),(326973,30,16),(326993,30,17),(326969,30,18),(326992,30,19),(326960,30,20),(326968,30,21),(326961,30,22),(326958,30,30),(326991,30,31),(326990,30,32),(326967,30,33),(326989,30,34),(326966,30,35),(326988,30,36),(326987,30,37),(326986,30,38),(326997,30,39),(326998,30,40),(326999,30,41),(327000,30,42),(327001,30,43),(327002,30,44),(327003,30,45),(327004,30,47),(327005,30,48),(326976,30,49),(327006,30,50),(327007,30,51),(327008,30,52),(326962,30,53),(327009,30,54),(327010,30,55),(327011,30,56),(326975,30,57),(327012,30,58),(326985,30,59),(327013,30,60),(327014,30,61),(326963,30,64),(326974,30,65),(327015,30,67),(327016,30,69),(326982,30,70),(327017,30,71),(326980,30,72),(327018,30,73),(327019,30,74),(326979,30,75),(326964,30,76),(327020,30,101),(327021,30,102),(326978,30,103),(326965,30,111),(327022,30,112),(326977,30,122),(327024,30,123),(327023,30,124),(326981,30,125),(327026,31,1),(327027,31,2),(327028,31,3),(327032,31,6),(327031,31,11),(327025,31,31),(327029,31,70),(327030,31,76),(327034,32,1),(327035,32,2),(327036,32,3),(327040,32,6),(327039,32,11),(327033,32,32),(327037,32,70),(327038,32,76),(327041,33,33),(327043,34,1),(327048,34,2),(327047,34,3),(327051,34,6),(327050,34,11),(327044,34,13),(327045,34,33),(327042,34,34),(327046,34,70),(327049,34,76),(327053,35,1),(327060,35,2),(327059,35,3),(327062,35,6),(327061,35,11),(327052,35,35),(327058,35,70),(327054,35,75),(327055,35,76),(327056,35,111),(327057,35,125),(327067,36,1),(327069,36,2),(327068,36,3),(327073,36,6),(327072,36,11),(327063,36,36),(327064,36,44),(327065,36,47),(327070,36,70),(327071,36,76),(327066,36,111),(327075,37,1),(327084,37,2),(327083,37,3),(327091,37,6),(327089,37,11),(327076,37,18),(327080,37,36),(327074,37,37),(327088,37,44),(327087,37,47),(327077,37,49),(327085,37,54),(327086,37,58),(327082,37,70),(327078,37,74),(327079,37,76),(327090,37,111),(327081,37,125),(327100,38,1),(327104,38,2),(327103,38,3),(327112,38,6),(327110,38,11),(327093,38,13),(327099,38,18),(327105,38,36),(327094,38,37),(327092,38,38),(327109,38,44),(327108,38,47),(327098,38,49),(327106,38,54),(327107,38,58),(327095,38,64),(327102,38,70),(327097,38,74),(327096,38,76),(327111,38,111),(327101,38,125),(327121,39,1),(327133,39,2),(327132,39,3),(327114,39,5),(327140,39,6),(327137,39,11),(327124,39,13),(327120,39,18),(327115,39,21),(327119,39,33),(327118,39,35),(327136,39,36),(327113,39,39),(327139,39,44),(327138,39,47),(327129,39,49),(327122,39,53),(327135,39,54),(327128,39,56),(327116,39,57),(327134,39,58),(327131,39,70),(327125,39,72),(327130,39,75),(327117,39,76),(327123,39,111),(327126,39,123),(327127,39,125),(327142,40,1),(327145,40,2),(327144,40,3),(327155,40,6),(327153,40,11),(327148,40,36),(327141,40,40),(327152,40,44),(327151,40,47),(327143,40,49),(327149,40,54),(327150,40,58),(327146,40,70),(327147,40,76),(327154,40,111),(327165,41,1),(327170,41,2),(327169,41,3),(327175,41,6),(327174,41,11),(327157,41,13),(327158,41,35),(327167,41,36),(327159,41,40),(327156,41,41),(327173,41,44),(327172,41,47),(327162,41,49),(327166,41,54),(327171,41,58),(327168,41,70),(327164,41,75),(327160,41,76),(327163,41,111),(327161,41,125),(327182,42,1),(327191,42,2),(327190,42,3),(327193,42,6),(327192,42,11),(327177,42,35),(327184,42,36),(327176,42,42),(327188,42,44),(327187,42,47),(327178,42,49),(327185,42,54),(327186,42,58),(327189,42,70),(327181,42,75),(327179,42,76),(327180,42,111),(327183,42,125),(327202,43,1),(327208,43,2),(327207,43,3),(327214,43,6),(327213,43,11),(327195,43,13),(327196,43,18),(327199,43,35),(327204,43,36),(327197,43,42),(327194,43,43),(327212,43,44),(327211,43,47),(327203,43,49),(327209,43,54),(327210,43,58),(327206,43,70),(327205,43,75),(327201,43,76),(327198,43,111),(327200,43,125),(327216,44,1),(327217,44,2),(327218,44,3),(327222,44,6),(327221,44,11),(327215,44,44),(327219,44,70),(327220,44,76),(327226,45,1),(327228,45,2),(327227,45,3),(327232,45,6),(327231,45,11),(327224,45,13),(327225,45,44),(327223,45,45),(327229,45,70),(327230,45,76),(327234,47,1),(327237,47,2),(327236,47,3),(327241,47,6),(327240,47,11),(327233,47,47),(327238,47,70),(327239,47,76),(327235,47,111),(327252,48,1),(327259,48,2),(327258,48,3),(327261,48,6),(327260,48,11),(327243,48,13),(327244,48,35),(327253,48,36),(327256,48,44),(327245,48,47),(327242,48,48),(327246,48,49),(327254,48,54),(327255,48,58),(327247,48,69),(327257,48,70),(327251,48,75),(327250,48,76),(327249,48,111),(327248,48,125),(327266,49,1),(327272,49,2),(327271,49,3),(327275,49,6),(327274,49,11),(327263,49,36),(327268,49,44),(327267,49,47),(327262,49,49),(327264,49,54),(327265,49,58),(327270,49,70),(327269,49,76),(327273,49,111),(327288,50,1),(327301,50,2),(327300,50,3),(327290,50,5),(327305,50,6),(327304,50,11),(327277,50,13),(327287,50,18),(327278,50,21),(327286,50,33),(327291,50,35),(327295,50,36),(327303,50,44),(327302,50,47),(327292,50,49),(327276,50,50),(327285,50,53),(327294,50,54),(327297,50,56),(327279,50,57),(327293,50,58),(327280,50,59),(327281,50,60),(327299,50,70),(327284,50,72),(327296,50,75),(327282,50,76),(327298,50,111),(327283,50,123),(327289,50,125),(327307,51,1),(327316,51,2),(327315,51,3),(327328,51,6),(327324,51,11),(327312,51,13),(327317,51,18),(327308,51,21),(327318,51,33),(327309,51,35),(327327,51,36),(327330,51,44),(327329,51,47),(327323,51,49),(327306,51,51),(327319,51,53),(327326,51,54),(327325,51,58),(327314,51,70),(327320,51,72),(327310,51,74),(327311,51,75),(327313,51,76),(327321,51,111),(327322,51,125),(327339,52,1),(327345,52,2),(327344,52,3),(327355,52,6),(327351,52,11),(327332,52,13),(327342,52,18),(327333,52,19),(327338,52,21),(327341,52,33),(327337,52,35),(327354,52,36),(327357,52,44),(327356,52,47),(327350,52,49),(327334,52,51),(327331,52,52),(327346,52,53),(327353,52,54),(327352,52,58),(327343,52,70),(327347,52,72),(327336,52,74),(327340,52,75),(327335,52,76),(327348,52,111),(327349,52,125),(327359,53,1),(327360,53,2),(327361,53,3),(327365,53,6),(327364,53,11),(327358,53,53),(327362,53,70),(327363,53,76),(327367,54,1),(327368,54,2),(327369,54,3),(327373,54,6),(327372,54,11),(327366,54,54),(327370,54,70),(327371,54,76),(327377,55,1),(327379,55,2),(327378,55,3),(327383,55,6),(327382,55,11),(327375,55,13),(327376,55,54),(327374,55,55),(327380,55,70),(327381,55,76),(327385,56,1),(327386,56,2),(327387,56,3),(327391,56,6),(327390,56,11),(327384,56,56),(327388,56,70),(327389,56,76),(327398,57,1),(327401,57,2),(327400,57,3),(327404,57,6),(327403,57,11),(327393,57,13),(327397,57,33),(327396,57,56),(327392,57,57),(327399,57,70),(327402,57,76),(327394,57,123),(327395,57,125),(327406,58,1),(327409,58,2),(327408,58,3),(327412,58,6),(327411,58,11),(327405,58,58),(327410,58,70),(327407,58,76),(327417,59,1),(327425,59,2),(327424,59,3),(327430,59,5),(327442,59,6),(327439,59,11),(327414,59,13),(327422,59,18),(327416,59,21),(327421,59,33),(327431,59,35),(327435,59,36),(327441,59,44),(327440,59,47),(327432,59,49),(327415,59,50),(327426,59,53),(327434,59,54),(327437,59,56),(327418,59,57),(327433,59,58),(327413,59,59),(327419,59,60),(327423,59,70),(327427,59,72),(327436,59,75),(327420,59,76),(327438,59,111),(327428,59,123),(327429,59,125),(327453,60,1),(327467,60,2),(327466,60,3),(327444,60,5),(327469,60,6),(327468,60,11),(327464,60,13),(327452,60,18),(327451,60,21),(327450,60,33),(327445,60,35),(327457,60,36),(327462,60,44),(327461,60,47),(327446,60,49),(327449,60,53),(327458,60,54),(327460,60,56),(327459,60,58),(327443,60,60),(327465,60,70),(327463,60,72),(327455,60,75),(327447,60,76),(327454,60,111),(327448,60,123),(327456,60,125),(327474,61,1),(327478,61,2),(327477,61,3),(327482,61,6),(327481,61,11),(327471,61,13),(327472,61,36),(327473,61,44),(327475,61,47),(327470,61,61),(327476,61,70),(327479,61,76),(327480,61,111),(327483,62,62),(327484,64,64),(327499,65,1),(327510,65,2),(327509,65,3),(327511,65,5),(327515,65,6),(327514,65,11),(327486,65,13),(327487,65,18),(327503,65,21),(327505,65,33),(327488,65,35),(327495,65,36),(327507,65,44),(327506,65,47),(327489,65,49),(327501,65,50),(327513,65,53),(327494,65,54),(327504,65,56),(327490,65,57),(327493,65,58),(327491,65,59),(327502,65,60),(327485,65,65),(327508,65,70),(327512,65,72),(327497,65,75),(327492,65,76),(327496,65,111),(327500,65,123),(327498,65,125),(327520,66,1),(327519,66,2),(327521,66,3),(327522,66,5),(327523,66,6),(327517,66,9),(327524,66,11),(327525,66,13),(327526,66,15),(327527,66,16),(327528,66,17),(327529,66,18),(327530,66,19),(327531,66,20),(327532,66,21),(327533,66,22),(327534,66,30),(327535,66,31),(327536,66,32),(327537,66,33),(327538,66,34),(327539,66,35),(327540,66,36),(327541,66,37),(327542,66,38),(327543,66,39),(327544,66,40),(327545,66,41),(327546,66,42),(327547,66,43),(327548,66,44),(327549,66,45),(327550,66,47),(327551,66,48),(327552,66,49),(327553,66,50),(327554,66,51),(327555,66,52),(327556,66,53),(327557,66,54),(327558,66,55),(327559,66,56),(327560,66,57),(327561,66,58),(327562,66,59),(327563,66,60),(327564,66,61),(327565,66,64),(327566,66,65),(327516,66,66),(327567,66,67),(327568,66,69),(327569,66,70),(327570,66,71),(327571,66,72),(327572,66,73),(327573,66,74),(327574,66,75),(327575,66,76),(327576,66,101),(327577,66,102),(327518,66,103),(327583,66,111),(327578,66,112),(327582,66,122),(327580,66,123),(327579,66,124),(327581,66,125),(327588,67,1),(327606,67,2),(327605,67,3),(327585,67,5),(327610,67,6),(327609,67,11),(327602,67,13),(327587,67,18),(327589,67,21),(327590,67,33),(327591,67,35),(327599,67,36),(327586,67,37),(327608,67,44),(327607,67,47),(327595,67,49),(327592,67,53),(327598,67,54),(327597,67,58),(327584,67,67),(327604,67,70),(327601,67,72),(327596,67,74),(327600,67,75),(327593,67,76),(327594,67,111),(327603,67,125),(327619,69,1),(327626,69,2),(327625,69,3),(327628,69,6),(327627,69,11),(327612,69,35),(327621,69,36),(327623,69,44),(327613,69,47),(327614,69,49),(327622,69,54),(327615,69,58),(327611,69,69),(327624,69,70),(327618,69,75),(327617,69,76),(327616,69,111),(327620,69,125),(327631,70,6),(327630,70,11),(327629,70,70),(327633,71,1),(327636,71,2),(327635,71,3),(327640,71,6),(327639,71,11),(327634,71,58),(327637,71,70),(327632,71,71),(327638,71,76),(327647,72,1),(327655,72,2),(327654,72,3),(327657,72,6),(327656,72,11),(327642,72,18),(327648,72,36),(327652,72,44),(327651,72,47),(327643,72,49),(327649,72,54),(327650,72,58),(327653,72,70),(327641,72,72),(327646,72,76),(327644,72,111),(327645,72,125),(327664,73,1),(327676,73,2),(327675,73,3),(327659,73,5),(327682,73,6),(327678,73,11),(327672,73,13),(327663,73,18),(327660,73,19),(327662,73,21),(327665,73,33),(327666,73,35),(327681,73,36),(327684,73,44),(327683,73,47),(327677,73,49),(327667,73,53),(327680,73,54),(327679,73,58),(327661,73,64),(327674,73,70),(327671,73,72),(327658,73,73),(327670,73,75),(327668,73,76),(327669,73,111),(327673,73,125),(327685,74,74),(327686,75,75),(327687,76,76),(327689,100,1),(327690,100,2),(327691,100,3),(327692,100,5),(327693,100,6),(327694,100,9),(327695,100,11),(327696,100,13),(327697,100,15),(327698,100,16),(327699,100,17),(327700,100,18),(327701,100,19),(327702,100,20),(327703,100,21),(327704,100,22),(327705,100,30),(327706,100,31),(327707,100,32),(327708,100,33),(327709,100,34),(327710,100,35),(327711,100,36),(327712,100,37),(327713,100,38),(327714,100,39),(327715,100,40),(327716,100,41),(327717,100,42),(327718,100,43),(327719,100,44),(327720,100,45),(327721,100,47),(327722,100,48),(327723,100,49),(327724,100,50),(327725,100,51),(327726,100,52),(327727,100,53),(327728,100,54),(327729,100,55),(327730,100,56),(327731,100,57),(327732,100,58),(327733,100,59),(327734,100,60),(327735,100,61),(327736,100,62),(327737,100,64),(327738,100,65),(327739,100,66),(327740,100,67),(327741,100,69),(327742,100,70),(327743,100,71),(327744,100,72),(327745,100,73),(327746,100,74),(327747,100,75),(327748,100,76),(327688,100,100),(327749,100,101),(327750,100,102),(327751,100,103),(327752,100,104),(327753,100,105),(327754,100,106),(327755,100,107),(327756,100,108),(327757,100,109),(327758,100,110),(327759,100,111),(327760,100,112),(327761,100,114),(327762,100,115),(327763,100,119),(327770,100,120),(327764,100,121),(327765,100,122),(327768,100,123),(327766,100,124),(327769,100,125),(327767,100,126),(327777,101,1),(327782,101,2),(327781,101,3),(327784,101,6),(327783,101,11),(327772,101,13),(327773,101,18),(327774,101,35),(327780,101,70),(327778,101,75),(327776,101,76),(327771,101,101),(327779,101,111),(327775,101,125),(327786,102,1),(327793,102,2),(327792,102,3),(327803,102,6),(327802,102,11),(327787,102,13),(327788,102,35),(327797,102,36),(327801,102,44),(327800,102,47),(327789,102,49),(327798,102,54),(327799,102,58),(327791,102,70),(327794,102,75),(327790,102,76),(327785,102,102),(327795,102,111),(327796,102,125),(327805,103,1),(327806,103,2),(327807,103,3),(327808,103,5),(327809,103,6),(327867,103,9),(327810,103,11),(327811,103,13),(327812,103,15),(327813,103,16),(327814,103,17),(327815,103,18),(327816,103,19),(327817,103,20),(327818,103,21),(327819,103,22),(327820,103,30),(327821,103,31),(327822,103,32),(327823,103,33),(327824,103,34),(327825,103,35),(327826,103,36),(327827,103,37),(327828,103,38),(327829,103,39),(327830,103,40),(327831,103,41),(327832,103,42),(327833,103,43),(327834,103,44),(327835,103,45),(327836,103,47),(327837,103,48),(327838,103,49),(327839,103,50),(327840,103,51),(327841,103,52),(327842,103,53),(327843,103,54),(327844,103,55),(327845,103,56),(327846,103,57),(327847,103,58),(327848,103,59),(327849,103,60),(327850,103,61),(327851,103,64),(327852,103,65),(327853,103,67),(327854,103,69),(327855,103,70),(327856,103,71),(327857,103,72),(327858,103,73),(327859,103,74),(327860,103,75),(327861,103,76),(327862,103,101),(327863,103,102),(327804,103,103),(327870,103,111),(327864,103,112),(327869,103,122),(327866,103,123),(327865,103,124),(327868,103,125),(327878,104,1),(327877,104,2),(327880,104,3),(327881,104,5),(327882,104,6),(327879,104,9),(327883,104,11),(327884,104,13),(327885,104,15),(327886,104,16),(327887,104,17),(327888,104,18),(327889,104,19),(327890,104,20),(327891,104,21),(327892,104,22),(327893,104,30),(327894,104,31),(327895,104,32),(327896,104,33),(327897,104,34),(327898,104,35),(327899,104,36),(327900,104,37),(327901,104,38),(327902,104,39),(327903,104,40),(327904,104,41),(327905,104,42),(327906,104,43),(327907,104,44),(327908,104,45),(327909,104,47),(327910,104,48),(327911,104,49),(327912,104,50),(327913,104,51),(327914,104,52),(327915,104,53),(327916,104,54),(327917,104,55),(327918,104,56),(327919,104,57),(327920,104,58),(327921,104,59),(327922,104,60),(327923,104,61),(327948,104,62),(327924,104,64),(327925,104,65),(327875,104,66),(327926,104,67),(327927,104,69),(327928,104,70),(327929,104,71),(327930,104,72),(327931,104,73),(327932,104,74),(327933,104,75),(327934,104,76),(327872,104,100),(327935,104,101),(327936,104,102),(327874,104,103),(327871,104,104),(327945,104,105),(327944,104,106),(327951,104,107),(327953,104,108),(327952,104,109),(327949,104,110),(327942,104,111),(327937,104,112),(327947,104,114),(327873,104,115),(327950,104,119),(327876,104,120),(327943,104,121),(327941,104,122),(327939,104,123),(327938,104,124),(327940,104,125),(327946,104,126),(327954,105,105),(327957,106,6),(327956,106,11),(327955,106,106),(327969,107,1),(327983,107,2),(327982,107,3),(327960,107,5),(327985,107,6),(327984,107,11),(327980,107,13),(327968,107,18),(327967,107,21),(327966,107,33),(327961,107,35),(327973,107,36),(327978,107,44),(327977,107,47),(327962,107,49),(327965,107,53),(327974,107,54),(327976,107,56),(327975,107,58),(327959,107,60),(327981,107,70),(327979,107,72),(327971,107,75),(327963,107,76),(327958,107,107),(327970,107,111),(327964,107,123),(327972,107,125),(327987,108,1),(327988,108,2),(327989,108,3),(327993,108,6),(327992,108,11),(327990,108,70),(327991,108,76),(327986,108,108),(327998,109,1),(328002,109,2),(328001,109,3),(328004,109,6),(328003,109,11),(327995,109,13),(327996,109,18),(328000,109,70),(327997,109,76),(327994,109,109),(327999,109,125),(328006,110,1),(328009,110,2),(328008,110,3),(328012,110,6),(328011,110,11),(328010,110,70),(328007,110,76),(328005,110,110),(328013,111,111),(328015,112,1),(328018,112,2),(328017,112,3),(328028,112,6),(328026,112,11),(328021,112,36),(328025,112,44),(328024,112,47),(328016,112,49),(328022,112,54),(328023,112,58),(328019,112,70),(328020,112,76),(328027,112,111),(328014,112,112),(328033,114,1),(328035,114,2),(328034,114,3),(328045,114,6),(328043,114,11),(328030,114,13),(328038,114,36),(328042,114,44),(328041,114,47),(328032,114,49),(328039,114,54),(328040,114,58),(328036,114,70),(328037,114,76),(328044,114,111),(328031,114,112),(328029,114,114),(328051,115,1),(328050,115,2),(328053,115,3),(328054,115,5),(328055,115,6),(328052,115,9),(328056,115,11),(328057,115,13),(328058,115,15),(328059,115,16),(328060,115,17),(328061,115,18),(328062,115,19),(328063,115,20),(328064,115,21),(328065,115,22),(328066,115,30),(328067,115,31),(328068,115,32),(328069,115,33),(328070,115,34),(328071,115,35),(328072,115,36),(328073,115,37),(328074,115,38),(328075,115,39),(328076,115,40),(328077,115,41),(328078,115,42),(328079,115,43),(328080,115,44),(328081,115,45),(328082,115,47),(328083,115,48),(328084,115,49),(328085,115,50),(328086,115,51),(328087,115,52),(328088,115,53),(328089,115,54),(328090,115,55),(328091,115,56),(328092,115,57),(328093,115,58),(328094,115,59),(328095,115,60),(328096,115,61),(328097,115,64),(328098,115,65),(328047,115,66),(328099,115,67),(328100,115,69),(328101,115,70),(328102,115,71),(328103,115,72),(328104,115,73),(328105,115,74),(328106,115,75),(328107,115,76),(328108,115,101),(328109,115,102),(328048,115,103),(328115,115,111),(328110,115,112),(328046,115,115),(328049,115,120),(328114,115,122),(328112,115,123),(328111,115,124),(328113,115,125),(328118,119,1),(328121,119,2),(328120,119,3),(328124,119,6),(328123,119,11),(328122,119,70),(328119,119,76),(328117,119,110),(328116,119,119),(328225,120,1),(328229,120,2),(328228,120,3),(328227,120,5),(328230,120,6),(328222,120,9),(328231,120,11),(328223,120,13),(328232,120,15),(328233,120,16),(328234,120,17),(328235,120,18),(328236,120,19),(328237,120,20),(328238,120,21),(328239,120,22),(328240,120,30),(328241,120,31),(328242,120,32),(328243,120,33),(328244,120,34),(328245,120,35),(328246,120,36),(328247,120,37),(328248,120,38),(328249,120,39),(328250,120,40),(328251,120,41),(328252,120,42),(328253,120,43),(328254,120,44),(328255,120,45),(328256,120,47),(328257,120,48),(328258,120,49),(328259,120,50),(328260,120,51),(328261,120,52),(328262,120,53),(328263,120,54),(328264,120,55),(328265,120,56),(328266,120,57),(328267,120,58),(328268,120,59),(328269,120,60),(328270,120,61),(328271,120,64),(328272,120,65),(328224,120,66),(328273,120,67),(328274,120,69),(328275,120,70),(328276,120,71),(328277,120,72),(328278,120,73),(328279,120,74),(328280,120,75),(328281,120,76),(328282,120,101),(328283,120,102),(328226,120,103),(328289,120,111),(328284,120,112),(328221,120,120),(328288,120,122),(328286,120,123),(328285,120,124),(328287,120,125),(328134,121,1),(328140,121,2),(328139,121,3),(328146,121,6),(328142,121,11),(328129,121,13),(328128,121,18),(328126,121,21),(328130,121,33),(328127,121,35),(328145,121,36),(328148,121,44),(328147,121,47),(328141,121,49),(328131,121,53),(328144,121,54),(328143,121,58),(328138,121,70),(328132,121,72),(328135,121,75),(328133,121,76),(328136,121,111),(328125,121,121),(328137,121,125),(328156,122,1),(328166,122,2),(328165,122,3),(328168,122,6),(328167,122,11),(328150,122,15),(328151,122,35),(328159,122,36),(328163,122,44),(328162,122,47),(328152,122,49),(328160,122,54),(328153,122,56),(328161,122,58),(328164,122,70),(328155,122,75),(328154,122,76),(328157,122,111),(328149,122,122),(328158,122,125),(328213,123,1),(328215,123,2),(328214,123,3),(328219,123,6),(328218,123,11),(328211,123,33),(328212,123,56),(328216,123,70),(328217,123,76),(328210,123,123),(328173,124,1),(328185,124,2),(328184,124,3),(328189,124,6),(328188,124,11),(328177,124,18),(328170,124,35),(328182,124,36),(328171,124,37),(328187,124,44),(328186,124,47),(328178,124,49),(328181,124,54),(328180,124,58),(328183,124,70),(328179,124,74),(328172,124,75),(328174,124,76),(328175,124,111),(328169,124,124),(328176,124,125),(328220,125,125),(328197,126,1),(328207,126,2),(328206,126,3),(328209,126,6),(328208,126,11),(328191,126,15),(328192,126,35),(328200,126,36),(328204,126,44),(328203,126,47),(328193,126,49),(328201,126,54),(328194,126,56),(328202,126,58),(328205,126,70),(328196,126,75),(328195,126,76),(328198,126,111),(328199,126,125),(328190,126,126);
+INSERT INTO `roleRole` VALUES (370990,1,1),(370991,1,2),(370992,1,3),(370996,1,6),(370995,1,11),(370993,1,70),(370994,1,76),(370997,2,2),(370999,2,6),(370998,2,11),(371000,3,3),(371002,3,6),(371001,3,11),(371004,5,1),(371018,5,2),(371017,5,3),(371003,5,5),(371024,5,6),(371020,5,11),(371014,5,13),(371005,5,18),(371006,5,21),(371007,5,33),(371008,5,35),(371023,5,36),(371025,5,47),(371019,5,49),(371009,5,53),(371022,5,54),(371021,5,58),(371016,5,70),(371013,5,72),(371012,5,75),(371010,5,76),(371011,5,111),(371015,5,125),(371026,6,6),(371029,9,1),(371030,9,2),(371031,9,3),(371032,9,5),(371033,9,6),(371027,9,9),(371034,9,11),(371035,9,13),(371036,9,15),(371037,9,16),(371038,9,17),(371039,9,18),(371040,9,19),(371041,9,20),(371042,9,21),(371043,9,22),(371044,9,30),(371045,9,31),(371046,9,32),(371047,9,33),(371048,9,34),(371049,9,35),(371050,9,36),(371051,9,37),(371052,9,38),(371053,9,39),(371054,9,40),(371055,9,41),(371056,9,42),(371057,9,43),(371058,9,44),(371059,9,45),(371060,9,47),(371061,9,48),(371062,9,49),(371063,9,50),(371064,9,51),(371065,9,52),(371066,9,53),(371067,9,54),(371068,9,55),(371069,9,56),(371070,9,57),(371071,9,58),(371072,9,59),(371073,9,60),(371074,9,61),(371075,9,64),(371076,9,65),(371077,9,67),(371078,9,69),(371079,9,70),(371080,9,71),(371081,9,72),(371082,9,73),(371083,9,74),(371084,9,75),(371085,9,76),(371086,9,101),(371087,9,102),(371028,9,103),(371091,9,110),(371095,9,111),(371088,9,112),(371089,9,119),(371094,9,122),(371092,9,123),(371090,9,124),(371093,9,125),(371097,11,6),(371096,11,11),(371099,13,1),(371100,13,2),(371101,13,3),(371105,13,6),(371104,13,11),(371098,13,13),(371102,13,70),(371103,13,76),(371112,15,1),(371121,15,2),(371120,15,3),(371123,15,6),(371122,15,11),(371106,15,15),(371107,15,35),(371115,15,36),(371118,15,47),(371108,15,49),(371116,15,54),(371109,15,56),(371117,15,58),(371119,15,70),(371111,15,75),(371110,15,76),(371113,15,111),(371114,15,125),(371132,16,1),(371141,16,2),(371140,16,3),(371143,16,6),(371142,16,11),(371126,16,15),(371124,16,16),(371127,16,35),(371135,16,36),(371138,16,47),(371128,16,49),(371136,16,54),(371129,16,56),(371137,16,58),(371139,16,70),(371131,16,75),(371130,16,76),(371133,16,111),(371125,16,122),(371134,16,125),(371152,17,1),(371168,17,2),(371167,17,3),(371159,17,5),(371195,17,6),(371156,17,9),(371194,17,11),(371155,17,13),(371193,17,15),(371154,17,16),(371144,17,17),(371151,17,18),(371192,17,19),(371145,17,20),(371160,17,21),(371191,17,22),(371190,17,30),(371189,17,31),(371188,17,32),(371174,17,33),(371187,17,34),(371170,17,35),(371164,17,36),(371146,17,37),(371186,17,38),(371147,17,39),(371185,17,40),(371184,17,41),(371183,17,42),(371182,17,43),(371181,17,44),(371180,17,45),(371179,17,47),(371196,17,48),(371157,17,49),(371197,17,50),(371198,17,51),(371199,17,52),(371175,17,53),(371163,17,54),(371200,17,55),(371201,17,56),(371161,17,57),(371162,17,58),(371169,17,59),(371202,17,60),(371203,17,61),(371148,17,64),(371153,17,65),(371149,17,67),(371204,17,69),(371166,17,70),(371205,17,71),(371177,17,72),(371206,17,73),(371158,17,74),(371173,17,75),(371150,17,76),(371207,17,101),(371208,17,102),(371172,17,103),(371212,17,110),(371176,17,111),(371209,17,112),(371210,17,119),(371171,17,122),(371178,17,123),(371211,17,124),(371165,17,125),(371214,18,1),(371219,18,2),(371218,18,3),(371221,18,6),(371220,18,11),(371213,18,18),(371217,18,70),(371215,18,76),(371216,18,125),(371234,19,1),(371240,19,2),(371239,19,3),(371244,19,6),(371243,19,11),(371224,19,13),(371225,19,18),(371222,19,19),(371223,19,21),(371226,19,33),(371232,19,35),(371236,19,36),(371242,19,47),(371231,19,49),(371227,19,53),(371235,19,54),(371241,19,58),(371238,19,70),(371228,19,72),(371237,19,75),(371229,19,76),(371230,19,111),(371233,19,125),(371254,20,1),(371266,20,2),(371265,20,3),(371264,20,5),(371263,20,6),(371246,20,9),(371262,20,11),(371247,20,13),(371261,20,15),(371248,20,16),(371260,20,17),(371252,20,18),(371259,20,19),(371245,20,20),(371267,20,21),(371268,20,22),(371269,20,30),(371270,20,31),(371271,20,32),(371272,20,33),(371273,20,34),(371251,20,35),(371274,20,36),(371275,20,37),(371276,20,38),(371277,20,39),(371278,20,40),(371279,20,41),(371280,20,42),(371281,20,43),(371282,20,44),(371283,20,45),(371284,20,47),(371285,20,48),(371256,20,49),(371286,20,50),(371287,20,51),(371288,20,52),(371289,20,53),(371290,20,54),(371291,20,55),(371292,20,56),(371257,20,57),(371293,20,58),(371258,20,59),(371294,20,60),(371295,20,61),(371296,20,64),(371249,20,65),(371297,20,67),(371298,20,69),(371299,20,70),(371300,20,71),(371301,20,72),(371302,20,73),(371303,20,74),(371304,20,75),(371250,20,76),(371305,20,101),(371306,20,102),(371255,20,103),(371313,20,110),(371311,20,111),(371307,20,112),(371308,20,119),(371253,20,122),(371312,20,123),(371309,20,124),(371310,20,125),(371325,21,1),(371331,21,2),(371330,21,3),(371335,21,6),(371334,21,11),(371315,21,13),(371316,21,18),(371314,21,21),(371317,21,33),(371323,21,35),(371327,21,36),(371333,21,47),(371322,21,49),(371318,21,53),(371326,21,54),(371332,21,58),(371329,21,70),(371319,21,72),(371328,21,75),(371320,21,76),(371321,21,111),(371324,21,125),(371340,22,1),(371350,22,2),(371349,22,3),(371358,22,6),(371356,22,11),(371337,22,13),(371339,22,18),(371338,22,21),(371336,22,22),(371341,22,33),(371346,22,35),(371354,22,36),(371357,22,47),(371345,22,49),(371342,22,53),(371353,22,54),(371352,22,58),(371348,22,70),(371343,22,72),(371355,22,75),(371344,22,76),(371351,22,111),(371347,22,125),(371371,30,1),(371385,30,2),(371384,30,3),(371360,30,5),(371396,30,6),(371372,30,9),(371397,30,11),(371373,30,13),(371395,30,15),(371374,30,16),(371394,30,17),(371370,30,18),(371393,30,19),(371361,30,20),(371369,30,21),(371362,30,22),(371359,30,30),(371392,30,31),(371391,30,32),(371368,30,33),(371390,30,34),(371367,30,35),(371389,30,36),(371388,30,37),(371387,30,38),(371398,30,39),(371399,30,40),(371400,30,41),(371401,30,42),(371402,30,43),(371403,30,44),(371404,30,45),(371405,30,47),(371406,30,48),(371377,30,49),(371407,30,50),(371408,30,51),(371409,30,52),(371363,30,53),(371410,30,54),(371411,30,55),(371412,30,56),(371376,30,57),(371413,30,58),(371386,30,59),(371414,30,60),(371415,30,61),(371364,30,64),(371375,30,65),(371416,30,67),(371417,30,69),(371383,30,70),(371418,30,71),(371381,30,72),(371419,30,73),(371420,30,74),(371380,30,75),(371365,30,76),(371421,30,101),(371422,30,102),(371379,30,103),(371427,30,110),(371366,30,111),(371423,30,112),(371424,30,119),(371378,30,122),(371426,30,123),(371425,30,124),(371382,30,125),(371429,31,1),(371430,31,2),(371431,31,3),(371435,31,6),(371434,31,11),(371428,31,31),(371432,31,70),(371433,31,76),(371437,32,1),(371438,32,2),(371439,32,3),(371443,32,6),(371442,32,11),(371436,32,32),(371440,32,70),(371441,32,76),(371444,33,33),(371446,34,1),(371451,34,2),(371450,34,3),(371454,34,6),(371453,34,11),(371447,34,13),(371448,34,33),(371445,34,34),(371449,34,70),(371452,34,76),(371456,35,1),(371463,35,2),(371462,35,3),(371465,35,6),(371464,35,11),(371455,35,35),(371461,35,70),(371457,35,75),(371458,35,76),(371459,35,111),(371460,35,125),(371472,36,1),(371479,36,2),(371478,36,3),(371481,36,6),(371480,36,11),(371467,36,35),(371466,36,36),(371468,36,47),(371469,36,49),(371475,36,54),(371476,36,58),(371477,36,70),(371471,36,75),(371470,36,76),(371473,36,111),(371474,36,125),(371483,37,1),(371492,37,2),(371491,37,3),(371500,37,6),(371498,37,11),(371484,37,18),(371497,37,35),(371488,37,36),(371482,37,37),(371496,37,47),(371485,37,49),(371493,37,54),(371494,37,58),(371490,37,70),(371486,37,74),(371495,37,75),(371487,37,76),(371499,37,111),(371489,37,125),(371509,38,1),(371513,38,2),(371512,38,3),(371522,38,6),(371520,38,11),(371502,38,13),(371508,38,18),(371519,38,35),(371514,38,36),(371503,38,37),(371501,38,38),(371518,38,47),(371507,38,49),(371515,38,54),(371516,38,58),(371504,38,64),(371511,38,70),(371506,38,74),(371517,38,75),(371505,38,76),(371521,38,111),(371510,38,125),(371531,39,1),(371543,39,2),(371542,39,3),(371524,39,5),(371549,39,6),(371547,39,11),(371534,39,13),(371530,39,18),(371525,39,21),(371529,39,33),(371528,39,35),(371546,39,36),(371523,39,39),(371548,39,47),(371539,39,49),(371532,39,53),(371545,39,54),(371538,39,56),(371526,39,57),(371544,39,58),(371541,39,70),(371535,39,72),(371540,39,75),(371527,39,76),(371533,39,111),(371536,39,123),(371537,39,125),(371551,40,1),(371554,40,2),(371553,40,3),(371566,40,6),(371563,40,11),(371562,40,35),(371557,40,36),(371550,40,40),(371561,40,47),(371552,40,49),(371558,40,54),(371559,40,58),(371555,40,70),(371560,40,75),(371556,40,76),(371565,40,111),(371564,40,125),(371576,41,1),(371581,41,2),(371580,41,3),(371585,41,6),(371584,41,11),(371568,41,13),(371569,41,35),(371578,41,36),(371570,41,40),(371567,41,41),(371583,41,47),(371573,41,49),(371577,41,54),(371582,41,58),(371579,41,70),(371575,41,75),(371571,41,76),(371574,41,111),(371572,41,125),(371592,42,1),(371600,42,2),(371599,42,3),(371602,42,6),(371601,42,11),(371587,42,35),(371594,42,36),(371586,42,42),(371597,42,47),(371588,42,49),(371595,42,54),(371596,42,58),(371598,42,70),(371591,42,75),(371589,42,76),(371590,42,111),(371593,42,125),(371611,43,1),(371617,43,2),(371616,43,3),(371622,43,6),(371621,43,11),(371604,43,13),(371605,43,18),(371608,43,35),(371613,43,36),(371606,43,42),(371603,43,43),(371620,43,47),(371612,43,49),(371618,43,54),(371619,43,58),(371615,43,70),(371614,43,75),(371610,43,76),(371607,43,111),(371609,43,125),(371624,44,1),(371625,44,2),(371626,44,3),(371630,44,6),(371629,44,11),(371623,44,44),(371627,44,70),(371628,44,76),(371634,45,1),(371636,45,2),(371635,45,3),(371640,45,6),(371639,45,11),(371632,45,13),(371633,45,44),(371631,45,45),(371637,45,70),(371638,45,76),(371642,47,1),(371645,47,2),(371644,47,3),(371649,47,6),(371648,47,11),(371641,47,47),(371646,47,70),(371647,47,76),(371643,47,111),(371660,48,1),(371666,48,2),(371665,48,3),(371668,48,6),(371667,48,11),(371651,48,13),(371652,48,35),(371661,48,36),(371653,48,47),(371650,48,48),(371654,48,49),(371662,48,54),(371663,48,58),(371655,48,69),(371664,48,70),(371659,48,75),(371658,48,76),(371657,48,111),(371656,48,125),(371675,49,1),(371679,49,2),(371678,49,3),(371684,49,6),(371683,49,11),(371677,49,35),(371670,49,36),(371676,49,47),(371669,49,49),(371671,49,54),(371672,49,58),(371682,49,70),(371673,49,75),(371674,49,76),(371681,49,111),(371680,49,125),(371697,50,1),(371710,50,2),(371709,50,3),(371699,50,5),(371713,50,6),(371712,50,11),(371686,50,13),(371696,50,18),(371687,50,21),(371695,50,33),(371700,50,35),(371704,50,36),(371711,50,47),(371701,50,49),(371685,50,50),(371694,50,53),(371703,50,54),(371706,50,56),(371688,50,57),(371702,50,58),(371689,50,59),(371690,50,60),(371708,50,70),(371693,50,72),(371705,50,75),(371691,50,76),(371707,50,111),(371692,50,123),(371698,50,125),(371715,51,1),(371724,51,2),(371723,51,3),(371736,51,6),(371732,51,11),(371720,51,13),(371725,51,18),(371716,51,21),(371726,51,33),(371717,51,35),(371735,51,36),(371737,51,47),(371731,51,49),(371714,51,51),(371727,51,53),(371734,51,54),(371733,51,58),(371722,51,70),(371728,51,72),(371718,51,74),(371719,51,75),(371721,51,76),(371729,51,111),(371730,51,125),(371746,52,1),(371752,52,2),(371751,52,3),(371762,52,6),(371758,52,11),(371739,52,13),(371749,52,18),(371740,52,19),(371745,52,21),(371748,52,33),(371744,52,35),(371761,52,36),(371763,52,47),(371757,52,49),(371741,52,51),(371738,52,52),(371753,52,53),(371760,52,54),(371759,52,58),(371750,52,70),(371754,52,72),(371743,52,74),(371747,52,75),(371742,52,76),(371755,52,111),(371756,52,125),(371765,53,1),(371766,53,2),(371767,53,3),(371771,53,6),(371770,53,11),(371764,53,53),(371768,53,70),(371769,53,76),(371773,54,1),(371774,54,2),(371775,54,3),(371779,54,6),(371778,54,11),(371772,54,54),(371776,54,70),(371777,54,76),(371783,55,1),(371785,55,2),(371784,55,3),(371789,55,6),(371788,55,11),(371781,55,13),(371782,55,54),(371780,55,55),(371786,55,70),(371787,55,76),(371791,56,1),(371792,56,2),(371793,56,3),(371797,56,6),(371796,56,11),(371790,56,56),(371794,56,70),(371795,56,76),(371804,57,1),(371807,57,2),(371806,57,3),(371810,57,6),(371809,57,11),(371799,57,13),(371803,57,33),(371802,57,56),(371798,57,57),(371805,57,70),(371808,57,76),(371800,57,123),(371801,57,125),(371812,58,1),(371815,58,2),(371814,58,3),(371818,58,6),(371817,58,11),(371811,58,58),(371816,58,70),(371813,58,76),(371823,59,1),(371831,59,2),(371830,59,3),(371836,59,5),(371847,59,6),(371845,59,11),(371820,59,13),(371828,59,18),(371822,59,21),(371827,59,33),(371837,59,35),(371841,59,36),(371846,59,47),(371838,59,49),(371821,59,50),(371832,59,53),(371840,59,54),(371843,59,56),(371824,59,57),(371839,59,58),(371819,59,59),(371825,59,60),(371829,59,70),(371833,59,72),(371842,59,75),(371826,59,76),(371844,59,111),(371834,59,123),(371835,59,125),(371858,60,1),(371871,60,2),(371870,60,3),(371849,60,5),(371873,60,6),(371872,60,11),(371868,60,13),(371857,60,18),(371856,60,21),(371855,60,33),(371850,60,35),(371862,60,36),(371866,60,47),(371851,60,49),(371854,60,53),(371863,60,54),(371865,60,56),(371864,60,58),(371848,60,60),(371869,60,70),(371867,60,72),(371860,60,75),(371852,60,76),(371859,60,111),(371853,60,123),(371861,60,125),(371878,61,1),(371884,61,2),(371883,61,3),(371891,61,6),(371890,61,11),(371875,61,13),(371877,61,35),(371876,61,36),(371879,61,47),(371880,61,49),(371888,61,54),(371889,61,58),(371874,61,61),(371882,61,70),(371885,61,75),(371881,61,76),(371886,61,111),(371887,61,125),(371892,62,62),(371893,64,64),(371908,65,1),(371918,65,2),(371917,65,3),(371919,65,5),(371923,65,6),(371922,65,11),(371895,65,13),(371896,65,18),(371912,65,21),(371914,65,33),(371897,65,35),(371904,65,36),(371915,65,47),(371898,65,49),(371910,65,50),(371921,65,53),(371903,65,54),(371913,65,56),(371899,65,57),(371902,65,58),(371900,65,59),(371911,65,60),(371894,65,65),(371916,65,70),(371920,65,72),(371906,65,75),(371901,65,76),(371905,65,111),(371909,65,123),(371907,65,125),(371928,66,1),(371927,66,2),(371929,66,3),(371930,66,5),(371931,66,6),(371925,66,9),(371932,66,11),(371933,66,13),(371934,66,15),(371935,66,16),(371936,66,17),(371937,66,18),(371938,66,19),(371939,66,20),(371940,66,21),(371941,66,22),(371942,66,30),(371943,66,31),(371944,66,32),(371945,66,33),(371946,66,34),(371947,66,35),(371948,66,36),(371949,66,37),(371950,66,38),(371951,66,39),(371952,66,40),(371953,66,41),(371954,66,42),(371955,66,43),(371956,66,44),(371957,66,45),(371958,66,47),(371959,66,48),(371960,66,49),(371961,66,50),(371962,66,51),(371963,66,52),(371964,66,53),(371965,66,54),(371966,66,55),(371967,66,56),(371968,66,57),(371969,66,58),(371970,66,59),(371971,66,60),(371972,66,61),(371973,66,64),(371974,66,65),(371924,66,66),(371975,66,67),(371976,66,69),(371977,66,70),(371978,66,71),(371979,66,72),(371980,66,73),(371981,66,74),(371982,66,75),(371983,66,76),(371984,66,101),(371985,66,102),(371926,66,103),(371989,66,110),(371993,66,111),(371986,66,112),(371987,66,119),(371992,66,122),(371990,66,123),(371988,66,124),(371991,66,125),(371998,67,1),(372016,67,2),(372015,67,3),(371995,67,5),(372019,67,6),(372018,67,11),(372012,67,13),(371997,67,18),(371999,67,21),(372000,67,33),(372001,67,35),(372009,67,36),(371996,67,37),(372017,67,47),(372005,67,49),(372002,67,53),(372008,67,54),(372007,67,58),(371994,67,67),(372014,67,70),(372011,67,72),(372006,67,74),(372010,67,75),(372003,67,76),(372004,67,111),(372013,67,125),(372026,69,1),(372034,69,2),(372033,69,3),(372036,69,6),(372035,69,11),(372021,69,35),(372029,69,36),(372022,69,47),(372023,69,49),(372030,69,54),(372031,69,58),(372020,69,69),(372032,69,70),(372025,69,75),(372024,69,76),(372027,69,111),(372028,69,125),(372039,70,6),(372038,70,11),(372037,70,70),(372041,71,1),(372044,71,2),(372043,71,3),(372048,71,6),(372047,71,11),(372042,71,58),(372045,71,70),(372040,71,71),(372046,71,76),(372057,72,1),(372064,72,2),(372063,72,3),(372066,72,6),(372065,72,11),(372050,72,18),(372051,72,35),(372058,72,36),(372061,72,47),(372052,72,49),(372059,72,54),(372060,72,58),(372062,72,70),(372049,72,72),(372054,72,75),(372056,72,76),(372053,72,111),(372055,72,125),(372073,73,1),(372085,73,2),(372084,73,3),(372068,73,5),(372091,73,6),(372087,73,11),(372081,73,13),(372072,73,18),(372069,73,19),(372071,73,21),(372074,73,33),(372075,73,35),(372090,73,36),(372092,73,47),(372086,73,49),(372076,73,53),(372089,73,54),(372088,73,58),(372070,73,64),(372083,73,70),(372080,73,72),(372067,73,73),(372079,73,75),(372077,73,76),(372078,73,111),(372082,73,125),(372093,74,74),(372094,75,75),(372095,76,76),(372097,100,1),(372098,100,2),(372099,100,3),(372100,100,5),(372101,100,6),(372102,100,9),(372103,100,11),(372104,100,13),(372105,100,15),(372106,100,16),(372107,100,17),(372108,100,18),(372109,100,19),(372110,100,20),(372111,100,21),(372112,100,22),(372113,100,30),(372114,100,31),(372115,100,32),(372116,100,33),(372117,100,34),(372118,100,35),(372119,100,36),(372120,100,37),(372121,100,38),(372122,100,39),(372123,100,40),(372124,100,41),(372125,100,42),(372126,100,43),(372127,100,44),(372128,100,45),(372129,100,47),(372130,100,48),(372131,100,49),(372132,100,50),(372133,100,51),(372134,100,52),(372135,100,53),(372136,100,54),(372137,100,55),(372138,100,56),(372139,100,57),(372140,100,58),(372141,100,59),(372142,100,60),(372143,100,61),(372144,100,62),(372145,100,64),(372146,100,65),(372147,100,66),(372148,100,67),(372149,100,69),(372150,100,70),(372151,100,71),(372152,100,72),(372153,100,73),(372154,100,74),(372155,100,75),(372156,100,76),(372096,100,100),(372157,100,101),(372158,100,102),(372159,100,103),(372160,100,104),(372161,100,105),(372162,100,106),(372163,100,107),(372164,100,108),(372165,100,109),(372166,100,110),(372167,100,111),(372168,100,112),(372169,100,114),(372170,100,115),(372171,100,119),(372179,100,120),(372172,100,121),(372173,100,122),(372177,100,123),(372174,100,124),(372178,100,125),(372175,100,126),(372176,100,127),(372186,101,1),(372191,101,2),(372190,101,3),(372193,101,6),(372192,101,11),(372181,101,13),(372182,101,18),(372183,101,35),(372189,101,70),(372187,101,75),(372185,101,76),(372180,101,101),(372188,101,111),(372184,101,125),(372195,102,1),(372202,102,2),(372201,102,3),(372211,102,6),(372210,102,11),(372196,102,13),(372197,102,35),(372206,102,36),(372209,102,47),(372198,102,49),(372207,102,54),(372208,102,58),(372200,102,70),(372203,102,75),(372199,102,76),(372194,102,102),(372204,102,111),(372205,102,125),(372213,103,1),(372214,103,2),(372215,103,3),(372216,103,5),(372217,103,6),(372277,103,9),(372218,103,11),(372219,103,13),(372220,103,15),(372221,103,16),(372222,103,17),(372223,103,18),(372224,103,19),(372225,103,20),(372226,103,21),(372227,103,22),(372228,103,30),(372229,103,31),(372230,103,32),(372231,103,33),(372232,103,34),(372233,103,35),(372234,103,36),(372235,103,37),(372236,103,38),(372237,103,39),(372238,103,40),(372239,103,41),(372240,103,42),(372241,103,43),(372242,103,44),(372243,103,45),(372244,103,47),(372245,103,48),(372246,103,49),(372247,103,50),(372248,103,51),(372249,103,52),(372250,103,53),(372251,103,54),(372252,103,55),(372253,103,56),(372254,103,57),(372255,103,58),(372256,103,59),(372257,103,60),(372258,103,61),(372259,103,64),(372260,103,65),(372261,103,67),(372262,103,69),(372263,103,70),(372264,103,71),(372265,103,72),(372266,103,73),(372267,103,74),(372268,103,75),(372269,103,76),(372270,103,101),(372271,103,102),(372212,103,103),(372275,103,110),(372280,103,111),(372272,103,112),(372273,103,119),(372279,103,122),(372276,103,123),(372274,103,124),(372278,103,125),(372288,104,1),(372287,104,2),(372290,104,3),(372291,104,5),(372292,104,6),(372289,104,9),(372293,104,11),(372294,104,13),(372295,104,15),(372296,104,16),(372297,104,17),(372298,104,18),(372299,104,19),(372300,104,20),(372301,104,21),(372302,104,22),(372303,104,30),(372304,104,31),(372305,104,32),(372306,104,33),(372307,104,34),(372308,104,35),(372309,104,36),(372310,104,37),(372311,104,38),(372312,104,39),(372313,104,40),(372314,104,41),(372315,104,42),(372316,104,43),(372317,104,44),(372318,104,45),(372319,104,47),(372320,104,48),(372321,104,49),(372322,104,50),(372323,104,51),(372324,104,52),(372325,104,53),(372326,104,54),(372327,104,55),(372328,104,56),(372329,104,57),(372330,104,58),(372331,104,59),(372332,104,60),(372333,104,61),(372360,104,62),(372334,104,64),(372335,104,65),(372285,104,66),(372336,104,67),(372337,104,69),(372338,104,70),(372339,104,71),(372340,104,72),(372341,104,73),(372342,104,74),(372343,104,75),(372344,104,76),(372282,104,100),(372345,104,101),(372346,104,102),(372284,104,103),(372281,104,104),(372357,104,105),(372356,104,106),(372361,104,107),(372363,104,108),(372362,104,109),(372350,104,110),(372354,104,111),(372347,104,112),(372359,104,114),(372283,104,115),(372348,104,119),(372286,104,120),(372355,104,121),(372353,104,122),(372351,104,123),(372349,104,124),(372352,104,125),(372358,104,126),(372364,104,127),(372365,105,105),(372368,106,6),(372367,106,11),(372366,106,106),(372380,107,1),(372393,107,2),(372392,107,3),(372371,107,5),(372395,107,6),(372394,107,11),(372390,107,13),(372379,107,18),(372378,107,21),(372377,107,33),(372372,107,35),(372384,107,36),(372388,107,47),(372373,107,49),(372376,107,53),(372385,107,54),(372387,107,56),(372386,107,58),(372370,107,60),(372391,107,70),(372389,107,72),(372382,107,75),(372374,107,76),(372369,107,107),(372381,107,111),(372375,107,123),(372383,107,125),(372397,108,1),(372398,108,2),(372399,108,3),(372403,108,6),(372402,108,11),(372400,108,70),(372401,108,76),(372396,108,108),(372408,109,1),(372412,109,2),(372411,109,3),(372414,109,6),(372413,109,11),(372405,109,13),(372406,109,18),(372410,109,70),(372407,109,76),(372404,109,109),(372409,109,125),(372416,110,1),(372421,110,2),(372420,110,3),(372431,110,6),(372428,110,11),(372427,110,35),(372422,110,36),(372426,110,47),(372417,110,49),(372423,110,54),(372424,110,58),(372419,110,70),(372425,110,75),(372418,110,76),(372415,110,110),(372430,110,111),(372429,110,125),(372432,111,111),(372434,112,1),(372437,112,2),(372436,112,3),(372449,112,6),(372446,112,11),(372445,112,35),(372440,112,36),(372444,112,47),(372435,112,49),(372441,112,54),(372442,112,58),(372438,112,70),(372443,112,75),(372439,112,76),(372448,112,111),(372433,112,112),(372447,112,125),(372454,114,1),(372456,114,2),(372455,114,3),(372468,114,6),(372465,114,11),(372451,114,13),(372464,114,35),(372459,114,36),(372463,114,47),(372453,114,49),(372460,114,54),(372461,114,58),(372457,114,70),(372462,114,75),(372458,114,76),(372467,114,111),(372452,114,112),(372450,114,114),(372466,114,125),(372474,115,1),(372473,115,2),(372476,115,3),(372477,115,5),(372478,115,6),(372475,115,9),(372479,115,11),(372480,115,13),(372481,115,15),(372482,115,16),(372483,115,17),(372484,115,18),(372485,115,19),(372486,115,20),(372487,115,21),(372488,115,22),(372489,115,30),(372490,115,31),(372491,115,32),(372492,115,33),(372493,115,34),(372494,115,35),(372495,115,36),(372496,115,37),(372497,115,38),(372498,115,39),(372499,115,40),(372500,115,41),(372501,115,42),(372502,115,43),(372503,115,44),(372504,115,45),(372505,115,47),(372506,115,48),(372507,115,49),(372508,115,50),(372509,115,51),(372510,115,52),(372511,115,53),(372512,115,54),(372513,115,55),(372514,115,56),(372515,115,57),(372516,115,58),(372517,115,59),(372518,115,60),(372519,115,61),(372520,115,64),(372521,115,65),(372470,115,66),(372522,115,67),(372523,115,69),(372524,115,70),(372525,115,71),(372526,115,72),(372527,115,73),(372528,115,74),(372529,115,75),(372530,115,76),(372531,115,101),(372532,115,102),(372471,115,103),(372536,115,110),(372540,115,111),(372533,115,112),(372469,115,115),(372534,115,119),(372472,115,120),(372539,115,122),(372537,115,123),(372535,115,124),(372538,115,125),(372543,119,1),(372548,119,2),(372547,119,3),(372558,119,6),(372555,119,11),(372554,119,35),(372549,119,36),(372553,119,47),(372544,119,49),(372550,119,54),(372551,119,58),(372546,119,70),(372552,119,75),(372545,119,76),(372542,119,110),(372557,119,111),(372541,119,119),(372556,119,125),(372659,120,1),(372663,120,2),(372662,120,3),(372661,120,5),(372664,120,6),(372656,120,9),(372665,120,11),(372657,120,13),(372666,120,15),(372667,120,16),(372668,120,17),(372669,120,18),(372670,120,19),(372671,120,20),(372672,120,21),(372673,120,22),(372674,120,30),(372675,120,31),(372676,120,32),(372677,120,33),(372678,120,34),(372679,120,35),(372680,120,36),(372681,120,37),(372682,120,38),(372683,120,39),(372684,120,40),(372685,120,41),(372686,120,42),(372687,120,43),(372688,120,44),(372689,120,45),(372690,120,47),(372691,120,48),(372692,120,49),(372693,120,50),(372694,120,51),(372695,120,52),(372696,120,53),(372697,120,54),(372698,120,55),(372699,120,56),(372700,120,57),(372701,120,58),(372702,120,59),(372703,120,60),(372704,120,61),(372705,120,64),(372706,120,65),(372658,120,66),(372707,120,67),(372708,120,69),(372709,120,70),(372710,120,71),(372711,120,72),(372712,120,73),(372713,120,74),(372714,120,75),(372715,120,76),(372716,120,101),(372717,120,102),(372660,120,103),(372721,120,110),(372725,120,111),(372718,120,112),(372719,120,119),(372655,120,120),(372724,120,122),(372722,120,123),(372720,120,124),(372723,120,125),(372568,121,1),(372574,121,2),(372573,121,3),(372580,121,6),(372576,121,11),(372563,121,13),(372562,121,18),(372560,121,21),(372564,121,33),(372561,121,35),(372579,121,36),(372581,121,47),(372575,121,49),(372565,121,53),(372578,121,54),(372577,121,58),(372572,121,70),(372566,121,72),(372569,121,75),(372567,121,76),(372570,121,111),(372559,121,121),(372571,121,125),(372589,122,1),(372598,122,2),(372597,122,3),(372600,122,6),(372599,122,11),(372583,122,15),(372584,122,35),(372592,122,36),(372595,122,47),(372585,122,49),(372593,122,54),(372586,122,56),(372594,122,58),(372596,122,70),(372588,122,75),(372587,122,76),(372590,122,111),(372582,122,122),(372591,122,125),(372647,123,1),(372650,123,2),(372649,123,3),(372653,123,6),(372652,123,11),(372644,123,33),(372645,123,56),(372648,123,70),(372651,123,76),(372643,123,123),(372646,123,125),(372605,124,1),(372617,124,2),(372616,124,3),(372620,124,6),(372619,124,11),(372609,124,18),(372602,124,35),(372614,124,36),(372603,124,37),(372618,124,47),(372610,124,49),(372613,124,54),(372612,124,58),(372615,124,70),(372611,124,74),(372604,124,75),(372606,124,76),(372607,124,111),(372601,124,124),(372608,124,125),(372654,125,125),(372628,126,1),(372637,126,2),(372636,126,3),(372639,126,6),(372638,126,11),(372622,126,15),(372623,126,35),(372631,126,36),(372634,126,47),(372624,126,49),(372632,126,54),(372625,126,56),(372633,126,58),(372635,126,70),(372627,126,75),(372626,126,76),(372629,126,111),(372630,126,125),(372621,126,126),(372642,127,6),(372641,127,11),(372640,127,127);
 /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -140,13 +140,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:25
 USE `salix`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: salix
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -164,7 +164,7 @@ USE `salix`;
 
 LOCK TABLES `ACL` WRITE;
 /*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'Ticket','state','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','logisticBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryAssistant'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryAssistant'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','find','READ','ALLOW','ROLE','hr'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','READ','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'),(429,'ItemConfig','*','READ','ALLOW','ROLE','employee'),(431,'Tag','onSubmit','WRITE','ALLOW','ROLE','employee'),(432,'Worker','updateAttributes','WRITE','ALLOW','ROLE','hr'),(433,'Worker','createAbsence','*','ALLOW','ROLE','employee'),(434,'Worker','updateAbsence','WRITE','ALLOW','ROLE','employee'),(435,'Worker','deleteAbsence','*','ALLOW','ROLE','employee'),(436,'Worker','new','WRITE','ALLOW','ROLE','hr'),(438,'Client','getClientOrSupplierReference','READ','ALLOW','ROLE','employee'),(439,'NotificationSubscription','*','*','ALLOW','ROLE','employee'),(440,'NotificationAcl','*','READ','ALLOW','ROLE','employee'),(441,'MdbApp','*','READ','ALLOW','ROLE','$everyone'),(442,'MdbApp','*','*','ALLOW','ROLE','developer'),(443,'ItemConfig','*','*','ALLOW','ROLE','employee'),(444,'DeviceProduction','*','*','ALLOW','ROLE','hr'),(445,'DeviceProductionModels','*','*','ALLOW','ROLE','hr'),(446,'DeviceProductionState','*','*','ALLOW','ROLE','hr'),(447,'DeviceProductionUser','*','*','ALLOW','ROLE','hr'),(448,'DeviceProduction','*','*','ALLOW','ROLE','productionAssi'),(449,'DeviceProductionModels','*','*','ALLOW','ROLE','productionAssi'),(450,'DeviceProductionState','*','*','ALLOW','ROLE','productionAssi'),(451,'DeviceProductionUser','*','*','ALLOW','ROLE','productionAssi'),(452,'Worker','deallocatePDA','*','ALLOW','ROLE','hr'),(453,'Worker','allocatePDA','*','ALLOW','ROLE','hr'),(454,'Worker','deallocatePDA','*','ALLOW','ROLE','productionAssi'),(455,'Worker','allocatePDA','*','ALLOW','ROLE','productionAssi'),(456,'Zone','*','*','ALLOW','ROLE','deliveryAssistant'),(458,'Operator','*','READ','ALLOW','ROLE','employee'),(459,'Operator','*','WRITE','ALLOW','ROLE','employee'),(460,'InvoiceIn','getSerial','READ','ALLOW','ROLE','administrative'),(461,'Ticket','saveSign','WRITE','ALLOW','ROLE','employee'),(462,'InvoiceOut','negativeBases','READ','ALLOW','ROLE','administrative'),(463,'InvoiceOut','negativeBasesCsv','READ','ALLOW','ROLE','administrative'),(464,'WorkerObservation','*','*','ALLOW','ROLE','hr'),(465,'ClientInforma','*','READ','ALLOW','ROLE','employee'),(466,'ClientInforma','*','WRITE','ALLOW','ROLE','financial'),(467,'Receipt','receiptEmail','*','ALLOW','ROLE','salesAssistant'),(468,'Client','setRating','WRITE','ALLOW','ROLE','financial'),(470,'Client','addressesPropagateRe','*','ALLOW','ROLE','employee'),(471,'Client','canBeInvoiced','*','ALLOW','ROLE','employee'),(472,'Client','canCreateTicket','*','ALLOW','ROLE','employee'),(473,'Client','consumption','*','ALLOW','ROLE','employee'),(474,'Client','createAddress','*','ALLOW','ROLE','employee'),(475,'Client','createWithUser','*','ALLOW','ROLE','employee'),(476,'Client','extendedListFilter','*','ALLOW','ROLE','employee'),(477,'Client','getAverageInvoiced','*','ALLOW','ROLE','employee'),(478,'Client','getCard','*','ALLOW','ROLE','employee'),(479,'Client','getDebt','*','ALLOW','ROLE','employee'),(480,'Client','getMana','*','ALLOW','ROLE','employee'),(481,'Client','transactions','*','ALLOW','ROLE','employee'),(482,'Client','hasCustomerRole','*','ALLOW','ROLE','employee'),(483,'Client','isValidClient','*','ALLOW','ROLE','employee'),(484,'Client','lastActiveTickets','*','ALLOW','ROLE','employee'),(485,'Client','sendSms','*','ALLOW','ROLE','employee'),(486,'Client','setPassword','*','ALLOW','ROLE','employee'),(487,'Client','summary','*','ALLOW','ROLE','employee'),(488,'Client','updateAddress','*','ALLOW','ROLE','employee'),(489,'Client','updateFiscalData','*','ALLOW','ROLE','employee'),(491,'Client','uploadFile','*','ALLOW','ROLE','employee'),(492,'Client','campaignMetricsPdf','*','ALLOW','ROLE','employee'),(493,'Client','campaignMetricsEmail','*','ALLOW','ROLE','employee'),(494,'Client','clientWelcomeHtml','*','ALLOW','ROLE','employee'),(495,'Client','clientWelcomeEmail','*','ALLOW','ROLE','employee'),(496,'Client','printerSetupHtml','*','ALLOW','ROLE','employee'),(497,'Client','printerSetupEmail','*','ALLOW','ROLE','employee'),(498,'Client','sepaCoreEmail','*','ALLOW','ROLE','employee'),(499,'Client','letterDebtorPdf','*','ALLOW','ROLE','employee'),(500,'Client','letterDebtorStHtml','*','ALLOW','ROLE','employee'),(501,'Client','letterDebtorStEmail','*','ALLOW','ROLE','employee'),(502,'Client','letterDebtorNdHtml','*','ALLOW','ROLE','employee'),(503,'Client','letterDebtorNdEmail','*','ALLOW','ROLE','employee'),(504,'Client','clientDebtStatementPdf','*','ALLOW','ROLE','employee'),(505,'Client','clientDebtStatementHtml','*','ALLOW','ROLE','employee'),(506,'Client','clientDebtStatementEmail','*','ALLOW','ROLE','employee'),(507,'Client','creditRequestPdf','*','ALLOW','ROLE','employee'),(508,'Client','creditRequestHtml','*','ALLOW','ROLE','employee'),(509,'Client','creditRequestEmail','*','ALLOW','ROLE','employee'),(510,'Client','incotermsAuthorizationPdf','*','ALLOW','ROLE','employee'),(511,'Client','incotermsAuthorizationHtml','*','ALLOW','ROLE','employee'),(512,'Client','incotermsAuthorizationEmail','*','ALLOW','ROLE','employee'),(513,'Client','consumptionSendQueued','*','ALLOW','ROLE','employee'),(514,'Client','filter','*','ALLOW','ROLE','employee'),(515,'Client','getClientOrSupplierReference','*','ALLOW','ROLE','employee'),(516,'Client','upsert','*','ALLOW','ROLE','employee'),(518,'Client','replaceById','*','ALLOW','ROLE','employee'),(519,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(520,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(521,'Client','deleteById','*','ALLOW','ROLE','employee'),(522,'Client','replaceOrCreate','*','ALLOW','ROLE','employee'),(523,'Client','updateAll','*','ALLOW','ROLE','employee'),(524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee'),(525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee'),(527,'VnUser','acl','READ','ALLOW','ROLE','account'),(528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),(530,'Account','exists','READ','ALLOW','ROLE','account'),(531,'Account','exists','READ','ALLOW','ROLE','account'),(532,'UserLog','*','READ','ALLOW','ROLE','employee'),(533,'RoleLog','*','READ','ALLOW','ROLE','employee'),(534,'WagonType','*','*','ALLOW','ROLE','productionAssi'),(535,'WagonTypeColor','*','*','ALLOW','ROLE','productionAssi'),(536,'WagonTypeTray','*','*','ALLOW','ROLE','productionAssi'),(537,'WagonConfig','*','*','ALLOW','ROLE','productionAssi'),(538,'CollectionWagon','*','*','ALLOW','ROLE','productionAssi'),(539,'CollectionWagonTicket','*','*','ALLOW','ROLE','productionAssi'),(540,'Wagon','*','*','ALLOW','ROLE','productionAssi'),(541,'WagonType','createWagonType','*','ALLOW','ROLE','productionAssi'),(542,'WagonType','deleteWagonType','*','ALLOW','ROLE','productionAssi'),(543,'WagonType','editWagonType','*','ALLOW','ROLE','productionAssi'),(544,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(545,'Agency','find','READ','ALLOW','ROLE','employee'),(546,'Agency','seeExpired','READ','ALLOW','ROLE','coolerAssist'),(547,'WorkerLog','models','READ','ALLOW','ROLE','hr'),(548,'Ticket','editDiscount','WRITE','ALLOW','ROLE','claimManager'),(549,'Ticket','editDiscount','WRITE','ALLOW','ROLE','salesPerson'),(550,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','salesAssistant'),(551,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','deliveryAssistant'),(552,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','buyer'),(553,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','claimManager'),(554,'Ticket','deleteTicketWithPartPrepared','WRITE','ALLOW','ROLE','salesAssistant'),(555,'Ticket','editZone','WRITE','ALLOW','ROLE','deliveryAssistant'),(556,'State','editableStates','READ','ALLOW','ROLE','employee'),(557,'State','seeEditableStates','READ','ALLOW','ROLE','administrative'),(558,'State','seeEditableStates','READ','ALLOW','ROLE','production'),(559,'State','isSomeEditable','READ','ALLOW','ROLE','salesPerson'),(560,'State','isAllEditable','READ','ALLOW','ROLE','production'),(561,'State','isAllEditable','READ','ALLOW','ROLE','administrative'),(562,'Agency','seeExpired','READ','ALLOW','ROLE','administrative'),(563,'Agency','seeExpired','READ','ALLOW','ROLE','productionBoss'),(564,'Claim','createAfterDeadline','WRITE','ALLOW','ROLE','claimManager'),(565,'Client','editAddressLogifloraAllowed','WRITE','ALLOW','ROLE','salesAssistant'),(566,'Client','editFiscalDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(567,'Client','editVerifiedDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(568,'Client','editCredit','WRITE','ALLOW','ROLE','financialBoss'),(569,'Client','zeroCreditEditor','WRITE','ALLOW','ROLE','financialBoss'),(570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE','invoicing'),(571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial'),(572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss'),(573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr'),(574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager'),(577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson'),(579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson'),(580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager'),(581,'Claim','updateClaimDestination','WRITE','ALLOW','ROLE','claimManager'),(582,'Claim','downloadFile','READ','ALLOW','ROLE','claimManager'),(583,'Claim','deleteById','WRITE','ALLOW','ROLE','claimManager'),(585,'Claim','logs','READ','ALLOW','ROLE','claimManager'),(586,'Ticket','find','READ','ALLOW','ROLE','employee'),(587,'Ticket','findById','READ','ALLOW','ROLE','employee'),(588,'Ticket','findOne','READ','ALLOW','ROLE','employee'),(589,'Ticket','getVolume','READ','ALLOW','ROLE','employee'),(590,'Ticket','getTotalVolume','READ','ALLOW','ROLE','employee'),(591,'Ticket','summary','READ','ALLOW','ROLE','employee'),(592,'Ticket','priceDifference','READ','ALLOW','ROLE','employee'),(593,'Ticket','componentUpdate','WRITE','ALLOW','ROLE','employee'),(594,'Ticket','new','WRITE','ALLOW','ROLE','employee'),(595,'Ticket','isEditable','READ','ALLOW','ROLE','employee'),(596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson'),(597,'Ticket','restore','WRITE','ALLOW','ROLE','employee'),(598,'Ticket','getSales','READ','ALLOW','ROLE','employee'),(599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee'),(600,'Ticket','filter','READ','ALLOW','ROLE','employee'),(601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee'),(602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee'),(603,'Ticket','updateDiscount','WRITE','ALLOW','ROLE','employee'),(604,'Ticket','transferSales','WRITE','ALLOW','ROLE','employee'),(605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employee'),(606,'Ticket','isLocked','READ','ALLOW','ROLE','employee'),(607,'Ticket','freightCost','READ','ALLOW','ROLE','employee'),(608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee'),(609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery'),(610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee'),(611,'State','find','READ','ALLOW','ROLE','employee'),(612,'State','findById','READ','ALLOW','ROLE','employee'),(613,'State','findOne','READ','ALLOW','ROLE','employee'),(614,'Worker','find','READ','ALLOW','ROLE','employee'),(615,'Worker','findById','READ','ALLOW','ROLE','employee'),(616,'Worker','findOne','READ','ALLOW','ROLE','employee'),(617,'Worker','filter','READ','ALLOW','ROLE','employee'),(618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee'),(619,'Worker','active','READ','ALLOW','ROLE','employee'),(620,'Worker','activeWithRole','READ','ALLOW','ROLE','employee'),(621,'Worker','uploadFile','WRITE','ALLOW','ROLE','hr'),(622,'Worker','contracts','READ','ALLOW','ROLE','employee'),(623,'Worker','holidays','READ','ALLOW','ROLE','employee'),(624,'Worker','activeContract','READ','ALLOW','ROLE','employee'),(625,'Worker','activeWithInheritedRole','READ','ALLOW','ROLE','employee'),(626,'Ticket','collectionLabel','READ','ALLOW','ROLE','employee'),(628,'Ticket','expeditionPalletLabel','READ','ALLOW','ROLE','employee'),(629,'Ticket','editDiscount','WRITE','ALLOW','ROLE','artificialBoss'),(630,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesTeamBoss'),(635,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','administrative'),(636,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesPerson'),(637,'Claim','downloadFile','READ','ALLOW','ROLE','salesPerson'),(638,'Agency','seeExpired','READ','ALLOW','ROLE','artificialBoss'),(639,'Agency','seeExpired','READ','ALLOW','ROLE','logisticAssistant'),(654,'Ticket','editZone','WRITE','ALLOW','ROLE','logisticAssistant'),(655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production'),(656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production'),(657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production'),(658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system'),(659,'Account','*','*','ALLOW','ROLE','developerBoss'),(664,'MailForward','*','*','ALLOW','ROLE','itManagement'),(665,'Role','*','READ','ALLOW','ROLE','employee'),(666,'Role','*','WRITE','ALLOW','ROLE','it'),(667,'VnUser','*','*','ALLOW','ROLE','itManagement'),(668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee'),(669,'VnUser','preview','*','ALLOW','ROLE','employee'),(670,'VnUser','create','*','ALLOW','ROLE','itManagement'),(671,'VnUser','renewToken','WRITE','ALLOW','ROLE','employee'),(672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production'),(673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing'),(674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing'),(676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee'),(680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee'),(681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee'),(682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee'),(683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement'),(684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement'),(685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement'),(686,'MailForward','*','*','ALLOW','ROLE','hr'),(687,'ClientSms','find','READ','ALLOW','ROLE','employee'),(688,'ClientSms','create','WRITE','ALLOW','ROLE','employee'),(689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee'),(690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss'),(691,'Roadmap','*','*','ALLOW','ROLE','productionBoss'),(692,'ExpeditionTruck','*','*','ALLOW','ROLE','palletizerBoss'),(693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss'),(694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss'),(695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee'),(696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee'),(697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative'),(698,'Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer'),(699,'TicketSms','find','READ','ALLOW','ROLE','salesPerson'),(701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryAssistant'),(702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson'),(703,'Worker','search','READ','ALLOW','ROLE','employee'),(704,'ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery'),(705,'SaleGroupDetail','deleteById','WRITE','ALLOW','ROLE','employee'),(706,'Ticket','setDeleted','WRITE','ALLOW','ROLE','buyer'),(707,'DeviceLog','create','WRITE','ALLOW','ROLE','employee'),(708,'Collection','getTickets','WRITE','ALLOW','ROLE','employee'),(709,'Client','findOne','READ','ALLOW','ROLE','employee'),(710,'Client','findById','READ','ALLOW','ROLE','employee'),(711,'Client','find','READ','ALLOW','ROLE','employee'),(712,'Client','exists','READ','ALLOW','ROLE','employee'),(713,'Client','__get__addresses','READ','ALLOW','ROLE','employee'),(714,'ExpeditionMistakeType','*','READ','ALLOW','ROLE','employee'),(715,'WorkerMistakeType','*','READ','ALLOW','ROLE','employee'),(716,'ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'),(717,'WorkerMistake','*','WRITE','ALLOW','ROLE','coolerBoss'),(718,'MistakesTypes','*','WRITE','ALLOW','ROLE','coolerBoss'),(719,'MistakeType','*','READ','ALLOW','ROLE','employee'),(720,'MachineWorker','*','READ','ALLOW','ROLE','coolerAssist'),(721,'Printer','*','READ','ALLOW','ROLE','employee'),(722,'SaleMistake','*','WRITE','ALLOW','ROLE','production'),(723,'Item','setVisibleDiscard','WRITE','ALLOW','ROLE','employee'),(724,'Address','getAddress','READ','ALLOW','ROLE','employee'),(725,'Account','findOne','READ','ALLOW','ROLE','employee'),(726,'Account','findById','READ','ALLOW','ROLE','employee'),(727,'Account','find','READ','ALLOW','ROLE','employee'),(728,'Account','exists','READ','ALLOW','ROLE','employee'),(729,'Sale','refund','WRITE','ALLOW','ROLE','buyer'),(730,'Ticket','setDeleted','WRITE','ALLOW','ROLE','deliveryAssistant'),(732,'Sale','isInPreparing','*','ALLOW','ROLE','production'),(733,'Train','*','READ','ALLOW','ROLE','production'),(734,'WorkerDepartment','*','*','ALLOW','ROLE','employee'),(735,'VnUser','higherPrivileges','*','ALLOW','ROLE','itManagement'),(736,'VnUser','mediumPrivileges','*','ALLOW','ROLE','hr'),(737,'VnUser','updateUser','*','ALLOW','ROLE','employee'),(738,'TicketCollection','*','WRITE','ALLOW','ROLE','production'),(739,'Worker','setPassword','*','ALLOW','ROLE','employee'),(740,'Url','getByUser','READ','ALLOW','ROLE','$everyone'),(741,'Claim','__get__lines','READ','ALLOW','ROLE','claimViewer'),(742,'AddressShortage','*','READ','ALLOW','ROLE','production'),(743,'Claim','filter','READ','ALLOW','ROLE','claimViewer'),(744,'Claim','find','READ','ALLOW','ROLE','claimViewer'),(745,'Claim','findById','READ','ALLOW','ROLE','claimViewer'),(746,'Claim','getSummary','READ','ALLOW','ROLE','claimViewer'),(747,'CplusRectificationType','*','READ','ALLOW','ROLE','administrative'),(748,'SiiTypeInvoiceOut','*','READ','ALLOW','ROLE','administrative'),(749,'InvoiceCorrectionType','*','READ','ALLOW','ROLE','administrative'),(750,'InvoiceOut','transferInvoice','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'Ticket','state','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','logisticBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryAssistant'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryAssistant'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','find','READ','ALLOW','ROLE','hr'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','READ','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryAssistant'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'),(429,'ItemConfig','*','READ','ALLOW','ROLE','employee'),(431,'Tag','onSubmit','WRITE','ALLOW','ROLE','employee'),(432,'Worker','updateAttributes','WRITE','ALLOW','ROLE','hr'),(433,'Worker','createAbsence','*','ALLOW','ROLE','employee'),(434,'Worker','updateAbsence','WRITE','ALLOW','ROLE','employee'),(435,'Worker','deleteAbsence','*','ALLOW','ROLE','employee'),(436,'Worker','new','WRITE','ALLOW','ROLE','hr'),(438,'Client','getClientOrSupplierReference','READ','ALLOW','ROLE','employee'),(439,'NotificationSubscription','*','*','ALLOW','ROLE','employee'),(440,'NotificationAcl','*','READ','ALLOW','ROLE','employee'),(441,'MdbApp','*','READ','ALLOW','ROLE','$everyone'),(442,'MdbApp','*','*','ALLOW','ROLE','developer'),(443,'ItemConfig','*','*','ALLOW','ROLE','employee'),(444,'DeviceProduction','*','*','ALLOW','ROLE','hr'),(445,'DeviceProductionModels','*','*','ALLOW','ROLE','hr'),(446,'DeviceProductionState','*','*','ALLOW','ROLE','hr'),(447,'DeviceProductionUser','*','*','ALLOW','ROLE','hr'),(448,'DeviceProduction','*','*','ALLOW','ROLE','productionAssi'),(449,'DeviceProductionModels','*','*','ALLOW','ROLE','productionAssi'),(450,'DeviceProductionState','*','*','ALLOW','ROLE','productionAssi'),(451,'DeviceProductionUser','*','*','ALLOW','ROLE','productionAssi'),(452,'Worker','deallocatePDA','*','ALLOW','ROLE','hr'),(453,'Worker','allocatePDA','*','ALLOW','ROLE','hr'),(454,'Worker','deallocatePDA','*','ALLOW','ROLE','productionAssi'),(455,'Worker','allocatePDA','*','ALLOW','ROLE','productionAssi'),(456,'Zone','*','*','ALLOW','ROLE','deliveryAssistant'),(458,'Operator','*','READ','ALLOW','ROLE','employee'),(459,'Operator','*','WRITE','ALLOW','ROLE','employee'),(460,'InvoiceIn','getSerial','READ','ALLOW','ROLE','administrative'),(461,'Ticket','saveSign','WRITE','ALLOW','ROLE','employee'),(462,'InvoiceOut','negativeBases','READ','ALLOW','ROLE','administrative'),(463,'InvoiceOut','negativeBasesCsv','READ','ALLOW','ROLE','administrative'),(464,'WorkerObservation','*','*','ALLOW','ROLE','hr'),(465,'ClientInforma','*','READ','ALLOW','ROLE','employee'),(466,'ClientInforma','*','WRITE','ALLOW','ROLE','financial'),(467,'Receipt','receiptEmail','*','ALLOW','ROLE','salesAssistant'),(468,'Client','setRating','WRITE','ALLOW','ROLE','financial'),(470,'Client','addressesPropagateRe','*','ALLOW','ROLE','employee'),(471,'Client','canBeInvoiced','*','ALLOW','ROLE','employee'),(472,'Client','canCreateTicket','*','ALLOW','ROLE','employee'),(473,'Client','consumption','*','ALLOW','ROLE','employee'),(474,'Client','createAddress','*','ALLOW','ROLE','employee'),(475,'Client','createWithUser','*','ALLOW','ROLE','employee'),(476,'Client','extendedListFilter','*','ALLOW','ROLE','employee'),(477,'Client','getAverageInvoiced','*','ALLOW','ROLE','employee'),(478,'Client','getCard','*','ALLOW','ROLE','employee'),(479,'Client','getDebt','*','ALLOW','ROLE','employee'),(480,'Client','getMana','*','ALLOW','ROLE','employee'),(481,'Client','transactions','*','ALLOW','ROLE','employee'),(482,'Client','hasCustomerRole','*','ALLOW','ROLE','employee'),(483,'Client','isValidClient','*','ALLOW','ROLE','employee'),(484,'Client','lastActiveTickets','*','ALLOW','ROLE','employee'),(485,'Client','sendSms','*','ALLOW','ROLE','employee'),(486,'Client','setPassword','*','ALLOW','ROLE','employee'),(487,'Client','summary','*','ALLOW','ROLE','employee'),(488,'Client','updateAddress','*','ALLOW','ROLE','employee'),(489,'Client','updateFiscalData','*','ALLOW','ROLE','employee'),(491,'Client','uploadFile','*','ALLOW','ROLE','employee'),(492,'Client','campaignMetricsPdf','*','ALLOW','ROLE','employee'),(493,'Client','campaignMetricsEmail','*','ALLOW','ROLE','employee'),(494,'Client','clientWelcomeHtml','*','ALLOW','ROLE','employee'),(495,'Client','clientWelcomeEmail','*','ALLOW','ROLE','employee'),(496,'Client','printerSetupHtml','*','ALLOW','ROLE','employee'),(497,'Client','printerSetupEmail','*','ALLOW','ROLE','employee'),(498,'Client','sepaCoreEmail','*','ALLOW','ROLE','employee'),(499,'Client','letterDebtorPdf','*','ALLOW','ROLE','employee'),(500,'Client','letterDebtorStHtml','*','ALLOW','ROLE','employee'),(501,'Client','letterDebtorStEmail','*','ALLOW','ROLE','employee'),(502,'Client','letterDebtorNdHtml','*','ALLOW','ROLE','employee'),(503,'Client','letterDebtorNdEmail','*','ALLOW','ROLE','employee'),(504,'Client','clientDebtStatementPdf','*','ALLOW','ROLE','employee'),(505,'Client','clientDebtStatementHtml','*','ALLOW','ROLE','employee'),(506,'Client','clientDebtStatementEmail','*','ALLOW','ROLE','employee'),(507,'Client','creditRequestPdf','*','ALLOW','ROLE','employee'),(508,'Client','creditRequestHtml','*','ALLOW','ROLE','employee'),(509,'Client','creditRequestEmail','*','ALLOW','ROLE','employee'),(510,'Client','incotermsAuthorizationPdf','*','ALLOW','ROLE','employee'),(511,'Client','incotermsAuthorizationHtml','*','ALLOW','ROLE','employee'),(512,'Client','incotermsAuthorizationEmail','*','ALLOW','ROLE','employee'),(513,'Client','consumptionSendQueued','*','ALLOW','ROLE','employee'),(514,'Client','filter','*','ALLOW','ROLE','employee'),(515,'Client','getClientOrSupplierReference','*','ALLOW','ROLE','employee'),(516,'Client','upsert','*','ALLOW','ROLE','employee'),(518,'Client','replaceById','*','ALLOW','ROLE','employee'),(519,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(520,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(521,'Client','deleteById','*','ALLOW','ROLE','employee'),(522,'Client','replaceOrCreate','*','ALLOW','ROLE','employee'),(523,'Client','updateAll','*','ALLOW','ROLE','employee'),(524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee'),(525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee'),(527,'VnUser','acl','READ','ALLOW','ROLE','account'),(528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),(530,'Account','exists','READ','ALLOW','ROLE','account'),(531,'Account','exists','READ','ALLOW','ROLE','account'),(532,'UserLog','*','READ','ALLOW','ROLE','employee'),(533,'RoleLog','*','READ','ALLOW','ROLE','employee'),(534,'WagonType','*','*','ALLOW','ROLE','productionAssi'),(535,'WagonTypeColor','*','*','ALLOW','ROLE','productionAssi'),(536,'WagonTypeTray','*','*','ALLOW','ROLE','productionAssi'),(537,'WagonConfig','*','*','ALLOW','ROLE','productionAssi'),(538,'CollectionWagon','*','*','ALLOW','ROLE','productionAssi'),(539,'CollectionWagonTicket','*','*','ALLOW','ROLE','productionAssi'),(540,'Wagon','*','*','ALLOW','ROLE','productionAssi'),(541,'WagonType','createWagonType','*','ALLOW','ROLE','productionAssi'),(542,'WagonType','deleteWagonType','*','ALLOW','ROLE','productionAssi'),(543,'WagonType','editWagonType','*','ALLOW','ROLE','productionAssi'),(544,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(545,'Agency','find','READ','ALLOW','ROLE','employee'),(546,'Agency','seeExpired','READ','ALLOW','ROLE','coolerAssist'),(547,'WorkerLog','models','READ','ALLOW','ROLE','hr'),(548,'Ticket','editDiscount','WRITE','ALLOW','ROLE','claimManager'),(549,'Ticket','editDiscount','WRITE','ALLOW','ROLE','salesPerson'),(550,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','salesAssistant'),(551,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','deliveryAssistant'),(552,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','buyer'),(553,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','claimManager'),(554,'Ticket','deleteTicketWithPartPrepared','WRITE','ALLOW','ROLE','salesAssistant'),(555,'Ticket','editZone','WRITE','ALLOW','ROLE','deliveryAssistant'),(556,'State','editableStates','READ','ALLOW','ROLE','employee'),(557,'State','seeEditableStates','READ','ALLOW','ROLE','administrative'),(558,'State','seeEditableStates','READ','ALLOW','ROLE','production'),(559,'State','isSomeEditable','READ','ALLOW','ROLE','salesPerson'),(560,'State','isAllEditable','READ','ALLOW','ROLE','production'),(561,'State','isAllEditable','READ','ALLOW','ROLE','administrative'),(562,'Agency','seeExpired','READ','ALLOW','ROLE','administrative'),(563,'Agency','seeExpired','READ','ALLOW','ROLE','productionBoss'),(564,'Claim','createAfterDeadline','WRITE','ALLOW','ROLE','claimManager'),(565,'Client','editAddressLogifloraAllowed','WRITE','ALLOW','ROLE','salesAssistant'),(566,'Client','editFiscalDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(567,'Client','editVerifiedDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(568,'Client','editCredit','WRITE','ALLOW','ROLE','financialBoss'),(569,'Client','zeroCreditEditor','WRITE','ALLOW','ROLE','financialBoss'),(570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE','invoicing'),(571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial'),(572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss'),(573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr'),(574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager'),(577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson'),(579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson'),(580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager'),(581,'Claim','updateClaimDestination','WRITE','ALLOW','ROLE','claimManager'),(582,'Claim','downloadFile','READ','ALLOW','ROLE','claimManager'),(583,'Claim','deleteById','WRITE','ALLOW','ROLE','claimManager'),(585,'Claim','logs','READ','ALLOW','ROLE','claimManager'),(586,'Ticket','find','READ','ALLOW','ROLE','employee'),(587,'Ticket','findById','READ','ALLOW','ROLE','employee'),(588,'Ticket','findOne','READ','ALLOW','ROLE','employee'),(589,'Ticket','getVolume','READ','ALLOW','ROLE','employee'),(590,'Ticket','getTotalVolume','READ','ALLOW','ROLE','employee'),(591,'Ticket','summary','READ','ALLOW','ROLE','employee'),(592,'Ticket','priceDifference','READ','ALLOW','ROLE','employee'),(593,'Ticket','componentUpdate','WRITE','ALLOW','ROLE','employee'),(594,'Ticket','new','WRITE','ALLOW','ROLE','employee'),(595,'Ticket','isEditable','READ','ALLOW','ROLE','employee'),(596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson'),(597,'Ticket','restore','WRITE','ALLOW','ROLE','employee'),(598,'Ticket','getSales','READ','ALLOW','ROLE','employee'),(599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee'),(600,'Ticket','filter','READ','ALLOW','ROLE','employee'),(601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee'),(602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee'),(603,'Ticket','updateDiscount','WRITE','ALLOW','ROLE','employee'),(604,'Ticket','transferSales','WRITE','ALLOW','ROLE','employee'),(605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employee'),(606,'Ticket','isLocked','READ','ALLOW','ROLE','employee'),(607,'Ticket','freightCost','READ','ALLOW','ROLE','employee'),(608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee'),(609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery'),(610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee'),(611,'State','find','READ','ALLOW','ROLE','employee'),(612,'State','findById','READ','ALLOW','ROLE','employee'),(613,'State','findOne','READ','ALLOW','ROLE','employee'),(614,'Worker','find','READ','ALLOW','ROLE','employee'),(615,'Worker','findById','READ','ALLOW','ROLE','employee'),(616,'Worker','findOne','READ','ALLOW','ROLE','employee'),(617,'Worker','filter','READ','ALLOW','ROLE','employee'),(618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee'),(619,'Worker','active','READ','ALLOW','ROLE','employee'),(620,'Worker','activeWithRole','READ','ALLOW','ROLE','employee'),(621,'Worker','uploadFile','WRITE','ALLOW','ROLE','hr'),(622,'Worker','contracts','READ','ALLOW','ROLE','employee'),(623,'Worker','holidays','READ','ALLOW','ROLE','employee'),(624,'Worker','activeContract','READ','ALLOW','ROLE','employee'),(625,'Worker','activeWithInheritedRole','READ','ALLOW','ROLE','employee'),(626,'Ticket','collectionLabel','READ','ALLOW','ROLE','employee'),(628,'Ticket','expeditionPalletLabel','READ','ALLOW','ROLE','employee'),(629,'Ticket','editDiscount','WRITE','ALLOW','ROLE','artificialBoss'),(630,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesTeamBoss'),(635,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','administrative'),(636,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesPerson'),(637,'Claim','downloadFile','READ','ALLOW','ROLE','salesPerson'),(638,'Agency','seeExpired','READ','ALLOW','ROLE','artificialBoss'),(639,'Agency','seeExpired','READ','ALLOW','ROLE','logisticAssistant'),(654,'Ticket','editZone','WRITE','ALLOW','ROLE','logisticAssistant'),(655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production'),(656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production'),(657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production'),(658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system'),(659,'Account','*','*','ALLOW','ROLE','developerBoss'),(664,'MailForward','*','*','ALLOW','ROLE','itManagement'),(665,'Role','*','READ','ALLOW','ROLE','employee'),(666,'Role','*','WRITE','ALLOW','ROLE','it'),(667,'VnUser','*','*','ALLOW','ROLE','itManagement'),(668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee'),(669,'VnUser','preview','*','ALLOW','ROLE','employee'),(670,'VnUser','create','*','ALLOW','ROLE','itManagement'),(672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production'),(673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing'),(674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing'),(676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee'),(680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee'),(681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee'),(682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee'),(683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement'),(684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement'),(685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement'),(686,'MailForward','*','*','ALLOW','ROLE','hr'),(687,'ClientSms','find','READ','ALLOW','ROLE','employee'),(688,'ClientSms','create','WRITE','ALLOW','ROLE','employee'),(689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee'),(690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss'),(691,'Roadmap','*','*','ALLOW','ROLE','productionBoss'),(692,'ExpeditionTruck','*','*','ALLOW','ROLE','production'),(693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss'),(694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss'),(695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee'),(696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee'),(697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative'),(698,'Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer'),(699,'TicketSms','find','READ','ALLOW','ROLE','salesPerson'),(701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryAssistant'),(702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson'),(703,'Worker','search','READ','ALLOW','ROLE','employee'),(704,'ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery'),(705,'SaleGroupDetail','deleteById','WRITE','ALLOW','ROLE','employee'),(706,'Ticket','setDeleted','WRITE','ALLOW','ROLE','buyer'),(707,'DeviceLog','create','WRITE','ALLOW','ROLE','employee'),(708,'Collection','getTickets','WRITE','ALLOW','ROLE','employee'),(709,'Client','findOne','READ','ALLOW','ROLE','employee'),(710,'Client','findById','READ','ALLOW','ROLE','employee'),(711,'Client','find','READ','ALLOW','ROLE','employee'),(712,'Client','exists','READ','ALLOW','ROLE','employee'),(713,'Client','__get__addresses','READ','ALLOW','ROLE','employee'),(714,'ExpeditionMistakeType','*','READ','ALLOW','ROLE','employee'),(715,'WorkerMistakeType','*','READ','ALLOW','ROLE','employee'),(716,'ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'),(717,'WorkerMistake','*','WRITE','ALLOW','ROLE','coolerAssist'),(718,'MistakesTypes','*','WRITE','ALLOW','ROLE','coolerAssist'),(719,'MistakeType','*','READ','ALLOW','ROLE','employee'),(720,'MachineWorker','*','READ','ALLOW','ROLE','coolerAssist'),(721,'Printer','*','READ','ALLOW','ROLE','employee'),(722,'SaleMistake','*','WRITE','ALLOW','ROLE','production'),(723,'Item','setVisibleDiscard','WRITE','ALLOW','ROLE','employee'),(724,'Address','getAddress','READ','ALLOW','ROLE','employee'),(725,'Account','findOne','READ','ALLOW','ROLE','employee'),(726,'Account','findById','READ','ALLOW','ROLE','employee'),(727,'Account','find','READ','ALLOW','ROLE','employee'),(728,'Account','exists','READ','ALLOW','ROLE','employee'),(729,'Sale','refund','WRITE','ALLOW','ROLE','buyer'),(730,'Ticket','setDeleted','WRITE','ALLOW','ROLE','deliveryAssistant'),(732,'Sale','isInPreparing','*','ALLOW','ROLE','production'),(733,'Train','*','READ','ALLOW','ROLE','production'),(734,'WorkerDepartment','*','*','ALLOW','ROLE','employee'),(735,'VnUser','higherPrivileges','*','ALLOW','ROLE','itManagement'),(736,'VnUser','mediumPrivileges','*','ALLOW','ROLE','hr'),(737,'VnUser','updateUser','*','ALLOW','ROLE','employee'),(738,'TicketCollection','*','WRITE','ALLOW','ROLE','production'),(739,'Worker','setPassword','*','ALLOW','ROLE','employee'),(740,'Url','getByUser','READ','ALLOW','ROLE','$everyone'),(741,'Claim','__get__lines','READ','ALLOW','ROLE','claimViewer'),(742,'AddressShortage','*','READ','ALLOW','ROLE','production'),(743,'Claim','filter','READ','ALLOW','ROLE','claimViewer'),(744,'Claim','find','READ','ALLOW','ROLE','claimViewer'),(745,'Claim','findById','READ','ALLOW','ROLE','claimViewer'),(746,'Claim','getSummary','READ','ALLOW','ROLE','claimViewer'),(747,'CplusRectificationType','*','READ','ALLOW','ROLE','administrative'),(748,'SiiTypeInvoiceOut','*','READ','ALLOW','ROLE','salesPerson'),(749,'InvoiceCorrectionType','*','READ','ALLOW','ROLE','salesPerson'),(750,'InvoiceOut','transferInvoice','WRITE','ALLOW','ROLE','administrative'),(751,'Application','executeProc','*','ALLOW','ROLE','employee'),(752,'Application','executeFunc','*','ALLOW','ROLE','employee'),(753,'NotificationSubscription','getList','READ','ALLOW','ROLE','employee'),(754,'Route','find','READ','ALLOW','ROLE','employee'),(755,'Route','findById','READ','ALLOW','ROLE','employee'),(756,'Route','findOne','READ','ALLOW','ROLE','employee'),(757,'Route','getRoutesByWorker','READ','ALLOW','ROLE','employee'),(758,'Route','canViewAllRoute','READ','ALLOW','ROLE','deliveryAssistant'),(759,'Route','cmr','READ','ALLOW','ROLE','employee'),(760,'Route','downloadCmrsZip','READ','ALLOW','ROLE','employee'),(761,'Route','downloadZip','READ','ALLOW','ROLE','employee'),(762,'Route','filter','READ','ALLOW','ROLE','employee'),(763,'Route','getByWorker','READ','ALLOW','ROLE','employee'),(764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee'),(765,'Route','getExternalCmrs','READ','ALLOW','ROLE','employee'),(766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee'),(767,'Route','getTickets','READ','ALLOW','ROLE','employee'),(768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee'),(769,'Route','insertTicket','WRITE','ALLOW','ROLE','employee'),(770,'Route','getDeliveryPoint','READ','ALLOW','ROLE','deliveryBoss'),(771,'Route','summary','READ','ALLOW','ROLE','employee'),(772,'Route','getExpeditionSummary','READ','ALLOW','ROLE','delivery'),(773,'WorkerTimeControl','login','READ','ALLOW','ROLE','timeControl'),(774,'WorkerTimeControl','getClockIn','READ','ALLOW','ROLE','timeControl'),(775,'WorkerTimeControl','clockIn','WRITE','ALLOW','ROLE','timeControl'),(776,'WorkerTimeControl','addTimeEntry','WRITE','ALLOW','ROLE','employee'),(777,'WorkerTimeControl','deleteTimeEntry','WRITE','ALLOW','ROLE','employee'),(778,'WorkerTimeControl','updateTimeEntry','WRITE','ALLOW','ROLE','employee'),(779,'WorkerTimeControl','sendMail','WRITE','ALLOW','ROLE','employee'),(780,'WorkerTimeControl','updateWorkerTimeControlMail','WRITE','ALLOW','ROLE','employee'),(781,'WorkerTimeControl','weeklyHourRecordEmail','WRITE','ALLOW','ROLE','employee'),(782,'WorkerTimeControl','getMailStates','READ','ALLOW','ROLE','employee'),(783,'WorkerTimeControl','resendWeeklyHourEmail','WRITE','ALLOW','ROLE','employee');
 /*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -206,13 +206,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:25
 USE `vn`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: vn
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -400,7 +400,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `department` WRITE;
 /*!40000 ALTER TABLE `department` DISABLE KEYS */;
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,106,763,0,0,0,0,31,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL),(22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL),(31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL),(34,NULL,'CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(35,NULL,'FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL),(36,NULL,'LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(37,'PROD','PRODUCCION',12,27,NULL,72,1,1,1,7,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL),(38,NULL,'SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(39,NULL,'ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(41,NULL,'ADMINISTRACION',28,29,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(43,'VT','VENTAS',30,53,NULL,0,0,0,1,11,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL),(44,'management','GERENCIA',54,55,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(45,'logistic','LOGISTICA',56,57,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(46,'delivery','REPARTO',58,59,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(48,NULL,'ALMACENAJE',60,61,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(49,NULL,'PROPIEDAD',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(52,NULL,'CARGA AEREA',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(53,NULL,'MARKETING Y COMUNICACIÓN',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(54,NULL,'ORNAMENTALES',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(55,NULL,'TALLER NATURAL',70,73,14548,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,1,1,0,1118,NULL),(56,NULL,'TALLER ARTIFICIAL',71,72,8470,72,0,0,2,0,55,'/1/55/',NULL,0,NULL,0,1,1,0,1927,NULL),(58,'CMP','CAMPOS',74,77,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(59,NULL,'MANTENIMIENTO',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(60,NULL,'RECLAMACIONES',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL),(61,NULL,'VNH',82,85,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(66,NULL,'VERDNAMADRID',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(68,NULL,'COMPLEMENTOS',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL),(69,NULL,'VERDNABARNA',88,89,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(80,NULL,'EQUIPO J VALLES',31,32,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(86,NULL,'LIMPIEZA',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(89,NULL,'COORDINACION',92,93,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(90,NULL,'TRAILER',83,84,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL),(91,NULL,'ARTIFICIAL',21,22,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(92,NULL,'EQUIPO SILVERIO',33,34,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(93,NULL,'CONFECCION',94,95,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL,NULL),(94,NULL,'EQUIPO J BROCAL',35,36,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(95,NULL,'EQUIPO C ZAMBRANO',37,38,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(96,NULL,'EQUIPO C LOPEZ',39,40,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(115,NULL,'EQUIPO CLAUDI',41,42,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(123,NULL,'EQUIPO ELENA BASCUÑANA',43,44,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(124,NULL,'CONTROL INTERNO',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL),(125,NULL,'EQUIPO MIRIAM MAR',45,46,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(126,NULL,'PRESERVADO',98,99,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,1,0,NULL,NULL),(128,NULL,'PALETIZADO',23,24,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(130,NULL,'REVISION',25,26,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(131,NULL,'INVERNADERO',75,76,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL),(132,NULL,'EQUIPO DC',47,48,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(133,'franceTeam','EQUIPO FRANCIA',49,50,1731,72,0,0,2,0,43,'/1/43/','fra_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(134,NULL,'EQUIPO RODRI',51,52,6264,0,0,0,2,0,43,'/1/43/','rhr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(135,'routers','ENRUTADORES',100,101,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(136,'heavyVehicles','VEHICULOS PESADOS',102,103,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(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 (1,'VN','VERDNATURA',1,106,763,0,0,0,0,28,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL),(22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL),(31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL),(34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL),(36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(37,'PROD','PRODUCCION',12,33,NULL,72,1,1,1,10,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL),(38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(41,'administration','ADMINISTRACION',34,35,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(43,'VT','VENTAS',36,61,NULL,0,0,0,1,12,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL),(44,'management','GERENCIA',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(45,'logistic','LOGISTICA',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(46,'delivery','REPARTO',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(48,'storage','ALMACENAJE',68,69,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(49,NULL,'PROPIEDAD',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(52,NULL,'CARGA AEREA',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(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),(54,NULL,'ORNAMENTALES',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL),(56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL),(58,'CMP','CAMPOS',78,81,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(59,'maintenance','MANTENIMIENTO',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(60,'claims','RECLAMACIONES',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL),(61,NULL,'VNH',86,89,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(66,NULL,'VERDNAMADRID',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL),(69,NULL,'VERDNABARNA',92,93,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(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),(86,NULL,'LIMPIEZA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(89,NULL,'COORDINACION',96,97,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(90,NULL,'TRAILER',87,88,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL),(91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(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),(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),(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),(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),(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),(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),(124,NULL,'CONTROL INTERNO',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL),(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),(126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL),(128,NULL,'PALETIZADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(130,NULL,'REVISION',31,32,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(131,'greenhouse','INVERNADERO',79,80,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL),(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),(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),(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),(135,'routers','ENRUTADORES',100,101,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(136,'heavyVehicles','VEHICULOS PESADOS',102,103,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(137,'sorter','SORTER',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(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);
 /*!40000 ALTER TABLE `department` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -480,7 +480,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `workCenter` WRITE;
 /*!40000 ALTER TABLE `workCenter` DISABLE KEYS */;
-INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL),(2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL,NULL),(4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL),(5,'Madrid',28,2869,5,'Av constitución 3',554145,0.50),(6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL),(7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL),(8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL),(9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL),(10,'Rubi',88,NULL,84,'Av. de la Llana, 131',549722,0.50);
+INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL),(2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL,NULL),(4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL),(5,'Madrid',28,2869,5,'Av constitución 3',554145,2.00),(6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL),(7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL),(8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL),(9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL),(10,'Rubi',88,NULL,84,'Av. de la Llana, 131',549722,NULL);
 /*!40000 ALTER TABLE `workCenter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -522,13 +522,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:26
 USE `cache`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: cache
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -558,13 +558,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:26
 USE `hedera`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: hedera
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -724,13 +724,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:26
 USE `sage`;
 -- MariaDB dump 10.19  Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db2.static.verdnatura.es    Database: sage
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -790,4 +790,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 12:26:42
+-- Dump completed on 2024-01-24  8:21:26
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 0a45cc216..dae737466 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -180,11 +180,13 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 2, 1,   0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
 
+INSERT INTO `vn`.`sectorType` (id,description)
+	VALUES (1,'First type');
 
-INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPreparedByPacking`, `code`)
+INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`)
     VALUES
-        (1, 'First sector',     1, 1, 'FIRST'),
-        (2, 'Second sector',    2, 0, 'SECOND');
+        (1, 'First sector',     1, 'FIRST', 1),
+        (2, 'Second sector',    2, 'SECOND',1);
 
 INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAddress`)
     VALUES
@@ -194,6 +196,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
 
 UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
 
+
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
     VALUES
         (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106),
@@ -659,19 +662,20 @@ INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`
 
 INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`)
     VALUES
-        (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 0,    0, 100),
-        (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 0,    0, 100),
+        (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
+        (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
         (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
         (4,  'Zone 247 B',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
         (5,  'Zone expensive A',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
         (6,  'Zone expensive B',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
-        (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 0,    0, 100),
-        (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 0,    0, 100),
-        (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 0,    0, 100),
-        (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 0,    0, 100),
-        (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 0,    0, 100),
-        (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 0,    0, 100),
-        (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 0,    0, 100);
+        (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1,    0, 100),
+        (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1,    0, 100),
+        (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 1,    0, 100),
+        (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 1,    0, 100),
+        (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
+        (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 1,    0, 100),
+        (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 1,    0, 100);
+
 
 INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
     VALUES
@@ -2922,7 +2926,7 @@ INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk
 
 INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
     VALUES
-        (24, 7);
+        (24, 8);
 
 INSERT INTO `vn`.`deviceProductionModels` (`code`)
     VALUES
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 66e9fd2f8..f69dbbb18 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -2,7 +2,7 @@
 --
 -- Host: db2.static.verdnatura.es    Database: account
 -- ------------------------------------------------------
--- Server version	10.7.7-MariaDB-1:10.7.7+maria~deb11-log
+-- Server version	10.11.6-MariaDB-1:10.11.6+maria~deb12-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -314,6 +314,23 @@ CREATE TABLE `mailAliasAccount` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Mail alias that is assigned to each account';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `mailAliasAcl`
+--
+
+DROP TABLE IF EXISTS `mailAliasAcl`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mailAliasAcl` (
+  `mailAliasFk` int(10) unsigned NOT NULL,
+  `roleFk` int(10) unsigned NOT NULL,
+  KEY `mailAliasFk` (`mailAliasFk`),
+  KEY `roleFk` (`roleFk`),
+  CONSTRAINT `mailAliasAcl_ibfk_1` FOREIGN KEY (`mailAliasFk`) REFERENCES `mailAlias` (`id`),
+  CONSTRAINT `mailAliasAcl_ibfk_2` FOREIGN KEY (`roleFk`) REFERENCES `role` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `mailClientAccess__`
 --
@@ -744,7 +761,9 @@ CREATE TABLE `signInLog` (
   `token` varchar(255) NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `userName` varchar(30) NOT NULL,
   `ip` varchar(100) NOT NULL,
+  `owner` tinyint(1) DEFAULT 1,
   PRIMARY KEY (`id`),
   KEY `userFk` (`userFk`),
   CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -808,7 +827,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	CALL user_checkName(NEW.`name`);
 
 	IF NEW.nickname = '' THEN
@@ -1005,27 +1024,6 @@ CREATE TABLE `userSync` (
 --
 -- Dumping events for database 'account'
 --
-/*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
-/*!50106 DROP EVENT IF EXISTS `role_sync` */;
-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_results = utf8mb3 */ ;;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
-/*!50003 SET @saved_time_zone      = @@time_zone */ ;;
-/*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`salix`@`10.0.%.%`*/ /*!50106 EVENT `role_sync` ON SCHEDULE AT '2023-11-16 14:32:48' ON COMPLETION NOT PRESERVE DISABLE ON SLAVE DO CALL role_sync */ ;;
-/*!50003 SET time_zone             = @saved_time_zone */ ;;
-/*!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 */ ;;
-DELIMITER ;
-/*!50106 SET TIME_ZONE= @save_time_zone */ ;
 
 --
 -- Dumping routines for database 'account'
@@ -1060,7 +1058,7 @@ BEGIN
 		SET vSignature = util.hmacSha2(256, CONCAT_WS('/', @userId, @userName), vKey);
 		RETURN vSignature = @userSignature;
 	END IF;
-
+	
 	RETURN FALSE;
 
 END ;;
@@ -1089,7 +1087,7 @@ BEGIN
  * @return The user id
  */
 	DECLARE vUser INT DEFAULT NULL;
-
+	
 	IF myUser_checkLogin()
 	THEN
 		SET vUser = @userId;
@@ -1097,7 +1095,7 @@ BEGIN
 		SELECT id INTO vUser FROM user
 			WHERE name = LEFT(USER(), INSTR(USER(), '@') - 1);
 	END IF;
-
+	
 	RETURN vUser;
 END ;;
 DELIMITER ;
@@ -1132,7 +1130,7 @@ BEGIN
 	ELSE
 		SET vUser = LEFT(USER(), INSTR(USER(), '@') - 1);
 	END IF;
-
+	
 	RETURN vUser;
 END ;;
 DELIMITER ;
@@ -1150,7 +1148,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_hasPriv`(vChain VARCHAR(100),
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_hasPriv`(vChain VARCHAR(100), 
 	vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE')
 ) RETURNS tinyint(1)
     READS SQL DATA
@@ -1285,10 +1283,10 @@ BEGIN
 	DECLARE vDigitChars TEXT DEFAULT '1234567890';
 	DECLARE vPunctChars TEXT DEFAULT '!$%&()=.';
 
-	SELECT length, nAlpha, nUpper, nDigits, nPunct
+	SELECT length, nAlpha, nUpper, nDigits, nPunct 
 		INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword;
 
-	WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha
+	WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha 
 	OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO
 		SET vRandIndex = FLOOR((RAND() * 4) + 1);
 
@@ -1363,7 +1361,7 @@ BEGIN
 	DECLARE vRole VARCHAR(255);
 
 	SELECT CONCAT(IF(r.hasLogin, c.rolePrefix, ''), r.name) INTO vRole
-		FROM role r
+		FROM role r 
 			JOIN user u ON u.role = r.id
 			JOIN roleConfig c
 		WHERE u.name = vUserName;
@@ -1390,16 +1388,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `user_getNameFromId`(vSelf INT) RETUR
 BEGIN
 /**
  * Gets user name from it's id.
- *
+ * 
  * @param vSelf The user id
  * @return The user name
  */
 	DECLARE vName VARCHAR(30);
-
-	SELECT `name` INTO vName
-		FROM user
+	
+	SELECT `name` INTO vName 
+		FROM user 
 		WHERE id = vSelf;
-
+	
 	RETURN vName;
 END ;;
 DELIMITER ;
@@ -1417,8 +1415,8 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` FUNCTION `user_hasPriv`(vChain VARCHAR(100),
-	vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE'),
+CREATE DEFINER=`root`@`localhost` FUNCTION `user_hasPriv`(vChain VARCHAR(100), 
+	vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE'), 
 	vUserFk INT
 ) RETURNS tinyint(1)
     READS SQL DATA
@@ -1440,16 +1438,20 @@ BEGIN
 
 	SET vDb = SUBSTRING_INDEX(vChain, '.', 1);
 	SET vChain = SUBSTRING(vChain, LENGTH(vDb) + 2);
-	SET vTableName = SUBSTRING_INDEX(vChain, '.', 1);
-	SET vColumnName = SUBSTRING(vChain, LENGTH(vTableName) + 2);
-
+	IF LOCATE('.', vChain) > 0 THEN
+		SET vTableName = SUBSTRING_INDEX(vChain, '.', 1);
+		SET vColumnName = SUBSTRING(vChain, LENGTH(vTableName) + 2);
+	ELSE
+		SET vTableName = vChain;
+	END IF;
+	
 	SELECT COUNT(*) INTO vChainExists
 		FROM information_schema.COLUMNS
-			WHERE TABLE_SCHEMA = vDb
-				AND TABLE_NAME = vTableName
-				AND COLUMN_NAME = vColumnName
-			LIMIT 1;
-
+		WHERE TABLE_SCHEMA = vDb
+			AND TABLE_NAME = vTableName
+			AND (COLUMN_NAME = vColumnName OR vColumnName IS NULL)
+		LIMIT 1;
+	
 	IF NOT vChainExists THEN
 		RETURN FALSE;
 	END IF;
@@ -1474,22 +1476,22 @@ BEGIN
 
 	SELECT hasPrivilege INTO vHasPrivilege
 		FROM (SELECT JSON_VALUE(Priv, '$.access') & vPrivilegeFlag hasPrivilege
-				FROM mysql.global_priv gp
+				FROM mysql.global_priv gp 
 					JOIN tRole tr ON CONCAT(tr.name) = gp.User
 				HAVING hasPrivilege
 				LIMIT 1)sub;
-
+			
 	IF NOT vHasPrivilege THEN
 
-		SELECT sub.privilege = 'Y' INTO vHasPrivilege
-			FROM
-				(SELECT CASE vPrivilege
-							WHEN 'SELECT' THEN Select_priv
-							WHEN 'INSERT' THEN Insert_priv
-							WHEN 'UPDATE' THEN Update_priv
-							WHEN 'DELETE' THEN Delete_priv
-						END privilege
-					FROM mysql.db db
+		SELECT sub.privilege = 'Y' INTO vHasPrivilege 
+			FROM 
+				(SELECT CASE vPrivilege 
+							WHEN 'SELECT' THEN Select_priv 
+							WHEN 'INSERT' THEN Insert_priv 
+							WHEN 'UPDATE' THEN Update_priv 
+							WHEN 'DELETE' THEN Delete_priv 
+						END privilege 
+					FROM mysql.db db 
 						JOIN tRole tr ON tr.name = db.User
 					WHERE db.Db = vDb)sub;
 
@@ -1498,13 +1500,13 @@ BEGIN
 	IF NOT vHasPrivilege THEN
 
 		SELECT TRUE INTO vHasPrivilege
-			FROM tRole tr
+			FROM tRole tr 
 				LEFT JOIN (
 					SELECT User, Table_priv privilege
 						FROM mysql.tables_priv
 						 WHERE Db = vDb
 							AND Table_name = vTableName
-					UNION
+					UNION 
 					SELECT User, Column_priv
 						FROM mysql.columns_priv
 						 WHERE Db = vDb
@@ -1587,7 +1589,7 @@ BEGIN
 			JOIN role r ON r.id = rr.inheritsFrom
 		WHERE u.`name` = vUser
 			AND r.id = vRoleId;
-
+	
 	RETURN vHasRole;
 END ;;
 DELIMITER ;
@@ -1624,7 +1626,7 @@ BEGIN
 	DECLARE vObject VARCHAR(50);
 	DECLARE vChainExists BOOL;
 	DECLARE vExecutePriv INT DEFAULT 262144;
-	-- 262144 = CONV(1000000000000000000, 2, 10)
+	-- 262144 = CONV(1000000000000000000, 2, 10) 
 	-- 1000000000000000000 execution permission expressed in binary base
 
 	SET vDb = SUBSTRING_INDEX(vChain, '.', 1);
@@ -1636,7 +1638,7 @@ BEGIN
 			WHERE db = vDb
 				AND `name` = vObject
 				AND `type` = vType
-			LIMIT 1;
+			LIMIT 1;	
 
 	IF NOT vChainExists THEN
 		RETURN FALSE;
@@ -1651,18 +1653,18 @@ BEGIN
 				JOIN roleRole rr ON rr.role = u.role
 				JOIN `role` r ON r.id = rr.inheritsFrom
 			WHERE u.id = vUserFk;
-
+			
 	SELECT TRUE INTO vHasPrivilege
-		FROM mysql.global_priv gp
-			JOIN tRole tr ON tr.name = gp.`User`
+		FROM mysql.global_priv gp 
+			JOIN tRole tr ON tr.name = gp.`User` 
 				OR CONCAT('$', tr.name) = gp.`User`
 		WHERE JSON_VALUE(gp.Priv, '$.access') >= vExecutePriv
 			AND gp.Host = ''
 		LIMIT 1;
 
 	IF NOT vHasPrivilege THEN
-		SELECT TRUE INTO vHasPrivilege
-			FROM mysql.db db
+		SELECT TRUE INTO vHasPrivilege 
+			FROM mysql.db db 
 				JOIN tRole tr ON tr.name = db.`User`
 			WHERE db.Db = vDb
 				AND db.Execute_priv = 'Y';
@@ -1670,7 +1672,7 @@ BEGIN
 
 	IF NOT vHasPrivilege THEN
 		SELECT TRUE INTO vHasPrivilege
-			FROM mysql.procs_priv pp
+			FROM mysql.procs_priv pp 
 				JOIN tRole tr ON tr.name = pp.`User`
 			WHERE pp.Db = vDb
 				AND pp.Routine_name = vObject
@@ -1750,7 +1752,7 @@ BEGIN
 			AND password = MD5(vPassword)
 			AND active;
 
-	IF vAuthIsOk
+	IF vAuthIsOk	
 	THEN
 		CALL myUser_loginWithName (vUserName);
 	ELSE
@@ -1811,7 +1813,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_loginWithName`(vUserName VAR
 BEGIN
 /**
  * Logs in using only the user name. This procedure is intended to be executed
- * by users with a high level of privileges so that normal users should not have
+ * by users with a high level of privileges so that normal users should not have 
  * execute permissions on it.
  *
  * @param vUserName The user name
@@ -1847,7 +1849,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_logout`()
 BEGIN
 /**
  * Logouts the user.
- */
+ */	
 	SET @userId = NULL;
 	SET @userName = NULL;
 	SET @userSignature = NULL;
@@ -1945,9 +1947,9 @@ BEGIN
 
 	SELECT COUNT(*) > 0 INTO vIsRoot
 		FROM tmp.role t
-			JOIN role r ON r.id = t.id
+			JOIN role r ON r.id = t.id 
 		WHERE r.`name` = 'root';
-
+		
 	IF vIsRoot THEN
 		INSERT IGNORE INTO tmp.role (id)
 			SELECT id FROM role;
@@ -2666,7 +2668,7 @@ BEGIN
 		IF vChr REGEXP '[[:alpha:]]'
 		THEN
 			SET vNAlpha = vNAlpha+1;
-
+			
 			IF vChr REGEXP '[A-Z]'
 			THEN
 				SET vNUpper = vNUpper+1;
@@ -3137,7 +3139,7 @@ BEGIN
 	IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN
 
 		CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED');
-
+		
 	END IF;
 
 END */;;
@@ -3163,7 +3165,7 @@ BEGIN
 	IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN
 
 		CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED');
-
+		
 	END IF;
 
 END */;;
@@ -3686,11 +3688,11 @@ BEGIN
 
 	DECLARE vTramo VARCHAR(20);
     DECLARE vHour INT;
-
+    
     SET vHour = HOUR(vDateTime) ;
-
+    
     SET vTramo =
-		CASE
+		CASE 		
 			WHEN vHour BETWEEN 0 AND 14 THEN 'Mañana'
             WHEN vHour BETWEEN 15 AND 24 THEN 'Tarde'
 		END ;
@@ -3718,7 +3720,7 @@ BEGIN
  * Inserta en la tabla bancos_evolution los saldos acumulados de cada banco
  *
  * @param vStartingDate Fecha desde la cual se recalculan la tabla bs.bancos_evolution
- */
+ */ 
 	DECLARE vCurrentDate DATE;
 	DECLARE vMaxDate DATE DEFAULT TIMESTAMPADD(MONTH, 7, util.VN_CURDATE());
 	IF IFNULL(vStartingDate,0) < TIMESTAMPADD(YEAR, -5, util.VN_CURDATE()) THEN
@@ -3732,49 +3734,49 @@ BEGIN
 		SELECT vCurrentDate, Id_Banco, deuda
 			FROM bs.bancos_evolution
 			WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate);
-
+            
 	WHILE vCurrentDate < vMaxDate DO
 -- insertar solo el dia de ayer
 		INSERT INTO bs.bancos_evolution(Fecha ,Id_Banco, saldo)
-			SELECT vCurrentDate, Id_Banco, SUM(saldo)
+			SELECT vCurrentDate, Id_Banco, SUM(saldo)  
 				FROM (
 					SELECT Id_Banco ,saldo
 						FROM bs.bancos_evolution
 						WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate)  -- los saldos acumulados del dia anterior
 					UNION ALL
-
+				
 					SELECT c.Id_Banco, IFNULL(SUM(Entrada),0) - IFNULL(SUM(Salida),0) as saldo
 						FROM vn2008.Cajas c
 							JOIN vn2008.Bancos b using(Id_Banco)   -- saldos de las cajas
-							JOIN vn.accountingType at2 ON at2.id = b.cash
+							JOIN vn.accountingType at2 ON at2.id = b.cash 
 						WHERE at2.code IN ('wireTransfer','fundingLine')
 							AND Cajafecha = vCurrentDate
 							AND (Serie = 'MB' OR at2.code = 'fundingLine')
 						GROUP BY Id_Banco
-			)sub
+			)sub 
 			GROUP BY Id_Banco
 		ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
+                              
 		SET vCurrentDate = TIMESTAMPADD(DAY,1,vCurrentDate);
 
 	END WHILE;
 
-    -- Ahora actualizamos la quilla
+    -- Ahora actualizamos la quilla 
 	UPDATE bs.bancos_evolution be
 		JOIN
 		(
 			SELECT bp.Id_Banco, - sum(bp.importe) as quilla, t.dated
-			FROM vn.time t
+			FROM vn.time t 
 				JOIN vn2008.Bancos_poliza bp ON t.dated between apertura AND IFNULL(cierre, t.dated)
 			WHERE t.dated BETWEEN vStartingDate AND vMaxDate
 			GROUP BY Id_Banco, t.dated
 		) sub ON be.Id_Banco = sub.Id_Banco AND sub.dated = be.Fecha
-		SET be.quilla = sub.quilla;
+		SET be.quilla = sub.quilla;                  
 
 	-- pagos futuros no concilidados
 	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
 		SELECT t.dated, p.id_banco, - importe
-			FROM vn.time t
+			FROM vn.time t 
 				join vn2008.pago p ON p.fecha <= t.dated
 		WHERE t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
 			AND p.fecha BETWEEN util.VN_CURDATE() AND vMaxDate
@@ -3784,7 +3786,7 @@ BEGIN
 		-- cobros futuros
 	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
 		SELECT t.dated, r.Id_Banco, SUM(Entregado)
-			FROM vn.time t
+			FROM vn.time t 
 				JOIN vn2008.Recibos r ON r.Fechacobro <= t.dated
 			WHERE r.Fechacobro > util.VN_CURDATE() AND r.Fechacobro <= vMaxDate
 				AND t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
@@ -3794,10 +3796,10 @@ BEGIN
 	-- saldos de la tabla prevision
 	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
 		SELECT t.dated, sp.Id_Banco, SUM(Importe)
-			FROM vn.time t
+			FROM vn.time t 
 				JOIN vn2008.Saldos_Prevision sp ON sp.Fecha <= t.dated
 				JOIN vn2008.Bancos b ON sp.Id_Banco = b.Id_Banco
-				JOIN vn.accountingType at2 ON at2.id = b.cash
+				JOIN vn.accountingType at2 ON at2.id = b.cash 
 		WHERE at2.code IN ('wireTransfer','fundingLine')
 			AND t.dated BETWEEN vStartingDate AND vMaxDate
 		GROUP BY t.dated, sp.Id_Banco
@@ -3811,12 +3813,12 @@ BEGIN
 	-- Deuda
 	UPDATE bs.bancos_evolution be
 		JOIN vn2008.Bancos b using(Id_Banco)
-		JOIN vn.accountingType at2 ON at2.id = b.cash
+		JOIN vn.accountingType at2 ON at2.id = b.cash 
 		SET be.deuda =  IF(at2.code = 'fundingLine', be.saldo_aux, 0)
 		   , be.saldo = IF(at2.code = 'fundingLine', 0, be.saldo_aux)
 	WHERE Fecha >= vStartingDate;
 
-	-- Liquidez
+	-- Liquidez            
 	update bs.bancos_evolution set liquidez = saldo - quilla + deuda WHERE Fecha >= vStartingDate;
    -- Disponibilidad
    update bs.bancos_evolution set `disponibilidad ajena` = - quilla + deuda WHERE Fecha >= vStartingDate;
@@ -3839,14 +3841,14 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `campaignComparative`(vDateFrom DATE, vDateTo DATE)
 BEGIN
-	SELECT
-		workerName,
-		id,
-		name,
-		CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount,
-		CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount
+	SELECT 
+		workerName, 
+		id, 
+		name, 
+		CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount, 
+		CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount 
 	FROM (
-			(SELECT
+			(SELECT 
 				 CONCAT(w.firstname, ' ', w.lastName) AS workerName,
 				 c.id,
 				 c.name,
@@ -3855,11 +3857,11 @@ BEGIN
 			FROM bs.ventas v
 				INNER JOIN vn.`client` c ON v.Id_Cliente = c.id
 				INNER JOIN vn.worker w ON c.salesPersonFk = w.id
-			WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR)
+			WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR) 
 				AND DATE_ADD(vDateTo, INTERVAL - 1 YEAR)
 				GROUP BY w.id, v.Id_Cliente)
 			UNION ALL
-			(SELECT
+			(SELECT 
 				 CONCAT(w.firstname, ' ', w.lastName) AS workerName,
 				 c.id,
 				 c.name,
@@ -3893,21 +3895,29 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `carteras_add`()
-BEGIN
-/**
- * Inserta en @bs.carteras.
- */
-	DELETE FROM bs.carteras
-		WHERE Año >= YEAR(util.VN_CURDATE()) - 1;
-
-	INSERT INTO bs.carteras(Año,Mes,CodigoTrabajador,Peso)
-		SELECT t.year AS Año, t.month AS Mes, w.code AS CodigoTrabajador, SUM(v.importe) AS Peso
-			FROM vn.time t
-				JOIN bs.ventas v on t.dated = v.fecha
-				JOIN vn.client c on c.id = v.Id_Cliente
-				JOIN vn.worker w ON w.id = c.salesPersonFk
-			WHERE t.year >= YEAR(util.VN_CURDATE()) - 1
-			GROUP BY w.code, t.year , t.month;
+BEGIN
+/**
+ * Inserta en la tabla @bs.carteras las ventas desde el año pasado 
+ * agrupadas por trabajador, año y mes
+ */
+	DECLARE vYear INT DEFAULT YEAR(util.VN_CURDATE()) - 1;
+
+	DELETE FROM bs.carteras WHERE Año >= vYear;
+
+	CALL util.time_generate(
+		MAKEDATE(vYear, 1),
+		(SELECT MAX(fecha) FROM ventas)
+	);
+
+	INSERT INTO carteras(Año, Mes , CodigoTrabajador, Peso)
+		SELECT t.`year`, t.`month`, w.code, SUM(v.importe)
+			FROM tmp.time t
+				JOIN ventas v on t.dated = v.fecha
+				JOIN vn.client c on c.id = v.Id_Cliente
+				JOIN vn.worker w ON w.id = c.salesPersonFk
+			GROUP BY w.code, t.`year`, t.`month`;
+
+	DROP TEMPORARY TABLE tmp.time;		
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -3926,18 +3936,14 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
 BEGIN
-	DECLARE vFourYearsAgo DATETIME;
-	DECLARE vOneYearAgo DATETIME;
-	DECLARE vTwoYearAgo DATETIME;
-	DECLARE vThreeYearAgo DATETIME;
 
+	DECLARE vOneYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
+	DECLARE vTwoYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR;
+	DECLARE vThreeYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 3 YEAR;
+	DECLARE vFourYearsAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR;
+	DECLARE vEighteenMonths DATE DEFAULT util.VN_CURDATE() - INTERVAL 18 MONTH;
 
-	SET vOneYearAgo = TIMESTAMPADD(YEAR, -1,util.VN_CURDATE());
-	SET vTwoYearAgo = TIMESTAMPADD(YEAR, -2,util.VN_CURDATE());
-	SET vThreeYearAgo = TIMESTAMPADD(YEAR, -3,util.VN_CURDATE());
-	SET vFourYearsAgo = TIMESTAMPADD(YEAR, -4,util.VN_CURDATE());
-
-    DELETE FROM bs.clientNewBorn
+    DELETE FROM clientNewBorn
 		WHERE lastShipped < vOneYearAgo;
 
 	DELETE FROM ventas
@@ -3949,14 +3955,17 @@ BEGIN
 	DELETE FROM payMethodClientEvolution
 		WHERE dated < vFourYearsAgo;
 
-	DELETE FROM bs.salesByclientSalesPerson
+	DELETE FROM salesByclientSalesPerson 
 		WHERE dated < vFourYearsAgo;
 
-	DELETE FROM bs.m3
+	DELETE FROM m3 
 		WHERE fecha < vTwoYearAgo;
 
 	DELETE FROM salesByItemTypeDay
 		WHERE dated < vThreeYearAgo;
+
+	DELETE FROM waste
+		WHERE MAKEDATE(`year`, 1) + INTERVAL (`week` - 1) WEEK + INTERVAL 1 DAY < vEighteenMonths;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4052,16 +4061,16 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `clientNewBorn_recalc`()
 BLOCK1: BEGIN
 
 	DECLARE vClientFk INT;
-	DECLARE vShipped DATE;
+	DECLARE vShipped DATE; 
 	DECLARE vPreviousShipped DATE;
-	DECLARE vDone boolean;
-	DECLARE cur cursor for
-
-	SELECT clientFk, firstShipped
-		FROM bs.clientNewBorn;
-
-	DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE;
-	SET vDone := FALSE;
+	DECLARE vDone boolean;  
+	DECLARE cur cursor for         
+	 
+	SELECT clientFk, firstShipped  
+		FROM bs.clientNewBorn;  
+        
+	DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE;      
+	SET vDone := FALSE;  
 
 	DELETE FROM	bs.clientNewBorn WHERE isModified = FALSE;
 
@@ -4073,7 +4082,7 @@ BLOCK1: BEGIN
 				WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null
 				GROUP BY c.id;
 	OPEN cur;
-
+     
 	LOOP1: LOOP
 		SET vDone := FALSE;
 		FETCH cur INTO vClientFk, vShipped;
@@ -4084,37 +4093,37 @@ BLOCK1: BEGIN
 		END IF;
 
 		BLOCK2: BEGIN
-			DECLARE vCurrentShipped DATE;
-			DECLARE vDone2 boolean;
+			DECLARE vCurrentShipped DATE;  
+			DECLARE vDone2 boolean;  
 			DECLARE cur2 CURSOR FOR
-				SELECT shipped
-					FROM vn.ticket
+				SELECT shipped 
+					FROM vn.ticket 
 						WHERE clientFk = vClientFk AND shipped <=  util.VN_CURDATE()
 						ORDER BY shipped DESC;
-
+		 
 		   DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone2 = TRUE;
 				SET vDone2 := FALSE;
 		   OPEN cur2;
-
+		   
 			SET vPreviousShipped := vShipped;
 			LOOP2: LOOP
 				SET vDone2 := FALSE;
 				FETCH cur2 INTO vCurrentShipped;
-
+				
 				IF DATEDIFF(vPreviousShipped,vCurrentShipped) > 365 THEN
-					UPDATE bs.clientNewBorn
-						SET firstShipped = vPreviousShipped
+					UPDATE bs.clientNewBorn 
+						SET firstShipped = vPreviousShipped 
 						WHERE clientFk= vClientFk;
-
+					
 					CLOSE cur2;
-					LEAVE LOOP2;
+					LEAVE LOOP2;    
 				END IF;
-
+				
 				SET vPreviousShipped := vCurrentShipped;
 
 				IF vDone2 THEN
-					UPDATE bs.clientNewBorn
-						SET firstShipped = vCurrentShipped
+					UPDATE bs.clientNewBorn 
+						SET firstShipped = vCurrentShipped 
 						WHERE clientFk= vClientFk;
 					CLOSE cur2;
 					LEAVE LOOP2;
@@ -4124,14 +4133,14 @@ BLOCK1: BEGIN
 		END BLOCK2;
 	END LOOP LOOP1;
 
-	UPDATE bs.clientNewBorn cnb
+	UPDATE bs.clientNewBorn cnb 
 		LEFT JOIN (SELECT DISTINCT t.clientFk
 						FROM vn.ticket t
 							JOIN vn.productionConfig pc
 						WHERE t.shipped BETWEEN util.VN_CURDATE() + INTERVAL -(`notBuyingMonths`) MONTH
 						AND util.VN_CURDATE() + INTERVAL -(`pc`.`rookieDays`) DAY) notRookie ON notRookie.clientFk = cnb.clientFk
-		SET cnb.isRookie = ISNULL(notRookie.clientFk);
-
+		SET cnb.isRookie = ISNULL(notRookie.clientFk); 
+	
 END BLOCK1 ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4152,16 +4161,16 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `comercialesCompleto`(IN vWorker INT
 BEGIN
 	DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01');
 	DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate));
-
+    
 	CALL vn.worker_GetHierarchy(vWorker);
-
+	
     INSERT IGNORE INTO tmp.workerHierarchyList (workerFk)
 		SELECT wd2.workerFk
 			FROM vn.workerDepartment wd2
 				WHERE wd2.workerFk = vWorker;
-
+		 
 	-- Falta que en algunos casos solo tenga en cuenta los tipos afectados.
-	SELECT
+	SELECT 
 		c.Id_Cliente id_cliente,
 		c.Cliente cliente,
 		cr.recobro * 100 tarifa,
@@ -4186,7 +4195,7 @@ BEGIN
 	FROM
 		vn2008.Clientes c
 			LEFT JOIN
-			(SELECT g.Id_Cliente, CAST( SUM(Importe) as DECIMAL(12,2)) AS Greuge
+			(SELECT g.Id_Cliente, CAST( SUM(Importe) as DECIMAL(12,2)) AS Greuge 
 				FROM vn2008.Greuges g
 					JOIN vn.`client` c ON c.id = g.Id_Cliente
 					LEFT JOIN vn.worker w ON c.salesPersonFk = w.id
@@ -4208,14 +4217,14 @@ BEGIN
 			WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, vDate) AND vDate
 				GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente
 			LEFT JOIN
-		(SELECT
+		(SELECT 
 			Id_Cliente, SUM(importe) consumo
 		FROM
 			 bs.ventas v
 		INNER JOIN vn2008.Clientes c USING (Id_Cliente)
 		LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
 		WHERE
-			(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
+			(c.Id_Trabajador = vWorker OR tr.boss = vWorker) 
 				AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate)  AND TIMESTAMPADD(DAY, - 1, vDate))
 		GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente
 			LEFT JOIN
@@ -4276,17 +4285,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_evolution_add`()
 BEGIN
 /**
  * Inserta en la tabla compradores_evolution las ventas acumuladas en los ultimos 365 dias
- *
+ * 
  */
 	DECLARE vDated DATE;
 	DECLARE vCount INT DEFAULT 1;
 
-	SELECT MAX(fecha) + INTERVAL 1 DAY INTO vDated
+	SELECT MAX(fecha) + INTERVAL 1 DAY INTO vDated 
 		FROM compradores_evolution;
 
 	IF vDated IS NULL THEN
-
-		SELECT MIN(dated) INTO vDated
+		
+		SELECT MIN(dated) INTO vDated 
 				FROM sale;
 
 		INSERT INTO compradores_evolution(
@@ -4307,7 +4316,7 @@ BEGIN
 	WHILE vDated < util.VN_CURDATE() DO
 
 		SET vCount = vCount + 1;
-
+		
 		REPLACE compradores_evolution(
 				Id_Trabajador,
 				fecha,
@@ -4319,18 +4328,18 @@ BEGIN
 					SELECT Id_Trabajador, importe
 						FROM compradores_evolution
 							JOIN (
-								SELECT DISTINCT it.workerFk
-									FROM vn.itemType it
+								SELECT DISTINCT it.workerFk 
+									FROM vn.itemType it 
 							)sub2 ON sub2.workerFk = Id_Trabajador
-						WHERE fecha = vDated - INTERVAL 1 DAY
+						WHERE fecha = vDated - INTERVAL 1 DAY 
 					UNION ALL
-					SELECT it.workerFk, s.amount * IF(s.dated < vDated, -1, 1)
+					SELECT it.workerFk, s.amount * IF(s.dated < vDated, -1, 1) 
 						FROM sale s
 							JOIN vn.itemType it ON it.id = s.typeFk
 							JOIN vn.itemCategory ic ON ic.id = it.categoryFk
 						WHERE s.dated IN (vDated, vDated - INTERVAL 1 YEAR)
 							AND ic.merchandise
-				)sub
+				)sub 
 				GROUP BY Id_Trabajador;
 
 		SET vDated = vDated + INTERVAL 1 DAY;
@@ -4357,49 +4366,49 @@ BEGIN
  * Inserta en la tabla fondo_maniobra los saldos acumulados en los ultimos 365 dias
  */
 	DECLARE datFEC DATE DEFAULT '2015-01-01';
-
-	SELECT TIMESTAMPADD(DAY,1,MAX(fecha))
-		INTO datFEC
+	
+	SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) 
+		INTO datFEC 
 			FROM bs.fondo_maniobra;
-
+	
 	WHILE datFEC < util.VN_CURDATE() DO
-
+		
 		IF DAY(datFEC) MOD 28 = 0 THEN  -- esto solo sirve para no aburrirse mientras esperamos...
            SELECT datFEC;
 		END IF;
-
+        
 		REPLACE bs.fondo_maniobra(Fecha, clientes_facturas, clientes_cobros,proveedores_facturas,proveedores_pagos, fondo)
 			SELECT datFEC AS Fecha, Facturas, Cobros,Recibidas,Pagos, Facturas + Cobros + Recibidas + Pagos
 				FROM (
 					SELECT SUM(io.amount) AS Facturas
 						FROM vn.invoiceOut io
-							JOIN vn.client c ON io.clientFk = c.id
+							JOIN vn.client c ON io.clientFk = c.id 
 						WHERE c.isRelevant
-							AND io.companyFk <> 1381
+							AND io.companyFk <> 1381 
 							AND io.issued BETWEEN '2011-01-01' AND datFEC
 				) fac
 					JOIN (
 						SELECT - SUM(r.amountPaid) AS Cobros
-							FROM vn.receipt r
-								JOIN vn.client c ON r.clientFk = c.id
-							WHERE c.isRelevant
+							FROM vn.receipt r 
+								JOIN vn.client c ON r.clientFk = c.id 
+							WHERE c.isRelevant 
 								AND r.companyFk <> 1381
 								AND r.payed BETWEEN '2011-01-01' AND datFEC
 					) cob
 					JOIN (
 						SELECT - SUM(id.amount) AS Recibidas
-							FROM vn.invoiceIn ii
-								JOIN vn.invoiceInDueDay id ON ii.id = id.invoiceInFk
+							FROM vn.invoiceIn ii 
+								JOIN vn.invoiceInDueDay id ON ii.id = id.invoiceInFk 
 							WHERE ii.companyFk <> 1381
 								AND ii.issued BETWEEN '2015-01-01' AND datFEC
 					) rec
 					JOIN (
 						SELECT SUM(p.amount) AS Pagos
-							FROM vn.payment p
-							WHERE p.companyFk <>1381
+							FROM vn.payment p 
+							WHERE p.companyFk <>1381 
 								AND p.received BETWEEN '2015-01-01' AND datFEC
 					) pag;
-
+                              
 		UPDATE bs.fondo_maniobra
         	JOIN (
         		SELECT AVG(fondo) AS media
@@ -4407,7 +4416,7 @@ BEGIN
 			        	WHERE fecha <= datFEC
 			) sub
 		SET fondo_medio = media WHERE fecha = datFEC;
-
+			                            
 		SET datFEC = TIMESTAMPADD(DAY,1,datFEC);
 
 	END WHILE;
@@ -4431,7 +4440,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `fruitsEvolution`()
 BEGIN
-select Id_Cliente,
+select Id_Cliente, 
 		Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker
 from (
 select distinct v.Id_Cliente, c.name as Cliente, week(fecha, 3) as semana
@@ -4472,40 +4481,40 @@ BEGIN
 
 	-- Ventas totales del ultimo año
 	UPDATE indicators
-		SET lastYearSales =
+		SET lastYearSales = 
 			(SELECT SUM(importe + recargo)
 				FROM ventas v
 					JOIN vn2008.empresa e ON e.id = v.empresa_id
 					JOIN vn2008.empresa_grupo eg ON eg.empresa_grupo_id = e.empresa_grupo
 				WHERE fecha BETWEEN oneYearBefore AND vDated
 					AND eg.grupo = 'Verdnatura'
-			)
+			) 
 		WHERE updated = vDated;
-
+ 
 	-- Greuge total acumulado
 	UPDATE indicators
-		SET totalGreuge =
+		SET totalGreuge = 
 			(SELECT SUM(amount)
 				FROM vn.greuge
 				WHERE shipped <= vDated
-			)
+			) 
 		WHERE updated = vDated;
 
 	-- Tasa de morosidad con respecto a las ventas del último mes
 	UPDATE indicators
-		SET latePaymentRate =
-			(SELECT SUM(amount)
-				FROM bi.defaulters
+		SET latePaymentRate = 
+			(SELECT SUM(amount) 
+				FROM bi.defaulters 
 				WHERE date = vDated AND amount > 0)
 			/
-			(SELECT SUM(importe + recargo)
-				FROM ventas
+			(SELECT SUM(importe + recargo) 
+				FROM ventas 
 				WHERE fecha BETWEEN oneMonthBefore AND vDated)
 		WHERE updated = vDated;
 
 	-- Número de trabajadores activos
 	UPDATE indicators
-		SET countEmployee =
+		SET countEmployee = 
 			(SELECT CAST(SUM(ct.hoursWeek) / 40 AS DECIMAL (10, 2))
 				FROM vn.business b
 					JOIN vn.calendarType ct ON ct.id = b.calendarTypeFk
@@ -4524,7 +4533,7 @@ BEGIN
 
 	-- Número de clientes que han comprado en los últimos 30 dias
 	UPDATE indicators
-		SET lastMonthActiveClients =
+		SET lastMonthActiveClients = 
 			(SELECT COUNT(DISTINCT t.clientFk)
 				FROM vn.ticket t
 					WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -4533,9 +4542,9 @@ BEGIN
 
 	-- Número de clientes que no han comprado en los últimos 30 dias, pero compraron en los 30 anteriores
 	UPDATE indicators
-		SET lastMonthLostClients =
+		SET lastMonthLostClients = 
 			(SELECT COUNT(lm.clientFk)
-				FROM
+				FROM 
 					(SELECT DISTINCT t.clientFk
 						FROM vn.ticket t
 						WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -4552,9 +4561,9 @@ BEGIN
 
 	-- Número de clientes que han comprado en los últimos 30 dias, pero no compraron en los 30 anteriores
 	UPDATE indicators
-		SET lastMonthNewClients =
+		SET lastMonthNewClients = 
 			(SELECT COUNT(cm.clientFk)
-				FROM
+				FROM 
 					(SELECT DISTINCT t.clientFk
 						FROM vn.ticket t
 						WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -4580,7 +4589,7 @@ BEGIN
 
 	-- Cálculo de las ventas agrupado por semanas
 	SELECT week INTO vWeek
-		FROM vn.time
+		FROM vn.time 
 		WHERE dated = vDated;
 
 	TRUNCATE salesByWeek;
@@ -4594,12 +4603,12 @@ BEGIN
 
 	-- Indicador Ventas semana actual
 	UPDATE indicators i
-			JOIN salesByWeek s ON s.week= vWeek
+			JOIN salesByWeek s ON s.week= vWeek 
 				AND s.year = YEAR(vDated)
 		SET i.thisWeekSales = s.sales
 		WHERE updated = vDated;
 
-	-- Indicador ventas semana actual en el año pasado
+	-- Indicador ventas semana actual en el año pasado 
 	UPDATE indicators i
 			JOIN salesByWeek s ON s.week = vWeek
 				AND s.year = YEAR(vDated)-1
@@ -4630,15 +4639,15 @@ BEGIN
 	SELECT IFNULL(TIMESTAMPADD(DAY,1,MAX(updated)), '2018-04-01')
 		INTO vDated
 		FROM bs.indicators;
-
+		
 	WHILE vDated < util.VN_CURDATE() DO
-
+    
 		CALL indicatorsUpdate(vDated);
-
+    
 		SELECT TIMESTAMPADD(DAY,1,MAX(updated))
 		INTO vDated
 		FROM bs.indicators;
-
+        
     END WHILE;
 
 END ;;
@@ -4667,7 +4676,7 @@ BEGIN
 	DECLARE vCalc INT;
 	DECLARE vWarehouseFk INT;
 
-	DECLARE cWarehouses CURSOR FOR
+	DECLARE cWarehouses CURSOR FOR 
 		SELECT id
 			FROM vn.warehouse
 			WHERE isInventory;
@@ -4680,13 +4689,13 @@ BEGIN
 	read_loop: LOOP
 		SET vDone = FALSE;
 		FETCH cWarehouses INTO vWarehouseFk;
-
+	
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
-
+	
 		CALL cache.visible_refresh(vCalc, FALSE, vWarehouseFk);
-
+	
 		CREATE OR REPLACE TEMPORARY TABLE tVisible
 			SELECT itemFk, SUM(visible) totalVisible
 				FROM vn.itemShelving ish
@@ -4695,7 +4704,7 @@ BEGIN
 					JOIN vn.sector sc ON sc.id = p.sectorFk
 					WHERE sc.warehouseFk = vWarehouseFk
 				GROUP BY itemFk;
-
+		
 		INSERT INTO inventoryDiscrepancyDetail(
 				warehouseFk,
 				itemFk,
@@ -4767,15 +4776,15 @@ BEGIN
 
 	DECLARE datSTART DATE;
     DECLARE datEND DATE;
-
+   
     SELECT TIMESTAMPADD(WEEK, -1,MAX(fecha)) INTO datSTART
 		FROM bs.m3;
-
+        
 	SET datEND = TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
-
-	DELETE FROM bs.m3
+        
+	DELETE FROM bs.m3 
     WHERE fecha >= datSTART;
-
+   
 	INSERT INTO bs.m3 (fecha, provinceFk, warehouseFk, m3, year, month, week, day, dayName, euros)
 		SELECT v.fecha, a.provinceFk, t.warehouseFk, sum(s.quantity * ic.cm3delivery) / 1000000 AS m3,
 				tm.year, tm.month, tm.week, tm.day, dayname(v.fecha), sum(importe)
@@ -4820,19 +4829,19 @@ BEGIN
     DECLARE vManaFromDays INT;
     DECLARE vManaToDays INT;
 
-	SELECT id INTO vManaId
+	SELECT id INTO vManaId 
 			FROM vn.component WHERE code = 'mana';
-
-	SELECT id INTO vManaAutoId
+		
+	SELECT id INTO vManaAutoId 
 		FROM vn.component WHERE code = 'autoMana';
-
+	
 	SELECT id INTO vClaimManaId
 		FROM vn.component WHERE code = 'manaClaim';
-
-	SELECT id INTO vManaBankId
+	
+	SELECT id INTO vManaBankId 
 		FROM vn.bank WHERE code = 'mana';
-
-	SELECT id INTO vManaGreugeTypeId
+	
+	SELECT id INTO vManaGreugeTypeId 
 		FROM vn.greugeType WHERE code = 'mana';
 
     SELECT manaFromDays, manaToDays
@@ -4840,17 +4849,17 @@ BEGIN
         FROM vn.salespersonConfig;
 
 	SELECT MAX(dated)
-        INTO vFromDated
+        INTO vFromDated 
         FROM vn.clientManaCache;
 
 	 DELETE
         FROM vn.clientManaCache
         WHERE dated = vFromDated;
-
+    
     SELECT MAX(dated)
-        INTO vFromDated
+        INTO vFromDated 
         FROM vn.clientManaCache;
-
+            
     IF ISNULL(vFromDated) THEN
         SELECT manaDateFrom
             INTO vFromDated
@@ -4860,20 +4869,20 @@ BEGIN
     WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
         SELECT
                 vFromDated + INTERVAL vManaToDays DAY,
-                vFromDated - INTERVAL vManaFromDays DAY
-            INTO
+                vFromDated - INTERVAL vManaFromDays DAY 
+            INTO 
                 vToDated,
                 vForDeleteDated;
-
+            
         DELETE FROM vn.clientManaCache
             WHERE dated <= vForDeleteDated;
 
         INSERT INTO vn.clientManaCache(clientFk, mana, dated)
-            SELECT
+            SELECT 
                     Id_Cliente,
                     SUM(mana),
-                    vToDated
-                FROM
+                    vToDated 
+                FROM 
                 (
                     SELECT cs.Id_Cliente, Cantidad * Valor as mana
                         FROM vn2008.Tickets t
@@ -4881,19 +4890,19 @@ BEGIN
                             JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
                             JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
                         WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.Fecha > vFromDated
+                            AND t.Fecha > vFromDated 
                             AND date(t.Fecha) <= vToDated
                     UNION ALL
                     SELECT r.Id_Cliente, - Entregado
                         FROM vn2008.Recibos r
                         WHERE Id_Banco = vManaBankId
-                            AND Fechacobro > vFromDated
+                            AND Fechacobro > vFromDated 
                             AND Fechacobro <= vToDated
                     UNION ALL
                     SELECT g.Id_Cliente, g.Importe
                         FROM vn2008.Greuges g
                         WHERE Greuges_type_id = vManaGreugeTypeId
-                            AND Fecha > vFromDated
+                            AND Fecha > vFromDated 
                             AND Fecha <= vToDated
                     UNION ALL
                     SELECT clientFk, mana
@@ -4903,7 +4912,7 @@ BEGIN
                 GROUP BY Id_Cliente
                 HAVING Id_Cliente;
 
-        SET vFromDated = vToDated;
+        SET vFromDated = vToDated;  
     END WHILE;
 END ;;
 DELIMITER ;
@@ -4923,26 +4932,26 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `manaSpellers_actualize`()
 BEGIN
-/**
- * Recalcula el valor del campo con el modificador de precio
+/**	
+ * Recalcula el valor del campo con el modificador de precio 
  * para el componente de maná automático.
  */
-	UPDATE vn.workerMana wm
+	UPDATE vn.workerMana wm 
 			JOIN (
-				SELECT c.lastSalesPersonFk,
+				SELECT c.lastSalesPersonFk, 
 					FLOOR(SUM(s.amount) / 12) amount
 					FROM salesByclientSalesPerson s
 						JOIN vn.client c ON c.id = s.clientFk
 					WHERE s.dated BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR AND util.VN_CURDATE()
 					GROUP BY c.lastSalesPersonFk
-			)avgPortfolioWeight ON avgPortfolioWeight.lastSalesPersonFk = wm.workerFk
+			)avgPortfolioWeight ON avgPortfolioWeight.lastSalesPersonFk = wm.workerFk 
 			JOIN vn.salespersonConfig spc
-		SET wm.pricesModifierRate =
+		SET wm.pricesModifierRate = 
 			IFNULL(
 					GREATEST(
-						spc.manaMinRate,
+						spc.manaMinRate, 
 						LEAST(
-							spc.manaMaxRate,
+							spc.manaMaxRate, 
 							ROUND( - wm.amount / avgPortfolioWeight.amount, 3)
 						)
 					)
@@ -4964,82 +4973,82 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `nightTask_launchAll`()
-BEGIN
-/**
- * Runs all nightly tasks.
- */
-	DECLARE vDone BOOL;
-	DECLARE vError VARCHAR(255);
-	DECLARE vErrorCode VARCHAR(255);
-	DECLARE vSchema VARCHAR(255);
-	DECLARE vProcedure VARCHAR(255);
-	DECLARE vLogMail VARCHAR(255);
-	DECLARE vNightTaskFk INT;
-
-	DECLARE vQueue CURSOR FOR
-		SELECT id, `schema`, `procedure`
-			FROM nightTask
-			WHERE finished <= util.VN_CURDATE()
-				OR finished IS NULL
-			ORDER BY `order`;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	SET max_sp_recursion_depth = 3;
-
-	SELECT logMail INTO vLogMail
-		FROM nightTaskConfig LIMIT 1;
-
-	OPEN vQueue;
-	l: LOOP
-		SET vDone = FALSE;
-		FETCH vQueue INTO vNightTaskFk, vSchema, vProcedure;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-		UPDATE nightTask
-			SET `started` = util.VN_NOW(),
-				`finished` = NULL,
-				`error` = NULL,
-				`errorCode` = NULL
-			WHERE id = vNightTaskFk;
-
-		SET vError = NULL;
-		CALL nightTask_launchTask(
-			vSchema,
-			vProcedure,
-			vError,
-			vErrorCode
-		);
-
-		IF vError IS NOT NULL THEN
-			IF vLogMail IS NOT NULL THEN
-				CALL vn.mail_insert(
-					vLogMail,
-					NULL,
-					CONCAT('Nightly task failed (', vSchema, '.', vProcedure, ')'),
-					CONCAT(
-						'[', vErrorCode, '] ', vError, CHAR(13, 10), -- Line break
-						'See ', SCHEMA(), '.nightTask table for more info.'
-					)
-				);
-			END IF;
-
-			UPDATE nightTask
-				SET `error` = vError,
-					`errorCode` = vErrorCode
-				WHERE id = vNightTaskFk;
-		ELSE
-			UPDATE nightTask
-				SET finished = util.VN_NOW(),
-					lastFinished = util.VN_NOW()
-				WHERE id = vNightTaskFk;
-		END IF;
-	END LOOP;
-	CLOSE vQueue;
+BEGIN
+/**
+ * Runs all nightly tasks.
+ */
+	DECLARE vDone BOOL;
+	DECLARE vError VARCHAR(255);
+	DECLARE vErrorCode VARCHAR(255);
+	DECLARE vSchema VARCHAR(255);
+	DECLARE vProcedure VARCHAR(255);
+	DECLARE vLogMail VARCHAR(255);
+	DECLARE vNightTaskFk INT;
+
+	DECLARE vQueue CURSOR FOR
+		SELECT id, `schema`, `procedure` 
+			FROM nightTask 
+			WHERE finished <= util.VN_CURDATE()
+				OR finished IS NULL
+			ORDER BY `order`;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	SET max_sp_recursion_depth = 3;
+
+	SELECT logMail INTO vLogMail
+		FROM nightTaskConfig LIMIT 1;
+
+	OPEN vQueue;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vQueue INTO vNightTaskFk, vSchema, vProcedure;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		UPDATE nightTask
+			SET `started` = util.VN_NOW(),
+				`finished` = NULL,
+				`error` = NULL,
+				`errorCode` = NULL
+			WHERE id = vNightTaskFk;
+
+		SET vError = NULL;
+		CALL nightTask_launchTask(
+			vSchema,
+			vProcedure,
+			vError,
+			vErrorCode
+		);
+
+		IF vError IS NOT NULL THEN
+			IF vLogMail IS NOT NULL THEN
+				CALL vn.mail_insert(
+					vLogMail,
+					NULL,
+					CONCAT('Nightly task failed (', vSchema, '.', vProcedure, ')'),
+					CONCAT(
+						'[', vErrorCode, '] ', vError, CHAR(13, 10), -- Line break
+						'See ', SCHEMA(), '.nightTask table for more info.'
+					)
+				);
+			END IF;
+
+			UPDATE nightTask
+				SET `error` = vError,
+					`errorCode` = vErrorCode
+				WHERE id = vNightTaskFk;
+		ELSE
+			UPDATE nightTask
+				SET finished = util.VN_NOW(),
+					lastFinished = util.VN_NOW()
+				WHERE id = vNightTaskFk;
+		END IF;
+	END LOOP;
+	CLOSE vQueue;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5078,7 +5087,7 @@ BEGIN
 			vError = MESSAGE_TEXT,
 			vErrorCode = RETURNED_SQLSTATE;
 
-	CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`'));
+	CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`')); 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5097,22 +5106,22 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `payMethodClientAdd`()
 BEGIN
-	INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk)
+	INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk)  
 		SELECT  util.VN_CURDATE(), c.payMethodFk, c.id
-			FROM vn.client c
+			FROM vn.client c    
 				JOIN vn.payMethod p ON c.payMethodFk = p.id;
-
+	
     TRUNCATE  `bs`.`payMethodClientEvolution` ;
-
+     
     INSERT INTO  `bs`.`payMethodClientEvolution` (dated, payMethodName, amountClient, amount, equalizationTax)
-		SELECT p.dated, pm.name, COUNT(p.clientFk), SUM(sub.importe) , SUM(sub.recargo)
+		SELECT p.dated, pm.name, COUNT(p.clientFk), SUM(sub.importe) , SUM(sub.recargo) 
 			 FROM bs.payMethodClient p
-			 JOIN  (SELECT SUM(v.importe) AS importe, SUM(v.recargo) as recargo, v.fecha, v.Id_cliente
+			 JOIN  (SELECT SUM(v.importe) AS importe, SUM(v.recargo) as recargo, v.fecha, v.Id_cliente 
 				 FROM bs.ventas v
 				 WHERE v.fecha>= (SELECT MIN(dated) FROM bs. payMethodClient)
 				 GROUP BY v.Id_cliente, v.fecha) sub ON sub.fecha = p.dated AND sub.Id_cliente = p.ClientFk
 			 JOIN vn.payMethod pm ON p.payMethodFk = pm.id
-		GROUP BY dated,payMethodFk;
+		GROUP BY dated,payMethodFk;    			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5132,12 +5141,12 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE,
                                              IN vToDate DATE, IN vProducerFk INT)
 BEGIN
-
+	
 	DECLARE vFromDateLastYear DATE;
 	DECLARE vToDateLastYear DATE;
 	DECLARE	vFromDateTwoYearsAgo DATE;
 	DECLARE vToDateTwoYearsAgo DATE;
-
+	
 	SET vItemFk = IFNULL(vItemFk,0);
 	SET vTypeFk = IFNULL(vTypeFk, 0);
 	SET vCategoryFk = IFNULL(vCategoryFk,0);
@@ -5152,19 +5161,19 @@ BEGIN
 
 	SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha
 		FROM bs.ventas v
-			JOIN vn.sale s ON s.id = v.Id_Movimiento
-			JOIN vn.item i ON i.id = s.itemFk
-			JOIN vn.itemType it ON it.id = i.typeFk
-			JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+			JOIN vn.sale s ON s.id = v.Id_Movimiento 
+			JOIN vn.item i ON i.id = s.itemFk 
+			JOIN vn.itemType it ON it.id = i.typeFk 
+			JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
 		WHERE vItemFk IN (i.id, 0)
 			AND vTypeFk IN (i.typeFk, 0)
 			AND vCategoryFk IN (it.categoryFk, 0)
 			AND vProducerFk IN (i.producerFk, 0)
 			AND (v.fecha BETWEEN vFromDate AND vToDate
 				OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear
-				OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo
+				OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo	
 				);
-
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5183,21 +5192,21 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `salePersonEvolutionAdd`(IN vDateStart DATETIME)
 BEGIN
-	DELETE FROM bs.salePersonEvolution
+	DELETE FROM bs.salePersonEvolution 
 				WHERE  dated <=  DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR);
-
-
+    
+    
     INSERT INTO bs.salePersonEvolution (dated, amount, equalizationTax, salesPersonFk)
-		SELECT fecha dated,
-				CAST(SUM(importe) AS DECIMAL(10,2) ) amount,
+		SELECT fecha dated, 
+				CAST(SUM(importe) AS DECIMAL(10,2) ) amount, 
 				CAST(SUM(recargo) AS DECIMAL(10,2) ) equalizationTax ,
 				IFNULL(salesPersonFk,0) salesPersonFk
 			FROM bs.ventas v
-				JOIN vn.client c ON v.Id_Cliente = c.id
+				JOIN vn.client c ON v.Id_Cliente = c.id 
 				JOIN vn.company co ON co.id = v.empresa_id
 			WHERE co.code = "VNL" AND fecha >= vDateStart
 		 GROUP BY v.fecha,c.salesPersonFk
-		 ORDER BY salesPersonFk,dated ASC;
+		 ORDER BY salesPersonFk,dated ASC;    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5219,7 +5228,7 @@ BEGIN
 /**
  * Agrupa las ventas por cliente/comercial/fecha en la tabla bs.salesByclientSalesPerson
  * El asociación cliente/comercial/fecha, se mantiene correcta en el tiempo
- *
+ * 
  * @param vDatedFrom el cálculo se realizará desde la fecha introducida hasta ayer
  */
 
@@ -5227,17 +5236,17 @@ BEGIN
 		SET vDatedFrom = util.VN_CURDATE() - INTERVAL 1 MONTH;
 	END IF;
 
-	UPDATE salesByclientSalesPerson
+	UPDATE salesByclientSalesPerson 
 		SET amount = 0,
 			equalizationTax = 0,
 			amountNewBorn = 0
 		WHERE dated BETWEEN vDatedFrom AND util.yesterday();
-
-	INSERT INTO salesByclientSalesPerson(
-			dated,
-			salesPersonFk,
-			clientFk,
-			amount,
+	
+	INSERT INTO salesByclientSalesPerson( 
+			dated, 
+			salesPersonFk, 
+			clientFk, 
+			amount, 
 			equalizationTax)
 		SELECT s.dated,
 				c.salesPersonFk,
@@ -5246,7 +5255,7 @@ BEGIN
 				SUM(s.surcharge)
 			FROM sale s
 				JOIN vn.client c on s.clientFk = c.id
-			WHERE s.dated BETWEEN vDatedFrom AND util.yesterday()
+			WHERE s.dated BETWEEN vDatedFrom AND util.yesterday() 
 			GROUP BY s.dated, c.salesPersonFk, s.clientFk
 		ON DUPLICATE KEY UPDATE amount= VALUES(amount),
 			equalizationTax= VALUES(equalizationTax);
@@ -5419,8 +5428,8 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `salesByItemTypeDay_addLauncher`()
-BEGIN
-	CALL bs.salesByItemTypeDay_add(util.VN_CURDATE() - INTERVAL 30 DAY, util.VN_CURDATE());
+BEGIN
+	CALL bs.salesByItemTypeDay_add(util.VN_CURDATE() - INTERVAL 30 DAY, util.VN_CURDATE());
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5440,35 +5449,35 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `salesPersonEvolution_add`()
 BEGIN
 /**
- * Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día.
+ * Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día. 
  * Recalcula automáticamente los 3 últimos meses para comprobar si hay algún cambio.
  */
 	DECLARE vDated DATE;
 	DECLARE vCont INT DEFAULT 1;
 
-	SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated
+	SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated 
 		FROM salesPersonEvolution;
 
-	DELETE FROM salesPersonEvolution
+	DELETE FROM salesPersonEvolution 
 		WHERE dated >= vDated;
 
 	IF ISNULL(vDated) THEN
-		SELECT MIN(dated) INTO vDated
+		SELECT MIN(dated) INTO vDated 
 			FROM salesByclientSalesPerson;
-
+		
 		INSERT INTO salesPersonEvolution(
-				salesPersonFk,
-				dated,
-				amount,
-				equalizationTax,
+				salesPersonFk, 
+				dated, 
+				amount, 
+				equalizationTax, 
 				amountNewBorn
 			)
-			SELECT salesPersonFk,
-				dated,
-				amount,
-				equalizationTax,
+			SELECT salesPersonFk, 
+				dated, 
+				amount, 
+				equalizationTax, 
 				amountNewBorn
-				FROM salesByclientSalesPerson
+				FROM salesByclientSalesPerson 
 				WHERE dated = vDated
 				GROUP BY salesPersonFk;
 
@@ -5476,21 +5485,21 @@ BEGIN
 	END IF;
 
 	WHILE vDated < util.VN_CURDATE() DO
-
+		
 		SET vCont = vCont + 1;
 		REPLACE salesPersonEvolution(salesPersonFk, dated, amount)
 			SELECT salesPersonFk, vDated, amount
 				FROM(SELECT salesPersonFk, SUM(amount) amount
 						FROM(SELECT salesPersonFk, amount
-								FROM salesPersonEvolution
+								FROM salesPersonEvolution 
 								WHERE dated = vDated - INTERVAL 1 DAY
 							UNION ALL
-							SELECT salesPersonFk, amount
-								FROM salesByclientSalesPerson
+							SELECT salesPersonFk, amount 
+								FROM salesByclientSalesPerson 
 								WHERE dated = vDated
 							UNION ALL
 							SELECT salesPersonFk, - amount
-								FROM salesByclientSalesPerson
+								FROM salesByclientSalesPerson 
 								WHERE dated = vDated - INTERVAL 1 YEAR
 							)sub
 						GROUP BY salesPersonFk
@@ -5519,7 +5528,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add_launcher`()
 BEGIN
 
 	CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY);
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5543,7 +5552,7 @@ BEGIN
 /**
 * Añade las ventas que se realizaron entre
 * vStarted y vEnded
-*
+* 
 * @param vStarted Fecha de inicio
 * @param vEnded Fecha de finalizacion
 *
@@ -5551,7 +5560,7 @@ BEGIN
 	DECLARE vStartingDate DATETIME;
 	DECLARE vEndingDate DATETIME;
 
-	IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE())
+	IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) 
 		OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN
 		CALL util.throw('fechaDemasiadoAntigua');
 	END IF;
@@ -5560,8 +5569,8 @@ BEGIN
 	SET vStartingDate = vStarted ;
 	SET vEndingDate = util.dayEnd(vStartingDate);
 
-	DELETE
-		FROM sale
+	DELETE 
+		FROM sale 
 		WHERE dated BETWEEN vStartingDate AND vEnded;
 
 	WHILE vEndingDate <= vEnded DO
@@ -5582,28 +5591,28 @@ BEGIN
 					JOIN vn.itemType it ON it.id = i.typeFk
 					JOIN vn.itemCategory ic ON ic.id = it.categoryFk
 					JOIN vn.ticket t ON t.id = s.ticketFk
-					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
 				WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
 					AND s.quantity <> 0
 					AND s.discount <> 100
-					AND ic.merchandise
+					AND ic.merchandise 
 				GROUP BY sc.saleFk
 				HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0;
 
 		UPDATE sale s
 				JOIN (
-					SELECT s.id,
+					SELECT s.id, 
 							SUM(s.quantity * sc.value ) margen,
 							s.quantity * s.price * (100 - s.discount ) / 100 pvp
 						FROM vn.sale s
-							JOIN vn.ticket t ON t.id = s.ticketFk
+							JOIN vn.ticket t ON t.id = s.ticketFk 
 							JOIN vn.saleComponent sc ON sc.saleFk = s.id
-							JOIN vn.component c ON c.id = sc.componentFk
-							JOIN vn.componentType ct ON ct.id = c.typeFk
+							JOIN vn.component c ON c.id = sc.componentFk 
+							JOIN vn.componentType ct ON ct.id = c.typeFk 
 						WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
 							AND ct.isMargin = TRUE
-						GROUP BY s.id) sub ON sub.id = s.saleFk
+						GROUP BY s.id) sub ON sub.id = s.saleFk 
 			SET s.margin = sub.margen + s.amount + s.surcharge - sub.pvp;
 
 		SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate);
@@ -5631,7 +5640,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_add_launcher`()
 BEGIN
 /**
  * Añade las ventas a la tabla bs.sale que se realizaron desde hace un mes hasta hoy
- *
+ * 
  */
 
 	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
@@ -5655,7 +5664,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `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
@@ -5667,8 +5676,8 @@ BEGIN
 
 	DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
 
-	DELETE FROM bs.ventas_contables
-		WHERE year = vYear
+	DELETE FROM bs.ventas_contables 
+		WHERE year = vYear 
 	    	AND month = vMonth;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
@@ -5679,7 +5688,7 @@ BEGIN
 			FROM vn2008.Tickets t
 				JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
 			WHERE year(f.Fecha) = vYear
-				AND month(f.Fecha) = vMonth;
+				AND month(f.Fecha) = vMonth;   
 
 	INSERT INTO bs.ventas_contables(year
 								  , month
@@ -5689,7 +5698,7 @@ BEGIN
 								  , tipo_id
 								  , empresa_id
 								  , gasto)
-
+	
 		SELECT  vYear
 			  , vMonth
 			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
@@ -5701,13 +5710,13 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , 7000000000
+			  , 7000000000 
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
 									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 1000000
+									  ) * 1000000  
 				+ tp.reino_id * 10000 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
@@ -5721,7 +5730,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
@@ -5740,17 +5749,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.client cl on cl.id = a.clientFk
+				JOIN vn.address a on a.id = t.addressFk 
+				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 ;
@@ -5770,13 +5779,13 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_add_launcher`()
 BEGIN
-
+	
 	/**
 	 * Reemplaza las ventas contables del último año.
 	 * Es el origen de datos para el balance de Entradas
 	 *
 	 **/
-
+	
 	CALL bs.ventas_contables_add(YEAR(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())), MONTH(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())));
 
 END ;;
@@ -5797,12 +5806,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT)
 BEGIN
-
+	
 	/**
 	 * Muestra las ventas (€) de cada cliente
 	 * dependiendo del año
 	 */
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 
 	CREATE TEMPORARY TABLE tmp.ticket_list
@@ -5811,8 +5820,8 @@ BEGIN
 			FROM vn2008.Tickets t
 				JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
 			WHERE year(f.Fecha) = vYear
-				AND month(f.Fecha) = vMonth;
-
+				AND month(f.Fecha) = vMonth;   		
+	            
 	SELECT vYear Año,
 			vMonth Mes,
 			t.Id_Cliente,
@@ -5822,7 +5831,7 @@ BEGIN
 				IF(e2.empresa_grupo,2,0))
 			AS grupo,
 			t.empresa_id empresa
-		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
@@ -5836,9 +5845,9 @@ BEGIN
 			AND m.Descuento <> 100
 			AND a.tipo_id != 188
 		GROUP BY t.Id_Cliente, grupo,t.empresa_id;
-
+	
 	DROP TEMPORARY TABLE tmp.ticket_list;
-
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5857,7 +5866,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `vivosMuertos`()
 BEGIN
-
+	
 	/**
 	 * Devuelve el número de clientes nuevos y muertos,
 	 * dependiendo de la fecha actual.
@@ -5868,9 +5877,9 @@ BEGIN
 
 		SET @datSTART = TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
 		SET @datEND = TIMESTAMPADD(DAY,-DAY(util.VN_CURDATE()),util.VN_CURDATE());
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.VivosMuertos;
-
+	
 	CREATE TEMPORARY TABLE tmp.VivosMuertos
 		SELECT c.Id_Cliente, tm.yearMonth, f.Compra, 0 as Nuevo, 0 as Muerto
 		FROM vn2008.Clientes c
@@ -5886,10 +5895,10 @@ BEGIN
 					WHERE Fecha BETWEEN @datSTART
 						AND @datEND) f ON f.yearMonth = tm.yearMonth
 						AND f.Id_Cliente = c.Id_Cliente;
-
+	
 	UPDATE tmp.VivosMuertos vm
 		JOIN
-			(SELECT MIN(tm.yearMonth) firstMonth, f.Id_Cliente
+			(SELECT MIN(tm.yearMonth) firstMonth, f.Id_Cliente 
 			FROM vn2008.Facturas f
 		        JOIN vn2008.time tm ON tm.date = f.Fecha
 			WHERE Fecha BETWEEN @datSTART AND @datEND
@@ -5897,9 +5906,9 @@ BEGIN
 		    	AND fm.Id_Cliente = vm.Id_Cliente
 
 	SET Nuevo = 1;
-
+	  
 	SELECT max(yearMonth) INTO @lastYearMonth FROM tmp.VivosMuertos;
-
+	 
 	UPDATE tmp.VivosMuertos vm
 	JOIN (
 	  SELECT MAX(tm.yearMonth) firstMonth, f.Id_Cliente
@@ -5940,23 +5949,23 @@ BEGIN
 		INTO vWeek, vYear
 	FROM vn.time
 		WHERE dated =  util.VN_CURDATE();
-
+	
 	REPLACE bs.waste
 	SELECT *, 100 * mermas / total as porcentaje
 	FROM (
-		SELECT  buyer,
-				year,
+		SELECT  buyer,  
+				year, 
 				week,
 				family,
 				itemFk,
 				itemTypeFk,
-				floor(sum(value)) as total,
+				floor(sum(value)) as total, 
 				floor(sum(IF(clientTypeFk = 'loses', value, 0))) as mermas
-			FROM vn.saleValue
+			FROM vn.saleValue 
 			where year = vYear and week = vWeek
-
+			
 			GROUP BY family, itemFk
-
+			
 		) sub
 		ORDER BY mermas DESC;
 END ;;
@@ -5988,56 +5997,56 @@ BEGIN
 	DECLARE vDateEnded DATE;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated)
+		SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated) 
 			FROM vn.time t
 			WHERE t.dated BETWEEN vDateStarted AND vDateEnded
-			GROUP BY  year,month;
+			GROUP BY  year,month;		
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+	
 	IF DAY(util.VN_CURDATE()) = 21 THEN
-
+    
 		SELECT  util.firstDayOfMonth(DATE_SUB(util.VN_CURDATE(), INTERVAL 12 MONTH)),
 				LAST_DAY(DATE_SUB(util.VN_CURDATE(), INTERVAL 1 MONTH))
-				INTO vDateStarted,
+				INTO vDateStarted, 
 					vDateEnded;
-
-		DELETE FROM workerLabourDataByMonth
+		
+		DELETE FROM workerLabourDataByMonth  
 			WHERE CONCAT(`year`, '-',`month`, '-01') BETWEEN vDateStarted AND vDateEnded;
 
 		OPEN vCursor;
 
 		l: LOOP
 			SET vDone = FALSE;
-
+		
 			FETCH vCursor INTO vFristDay, vLastDay;
-
+			
 			IF vDone THEN
 				LEAVE l;
 			END IF;
-
+			
 			-- Altas periodo
-			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
-				SELECT 'hiring', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)						 
+				SELECT 'hiring', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) 
 					FROM vn.business b
 						JOIN vn.workCenter wc ON wc.id = b.workCenterFk
 						JOIN vn.worker w ON w.id = b.workerFk
 						LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk
 						LEFT JOIN (SELECT b.id, b.workerFk
 									FROM vn.business b
-										LEFT JOIN (SELECT ended, workerFk FROM vn.business) wl
+										LEFT JOIN (SELECT ended, workerFk FROM vn.business) wl 
 											ON wl.ended = DATE_SUB(b.started, INTERVAL 1 DAY) AND wl.workerFk = b.workerFk
-									WHERE b.started BETWEEN vFristDay AND vLastDay AND wl.ended
+									WHERE b.started BETWEEN vFristDay AND vLastDay AND wl.ended 
 						)sub ON sub.workerFk = b.workerFk
 					WHERE wc.payrollCenterFk IS NOT NULL
 						AND b.workCenterFk  IS NOT NULL
 						AND b.started BETWEEN vFristDay AND vLastDay
 						AND sub.workerFk IS NULL
-						AND NOT w.isFreelance;
+						AND NOT w.isFreelance;	
 
 			-- Bajas periodo
-			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
-				SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)					
+				SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)  
 					FROM vn.business b
 						JOIN vn.worker w ON w.id = b.workerFk
 						JOIN vn.workCenter wc ON wc.id = b.workCenterFk
@@ -6048,12 +6057,12 @@ BEGIN
 						AND b.ended BETWEEN vFristDay AND vLastDay
 						AND wl.started IS NULL
 						AND NOT w.isFreelance;
-
+						
 			-- Anterior al periodo
 			SET vLastDay = LAST_DAY(DATE_SUB(vFristDay, INTERVAL 1 DAY));
 
-			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
-				SELECT 'staff', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)					
+				SELECT 'staff', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)  
 					FROM vn.business b
 						JOIN vn.worker w ON w.id = b.workerFk
 						JOIN vn.workCenter wc ON wc.id = b.workCenterFk
@@ -6063,8 +6072,8 @@ BEGIN
 						AND NOT w.isFreelance;
 
 			-- Discapacidad
-			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
-				SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+			INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)					
+				SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)  
 					FROM vn.business b
 						JOIN vn.worker w ON w.id = b.workerFk
 						JOIN vn.workCenter wc ON wc.id = b.workCenterFk
@@ -6473,7 +6482,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `addressFriendship_Update`()
 BEGIN
 
-	REPLACE cache.addressFriendship
+	REPLACE cache.addressFriendship 
 		SELECT addressFk1, addressFk2, count(*) friendship
 			FROM
 				(
@@ -6484,7 +6493,7 @@ BEGIN
 						AND t2.shipped >= TIMESTAMPADD(MONTH,-3,util.VN_CURDATE())
 						AND t.addressFk != t2.addressFk) sub
 			GROUP BY addressFk1, addressFk2;
-
+            
 	REPLACE cache.zoneAgencyFriendship
 		SELECT r.agencyModeFk, t.zoneFk, count(*) friendship
 			FROM vn.route r
@@ -6658,12 +6667,12 @@ BEGIN
 		FROM available a
 			LEFT JOIN tCalc c ON c.id = a.calc_id
 		WHERE c.id IS NULL;
-
+	
 	DELETE a
 		FROM availableNoRaids a
 			LEFT JOIN tCalc c ON c.id = a.calc_id
 		WHERE c.id IS NULL;
-
+		
 	DROP TEMPORARY TABLE tCalc;
 END ;;
 DELIMITER ;
@@ -6842,27 +6851,27 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_calc_end`(IN `v_calc` INT)
-BEGIN
-	DECLARE v_cache_name VARCHAR(255);
-	DECLARE v_params VARCHAR(255);
-
-	-- Libera el bloqueo y actualiza la fecha de ultimo refresco.
-
-	UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
-		SET
-			cc.last_refresh = NOW(),
-			cc.expires = ADDTIME(NOW(), c.lifetime),
-			cc.connection_id = NULL
-				WHERE cc.id = v_calc;
-
-	SELECT c.name, ca.params INTO v_cache_name, v_params
-		FROM cache c
-		JOIN cache_calc ca ON c.id = ca.cache_id
-			WHERE ca.id = v_calc;
-
-	IF v_cache_name IS NOT NULL THEN
-		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
-	END IF;
+BEGIN
+	DECLARE v_cache_name VARCHAR(255);
+	DECLARE v_params VARCHAR(255);
+
+	-- Libera el bloqueo y actualiza la fecha de ultimo refresco.
+
+	UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
+		SET
+			cc.last_refresh = NOW(),
+			cc.expires = ADDTIME(NOW(), c.lifetime),
+			cc.connection_id = NULL
+				WHERE cc.id = v_calc;
+
+	SELECT c.name, ca.params INTO v_cache_name, v_params
+		FROM cache c
+		JOIN cache_calc ca ON c.id = ca.cache_id
+			WHERE ca.id = v_calc;
+
+	IF v_cache_name IS NOT NULL THEN
+		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
+	END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -6880,89 +6889,89 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100))
-proc: BEGIN
-	DECLARE v_valid BOOL;
-	DECLARE v_lock_id VARCHAR(100);
-	DECLARE v_cache_id INT;
-	DECLARE v_expires DATETIME;
-	DECLARE v_clean_time DATETIME;
-	DECLARE vLastRefresh DATETIME;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		IF v_lock_id IS NOT NULL THEN
-			DO RELEASE_LOCK(v_lock_id);
-		END IF;
-
-		RESIGNAL;
-	END;
-
-	SET v_params = IFNULL(v_params, '');
-
-	-- Si el servidor se ha reiniciado invalida todos los calculos.
-
-	SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
-
-	IF !v_valid
-	THEN
-		DELETE FROM cache_calc;
-		INSERT INTO cache_valid (valid) VALUES (TRUE);
-	END IF;
-
-	-- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
-
-	SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
-
-	IF !GET_LOCK(v_lock_id, 30)
-	THEN
-		SET v_calc = NULL;
-		SET v_refresh = FALSE;
-		LEAVE proc;
-	END IF;
-
-	-- Comprueba si el calculo solicitado existe y esta actualizado.
-
-	SELECT c.id, ca.id, ca.expires, ca.last_refresh
-		INTO v_cache_id, v_calc, v_expires, vLastRefresh
-		FROM cache c
-			LEFT JOIN cache_calc ca
-				ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci'
-		WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
-
-	-- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
-
-	IF !v_refresh AND NOW() < v_expires AND vLastRefresh >= CURDATE()
-	THEN
-		DO RELEASE_LOCK(v_lock_id);
-		SET v_refresh = FALSE;
-		LEAVE proc;
-	END IF;
-
-	-- Si el calculo no existe le crea una entrada en la tabla de calculos.
-
-	IF v_calc IS NULL
-	THEN
-		INSERT INTO cache_calc SET
-			cache_id = v_cache_id,
-			cacheName = v_cache_name,
-			params = v_params,
-			last_refresh = NULL,
-			expires = NULL,
-			connection_id = CONNECTION_ID();
-
-		SET v_calc = LAST_INSERT_ID();
-	ELSE
-		UPDATE cache_calc
-			SET
-				last_refresh = NULL,
-				expires = NULL,
-				connection_id = CONNECTION_ID()
-			WHERE id = v_calc;
-	END IF;
-
-	-- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
-
-	SET v_refresh = TRUE;
+proc: BEGIN
+	DECLARE v_valid BOOL;
+	DECLARE v_lock_id VARCHAR(100);
+	DECLARE v_cache_id INT;
+	DECLARE v_expires DATETIME;
+	DECLARE v_clean_time DATETIME;
+	DECLARE vLastRefresh DATETIME;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		IF v_lock_id IS NOT NULL THEN
+			DO RELEASE_LOCK(v_lock_id);
+		END IF;
+
+		RESIGNAL;
+	END;
+
+	SET v_params = IFNULL(v_params, '');
+
+	-- Si el servidor se ha reiniciado invalida todos los calculos.
+
+	SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
+
+	IF !v_valid
+	THEN
+		DELETE FROM cache_calc;
+		INSERT INTO cache_valid (valid) VALUES (TRUE);
+	END IF;
+
+	-- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
+
+	SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
+
+	IF !GET_LOCK(v_lock_id, 30)
+	THEN
+		SET v_calc = NULL;
+		SET v_refresh = FALSE;
+		LEAVE proc;
+	END IF;
+
+	-- Comprueba si el calculo solicitado existe y esta actualizado.
+
+	SELECT c.id, ca.id, ca.expires, ca.last_refresh
+		INTO v_cache_id, v_calc, v_expires, vLastRefresh
+		FROM cache c
+			LEFT JOIN cache_calc ca
+				ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' 
+		WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
+				
+	-- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
+
+	IF !v_refresh AND NOW() < v_expires AND vLastRefresh >= CURDATE() 
+	THEN
+		DO RELEASE_LOCK(v_lock_id);
+		SET v_refresh = FALSE;
+		LEAVE proc;
+	END IF;
+
+	-- Si el calculo no existe le crea una entrada en la tabla de calculos.
+
+	IF v_calc IS NULL
+	THEN
+		INSERT INTO cache_calc SET
+			cache_id = v_cache_id,
+			cacheName = v_cache_name,
+			params = v_params,
+			last_refresh = NULL,
+			expires = NULL,
+			connection_id = CONNECTION_ID();
+
+		SET v_calc = LAST_INSERT_ID();
+	ELSE
+		UPDATE cache_calc
+			SET
+				last_refresh = NULL,
+				expires = NULL,
+				connection_id = CONNECTION_ID()
+			WHERE id = v_calc;
+	END IF;
+
+	-- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
+
+	SET v_refresh = TRUE;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -6992,7 +7001,7 @@ proc: BEGIN
 		FROM cache c
 		JOIN cache_calc ca ON c.id = ca.cache_id
 			WHERE ca.id = v_calc;
-
+			
 	DELETE FROM cache_calc WHERE id = v_calc;
 
 	IF v_cache_name IS NOT NULL THEN
@@ -7088,7 +7097,7 @@ DECLARE rs CURSOR FOR
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
-	SET myTime = HOUR(util.VN_NOW()) + MINUTE(util.VN_NOW()) / 60;
+	SET myTime = HOUR(util.VN_NOW()) + MINUTE(util.VN_NOW()) / 60; 
 
 	OPEN rs;
 
@@ -7097,23 +7106,23 @@ DECLARE rs CURSOR FOR
 	WHILE NOT done DO
 
 		SET resto = IF(inicioProd < rsDeparture, rsDeparture - inicioProd,0);
-
+		
 		SET inicioProd = rsDeparture - rsHoras;
-
+		
 		IF inicioProd - resto < myTime THEN
-
+		
 			SET done = TRUE;
-
+			
 		ELSE
-
+		
 			SET departureLimit = rsDeparture;
-
+			
 			FETCH rs INTO rsDeparture, rsHoras , rsInicio;
-
+			
 			-- SELECT rsDeparture, rsHoras , rsInicio;
-
+			
 		END IF;
-
+		
 	END WHILE;
 
 	SET departureLimit = IFNULL(departureLimit,24);
@@ -7158,7 +7167,7 @@ proc: BEGIN
     DECLARE started DATE;
     DECLARE ended DATE;
     DECLARE vLastRefresh DATE;
-
+	
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		CALL cache_calc_unlock (vCalc);
@@ -7208,14 +7217,14 @@ proc: BEGIN
 	DECLARE datEQ DATETIME;
 	DECLARE timDIF TIME;
     DECLARE v_calc INT;
-
+    
     CALL cache_calc_start (v_calc, v_refresh, 'prod_graphic', wh_id);
-
+    
     IF !v_refresh
     THEN
 		LEAVE proc;
 	END IF;
-
+    
     CALL vn2008.production_control_source(wh_id, 0);
 
 	DELETE FROM prod_graphic_source;
@@ -7233,8 +7242,8 @@ proc: BEGIN
     WHERE Fecha = util.VN_CURDATE()
     GROUP BY wh_id, graphCategory
     ;
-
-
+    
+    
     CALL cache_calc_end (v_calc);
 END ;;
 DELIMITER ;
@@ -7255,11 +7264,11 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `stock_refresh`(v_refresh BOOL)
 proc: BEGIN
 /**
- * Crea o actualiza la cache con el disponible hasta el día de
+ * Crea o actualiza la cache con el disponible hasta el dí­a de 
  * ayer. Esta cache es usada como base para otros procedimientos
- * como el cáculo del visible o del ATP.
+ * como el cálculo del visible o del ATP.
  *
- * @param v_refresh %TRUE para forzar el recálculo de la cache
+ * @param v_refresh %TRUE para forzar el recálculo de la cache
  **/
 	DECLARE v_calc INT;
 	DECLARE v_date_inv DATE;
@@ -7279,23 +7288,23 @@ proc: BEGIN
 		LEAVE proc;
 	END IF;
 
-	SET v_date_inv = (SELECT inventoried FROM vn.config LIMIT 1);
+	SET v_date_inv = vn.getInventoryDate();
 	SET vCURDATE = util.VN_CURDATE();
-
+	
 	DELETE FROM stock;
-
+	
 	INSERT INTO stock (item_id, warehouse_id, amount)
 	SELECT item_id, warehouse_id, SUM(amount) amount FROM
 	(
-		SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount
+		SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount 
 			FROM vn.itemTicketOut
 			WHERE shipped >= v_date_inv AND shipped < vCURDATE
 		UNION ALL
-		SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount
+		SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount 
 			FROM vn.itemEntryIn
 			WHERE landed >= v_date_inv AND landed < vCURDATE AND isVirtualStock is FALSE
 		UNION ALL
-		SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount
+		SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount 
 			FROM vn.itemEntryOut
 			WHERE shipped >= v_date_inv AND shipped < vCURDATE
 	) t
@@ -7325,12 +7334,12 @@ BEGIN
 		(INDEX (id))
 		ENGINE = MEMORY
 		SELECT id FROM cache_calc;
-
+				
 	DELETE v
 		FROM visible v
 			LEFT JOIN tCalc c ON c.id = v.calc_id
 		WHERE c.id IS NULL;
-
+		
 	DROP TEMPORARY TABLE tCalc;
 END ;;
 DELIMITER ;
@@ -8254,9 +8263,9 @@ DELIMITER ;;
 BEGIN
 
 	DECLARE nextID INT;
-
+	    
 	SELECT 1 + MAX(id) INTO nextID FROM putOrder ;
-
+    
     SET NEW.orderTradelineItemID  = nextID;
 
 END */;;
@@ -8278,36 +8287,36 @@ DELIMITER ;;
 	BEFORE UPDATE ON `putOrder`
 	FOR EACH ROW
 BEGIN
-
+	
 	DECLARE vError VARCHAR(100) DEFAULT 'Orderregel niet meer teruggevonden op basis van de orderps';
     DECLARE vVmpIdError INT DEFAULT 7;
     DECLARE vVmpFk INT;
    	DECLARE vSupplyResponseNumberOfUnits INT;
-
-   	SELECT sr.vmpID INTO vVmpFk
-		FROM edi.supplyResponse sr
+       
+   	SELECT sr.vmpID INTO vVmpFk 
+		FROM edi.supplyResponse sr 
 		WHERE sr.id = NEW.supplyResponseID;
-
-		IF NEW.OrderStatus = 3
-			AND NOT (NEW.OrderStatus <=> OLD.OrderStatus)
-			AND NEW.error = vError
-			AND vVmpFk = vVmpIdError
-
-		THEN
-
+		
+		IF NEW.OrderStatus = 3 
+			AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) 
+			AND NEW.error = vError 
+			AND vVmpFk = vVmpIdError 
+		
+		THEN 
+		
 			SET NEW.OrderStatus = 2;
-
+		
 		END IF;
-
+	
 	-- Error de disponible menor de lo solicitado
 	IF NEW.error LIKE 'error2602%' THEN
-
+	
 		SELECT NumberOfUnits INTO vSupplyResponseNumberOfUnits
-			FROM edi.supplyResponse sr
+			FROM edi.supplyResponse sr 
 			WHERE sr.ID = NEW.supplyResponseID;
-
+		
 		SET NEW.error = CONCAT('(',vSupplyResponseNumberOfUnits,') ', NEW.error);
-
+	
 	END IF;
 END */;;
 DELIMITER ;
@@ -8334,16 +8343,16 @@ BEGIN
 	DECLARE vIsEktSender BOOLEAN;
 
 	IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
-
+	
 			SELECT s.id INTO vSaleFk
-				FROM vn.sale s
+				FROM vn.sale s 
 					JOIN vn.ticket t ON s.ticketFk = t.id
 					JOIN vn.item i ON i.id = s.itemFk
 					JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID
 				WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE()
 					AND i.supplyResponseFk = NEW.supplyResponseID
 				LIMIT 1;
-
+			
 			UPDATE vn.sale s
 				JOIN vn.ticket t ON s.ticketFk = t.id
 				JOIN vn.item i ON i.id = s.itemFk
@@ -8351,7 +8360,7 @@ BEGIN
 				SET s.quantity = 0
 				WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE()
 					AND i.supplyResponseFk = NEW.supplyResponseID;
-
+				
 			INSERT INTO vn.mail (sender, `subject`, body)
 				SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL,
 							c.email,
@@ -8363,26 +8372,26 @@ BEGIN
 							IF (u.id IS NOT NULL AND c.email IS NOT NULL ,
 								CONCAT('https://shop.verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ),
 								CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary')))
-					FROM vn.sale s
+					FROM vn.sale s 
 						JOIN vn.ticket t ON t.id = s.ticketFk
 						JOIN vn.`client` c ON c.id = t.clientFk
 						LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismaelalcolea')
 					WHERE s.id = vSaleFk;
-
+			
 	END IF;
 
 
 	IF NEW.OrderStatus = vOrderStatusOK AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
 
-		SELECT v.isEktSender INTO vIsEktSender
+		SELECT v.isEktSender INTO vIsEktSender 
 			FROM edi.VMPSettings v
-				JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID
+				JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID 
 				WHERE sr.id = NEW.supplyResponseID;
-
+		
 		IF NOT vIsEktSender THEN
 
 			CALL edi.ekt_add(NEW.id);
-
+		
 		END IF;
 
 		IF NEW.barcode THEN
@@ -8391,7 +8400,7 @@ BEGIN
 				SELECT i.id, NEW.barcode
 					FROM vn.item i
 					WHERE i.supplyResponseFk = NEW.supplyResponseID;
-
+		
 		END IF;
 
 	END IF;
@@ -8589,8 +8598,8 @@ BEGIN
 
 	UPDATE vn.buy b
 			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk
-			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
+			JOIN vn.travel tr ON tr.id = e.travelFk 
+			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk 
 			JOIN vn.item i ON i.id = b.itemFk
 			JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
 		SET b.quantity = NEW.NumberOfItemsPerCask * NEW.NumberOfUnits,
@@ -8599,7 +8608,7 @@ BEGIN
 			AND am.name = 'LOGIFLORA'
 			AND e.isRaid
 			AND tr.landed >= util.VN_CURDATE();
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8741,7 +8750,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `imageName`(vPictureReference VARCHAR(255)) RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
     DETERMINISTIC
 BEGIN
-
+	
 	SET vPictureReference = REPLACE(vPictureReference,'.','');
 
 	SET vPictureReference = REPLACE(vPictureReference,'/','');
@@ -8753,7 +8762,7 @@ BEGIN
 	SET vPictureReference = REPLACE(vPictureReference,'?','');
 
 	SET vPictureReference = REPLACE(vPictureReference,'=','');
-
+	
 	RETURN vPictureReference;
 
 END ;;
@@ -8809,27 +8818,27 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `deliveryInformation_Delete`()
 BEGIN
-
+	
 	DECLARE vID INT;
 	DECLARE vGap INT DEFAULT 100;
 	DECLARE vTope INT;
-
-	SELECT MIN(ID), MAX(ID)
+	
+	SELECT MIN(ID), MAX(ID) 
 		INTO vID, vTope
 		FROM edi.deliveryInformation;
 
-	WHILE vID <= vTope DO
-
+	WHILE vID <= vTope DO 
+	
 		SET vID = vID + vGap;
-
-        DELETE
-        	FROM edi.deliveryInformation
+     
+        DELETE 
+        	FROM edi.deliveryInformation 
      		WHERE ID < vID
      			AND EarliestDespatchDateTime IS NULL;
-
+     
   	END WHILE;
-
-
+	
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8848,15 +8857,15 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_add`(vPutOrderFk INT)
 BEGIN
-
+	
 /**
  *  Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email
- *
+ * 
  * @param vPutOrderFk PutOrderId de donde coger los datos
  **/
-
-	INSERT INTO edi.ekt(entryYear,
-						deliveryNumber,
+	
+	INSERT INTO edi.ekt(entryYear, 
+						deliveryNumber, 
 						fec,
 						hor,
 						item,
@@ -8896,17 +8905,17 @@ BEGIN
 				i.value10 s6,
 				p.id putOrderFk,
 				sr.Item_ArticleCode,
-				sr.vmpID
+				sr.vmpID 
 			FROM edi.putOrder p
-				JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID
-				JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID
-				JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-				JOIN vn.item i ON i.supplyResponseFk = sr.ID
-				JOIN vn.origin o ON o.id = i.originFk
+				JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID 
+				JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID 
+				JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID 
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID 
+				JOIN vn.origin o ON o.id = i.originFk 
 			WHERE p.id = vPutOrderFk;
-
+				
 	CALL edi.ekt_load(LAST_INSERT_ID());
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8914,18 +8923,23 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ekt_load` */;
 /*!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_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_load`(IN `vSelf` INT)
 proc:BEGIN
-
+/**
+ * Carga los datos esenciales para el sistema EKT.
+ * Inserta compras y ventas si es necesario.
+ *
+ * @param vSelf Id de ekt
+ */
 	DECLARE vRef INT;
 	DECLARE vBuy INT;
 	DECLARE vItem INT;
@@ -8933,68 +8947,63 @@ proc:BEGIN
 	DECLARE vPackage INT;
 	DECLARE vPutOrderFk INT;
 	DECLARE vIsLot BOOLEAN;
-    DECLARE vForceToPacking INT DEFAULT 2;
-    DECLARE vEntryFk INT;
-   	DECLARE vHasToChangePackagingFk BOOLEAN;
-    DECLARE vIsFloramondoDirect BOOLEAN;
-    DECLARE vTicketFk INT;
+	DECLARE vForceToPacking INT DEFAULT 2;
+	DECLARE vEntryFk INT;
+	DECLARE vHasToChangePackagingFk BOOLEAN;
+	DECLARE vIsFloramondoDirect BOOLEAN;
+	DECLARE vTicketFk INT;
 	DECLARE vHasItemGroup BOOL;
 	DECLARE vDescription VARCHAR(255);
 	DECLARE vSaleFk INT;
 
 	-- Carga los datos necesarios del EKT
-
-	SELECT 	e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
+	SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
 			CONCAT(e.`ref`, ' ', e.item, ' ', e.sub, ' EktFk:', e.id)
 		INTO vRef, vQty, vPackage, vPutOrderFk, vItem, vIsFloramondoDirect, vHasItemGroup, vDescription
-		FROM edi.ekt e
-			LEFT JOIN edi.item i ON e.ref = i.id
-			LEFT JOIN edi.putOrder po ON po.id = e.putOrderFk
-			LEFT JOIN vn.item i2 ON i2.supplyResponseFk = po.supplyResponseID
+		FROM ekt e
+			LEFT JOIN item i ON e.ref = i.id
+			LEFT JOIN putOrder po ON po.id = e.putOrderFk
+			LEFT JOIN vn.item i2 ON i2.supplyResponseFk = po.supplyResponseID 
 			LEFT JOIN vn.ektEntryAssign eea ON eea.sub = e.sub
-			LEFT JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id
+			LEFT JOIN item_groupToOffer igto ON igto.group_code = i.group_id
 		WHERE e.id = vSelf
 			LIMIT 1;
-
+		
 	IF NOT vHasItemGroup THEN
-
 		CALL vn.mail_insert('logistica@verdnatura.es', 'nocontestar@verdnatura.es', 'Nuevo grupo en Floramondo', vDescription);
-
 		CALL vn.mail_insert('pako@verdnatura.es', 'nocontestar@verdnatura.es', CONCAT('Nuevo grupo en Floramondo: ', vDescription), vDescription);
-
 		LEAVE proc;
-
 	END IF;
-
+		
 	-- Asigna la entrada
-    SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
-
+	SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
+																					
 	-- Inserta el cubo si no existe
 
 	IF vPackage = 800 THEN
-
+	
 		SET vHasToChangePackagingFk = TRUE;
-
+	
 		IF vItem THEN
-
+		
 			SELECT vn.item_getPackage(vItem) INTO vPackage ;
-
+		
 		ELSE
-
-	 		SET vPackage = 8000 + vQty;
+		
+			SET vPackage = 8000 + vQty;
 
 			INSERT IGNORE INTO vn.packaging(id, width, `depth`)
 				SELECT vPackage, vc.ccLength / vQty, vc.ccWidth
 				FROM vn.volumeConfig vc;
-
+		
 		END IF;
-
+	
 	ELSE
-
+	
 		INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
 			SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
 				FROM bucket WHERE bucket_id = vPackage;
-
+		
 		IF ROW_COUNT() > 0
 		THEN
 			INSERT INTO vn2008.mail SET
@@ -9003,29 +9012,25 @@ proc:BEGIN
 				`to` = 'ekt@verdnatura.es';
 		END IF;
 	END IF;
-
+	
 	-- Si es una compra de Logiflora obtiene el articulo
 	IF vPutOrderFk THEN
-
 		SELECT i.id INTO vItem
-			FROM edi.putOrder po
+			FROM putOrder po
 				JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID
 			WHERE po.id = vPutOrderFk
 			LIMIT 1;
-
 	END IF;
 
-	INSERT IGNORE INTO item_track SET
-			item_id = vRef;
-
-    IF IFNULL(vItem,0) = 0 THEN
-
+	INSERT IGNORE INTO item_track
+		SET	item_id = vRef;
+	
+	IF vItem IS NULL THEN
 		-- Intenta obtener el artículo en base a los atributos holandeses
-
 		SELECT b.id, IFNULL(b.itemOriginalFk ,b.itemFk) INTO vBuy, vItem
-			FROM edi.ekt e
-				JOIN edi.item_track t ON t.item_id = e.ref
-				LEFT JOIN edi.ekt l ON l.ref = e.ref
+			FROM ekt e 
+				JOIN item_track t ON t.item_id = e.ref
+				LEFT JOIN ekt l ON l.ref = e.ref
 				LEFT JOIN vn.buy b ON b.ektFk = l.id
 				LEFT JOIN vn.item i ON i.id = b.itemFk
 				JOIN vn2008.config cfg
@@ -9044,89 +9049,77 @@ proc:BEGIN
 				AND IF(t.pro, l.pro = e.pro, TRUE)
 				AND IF(t.package, l.package = e.package, TRUE)
 				AND IF(t.item, l.item = e.item, TRUE)
-				AND  i.isFloramondo = vIsFloramondoDirect
-			ORDER BY l.now DESC, b.id ASC
+				AND  i.isFloramondo = vIsFloramondoDirect  				
+			ORDER BY l.now DESC, b.id ASC 
 			LIMIT 1;
 
 	END IF;
-
+	
 	-- Si no encuentra el articulo lo crea en el caso de las compras directas en Floramondo
-	IF ISNULL(vItem) AND vIsFloramondoDirect THEN
-
-		CALL edi.item_getNewByEkt(vSelf, vItem);
-
+	IF vItem IS NULL AND vIsFloramondoDirect THEN
+		CALL item_getNewByEkt(vSelf, vItem);
 	END IF;
+	
+	INSERT INTO vn.buy (
+			entryFk,
+			ektFk,
+			buyingValue,
+			itemFk,
+			stickers,
+			packing,
+			`grouping`,
+			quantity,
+			groupingMode,
+			packagingFk,
+			weight)
+		SELECT vEntryFk,
+				vSelf,
+				(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
+				IFNULL(vItem, cfg.generic_item) itemFk,
+				e.qty stickers,
+				@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
+				IFNULL(b.`grouping`, e.pac),
+				@pac * e.qty,
+				vForceToPacking,
+				IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk),
+				(IFNULL(i.weightByPiece, 0) * @pac) / 1000
+			FROM ekt e 
+				LEFT JOIN vn.buy b ON b.id = vBuy
+				LEFT JOIN vn.item i ON i.id = b.itemFk
+				LEFT JOIN vn.supplier s ON e.pro = s.id
+				JOIN vn2008.config cfg		
+			WHERE e.id = vSelf
+			LIMIT 1;
 
-    INSERT INTO vn.buy
-	(
-		 entryFk
-		,ektFk
-		,buyingValue
-		,itemFk
-        ,stickers
-        ,packing
-		,`grouping`
-        ,quantity
-		,groupingMode
-		,packagingFk
-        ,weight
-	)
-	SELECT
-		 vEntryFk
-		,vSelf
-		,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue
-		,IFNULL(vItem, cfg.generic_item) itemFk
-        ,e.qty stickers
-        ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing
-        ,IFNULL(b.`grouping`, e.pac)
-        ,@pac * e.qty
-		,vForceToPacking
-		,IF(vHasToChangePackagingFk OR ISNULL(b.packagingFk), vPackage, b.packagingFk)
-        ,(IFNULL(i.weightByPiece,0) * @pac)/1000
-		FROM edi.ekt e
-			LEFT JOIN vn.buy b ON b.id = vBuy
-			LEFT JOIN vn.item i ON i.id = b.itemFk
-			LEFT JOIN vn.supplier s ON e.pro = s.id
-            JOIN vn2008.config cfg
-		WHERE e.id = vSelf
-		LIMIT 1;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
-	CREATE TEMPORARY TABLE tmp.buyRecalc
+	CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
 		SELECT buy.id
-			FROM vn.buy
+			FROM vn.buy 
 			WHERE ektFk = vSelf;
 
 	CALL vn.buy_recalcPrices();
 
 	-- Si es una compra de Logiflora hay que informar la tabla vn.saleBuy
 	IF vPutOrderFk THEN
-
 		REPLACE vn.saleBuy(saleFk, buyFk, workerFk)
 			SELECT po.saleFk, b.id, account.myUser_getId()
-				FROM edi.putOrder po
+				FROM putOrder po
 					JOIN vn.buy b ON b.ektFk = vSelf
 				WHERE po.id = vPutOrderFk;
-
 	END IF;
+
 	-- Si es una compra directa en Floramondo hay que añadirlo al ticket
-
 	IF vIsFloramondoDirect THEN
-
 		SELECT t.id INTO vTicketFk
-            FROM vn.ticket t
-                JOIN vn.ektEntryAssign eea
-					ON eea.addressFk = t.addressFk
+			FROM vn.ticket t
+				JOIN vn.ektEntryAssign eea ON eea.addressFk = t.addressFk 
 					AND t.warehouseFk = eea.warehouseInFk
-                JOIN edi.ekt e
-					ON e.sub = eea.sub
+				JOIN ekt e ON e.sub = eea.sub 
 					AND e.id = vSelf
-            WHERE e.fec = t.shipped
-            LIMIT 1;
-
-		IF ISNULL(vTicketFk) THEN
-
+			WHERE e.fec = t.shipped
+			LIMIT 1;
+	
+		IF vTicketFk IS NULL THEN
+			SET @clientFk = NULL;
 			INSERT INTO vn.ticket (
 					clientFk,
 					shipped,
@@ -9138,22 +9131,20 @@ proc:BEGIN
 					landed,
 					zoneFk,
 					zonePrice,
-					zoneBonus
-				)
-				SELECT
-							a.clientFk,
-							e.fec,
-							a.id,
-							a.agencyModeFk,
-							a.nickname,
-							eea.warehouseInFk,
-							c.id,
-							e.fec,
-							z.id,
-							z.price,
-							z.bonus
-					FROM edi.ekt e
-						JOIN vn.ektEntryAssign eea ON eea.sub = e.sub
+					zoneBonus)
+				SELECT @clientFk := a.clientFk,
+						e.fec,
+						a.id,
+						a.agencyModeFk,
+						a.nickname,
+						eea.warehouseInFk,
+						c.id,
+						e.fec,
+						z.id,
+						z.price,
+						z.bonus
+					FROM ekt e 
+						JOIN vn.ektEntryAssign eea ON eea.sub = e.sub 
 						JOIN vn.address a ON a.id = eea.addressFk
 						JOIN vn.company c ON c.code = 'VNL'
 						JOIN vn.`zone` z ON z.code = 'FLORAMONDO'
@@ -9162,39 +9153,36 @@ proc:BEGIN
 
 			SET vTicketFk = LAST_INSERT_ID();
 
-			INSERT INTO vn.ticketLog
-			SET originFk = vTicketFk,
-				userFk = account.myUser_getId(),
-				`action` = 'insert',
-				description = CONCAT('EktLoad ha creado el ticket:', ' ', vTicketFk);
-
+			IF @clientFk IS NULL THEN
+				CALL util.throw(CONCAT("Ticket creation failed: ", vSelf));
+			END IF;
 		END IF;
 
 		INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, price)
 			SELECT vItem, vTicketFk, e.item, e.qty * e.pac, e.pri * ( 1 + fhc.floramondoMargin )
-				FROM edi.ekt e
-					JOIN edi.floraHollandConfig fhc
-					WHERE e.id = vSelf;
+				FROM ekt e
+					JOIN floraHollandConfig fhc
+				WHERE e.id = vSelf;
 
 		SELECT LAST_INSERT_ID() INTO vSaleFk;
 
 		REPLACE vn.saleBuy(saleFk, buyFk, workerFk)
 			SELECT vSaleFk, b.id, account.myUser_getId()
 				FROM vn.buy b
-					WHERE b.ektFk = vSelf;
+				WHERE b.ektFk = vSelf;
 
 		INSERT INTO vn.saleComponent(saleFk, componentFk, value)
 			SELECT vSaleFk, c.id, e.pri
-				FROM edi.ekt e
+				FROM ekt e
 					JOIN vn.component c ON c.code = 'purchaseValue'
-					WHERE e.id = vSelf;
+				WHERE e.id = vSelf;
 
 		INSERT INTO vn.saleComponent(saleFk, componentFk, value)
-			SELECT vSaleFk, c.id, e.pri * fhc.floramondoMargin
-				FROM edi.ekt e
-					JOIN edi.floraHollandConfig fhc
+			SELECT vSaleFk, c.id, e.pri * fhc.floramondoMargin 
+				FROM ekt e
+					JOIN floraHollandConfig fhc
 					JOIN vn.component c ON c.code = 'margin'
-					WHERE e.id = vSelf;
+				WHERE e.id = vSelf;
 	END IF;
 	DROP TEMPORARY TABLE tmp.buyRecalc;
 END ;;
@@ -9331,7 +9319,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_scan`(vBarcode VARCHAR(512))
 BEGIN
 /**
  * Busca transaciones a partir de un código de barras, las marca como escaneadas
- * y las devuelve.
+ * y las devuelve. 
  * Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura
  *
  * @param vBarcode Código de compra de una etiqueta de subasta
@@ -9370,19 +9358,19 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT id ektFk FROM ekt LIMIT 0;
 
-	CASE
+	CASE 
 		WHEN LENGTH(vBarcode) <= vFloridayBarcodeLength THEN
 			INSERT INTO tmp.ekt
-				SELECT id
+				SELECT id 
 					FROM edi.ektRecent e
 					WHERE e.cps = vBarcode
 						OR e.batchNumber = vBarcode;
 
 		WHEN LENGTH(vBarcode) = vFloramondoBarcodeLength THEN
 			INSERT INTO tmp.ekt
-				SELECT e.id
+				SELECT e.id 
 					FROM edi.ektRecent e
-					WHERE e.pro = MID(vBarcode,2,6)
+					WHERE e.pro = MID(vBarcode,2,6) 
 						AND CAST(e.ptd AS SIGNED) = MID(vBarcode,8,5);
 
 		ELSE
@@ -9397,7 +9385,7 @@ BEGIN
 			-- Clásico de subasta
 			-- Trade standard
 			-- Trade que construye como la subasta
-			-- Trade como el anterior pero sin trade code
+			-- Trade como el anterior pero sin trade code	
 			INSERT INTO tmp.ekt
 				SELECT id
 					FROM ekt
@@ -9418,9 +9406,9 @@ BEGIN
 			-- BatchNumber largo
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
-					SELECT id
+					SELECT id 
 						FROM edi.ektRecent e
-						WHERE e.batchNumber
+						WHERE e.batchNumber 
 							= LEFT(vBarcode,vUsefulAuctionLeftSegmentLength)
 							AND e.batchNumber > 0;
 
@@ -9430,7 +9418,7 @@ BEGIN
 			-- Order Number
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
-					SELECT id
+					SELECT id 
 						FROM edi.ektRecent e
 						WHERE e.putOrderFk = vBarcode;
 
@@ -9440,7 +9428,7 @@ BEGIN
 			-- deliveryNumber incrustado
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
-					SELECT id
+					SELECT id 
 						FROM edi.ektRecent e
 						WHERE e.deliveryNumber
 					= MID(vBarcode, 4, 13)
@@ -9451,7 +9439,7 @@ BEGIN
 	END CASE;
 
 	IF vIsFound THEN
-		UPDATE ekt e
+		UPDATE ekt e 
 			JOIN tmp.ekt t ON t.ektFk = e.id
 			SET e.scanned = TRUE;
 	END IF;
@@ -9472,524 +9460,524 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `floramondo_offerRefresh`()
-proc: BEGIN
-	DECLARE vLanded DATETIME;
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vFreeId INT;
-	DECLARE vSupplyResponseFk INT;
-	DECLARE vLastInserted DATETIME;
-	DECLARE vIsAuctionDay BOOLEAN;
-	DECLARE vMaxNewItems INT DEFAULT 10000;
-	DECLARE vStartingTime DATETIME;
-	DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-	DECLARE vDayRange INT;
-
-	DECLARE cur1 CURSOR FOR
-		SELECT id
-			FROM edi.item_free;
-
-	DECLARE cur2 CURSOR FOR
-		SELECT srId
-			FROM itemToInsert;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-		SET @isTriggerDisabled = FALSE;
-		RESIGNAL;
-	END;
-
-	IF 'test' = (SELECT environment FROM util.config) THEN
-		LEAVE proc;
-	END IF;
-
-	IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	SELECT dayRange INTO vDayRange
-		FROM offerRefreshConfig;
-
-	IF vDayRange IS NULL THEN
-		CALL util.throw("Variable vDayRange not declared");
-	END IF;
-
-	SET vStartingTime = util.VN_NOW();
-
-	TRUNCATE edi.offerList;
-
-	INSERT INTO edi.offerList(supplier, total)
-		SELECT v.name, COUNT(DISTINCT sr.ID) total
-			FROM edi.supplyResponse sr
-					JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				WHERE sr.NumberOfUnits > 0
-					AND sr.EmbalageCode != 999
-				GROUP BY sr.vmpID;
-
-	UPDATE edi.offerList o
-		JOIN (SELECT v.name, COUNT(*) total
-			FROM edi.supplyOffer sr
-				JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-		SET o.`filter` = sub.total;
-
-	-- Elimina de la lista de items libres aquellos que ya existen
-	DELETE itf.*
-		FROM edi.item_free itf
-			JOIN vn.item i ON i.id = itf.id;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp
-	(INDEX (`Item_ArticleCode`))
-	ENGINE = MEMORY
-		SELECT 	t.*
-			FROM (
-				SELECT *
-					FROM edi.supplyOffer
-					ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC,
-						NumberOfUnits DESC LIMIT 10000000000000000000) t
-		GROUP BY t.srId;
-
-	CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
-		INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
-		INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
-	ENGINE = MEMORY
-		SELECT so.*,
-				ev1.type_description s1Value,
-				ev2.type_description s2Value,
-				ev3.type_description s3Value,
-				ev4.type_description s4Value,
-				ev5.type_description s5Value,
-				ev6.type_description s6Value,
-				eif1.feature ef1,
-				eif2.feature ef2,
-				eif3.feature ef3,
-				eif4.feature ef4,
-				eif5.feature ef5,
-				eif6.feature ef6
-			FROM tmp so
-				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
-					AND eif1.presentation_order = 1
-					AND eif1.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
-					AND eif2.presentation_order = 2
-					AND eif2.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
-					AND eif3.presentation_order = 3
-					AND eif3.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
-					AND eif4.presentation_order = 4
-					AND eif4.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
-					AND eif5.presentation_order = 5
-					AND eif5.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
-					AND eif6.presentation_order = 6
-					AND eif6.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature
-					AND so.s1 = ev1.type_value
-				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature
-					AND so.s2 = ev2.type_value
-				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature
-					AND so.s3 = ev3.type_value
-				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature
-					AND so.s4 = ev4.type_value
-				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature
-					AND so.s5 = ev5.type_value
-				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature
-					AND so.s6 = ev6.type_value
-			ORDER BY Price;
-
-	DROP TEMPORARY TABLE tmp;
-
-	DELETE o
-		FROM edi.offer o
-			LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
-			LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
-			LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
-			LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
-			LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
-			LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
-			JOIN vn.floramondoConfig fc ON TRUE
-		WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
-
-	START TRANSACTION;
-
-	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
-	UPDATE IGNORE edi.offer o
-			JOIN vn.item i
-				ON i.name = o.product_name
-				AND i.subname <=> o.company_name
-				AND i.value5 <=> o.s1Value
-				AND i.value6 <=> o.s2Value
-				AND i.value7 <=> o.s3Value
-				AND i.value8 <=> o.s4Value
-				AND i.value9 <=> o.s5Value
-				AND i.value10 <=> o.s6Value
-				AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
-				AND i.EmbalageCode <=> o.EmbalageCode
-				AND i.quality <=> o.Quality
-			JOIN vn.itemType it ON it.id = i.typeFk
-			LEFT JOIN vn.sale s ON s.itemFk = i.id
-			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
-				AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-			LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-			LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk
-				AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-		SET i.supplyResponseFk = o.srID
-		WHERE (sr.ID IS NULL
-				OR sr.NumberOfUnits = 0
-				OR di.LatestOrderDateTime < util.VN_NOW()
-				OR di.ID IS NULL)
-			AND it.isInventory
-			AND t.id IS NULL
-			AND po.id IS NULL;
-
-	CREATE OR REPLACE TEMPORARY TABLE itemToInsert
-	ENGINE = MEMORY
-		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk
-			FROM edi.offer o
-				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
-		WHERE i.id IS NULL
-	LIMIT vMaxNewItems;
-
-	-- Reciclado de nº de item
-	OPEN cur1;
-	OPEN cur2;
-
-	read_loop: LOOP
-
-		FETCH cur2 INTO vSupplyResponseFk;
-		FETCH cur1 INTO vFreeId;
-
-		IF vDone THEN
-			LEAVE read_loop;
-		END IF;
-
-		UPDATE itemToInsert
-			SET itemFk = vFreeId
-			WHERE srId = vSupplyResponseFk;
-
-	END LOOP;
-
-	CLOSE cur1;
-	CLOSE cur2;
-
-	-- Insertamos todos los items en Articles de la oferta
-	INSERT INTO vn.item(id,
-					`name`,
-					longName,
-					subName,
-					expenseFk,
-					typeFk,
-					intrastatFk,
-					originFk,
-					supplyResponseFk,
-					numberOfItemsPerCask,
-					embalageCode,
-					quality,
-					isFloramondo)
-		SELECT iti.itemFk,
-				iti.product_name,
-				iti.product_name,
-				iti.company_name,
-				iti.expenseFk,
-				iti.itemTypeFk,
-				iti.intrastatFk,
-				iti.originFk,
-				iti.`srId`,
-				iti.NumberOfItemsPerCask,
-				iti.EmbalageCode,
-				iti.Quality,
-				TRUE
-		FROM itemToInsert iti;
-
-	-- Inserta la foto de los articulos nuevos (prioridad alta)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
-		SELECT i.id, PictureReference
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.srId
-			WHERE PictureReference IS NOT NULL
-				AND i.image IS NULL;
-
-	INSERT INTO edi.`log`(tableName, fieldName,fieldValue)
-		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
-			FROM vn.itemImageQueue
-			WHERE attempts = 0;
-
-	-- Inserta si se añadiesen tags nuevos
-	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
-		SELECT description, type_id FROM edi.type;
-
-	-- Desabilita el trigger para recalcular los tags al final
-	SET @isTriggerDisabled = TRUE;
-
-	-- Inserta los tags sólo en los articulos nuevos
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.product_name, 1
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Producto'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.product_name IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.Quality, 3
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Calidad'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.Quality IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.company_name, 4
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Productor'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.company_name IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s1Value, 5
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s1Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s2Value, 6
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s2Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s3Value, 7
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s3Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s4Value, 8
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s4Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s5Value, 9
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s5Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s6Value, 10
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s6Value IS NULL;
-
-	INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-				JOIN vn.tag t ON t.`name` = 'Color'
-				LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
-				LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id
-					AND tp.`description` = 'Hoofdkleur 1'
-				LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
-				LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
-			WHERE ink.name IS NOT NULL
-				OR ik.color IS NOT NULL;
-
-	CREATE OR REPLACE TABLE tmp.item
-		(PRIMARY KEY (id))
-		SELECT i.id FROM vn.item i
-			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
-	CALL vn.item_refreshTags();
-
-	DROP TABLE tmp.item;
-
-	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
-		FROM edi.supplyResponse sr
-			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-			JOIN vn.floramondoConfig fc
-		WHERE mp.isLatestOrderDateTimeRelevant
-			AND di.LatestOrderDateTime > IF(
-				fc.MaxLatestOrderHour > HOUR(util.VN_NOW()),
-				util.VN_CURDATE(),
-				util.VN_CURDATE() + INTERVAL 1 DAY);
-
-	UPDATE vn.floramondoConfig
-		SET nextLanded = vLanded
-		WHERE vLanded IS NOT NULL;
-
-	-- Elimina la oferta obsoleta
-	UPDATE vn.buy b
-			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk
-			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-			JOIN vn.item i ON i.id = b.itemFk
-			LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
-			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
-		SET b.quantity = 0
-		WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW()
-			OR i.supplyResponseFk IS NULL
-			OR sr.NumberOfUnits = 0)
-			AND am.name = 'LOGIFLORA'
-			AND e.isRaid;
-
-	-- Localiza las entradas de cada almacen
-	UPDATE edi.warehouseFloramondo
-		SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk);
-
-	IF vLanded IS NOT NULL THEN
-		-- Actualiza la oferta existente
-		UPDATE vn.buy b
-				JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				JOIN vn.item i ON i.id = b.itemFk
-				JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
-				b.buyingValue = o.price
-			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask
-				OR b.buyingValue <> o.price);
-
-		-- Inserta el resto
-		SET vLastInserted := util.VN_NOW();
-
-		-- Inserta la oferta
-		INSERT INTO vn.buy (
-				entryFk,
-				itemFk,
-				quantity,
-				buyingValue,
-				stickers,
-				packing,
-				`grouping`,
-				groupingMode,
-				packageFk,
-				deliveryFk)
-			SELECT wf.entryFk,
-					i.id,
-					o.NumberOfUnits * o.NumberOfItemsPerCask quantity,
-					o.Price,
-					o.NumberOfUnits etiquetas,
-					o.NumberOfItemsPerCask packing,
-					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
-					2, -- Obliga al Packing
-					o.embalageCode,
-					o.diId
-				FROM edi.offer o
-					JOIN vn.item i ON i.supplyResponseFk = o.srId
-					JOIN edi.warehouseFloramondo wf
-					JOIN vn.packaging p ON p.id
-						LIKE o.embalageCode
-					LEFT JOIN vn.buy b ON b.itemFk = i.id
-						AND b.entryFk = wf.entryFk
-				WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL
-
-			INSERT INTO vn.itemCost(
-					itemFk,
-					warehouseFk,
-					cm3,
-					cm3delivery)
-				SELECT b.itemFk,
-						wf.warehouseFk,
-						@cm3 := vn.buy_getUnitVolume(b.id),
-						IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3)
-					FROM warehouseFloramondo wf
-						JOIN vn.volumeConfig vc
-						JOIN vn.buy b ON b.entryFk = wf.entryFk
-						JOIN vn.item i ON i.id = b.itemFk
-						LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk
-							AND ic.warehouseFk = wf.warehouseFk
-					WHERE (ic.cm3 IS NULL OR ic.cm3 = 0)
-						ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3);
-
-			CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
-			SELECT b.id
-				FROM vn.buy b
-					JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				WHERE b.created >= vLastInserted;
-
-			CALL vn.buy_recalcPrices();
-
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'VNH'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.vnh = sub.total;
-
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'ALGEMESI'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.algemesi = sub.total;
-	END IF;
-
-	DROP TEMPORARY TABLE
-		edi.offer,
-		itemToInsert;
-
-	SET @isTriggerDisabled = FALSE;
-
-	COMMIT;
-
-	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
-	UPDATE vn.item i
-		SET typeFk = 121
-		WHERE i.longName LIKE 'Rosa Garden %'
-			AND typeFk = 17;
-
-	UPDATE vn.item i
-		SET typeFk = 156
-		WHERE i.longName LIKE 'Rosa ec %'
-			AND typeFk = 17;
-
-	-- Refresca las fotos de los items existentes que mostramos (prioridad baja)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority)
-		SELECT i.id, sr.PictureReference, 100
-			FROM edi.supplyResponse sr
-				JOIN vn.item i ON i.supplyResponseFk = sr.ID
-				JOIN edi.supplyOffer so ON so.srId = sr.ID
-				JOIN hedera.image i2 ON i2.name = i.image
-					AND i2.collectionFk = 'catalog'
-			WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange)
-				AND sr.NumberOfUnits;
-
-	INSERT INTO edi.`log`
-		SET tableName = 'floramondo_offerRefresh',
-			fieldName = 'Tiempo de proceso',
-			fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
-
-	DO RELEASE_LOCK('edi.floramondo_offerRefresh');
+proc: BEGIN
+	DECLARE vLanded DATETIME;
+	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vFreeId INT;
+	DECLARE vSupplyResponseFk INT;
+	DECLARE vLastInserted DATETIME;
+	DECLARE vIsAuctionDay BOOLEAN;
+	DECLARE vMaxNewItems INT DEFAULT 10000;
+	DECLARE vStartingTime DATETIME;
+	DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
+	DECLARE vDayRange INT;
+
+	DECLARE cur1 CURSOR FOR
+		SELECT id
+			FROM edi.item_free;
+
+	DECLARE cur2 CURSOR FOR
+		SELECT srId
+			FROM itemToInsert;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('edi.floramondo_offerRefresh');
+		SET @isTriggerDisabled = FALSE;
+		RESIGNAL;
+	END;
+
+	IF 'test' = (SELECT environment FROM util.config) THEN
+		LEAVE proc;
+	END IF;
+
+	IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN
+		LEAVE proc;
+	END IF;
+
+	SELECT dayRange INTO vDayRange 
+		FROM offerRefreshConfig;
+
+	IF vDayRange IS NULL THEN
+		CALL util.throw("Variable vDayRange not declared");
+	END IF;
+
+	SET vStartingTime = util.VN_NOW();
+
+	TRUNCATE edi.offerList;
+
+	INSERT INTO edi.offerList(supplier, total)
+		SELECT v.name, COUNT(DISTINCT sr.ID) total
+			FROM edi.supplyResponse sr
+					JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
+				WHERE sr.NumberOfUnits > 0
+					AND sr.EmbalageCode != 999
+				GROUP BY sr.vmpID;
+
+	UPDATE edi.offerList o
+		JOIN (SELECT v.name, COUNT(*) total
+			FROM edi.supplyOffer sr
+				JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
+				GROUP BY sr.vmpID) sub ON o.supplier = sub.name
+		SET o.`filter` = sub.total;
+
+	-- Elimina de la lista de items libres aquellos que ya existen
+	DELETE itf.*
+		FROM edi.item_free itf
+			JOIN vn.item i ON i.id = itf.id;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp
+	(INDEX (`Item_ArticleCode`))
+	ENGINE = MEMORY
+		SELECT 	t.*
+			FROM (
+				SELECT *
+					FROM edi.supplyOffer
+					ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC,
+						NumberOfUnits DESC LIMIT 10000000000000000000) t
+		GROUP BY t.srId;
+
+	CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
+		INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
+		INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
+	ENGINE = MEMORY
+		SELECT so.*,
+				ev1.type_description s1Value,
+				ev2.type_description s2Value,
+				ev3.type_description s3Value,
+				ev4.type_description s4Value,
+				ev5.type_description s5Value,
+				ev6.type_description s6Value,
+				eif1.feature ef1,
+				eif2.feature ef2,
+				eif3.feature ef3,
+				eif4.feature ef4,
+				eif5.feature ef5,
+				eif6.feature ef6
+			FROM tmp so
+				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
+					AND eif1.presentation_order = 1
+					AND eif1.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
+					AND eif2.presentation_order = 2
+					AND eif2.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
+					AND eif3.presentation_order = 3
+					AND eif3.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
+					AND eif4.presentation_order = 4
+					AND eif4.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
+					AND eif5.presentation_order = 5
+					AND eif5.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
+					AND eif6.presentation_order = 6
+					AND eif6.expiry_date IS NULL
+				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature
+					AND so.s1 = ev1.type_value
+				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature
+					AND so.s2 = ev2.type_value
+				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature
+					AND so.s3 = ev3.type_value
+				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature
+					AND so.s4 = ev4.type_value
+				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature
+					AND so.s5 = ev5.type_value
+				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature
+					AND so.s6 = ev6.type_value
+			ORDER BY Price;
+
+	DROP TEMPORARY TABLE tmp;
+
+	DELETE o
+		FROM edi.offer o
+			LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
+			LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
+			LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
+			LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
+			LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
+			LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
+			JOIN vn.floramondoConfig fc ON TRUE
+		WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
+			OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
+			OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
+			OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
+			OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
+			OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
+
+	START TRANSACTION;
+
+	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
+	UPDATE IGNORE edi.offer o
+			JOIN vn.item i
+				ON i.name = o.product_name
+				AND i.subname <=> o.company_name
+				AND i.value5 <=> o.s1Value
+				AND i.value6 <=> o.s2Value
+				AND i.value7 <=> o.s3Value
+				AND i.value8 <=> o.s4Value
+				AND i.value9 <=> o.s5Value
+				AND i.value10 <=> o.s6Value
+				AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
+				AND i.EmbalageCode <=> o.EmbalageCode
+				AND i.quality <=> o.Quality
+			JOIN vn.itemType it ON it.id = i.typeFk
+			LEFT JOIN vn.sale s ON s.itemFk = i.id
+			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+				AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK)
+			LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+			LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
+			LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk
+				AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK)
+		SET i.supplyResponseFk = o.srID
+		WHERE (sr.ID IS NULL
+				OR sr.NumberOfUnits = 0
+				OR di.LatestOrderDateTime < util.VN_NOW()
+				OR di.ID IS NULL)
+			AND it.isInventory
+			AND t.id IS NULL
+			AND po.id IS NULL;
+
+	CREATE OR REPLACE TEMPORARY TABLE itemToInsert
+	ENGINE = MEMORY
+		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk
+			FROM edi.offer o
+				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
+		WHERE i.id IS NULL
+	LIMIT vMaxNewItems;
+
+	-- Reciclado de nº de item
+	OPEN cur1;
+	OPEN cur2;
+
+	read_loop: LOOP
+
+		FETCH cur2 INTO vSupplyResponseFk;
+		FETCH cur1 INTO vFreeId;
+
+		IF vDone THEN
+			LEAVE read_loop;
+		END IF;
+
+		UPDATE itemToInsert
+			SET itemFk = vFreeId
+			WHERE srId = vSupplyResponseFk;
+
+	END LOOP;
+
+	CLOSE cur1;
+	CLOSE cur2;
+
+	-- Insertamos todos los items en Articles de la oferta
+	INSERT INTO vn.item(id,
+					`name`,
+					longName,
+					subName,
+					expenseFk,
+					typeFk,
+					intrastatFk,
+					originFk,
+					supplyResponseFk,
+					numberOfItemsPerCask,
+					embalageCode,
+					quality,
+					isFloramondo)
+		SELECT iti.itemFk,
+				iti.product_name,
+				iti.product_name,
+				iti.company_name,
+				iti.expenseFk,
+				iti.itemTypeFk,
+				iti.intrastatFk,
+				iti.originFk,
+				iti.`srId`,
+				iti.NumberOfItemsPerCask,
+				iti.EmbalageCode,
+				iti.Quality,
+				TRUE
+		FROM itemToInsert iti;
+
+	-- Inserta la foto de los articulos nuevos (prioridad alta)
+	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
+		SELECT i.id, PictureReference
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.srId
+			WHERE PictureReference IS NOT NULL
+				AND i.image IS NULL;
+
+	INSERT INTO edi.`log`(tableName, fieldName,fieldValue)
+		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
+			FROM vn.itemImageQueue
+			WHERE attempts = 0;
+
+	-- Inserta si se añadiesen tags nuevos
+	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
+		SELECT description, type_id FROM edi.type;
+
+	-- Desabilita el trigger para recalcular los tags al final
+	SET @isTriggerDisabled = TRUE;
+
+	-- Inserta los tags sólo en los articulos nuevos
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.product_name, 1
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Producto'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT ii.product_name IS NULL;
+			
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.Quality, 3
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Calidad'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT ii.Quality IS NULL;
+			
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.company_name, 4
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Productor'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT ii.company_name IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s1Value, 5
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s1Value IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s2Value, 6
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s2Value IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s3Value, 7
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s3Value IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s4Value, 8
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s4Value IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s5Value, 9
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s5Value IS NULL;
+
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s6Value, 10
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE NOT s6Value IS NULL;
+
+	INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+				JOIN vn.tag t ON t.`name` = 'Color'
+				LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
+				LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id
+					AND tp.`description` = 'Hoofdkleur 1'
+				LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
+				LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
+			WHERE ink.name IS NOT NULL
+				OR ik.color IS NOT NULL;
+
+	CREATE OR REPLACE TABLE tmp.item
+		(PRIMARY KEY (id))
+		SELECT i.id FROM vn.item i
+			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
+
+	CALL vn.item_refreshTags();
+
+	DROP TABLE tmp.item;
+
+	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
+		FROM edi.supplyResponse sr
+			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
+			JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+			JOIN vn.floramondoConfig fc
+		WHERE mp.isLatestOrderDateTimeRelevant
+			AND di.LatestOrderDateTime > IF(
+				fc.MaxLatestOrderHour > HOUR(util.VN_NOW()),
+				util.VN_CURDATE(),
+				util.VN_CURDATE() + INTERVAL 1 DAY);
+
+	UPDATE vn.floramondoConfig
+		SET nextLanded = vLanded
+		WHERE vLanded IS NOT NULL;
+
+	-- Elimina la oferta obsoleta
+	UPDATE vn.buy b
+			JOIN vn.entry e ON e.id = b.entryFk
+			JOIN vn.travel tr ON tr.id = e.travelFk
+			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
+			JOIN vn.item i ON i.id = b.itemFk
+			LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
+			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
+		SET b.quantity = 0
+		WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW()
+			OR i.supplyResponseFk IS NULL
+			OR sr.NumberOfUnits = 0)
+			AND am.name = 'LOGIFLORA'
+			AND e.isRaid;
+
+	-- Localiza las entradas de cada almacen
+	UPDATE edi.warehouseFloramondo
+		SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk);
+
+	IF vLanded IS NOT NULL THEN
+		-- Actualiza la oferta existente
+		UPDATE vn.buy b
+				JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+				JOIN vn.item i ON i.id = b.itemFk
+				JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
+			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
+				b.buyingValue = o.price
+			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask
+				OR b.buyingValue <> o.price);
+
+		-- Inserta el resto
+		SET vLastInserted := util.VN_NOW();
+
+		-- Inserta la oferta
+		INSERT INTO vn.buy (
+				entryFk,
+				itemFk,
+				quantity,
+				buyingValue,
+				stickers,
+				packing,
+				`grouping`,
+				groupingMode,
+				packagingFk,
+				deliveryFk)
+			SELECT wf.entryFk,
+					i.id,
+					o.NumberOfUnits * o.NumberOfItemsPerCask quantity,
+					o.Price,
+					o.NumberOfUnits etiquetas,
+					o.NumberOfItemsPerCask packing,
+					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
+					2, -- Obliga al Packing
+					o.embalageCode,
+					o.diId
+				FROM edi.offer o
+					JOIN vn.item i ON i.supplyResponseFk = o.srId
+					JOIN edi.warehouseFloramondo wf
+					JOIN vn.packaging p ON p.id
+						LIKE o.embalageCode
+					LEFT JOIN vn.buy b ON b.itemFk = i.id
+						AND b.entryFk = wf.entryFk
+				WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL
+
+			INSERT INTO vn.itemCost(
+					itemFk,
+					warehouseFk,
+					cm3,
+					cm3delivery)
+				SELECT b.itemFk,
+						wf.warehouseFk,
+						@cm3 := vn.buy_getUnitVolume(b.id),
+						IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3)
+					FROM warehouseFloramondo wf
+						JOIN vn.volumeConfig vc
+						JOIN vn.buy b ON b.entryFk = wf.entryFk
+						JOIN vn.item i ON i.id = b.itemFk
+						LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk
+							AND ic.warehouseFk = wf.warehouseFk
+					WHERE (ic.cm3 IS NULL OR ic.cm3 = 0)
+						ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3);
+
+			CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
+			SELECT b.id
+				FROM vn.buy b
+					JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk
+				WHERE b.created >= vLastInserted;
+		
+			CALL vn.buy_recalcPrices();
+
+			UPDATE edi.offerList o
+				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
+						FROM vn.buy b
+							JOIN vn.item i ON i.id = b.itemFk
+							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
+							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+							JOIN vn.warehouse w ON w.id = wf.warehouseFk
+							WHERE w.name = 'VNH'
+								AND b.quantity > 0
+						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
+				SET o.vnh = sub.total;
+		
+			UPDATE edi.offerList o
+				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
+						FROM vn.buy b
+							JOIN vn.item i ON i.id = b.itemFk
+							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
+							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+							JOIN vn.warehouse w ON w.id = wf.warehouseFk
+							WHERE w.name = 'ALGEMESI'
+								AND b.quantity > 0
+						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
+				SET o.algemesi = sub.total;
+	END IF;
+
+	DROP TEMPORARY TABLE
+		edi.offer,
+		itemToInsert;
+
+	SET @isTriggerDisabled = FALSE;
+
+	COMMIT;
+
+	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
+	UPDATE vn.item i
+		SET typeFk = 121
+		WHERE i.longName LIKE 'Rosa Garden %'
+			AND typeFk = 17;
+
+	UPDATE vn.item i
+		SET typeFk = 156
+		WHERE i.longName LIKE 'Rosa ec %'
+			AND typeFk = 17;
+		
+	-- Refresca las fotos de los items existentes que mostramos (prioridad baja)
+	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority)
+		SELECT i.id, sr.PictureReference, 100
+			FROM edi.supplyResponse sr
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID
+				JOIN edi.supplyOffer so ON so.srId = sr.ID
+				JOIN hedera.image i2 ON i2.name = i.image 
+					AND i2.collectionFk = 'catalog'
+			WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange)
+				AND sr.NumberOfUnits;
+
+	INSERT INTO edi.`log`
+		SET tableName = 'floramondo_offerRefresh',
+			fieldName = 'Tiempo de proceso',
+			fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
+
+	DO RELEASE_LOCK('edi.floramondo_offerRefresh');
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10056,7 +10044,7 @@ BEGIN
 
 /**
  *  Devuelve un número nuevo de item a partir de un registro de la tabla edi.ekt
- *
+ * 
  *  @param vEktFk Identificador de la tabla edi.ekt
  */
 
@@ -10065,17 +10053,17 @@ BEGIN
 		SELECT MIN(id) id INTO vItemFk
 			FROM edi.item_free;
 
-		DELETE FROM edi.item_free
+		DELETE FROM edi.item_free 
 			WHERE id = vItemFk;
-
+	
 	COMMIT;
-
+	
 	IF ISNULL(vItemFk) THEN
 		SELECT MAX(i.id) + 1
 			INTO vItemFk
 			FROM vn.item i;
 	END IF;
-
+	
 	INSERT INTO vn.item(id,
 			`name`,
 			longName,
@@ -10101,118 +10089,118 @@ BEGIN
 			least(IF((e.package = 800),((e.package * 10) + e.pac), e.package), IFNULL(idt.bucket_id, '999')) packageFk,
 			e.cat,
 			TRUE
-		FROM edi.ekt e
-			JOIN edi.item i ON i.id = e.`ref`
-			JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id
-			LEFT JOIN edi.item_defaultType idt ON idt.item_id = e.`ref`
+		FROM edi.ekt e 
+			JOIN edi.item i ON i.id = e.`ref` 
+			JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id 
+			LEFT JOIN edi.item_defaultType idt ON idt.item_id = e.`ref` 
 		WHERE e.id = vEktFk;
 
 	SET @isTriggerDisabled = TRUE;
-
+	
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.item , 1
-			FROM edi.ekt e
+		SELECT vItemFk, t.id , e.item , 1	
+			FROM edi.ekt e 
 				JOIN vn.tag t ON t.`name` = 'Producto'
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.item);
 
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.cat , 3
-			FROM edi.ekt e
+		SELECT vItemFk, t.id , e.cat , 3	
+			FROM edi.ekt e 
 				JOIN vn.tag t ON t.`name` = 'Calidad'
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.cat);
-
+	
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , s.company_name , 4
-			FROM edi.ekt e
+		SELECT vItemFk, t.id , s.company_name , 4	
+			FROM edi.ekt e 
 				JOIN edi.supplier s ON s.supplier_id = e.pro
 				JOIN vn.tag t ON t.`name` = 'Productor'
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(s.company_name);
 
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s1, 5
+		SELECT vItemFk, t.id , e.s1, 5	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
-					AND eif.presentation_order = 1
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
+					AND eif.presentation_order = 1 
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s1 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s1);
-
+	
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s2, 6
+		SELECT vItemFk, t.id , e.s2, 6	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
-					AND eif.presentation_order = 2
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
+					AND eif.presentation_order = 2 
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s2 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s2);
-
+		
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s3, 7
+		SELECT vItemFk, t.id , e.s3, 7	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
-					AND eif.presentation_order = 3
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
+					AND eif.presentation_order = 3 
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s3 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s3);
-
+	
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s4, 8
+		SELECT vItemFk, t.id , e.s4, 8	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
 					AND eif.presentation_order = 4
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s4 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s4);
-
+				
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s5, 9
+		SELECT vItemFk, t.id , e.s5, 9	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
 					AND eif.presentation_order = 5
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s5 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s5);
 
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT vItemFk, t.id , e.s6, 10
+		SELECT vItemFk, t.id , e.s6, 10	
 			FROM edi.ekt e
-				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+				LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` 
 					AND eif.presentation_order = 6
 					AND eif.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+				LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature 
 					AND e.s6 = ev.type_value
 				JOIN vn.tag t ON t.ediTypeFk = eif.feature
 			WHERE e.id = vEktFk
 				AND NOT ISNULL(e.s6);
 
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT  vItemFk, t.id, IFNULL(ink.name, ik.color), 11
-			FROM edi.ekt e
+		SELECT  vItemFk, t.id, IFNULL(ink.name, ik.color), 11	
+			FROM edi.ekt e				
 				JOIN vn.tag t ON t.`name` = 'Color'
-				LEFT JOIN edi.feature f ON f.item_id = e.`ref`
+				LEFT JOIN edi.feature f ON f.item_id = e.`ref` 
 				LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
 				LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
 				LEFT JOIN vn.itemInk ik ON ik.longName = e.item
 			WHERE e.id = vEktFk
-				AND ( ink.name IS NOT NULL
+				AND ( ink.name IS NOT NULL 
 				OR ik.color IS NOT NULL)
 			LIMIT 1;
 
@@ -10279,7 +10267,7 @@ BEGIN
 		sender = vSender,
 		senderFk = vSenderId,
 		messageId = vMessageId;
-
+		
 	IF vIsDuplicated THEN
 		SELECT id INTO vSelf
 			FROM mail
@@ -11101,7 +11089,7 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterInsert`
 	AFTER INSERT ON `order`
 	FOR EACH ROW
-BEGIN
+BEGIN	    
 	IF NEW.address_id = 2850 THEN
 		-- Fallo que se insertan no se sabe como tickets en este cliente
 		CALL vn.mail_insert(
@@ -11110,7 +11098,7 @@ BEGIN
 			'Creada order al address 2850',
 			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
 		);
-
+		
     END IF;
 END */;;
 DELIMITER ;
@@ -11127,27 +11115,27 @@ 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 `hedera`.`order_afterUpdate`
-	AFTER UPDATE ON `order`
-	FOR EACH ROW
-BEGIN
-	CALL stock.log_add('order', NEW.id, OLD.id);
-
-    IF !(OLD.address_id <=> NEW.address_id)
-    OR !(OLD.company_id <=> NEW.company_id)
-    OR !(OLD.customer_id <=> NEW.customer_id) THEN
-		CALL order_requestRecalc(NEW.id);
-	END IF;
-
-	IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
-		-- Fallo que se actualiza no se sabe como tickets en este cliente
-		CALL vn.mail_insert(
-			'jgallego@verdnatura.es',
-			'noreply@verdnatura.es',
-			'Actualizada order al address 2850',
-			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
-		);
-	END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterUpdate`
+	AFTER UPDATE ON `order`
+	FOR EACH ROW
+BEGIN
+	CALL stock.log_add('order', NEW.id, OLD.id);
+    
+    IF !(OLD.address_id <=> NEW.address_id)
+    OR !(OLD.company_id <=> NEW.company_id)
+    OR !(OLD.customer_id <=> NEW.customer_id) THEN
+		CALL order_requestRecalc(NEW.id);
+	END IF;
+
+	IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
+		-- Fallo que se actualiza no se sabe como tickets en este cliente
+		CALL vn.mail_insert(
+			'jgallego@verdnatura.es',
+			'noreply@verdnatura.es',
+			'Actualizada order al address 2850',
+			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
+		);
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11262,12 +11250,12 @@ DELIMITER ;;
 BEGIN
 	DECLARE vIsFirst BOOL;
 
-	SELECT (first_row_stamp IS NULL) INTO vIsFirst
-		FROM `order`
+	SELECT (first_row_stamp IS NULL) INTO vIsFirst  
+		FROM `order` 
 		WHERE id = NEW.orderFk;
 
 	IF vIsFirst THEN
-		UPDATE `order` SET first_row_stamp = util.VN_NOW()
+		UPDATE `order` SET first_row_stamp = util.VN_NOW() 
 			WHERE id = NEW.orderFk;
 	END IF;
 END */;;
@@ -11857,7 +11845,7 @@ BEGIN
 
 	IF vCount = 0 THEN
 		RETURN FALSE;
-	END IF;
+	END IF; 
 
 	SELECT COUNT(*) > 0
 		INTO vHasRole
@@ -11938,14 +11926,14 @@ BEGIN
  * @return tmp.ticketComponent
  * @return tmp.ticketLot
  * @return tmp.zoneGetShipped
- */
+ */  
     DECLARE vAgencyMode INT;
-
+    
 	SELECT a.agencyModeFk
 			INTO vAgencyMode
 		FROM myClient c
 			JOIN vn.address a ON a.clientFk = c.id
-		WHERE a.id = vAddress;
+		WHERE a.id = vAddress;      
 
 	CALL vn.available_calc(vDelivery, vAddress, vAgencyMode);
 
@@ -11958,7 +11946,7 @@ BEGIN
 				JOIN tmp.availableCalc a ON a.calcFk = c.calc_id
 			WHERE c.available > 0
 			GROUP BY c.item_id;
-
+ 
 	CALL vn.catalog_calculate(vDelivery, vAddress, vAgencyMode);
 
 	DROP TEMPORARY TABLE tmp.item;
@@ -12060,7 +12048,7 @@ BEGIN
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
 	CREATE TEMPORARY TABLE tmp.item
-		ENGINE = MEMORY
+		ENGINE = MEMORY 
 		SELECT vSelf itemFk;
 
 	CALL vn.catalog_calculate(vLanded, vAddressFk, vAgencyModeFk);
@@ -12085,14 +12073,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `item_getVisible` */;
 /*!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_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisible`(
 	vWarehouse TINYINT,
@@ -12100,7 +12088,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisible`(
     vType INT,
     vPrefix VARCHAR(255))
 BEGIN
-
+	
 /**
  * Gets visible items of the specified type at specified date.
  *
@@ -12109,22 +12097,22 @@ BEGIN
  * @param vType The type id
  * @param vPrefix The article prefix to filter or %NULL for all
  * @return tmp.itemVisible Visible items
- */
+ */ 
 	DECLARE vPrefixLen SMALLINT;
 	DECLARE vFilter VARCHAR(255) DEFAULT NULL;
-	DECLARE vDateInv DATE DEFAULT vn2008.date_inv();
+	DECLARE vDateInv DATE DEFAULT vn.getInventoryDate();
 	DECLARE EXIT HANDLER FOR 1114
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
         		@message = MESSAGE_TEXT;
 			CALL vn.mail_insert(
-				'cau@verdnatura.es',
-				NULL,
+				'cau@verdnatura.es', 
+				NULL, 
 			    CONCAT('hedera.item_getVisible error: ', @message),
 			    CONCAT(
-			    	'warehouse: ', IFNULL(vWarehouse, ''),
-			    	', Fecha:', IFNULL(vDate, ''),
-			    	', tipo: ', IFNULL(vType,''),
+			    	'warehouse: ', IFNULL(vWarehouse, ''), 
+			    	', Fecha:', IFNULL(vDate, ''), 
+			    	', tipo: ', IFNULL(vType,''), 
 			    	', prefijo: ', IFNULL(vPrefix,'')));
 			RESIGNAL;
 		END;
@@ -12168,7 +12156,7 @@ BEGIN
 				SELECT m.itemFk, -m.quantity
 					FROM vn.sale m
 						JOIN vn.ticket t ON t.id = m.ticketFk
-						JOIN vn.ticketState s ON s.ticket = t.id
+						JOIN vn.ticketState s ON s.ticketFk = t.id
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseFk = vWarehouse
 						AND s.alertLevel = 3
@@ -12203,7 +12191,7 @@ BEGIN
 				IF(p.depth > 0, p.depth, 0) depth, p.width, p.height,
 				CEIL(s.quantity / t.packing) etiquetas
 			FROM vn.item i
-				JOIN `filter` f ON f.itemFk = i.id
+				JOIN `filter` f ON f.itemFk = i.id 
 				JOIN currentStock s ON s.itemFk = i.id
 				LEFT JOIN tmp t ON t.itemFk = i.id
 				LEFT JOIN vn.packaging p ON p.id = t.packagingFk
@@ -12680,15 +12668,15 @@ BEGIN
 
 	START TRANSACTION;
 
-	SELECT a.agencyModeFk, a.id
+	SELECT a.agencyModeFk, a.id 
 			INTO vAgencyMode, vAddressFk
-		FROM vn.address a
+		FROM vn.address a 
 		WHERE a.id = vAddressFk;
-
+				
 	SELECT deliveryMethodFk INTO vDeliveryMethodId
 		FROM vn.agencyMode am
 		WHERE am.id = vAgencyMode;
-
+		
 	IF vCompany IS NULL
 	THEN
 		SELECT defaultCompanyFk INTO vCompany
@@ -12706,7 +12694,7 @@ BEGIN
 			company_id = vCompany;
 
 	SET vSelf = LAST_INSERT_ID();
-
+	 
 	CALL order_checkConfig(vSelf);
 
 	COMMIT;
@@ -12752,15 +12740,15 @@ BEGIN
 
 	START TRANSACTION;
 
-	SELECT a.agencyModeFk, a.id
+	SELECT a.agencyModeFk, a.id 
 			INTO vAgencyMode, vAddress
 		FROM myClient c
 			JOIN vn.address a ON a.id = c.defaultAddressFk;
-
+				
 	SELECT deliveryMethodFk INTO vDeliveryMethodId
 		FROM vn.agencyMode am
 		WHERE am.id = vAgencyMode;
-
+		
 	IF vCompany IS NULL
 	THEN
 		SELECT defaultCompanyFk INTO vCompany
@@ -12778,7 +12766,7 @@ BEGIN
 			company_id = vCompany;
 
 	SET vSelf = LAST_INSERT_ID();
-
+	 
 	CALL order_checkConfig(vSelf);
 
 	COMMIT;
@@ -12961,7 +12949,7 @@ BEGIN
 		SELECT t.id ticketFk
 			FROM myTicket t
 			WHERE shipped BETWEEN TIMESTAMP(vFrom) AND TIMESTAMP(vTo, '23:59:59');
-
+	
 	CALL vn.ticketGetTotal(NULL);
 
 	SELECT v.id, IFNULL(v.landed, v.shipped) landed,
@@ -13122,7 +13110,7 @@ BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
-
+	
 	CALL order_calcCatalogFromItem(vSelf, vItem);
 	START TRANSACTION;
 
@@ -13142,7 +13130,7 @@ BEGIN
 	END IF;
 
 	SELECT IFNULL(minQuantity, 0) INTO vMinQuantity
-		FROM vn.item
+		FROM vn.item 
 		WHERE id = vItem;
 
 	IF vAmount < LEAST(vMinQuantity, vAvailable)  THEN
@@ -13235,10 +13223,10 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.item
 		(PRIMARY KEY (itemFk))
 		ENGINE = MEMORY
-		SELECT itemFk FROM orderRow
+		SELECT itemFk FROM orderRow 
 			WHERE orderFk = vSelf
 			GROUP BY itemFk;
-
+		
 	CALL vn.catalog_calculate(vDate, vAddress, vAgencyMode);
 
 	DROP TEMPORARY TABLE tmp.item;
@@ -13613,7 +13601,7 @@ BEGIN
 	END;
 
 	-- Carga los datos del pedido
-	SELECT o.date_send, o.address_id, o.note, a.clientFk,
+	SELECT o.date_send, o.address_id, o.note, a.clientFk, 
 			o.company_id, o.agency_id, c.isTaxDataChecked
 		INTO vDelivery, vAddress, vNotes, vClientId,
 			vCompanyId, vAgencyModeId, vIsTaxDataChecked
@@ -13673,7 +13661,7 @@ BEGIN
 		SELECT t.id INTO vTicket
 			FROM vn.ticket t
 				LEFT JOIN tPrevia tp ON tp.ticketFk = t.id
-				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+				LEFT JOIN vn.ticketState tls on tls.ticketFk = t.id
 				JOIN hedera.`order` o
 					ON o.address_id = t.addressFk
 						AND vWarehouse = t.warehouseFk
@@ -13682,11 +13670,10 @@ BEGIN
 			WHERE o.id = vSelf
 				AND t.refFk IS NULL
 				AND tp.ticketFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0
+				AND IFNULL(tls.alertLevel,0) = 0				
 			LIMIT 1;
 
 		-- Crea el ticket en el caso de no existir uno adecuado
-
 		IF vTicket IS NULL
 		THEN
 
@@ -13708,7 +13695,7 @@ BEGIN
 		ELSE
 			INSERT INTO vn.ticketTracking
 				SET ticketFk = vTicket,
-					workerFk = vUserId,
+					userFk = vUserId,
 					stateFk = TICKET_FREE;
 		END IF;
 
@@ -13722,7 +13709,7 @@ BEGIN
 		THEN
 			INSERT INTO vn.ticketObservation SET
 					ticketFk = vTicket,
-					observationTypeFk = 4 /* salesperson */,
+					observationTypeFk = 4 /* salesperson */ ,
 					`description` = vNotes
 				ON DUPLICATE KEY UPDATE
 					`description` = CONCAT(VALUES(`description`),'. ', `description`);
@@ -13942,7 +13929,7 @@ BEGIN
 		INTO vDelivery, vAddress, vAgencyMode
 		FROM `order`
 		WHERE id = vSelf;
-
+		
 	CALL vn.available_calc(vDelivery, vAddress, vAgencyMode);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.itemAvailable;
@@ -13984,7 +13971,7 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
-		ENGINE = MEMORY
+		ENGINE = MEMORY 
 		SELECT DISTINCT o.address_id addressFk, o.company_id companyFk
 			FROM tmp.`order` tmpOrder
 				JOIN hedera.`order` o ON o.id = tmpOrder.orderFk;
@@ -14019,7 +14006,7 @@ BEGIN
 				JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
 			GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate
 			HAVING taxableBase != 0;
-
+					
 	DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount;
 	CREATE TEMPORARY TABLE tmp.orderAmount
 		(INDEX (orderFk))
@@ -14028,7 +14015,7 @@ BEGIN
 				SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax
 			FROM tmp.orderTax
 			GROUP BY orderFk, `code`;
-
+		
 	DROP TEMPORARY TABLE tmp.addressTaxArea;
 END ;;
 DELIMITER ;
@@ -14098,7 +14085,7 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.`order`
 		ENGINE = MEMORY
 		SELECT vSelf orderFk;
-
+		
 	CALL order_getTax;
 
 	SELECT IFNULL(SUM(taxableBase), 0.0), IFNULL(SUM(tax), 0.0)
@@ -14189,7 +14176,7 @@ proc: BEGIN
 			FROM orderRow r
 				JOIN orderRowComponent c ON c.rowFk = r.id
 				WHERE r.orderFk = vSelf;
-
+				
 		UPDATE orderRow r
 			LEFT JOIN tmp.ticketComponentPrice p
 				ON p.warehouseFk = r.warehouseFk
@@ -14214,7 +14201,7 @@ proc: BEGIN
 						ON t.id = c.componentFk
 							AND (t.classRate IS NULL OR t.classRate = r.rate)
 				WHERE r.orderFk = vSelf;
-
+        
 		CALL vn.ticketCalculatePurge;
 	END IF;
 
@@ -14742,13 +14729,13 @@ p: BEGIN
 		AND DATE(FECHA) = vDate
 		AND EURODEBE = vAmount
 			LIMIT 1;
-
+		
 	-- Actualiza la transaccion
 
 	UPDATE tpvTransaction
 		SET response = NULL, status = 'started'
 			WHERE id = vSelf;
-
+	
 	COMMIT;
 END ;;
 DELIMITER ;
@@ -14781,7 +14768,7 @@ BEGIN
 
 	UPDATE userSession SET userVisitFk = vUserVisit
 		WHERE ssid = vSsid;
-
+		
 	DELETE FROM userSession
 		WHERE lastUpdate < TIMESTAMPADD(HOUR, -1, util.VN_NOW());
 END ;;
@@ -14905,7 +14892,7 @@ BEGIN
 		UPDATE visitAgent SET firstAccessFk = vAccessId
 			WHERE id = vAgentId;
 	END IF;
-
+    
     -- Returns the visit info
 
 	SELECT vVisit visit, vAccessId access;
@@ -15618,7 +15605,7 @@ BEGIN
 	WHILE vI < vLen
     DO
 		SET vChr = SUBSTR(vPhone, vI + 1, 1);
-
+    
 		IF vChr REGEXP '^[0-9]$'
         THEN
 			SET vNewPhone = CONCAT(vNewPhone, vChr);
@@ -15626,7 +15613,7 @@ BEGIN
         THEN
 			SET vNewPhone = CONCAT(vNewPhone, '00');
 		END IF;
-
+        
         SET vI = vI + 1;
     END WHILE;
 
@@ -15725,18 +15712,18 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sip_getExtension`(vUserId INT(10))
 BEGIN
-
+	
 	 /*
 	  * Devuelve la extensión pbx del usuario
-	  *
-	  * @param vUserId Id del usuario
-	  *
+	  * 
+	  * @param vUserId Id del usuario 
+	  * 
 	  */
 
 	SELECT extension
-		FROM sip s
+		FROM sip s 
 	WHERE s.user_id = vUserId;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -15962,6 +15949,19 @@ CREATE TABLE `TiposTransacciones` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `accountingEntryError`
+--
+
+DROP TABLE IF EXISTS `accountingEntryError`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `accountingEntryError` (
+  `accountingEntryFk` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`accountingEntryFk`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Listado de asientos presentes en Sage para notificar su error';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `clientLastTwoMonths`
 --
@@ -16524,22 +16524,22 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `company_getCode`(vCompanyFk INT) RET
     READS SQL DATA
 BEGIN
 /**
- * Devuelve la correspondencía del código de empresa de sage.
+ * Devuelve la correspondencía del código de empresa de sage. 
  * Tiene en cuenta el entorno
- *
+ * 
  * @param vSelf Id de empresa de verdnatura
  * @return Código de empresa sage
  */
 	DECLARE vCompanySageFk INT(2);
-
-	SELECT IF(c.environment = 'production',
-				co.companyCode,
+	
+	SELECT IF(c.environment = 'production', 
+				co.companyCode, 
 				co.companyCodeTest
 			) INTO vCompanySageFk
 		FROM util.config c
 			JOIN vn.company co
 		WHERE co.id = vCompanyFk;
-
+        
 	RETURN vCompanySageFk;
 END ;;
 DELIMITER ;
@@ -16558,12 +16558,12 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `accountingMovements_add`(
-	vYear INT,
+	vYear INT, 
 	vCompanyFk INT
 )
 BEGIN
 /**
- * Traslada la info de contabilidad generada en base a vn.XDiario a la tabla sage.movConta
+ * Traslada la info de contabilidad generada en base a vn.XDiario a la tabla sage.movConta 
  * para poder ejecutar posteriormente el proceso de importación de datos de SQL Server
  * Solo traladará los asientos marcados con el campo vn.XDiario.enlazadoSage = FALSE
  * @vYear Año contable del que se quiere trasladar la información
@@ -16580,7 +16580,6 @@ BEGIN
 	DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
 	DECLARE vInvoiceTypeInformativeCode VARCHAR(1);
 	DECLARE vCountryCanariasCode, vCountryCeutaMelillaCode VARCHAR(2) ;
-	DECLARE vBookEntries TEXT;
 
 	SELECT SiglaNacion INTO vCountryCanariasCode
 		FROM Naciones
@@ -16879,8 +16878,8 @@ BEGIN
 			mci.FechaFacturaOriginal = x.FECHA_EX,
 			mci.SuFacturaNo = x.FACTURAEX,
 			mci.FechaOperacion = x.FECHA_OP,
-			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO +
+			mci.ImporteFactura = mci.ImporteFactura + 
+				x.BASEEURO + 
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -16899,7 +16898,7 @@ BEGIN
 			mci.CodigoIva2 = vTaxImportFk,
 			mci.IvaDeducible2 = TRUE,
 			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO +
+				x.BASEEURO + 
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -16917,8 +16916,8 @@ BEGIN
 			mci.CodigoTransaccion3 = vDuaTransactionFk ,
 			mci.CodigoIva3 = vTaxImportSuperReducedFk,
 			mci.IvaDeducible3 = TRUE,
-			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO +
+			mci.ImporteFactura = mci.ImporteFactura + 
+				x.BASEEURO + 
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -16952,14 +16951,14 @@ BEGIN
 				OR CodigoTransaccion2 = vTransactionExportFk
 				OR CodigoTransaccion3 = vTransactionExportFk
 				OR CodigoTransaccion4 = vTransactionExportFk)
-			AND SiglaNacion IN (vCountryCanariasCode COLLATE utf8mb3_unicode_ci,
+			AND SiglaNacion IN (vCountryCanariasCode COLLATE utf8mb3_unicode_ci, 
 				vCountryCeutaMelillaCode COLLATE utf8mb3_unicode_ci);
 
 	UPDATE movConta mc
 		SET CodigoDivisa = 'USD',
 			FactorCambio = TRUE,
-			ImporteCambio = ABS( CAST( IF( ImporteDivisa <> 0 AND ImporteCambio = 0,
-				ImporteAsiento / ImporteDivisa,
+			ImporteCambio = ABS( CAST( IF( ImporteDivisa <> 0 AND ImporteCambio = 0, 
+				ImporteAsiento / ImporteDivisa, 
 				ImporteCambio) AS DECIMAL( 10, 2)))
 		WHERE enlazadoSage = FALSE
 			AND (ImporteCambio <> 0 OR ImporteDivisa <> 0 OR FactorCambio);
@@ -16970,41 +16969,6 @@ BEGIN
 			AND importeDivisa > 0
 			AND ImporteAsiento < 0;
 
-	-- Comprobación que los importes e ivas sean correctos, avisa vía CAU
-	SELECT GROUP_CONCAT(Asiento ORDER BY Asiento ASC SEPARATOR ',') INTO vBookEntries
-		FROM(SELECT sub.Asiento
-				FROM (SELECT mc.Asiento, SUM(mc.ImporteAsiento) amount
-						FROM movConta mc
-						WHERE mc.enlazadoSage = FALSE
-						GROUP BY mc.Asiento)sub
-					JOIN (SELECT x.ASIEN, SUM(IFNULL(x.EURODEBE,0) + IFNULL(x.EUROHABER,0)) amount
-							FROM vn.XDiario x
-								WHERE x.enlazadoSage = FALSE
-							GROUP BY ASIEN)sub2 ON sub2.ASIEN = sub.Asiento
-				WHERE sub.amount <> sub2.amount
-			UNION ALL
-			SELECT sub.Asiento
-				FROM (SELECT Asiento, SUM(BaseIva1 + BaseIva2 + BaseIva3 + BaseIva4) amountTaxableBase
-						FROM movConta
-						WHERE TipoFactura <> 'I'
-							AND enlazadoSage = FALSE
-						GROUP BY Asiento) sub
-					JOIN (SELECT ASIEN, SUM(BASEEURO) amountTaxableBase
-							FROM (SELECT ASIEN, SUM(BASEEURO) BASEEURO
-									FROM vn.XDiario
-									WHERE FACTURA
-										AND auxiliar <> '*'
-										AND enlazadoSage = FALSE
-									GROUP BY FACTURA, ASIEN)sub3
-							GROUP BY ASIEN) sub2 ON sub2.ASIEN = sub.Asiento
-							WHERE sub.amountTaxableBase<>sub2.amountTaxableBase
-								AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase) sub;
-
-	IF vBookEntries IS NOT NULL THEN
-		SELECT util.notification_send ("book-entries-imported-incorrectly",
-			CONCAT('{"bookEntries":"', vBookEntries,'"}'),
-			null);
-	END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -17083,8 +17047,8 @@ BEGIN
 			IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla := IF(pr.Provincia IN ('CEUTA', 'MELILLA'), TRUE, FALSE), vCountryCeutaMelillaFk, IF (@isCanarias, vCountryCanariasCode, n.CodigoNacion)), n.CodigoNacion),
 			IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla, vCountryCeutaMelillaCode, IF (@isCanarias, vCountryCanariasCode, n.SiglaNacion)), n.SiglaNacion),
 			IF((c.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F'),
-			IF(cu.code = 'ES',
-				1,
+			IF(cu.code = 'ES', 
+				1, 
 				IF((cu.isUeeMember AND c.isVies), 2, 4)),
 			IFNULL(c.taxTypeSageFk,0),
 			IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci,
@@ -17150,6 +17114,81 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `importErrorNotification` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `importErrorNotification`()
+BEGIN
+/**
+ * Inserta notificaciones con los errores detectados durante la importación
+ * 
+ */
+	DECLARE vBookEntries TEXT;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SELECT GROUP_CONCAT(error SEPARATOR ' ') INTO vBookEntries
+		FROM(
+			SELECT CONCAT('- Importes: ', sub.Asiento) error
+				FROM (SELECT mc.Asiento, SUM(mc.ImporteAsiento) amount
+						FROM movConta mc
+						WHERE mc.enlazadoSage = FALSE
+						GROUP BY mc.Asiento)sub
+					JOIN (SELECT x.ASIEN, SUM(IFNULL(x.EURODEBE,0) + IFNULL(x.EUROHABER,0)) amount
+							FROM vn.XDiario x
+								WHERE x.enlazadoSage = FALSE
+							GROUP BY ASIEN)sub2 ON sub2.ASIEN = sub.Asiento
+			WHERE sub.amount <> sub2.amount
+			UNION ALL
+			SELECT CONCAT('- Base imponible: ', sub.Asiento)
+				FROM (SELECT Asiento, SUM(BaseIva1 + BaseIva2 + BaseIva3 + BaseIva4) amountTaxableBase
+						FROM movConta
+						WHERE TipoFactura <> 'I'
+							AND enlazadoSage = FALSE
+						GROUP BY Asiento) sub
+					JOIN (SELECT ASIEN, SUM(BASEEURO) amountTaxableBase
+							FROM (SELECT ASIEN, SUM(BASEEURO) BASEEURO
+									FROM vn.XDiario
+									WHERE FACTURA
+										AND auxiliar <> '*'
+										AND enlazadoSage = FALSE
+									GROUP BY FACTURA, ASIEN)sub3
+							GROUP BY ASIEN) sub2 ON sub2.ASIEN = sub.Asiento
+				WHERE sub.amountTaxableBase<>sub2.amountTaxableBase
+					AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase
+			UNION ALL
+			SELECT CONCAT('- Factura Duplicada: ', mc.Asiento)
+				FROM accountingEntryError
+		)sub;
+
+	IF vBookEntries IS NOT NULL THEN
+		START TRANSACTION;
+
+		SELECT util.notification_send ("book-entries-imported-incorrectly", 
+			CONCAT('{"bookEntries":"', vBookEntries,'"}'), 
+			null);
+		
+		TRUNCATE accountingEntryError;
+		
+		COMMIT;
+	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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `invoiceIn_add` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -17162,10 +17201,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_add`(vInvoiceInFk INT, vX
 BEGIN
 /**
  * Traslada la info de contabilidad relacionada con las facturas recibidas
- *
+ * 
  * @vInvoiceInFk Factura recibida
  * @vXDiarioFk Id tabla XDiario
- */
+ */	
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBase DOUBLE;
 	DECLARE vVat DOUBLE;
@@ -17182,25 +17221,25 @@ BEGIN
 	DECLARE vInvoiceTypeInformative VARCHAR(1);
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
-	DECLARE vCursor CURSOR FOR
+	DECLARE vCursor CURSOR FOR 
 		SELECT it.taxableBase,
 				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
 				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto
+				tt.ClaveOperacionDefecto 
 			FROM vn.invoiceIn i
 				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
 				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
 				JOIN taxType tty ON tty.id = t.CodigoIva
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk
+			WHERE i.id = vInvoiceInFk 
 				AND d.id IS NULL;
-
+	
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+	
 	DELETE FROM movContaIVA
 		WHERE id = vXDiarioFk;
 
@@ -17223,22 +17262,22 @@ BEGIN
 				vTaxCode,
 				vIsIntracommunity,
 				vOperationCode;
-
-		IF vDone THEN
+		
+		IF vDone THEN 
 			LEAVE l;
 		END IF;
 
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
+		SET vTransactionCodeOld = vTransactionCode; 
+		SET vTaxCodeOld = vTaxCode; 
 
-		IF vOperationCode IS NOT NULL THEN
+		IF vOperationCode IS NOT NULL THEN 
 			UPDATE movContaIVA
 				SET ClaveOperacionFactura = vOperationCode
 				WHERE id = vXDiarioFk;
 		END IF;
-
+		
 		SET vCounter = vCounter + 1;
-		CASE vCounter
+		CASE vCounter 
 			WHEN 1 THEN
 				 UPDATE movContaIVA
 					SET BaseIva1 = vBase,
@@ -17274,31 +17313,31 @@ BEGIN
 					WHERE id = vXDiarioFk;
 			ELSE
 				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE;
+		END CASE; 
 
 		IF vIsIntracommunity THEN
 			UPDATE movContaIVA
 				SET Intracomunitaria = TRUE
 				WHERE id = vXDiarioFk;
 		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
+	
+		SET vTransactionCodeOld = vTransactionCode; 
+		SET vTaxCodeOld = vTaxCode; 		
+		
 	END LOOP;
 
 	CLOSE vCursor;
 
 	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
 		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
+			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN 
 				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
 		WHERE d.ASIEN = (
 			SELECT ASIEN
-				FROM vn.XDiario
+				FROM vn.XDiario 
 				WHERE id = vXDiarioFk)
 		LIMIT 1;
-
+ 
 	UPDATE movContaIVA mci
 			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
 			JOIN vn.XDiario x ON x.id = mci.id
@@ -17310,13 +17349,13 @@ BEGIN
 			mci.Serie = ii.serial,
 			mci.Factura = ii.id,
 			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
+			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + 
+								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + 
+								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + 
 								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id,
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
+			mci.TipoFactura = IF(id.id, 
+				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), 
+				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)), 
 			mci.CodigoCuentaFactura = x.SUBCTA,
 			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
 			mci.Nombre = s.name,
@@ -17344,7 +17383,7 @@ BEGIN
 			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
 					FROM vn.XDiario x1
 						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0
+					WHERE x2.BASEEURO <> 0 
 						AND x1.id = vXDiarioFk
 				)sub
 			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
@@ -17352,8 +17391,8 @@ BEGIN
 			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
 			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
 			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1
-		WHERE mci.id = vXDiarioFk
+			mci.ImporteRetencion = iit.taxableBase * - 1 
+		WHERE mci.id = vXDiarioFk 
 			AND e.name = 'Retenciones'
 			AND id.id IS NULL;
 
@@ -17376,10 +17415,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_manager`(vYear INT, vCompanyFk INT)
 BEGIN
 /**
- * Traslada la info de contabilidad relacionada con las facturas recibidas
- *
+ * Traslada la info de contabilidad relacionada con las facturas recibidas 
+ * 
  * @vYear Año contable del que se quiere trasladar la información
- * @vCompany Empresa de la que se quiere trasladar datos
+ * @vCompany Empresa de la que se quiere trasladar datos 
  */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
@@ -17391,22 +17430,22 @@ BEGIN
 	DECLARE vAccountTaxOutstanding VARCHAR(10);
 	DECLARE vInvoiceTypeSended VARCHAR(1);
 	DECLARE vCursor CURSOR FOR
-		SELECT IFNULL(x.CLAVE, x.FACTURA) invoiceInFk,
+		SELECT IFNULL(x.CLAVE, x.FACTURA) invoiceInFk, 
 				x.id XDiarioFk
-			FROM vn.XDiario x
+			FROM vn.XDiario x 
 				JOIN(SELECT DISTINCT(x.ASIEN)
 						FROM vn.XDiario x
 							LEFT JOIN vn.invoiceIn ii ON x.CLAVE = ii.id
 							LEFT JOIN vn.invoiceInTax it ON it.invoiceInFk = ii.id
-						WHERE(it.taxTypeSageFk IS NOT NULL OR x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci)
-							AND	x.enlazadoSage = FALSE
+						WHERE(it.taxTypeSageFk IS NOT NULL OR x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci) 
+							AND	x.enlazadoSage = FALSE 
 							AND x.FECHA BETWEEN vDatedFrom AND vDatedTo
-							AND x.empresa_id = vCompanyFk
+							AND x.empresa_id = vCompanyFk 
 					) sub ON sub.ASIEN = x.ASIEN
 			WHERE x.CLAVE IS NOT NULL;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+	
 	SELECT CAST(CONCAT(vYear, '-01-01') AS DATETIME), util.dayEnd(CAST(CONCAT(vYear, '-12-31') AS DATE))
 		INTO vDatedFrom, vDatedTo;
 
@@ -17420,15 +17459,15 @@ BEGIN
 
 	SELECT codeSage INTO vInvoiceTypeSended
 		FROM invoiceType WHERE `code` ='sended';
-
+			
 	DROP TEMPORARY TABLE IF EXISTS tmp.invoiceDua;
 	CREATE TEMPORARY TABLE tmp.invoiceDua
-		SELECT x.id
+		SELECT x.id 
 			FROM vn.XDiario x
 				JOIN vn.company c ON c.id = x.empresa_id
 				JOIN (SELECT ASIEN
-						FROM vn.XDiario x
-						WHERE x.enlazadoSage = FALSE
+						FROM vn.XDiario x 
+						WHERE x.enlazadoSage = FALSE 
 							AND x.SUBCTA = vAccountTaxOutstanding COLLATE utf8mb3_unicode_ci
 							AND	x.FECHA BETWEEN vDatedFrom AND vDatedTo
 					)sub ON sub.ASIEN = x.ASIEN
@@ -17446,7 +17485,7 @@ BEGIN
 			FROM vn.invoiceIn i
 				JOIN vn.currency c ON c.id = i.currencyFk
 			WHERE i.bookEntried  BETWEEN vDatedFrom AND vDatedTo
-		UNION ALL
+		UNION ALL 
 		SELECT d.id,
 				d.code,
 				vSerialDua COLLATE utf8mb3_unicode_ci,
@@ -17454,8 +17493,8 @@ BEGIN
 				d.issued,
 				FALSE,
 				'' -- EUROS
-			FROM vn.dua d
-			WHERE d.issued IS NOT NULL
+			FROM vn.dua d 
+			WHERE d.issued IS NOT NULL 
 				AND code IS NOT NULL;
 
 	OPEN vCursor;
@@ -17463,7 +17502,7 @@ BEGIN
 	l: LOOP
 		FETCH vCursor INTO vInvoiceFk, vXDiarioFk;
 
-		IF vDone THEN
+		IF vDone THEN 
 			LEAVE l;
 		END IF;
 		CALL invoiceIn_add(vInvoiceFk, vXDiarioFk);
@@ -17551,21 +17590,21 @@ BEGIN
 			JOIN (SELECT x.ASIEN, x.id
 					FROM vn.XDiario x
 						JOIN(SELECT DISTINCT(x.ASIEN) ASIEN
-								FROM vn.XDiario x
+								FROM vn.XDiario x 
 									JOIN (SELECT DISTINCT(ASIEN)
 											FROM vn.XDiario x
-											WHERE SUBCTA LIKE '472%'
+											WHERE SUBCTA LIKE '472%' 
 												AND	x.enlazadoSage = FALSE
 												AND x.empresa_id = vCompanyFk
 												AND	x.FECHA BETWEEN vDatedFrom AND vDatedTo
 										) sub ON sub.ASIEN = x.ASIEN
 								WHERE x.SUBCTA LIKE '477%'
 							)sub2 ON sub2.ASIEN = x.ASIEN
-					WHERE x.CONTRA IS NOT NULL
+					WHERE x.CONTRA IS NOT NULL 
 						AND x.SUBCTA LIKE '477%'
 					GROUP BY x.ASIEN
 				 )sub3 ON sub3.ASIEN = x.ASIEN;
-
+	 
 	 INSERT INTO movContaIVA
 			(`id`,
 			`CodigoDivisa`,
@@ -17636,9 +17675,9 @@ BEGIN
 			`FechaGrabacion`,
 			`Intracomunitaria`,
 			`moveData`)
-		SELECT *
+		SELECT * 
 			FROM tmp.movContaIVA;
-
+			
 	DROP TEMPORARY TABLE tmp.movContaIVA;
 
 END ;;
@@ -17660,10 +17699,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT)
 BEGIN
 /**
- * Traslada la info de contabilidad relacionada con las facturas emitidas
- *
+ * Traslada la info de contabilidad relacionada con las facturas emitidas 
+ * 
  * @vYear Año contable del que se quiere trasladar la información
- * @vCompany Empresa de la que se quiere trasladar datos
+ * @vCompany Empresa de la que se quiere trasladar datos 
  */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vMaxLengthName INT DEFAULT 35;
@@ -17683,12 +17722,12 @@ BEGIN
 	DECLARE vHasCustomsAccountingNote BOOL;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT oit.taxableBase,
-				oit.vat,
-				pgc.rate,
-				pgc.mod347,
-				pgcRE.rate,
-				oitRE.vat,
+		SELECT oit.taxableBase, 
+				oit.vat, 
+				pgc.rate, 
+				pgc.mod347, 
+				pgcRE.rate, 
+				oitRE.vat, 
 				tc.transactionCode,
 				tc.taxCode,
 				tc.isIntracommunity,
@@ -17697,7 +17736,7 @@ BEGIN
 				JOIN vn.pgc ON pgc.code = oit.pgcFk
 				LEFT JOIN vn.pgcEqu e ON e.vatFk = oit.pgcFk
 				LEFT JOIN vn.pgcEqu eRE ON eRE.equFk = oit.pgcFk
-				LEFT JOIN vn.invoiceOutTax oitRE ON oitRE.invoiceOutFk = oit.invoiceOutFk
+				LEFT JOIN vn.invoiceOutTax oitRE ON oitRE.invoiceOutFk = oit.invoiceOutFk 
 					AND oitRE.pgcFk = e.equFk
 				LEFT JOIN vn.pgc pgcRE ON pgcRE.code = oitRE.pgcFk
 				LEFT JOIN vn.taxCode tc ON tc.code = pgc.code COLLATE 'utf8mb3_unicode_ci'
@@ -17713,12 +17752,12 @@ BEGIN
 		WHERE ASIEN = (SELECT ASIEN FROM vn.XDiario WHERE id = vXDiarioFk);
 
 	SELECT codeSage INTO vInvoiceTypeSended
-		FROM invoiceType
+		FROM invoiceType 
 		WHERE code = IF(vHasCustomsAccountingNote, 'informative', 'sended');
-
+	
 	DELETE FROM movContaIVA
 		WHERE id = vXDiarioFk;
-
+	
 	INSERT INTO movContaIVA(id) VALUES (vXDiarioFk);
 
 	OPEN vCursor;
@@ -17735,13 +17774,13 @@ BEGIN
 							vIsIntracommunity,
 							vOperationCode;
 
-		IF vDone THEN
+		IF vDone THEN 
 			LEAVE l;
 		END IF;
 
 		SET vCounter = vCounter + 1;
-
-		CASE vCounter
+		
+		CASE vCounter 
 			WHEN 1 THEN
 				UPDATE movContaIVA
 					SET BaseIva1 = vBase,
@@ -17782,7 +17821,7 @@ BEGIN
 						CodigoTransaccion4 = vTransactionCode,
 						CodigoIva4 = vTaxCode
 					WHERE id = vXDiarioFk;
-		END CASE;
+		END CASE; 
 
 		UPDATE movContaIVA
 			SET Exclusion347 = NOT vMod347,
@@ -17793,7 +17832,7 @@ BEGIN
 	END LOOP;
 
 	CLOSE vCursor;
-
+	
 	UPDATE movContaIVA mci
 			JOIN vn.invoiceOut i ON i.id = vInvoiceOutFk
 			LEFT JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutFk
@@ -17818,25 +17857,25 @@ BEGIN
 			mci.MantenerAsiento = TRUE,
 			mci.FechaFacturaOriginal = x.FECHA_EX
 		WHERE mci.id = vXDiarioFk;
-
+		
 	SELECT correctedFk INTO vInvoiceOutCorrectedFk
 		FROM vn.invoiceCorrection
 		WHERE correctingFk = vInvoiceOutFk;
-
-	IF vInvoiceOutCorrectedFk THEN
+	
+	IF vInvoiceOutCorrectedFk THEN 
 		UPDATE movContaIVA mci
 				JOIN vn.invoiceOut i ON i.id = vInvoiceOutCorrectedFk
 				JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutCorrectedFk
-				JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase,
+				JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase, 
 							 SUM(IF(IFNULL(e.vatFk, TRUE), iot.vat, 0)) vat,
 							 SUM(IF(IFNULL(e.vatFk, TRUE), 0, iot.vat)) equ
 						FROM vn.invoiceOutTax iot
-							LEFT JOIN vn.pgcEqu e ON e.vatFk = iot.pgcFk
+							LEFT JOIN vn.pgcEqu e ON e.vatFk = iot.pgcFk 
 						WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk
 					) tax
 				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
 			SET mci.TipoRectificativa = 2,
-				mci.ClaseAbonoRectificativas = 1,
+				mci.ClaseAbonoRectificativas = 1, 
 				mci.FechaFacturaOriginal = i.issued,
 				mci.FechaOperacion = i.issued,
 				mci.BaseImponibleOriginal = tax.taxableBase,
@@ -17867,10 +17906,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_manager`(vYear INT, vCompanyFk INT)
 BEGIN
 /**
- * Traslada la info de contabilidad relacionada con las facturas emitidas
- *
+ * Traslada la info de contabilidad relacionada con las facturas emitidas 
+ * 
  * @vYear Año contable del que se quiere trasladar la información
- * @vCompany Empresa de la que se quiere trasladar datos
+ * @vCompany Empresa de la que se quiere trasladar datos 
  */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
@@ -17887,7 +17926,7 @@ BEGIN
 							JOIN (SELECT x.ASIEN, CONCAT(x.SERIE, x.FACTURA) refFk
 									FROM vn.XDiario x
 									WHERE x.enlazadoSage = FALSE
-										AND x.FACTURA
+										AND x.FACTURA 
 										AND x.empresa_id = vCompanyFk
 										AND x.FECHA BETWEEN vDatedFrom AND vDatedTo
 									GROUP BY refFk
@@ -17896,19 +17935,19 @@ BEGIN
 					 )sub2 ON sub2.refFk = i.ref;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+	
 	SELECT CAST(CONCAT(vYear, '-01-01') AS DATETIME), util.dayEnd(CAST(CONCAT(vYear, '-12-31') AS DATE))
 		INTO vDatedFrom, vDatedTo;
-
+	
 	OPEN vCursor;
 
 	l: LOOP
 		FETCH vCursor INTO vInvoiceFk, vXDiarioFk;
 
-		IF vDone THEN
+		IF vDone THEN 
 			LEAVE l;
 		END IF;
-
+		
 		CALL invoiceOut_add(vInvoiceFk, vXDiarioFk);
 
 	END LOOP;
@@ -17934,7 +17973,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `pgc_add`(vCompanyFk INT)
 BEGIN
 /**
- * Añade cuentas del plan general contable para exportarlos a Sage
+ * Añade cuentas del plan general contable para exportarlos a Sage 
  * @vCompanyFk Empresa de la que se quiere trasladar datos
  */
 	TRUNCATE TABLE planCuentasPGC;
@@ -17944,25 +17983,25 @@ BEGIN
 			CodigoCuenta,
 			Cuenta,
 			ClienteOProveedor)
-		SELECT *
+		SELECT * 
 			FROM (SELECT company_getCode(vCompanyFk) companyFk,
 						e.id accountFk,
 						UCASE(e.name),
 						''
 					FROM vn.expense e
-					UNION
+					UNION 
 					SELECT company_getCode(vCompanyFk),
-							b.account,
+							b.account, 
 							UCASE(b.bank),
-							''
+							'' 
 						FROM vn.bank b
 						WHERE b.isActive
 							AND b.`account`
-					UNION
+					UNION 
 					SELECT CodigoEmpresa,
 							CodigoCuenta,
 							Nombre,
-							ClienteOProveedor
+							ClienteOProveedor 
 						FROM clientesProveedores)sub
 		GROUP BY companyFk, accountFk;
 END ;;
@@ -18311,7 +18350,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-
+    
     CALL visible_log(
 		NEW.isPicked,
         NEW.warehouseFk,
@@ -18435,7 +18474,7 @@ DELIMITER ;;
 BEGIN
 	SET NEW.lack = NEW.quantity;
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-
+    
     CALL visible_log(
 		NEW.isPicked,
         NEW.warehouseFk,
@@ -18646,7 +18685,7 @@ BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
 		SET vDone = TRUE;
-
+        
 	SET vSupplied = 0;
 
 	OPEN vPicks;
@@ -18662,7 +18701,7 @@ BEGIN
 		SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity);
 		SET vSupplied = vSupplied + vPickGranted;
 		CALL inbound_removePick(vSelf, vOutboundFk, vPickGranted, vPickQuantity);
-
+		
 		UPDATE outbound
 			SET isSync = FALSE,
 				lack = lack + vPickGranted
@@ -18742,7 +18781,7 @@ BEGIN
 		END IF;
 
 		SET vSupplied = LEAST(vAvailable, vLack);
-
+        
         IF vSupplied > 0 THEN
 			SET vAvailable = vAvailable - vSupplied;
 			UPDATE outbound
@@ -18755,7 +18794,7 @@ BEGIN
 			SET vSupplied = vSupplied + vSuppliedFromRequest;
 			SET vAvailable = vAvailable - vSuppliedFromRequest;
 		END IF;
-
+        
         IF vSupplied > 0 THEN
 			CALL inbound_addPick(vSelf, vOutboundFk, vSupplied);
 		END IF;
@@ -18884,7 +18923,7 @@ BEGIN
 		DO RELEASE_LOCK('stock.log_sync');
 		RESIGNAL;
 	END;
-
+    
 	IF !GET_LOCK('stock.log_sync', 30) THEN
 		CALL util.throw('Lock timeout exceeded');
 	END IF;
@@ -19355,7 +19394,7 @@ BEGIN
 		SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity);
 		SET vSupplied = vSupplied + vPickGranted;
 		CALL inbound_removePick(vInboundFk, vSelf, vPickGranted, vPickQuantity);
-
+		
 		UPDATE inbound
 			SET isSync = FALSE,
 				available = available + vPickGranted
@@ -19809,11 +19848,11 @@ BEGIN
 	WHILE vI < vLen
 	DO
 		SET vSpaceIni = vI;
-
+		
 		WHILE MID(vString, vI, 1) REGEXP '[[:space:]]' DO
 			SET vI = vI + 1;
 		END WHILE;
-
+		
 		SET vWordIni = vI;
 		SET vI = vWordIni + 1;
 
@@ -19850,11 +19889,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `crypt`(vText VARCHAR(255), vKey VARC
 BEGIN
 
 	DECLARE vResult VARCHAR(255);
-
+    
     CALL vn.crypt(vText, vKey, vResult);
 
 	RETURN vResult;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -19876,11 +19915,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `cryptOff`(vText VARCHAR(255), vKey V
 BEGIN
 
 	DECLARE vResult VARCHAR(255);
-
+    
     CALL vn.cryptOff(vText, vKey, vResult);
 
 	RETURN vResult;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -20048,7 +20087,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE) RETURNS tinyint(1)
     DETERMINISTIC
-BEGIN
+BEGIN 
 
 	RETURN GREATEST(vSarted1, vSarted2) <= LEAST(vEnded1,vEnded2);
 
@@ -20077,7 +20116,7 @@ BEGIN
  */
     DECLARE vHashlen INT UNSIGNED;
     DECLARE vOpad, vIpad TINYBLOB;
-
+    
     CASE vAlg
         WHEN 224 THEN SET vHashlen = 64;
         WHEN 256 THEN SET vHashlen = 64;
@@ -20085,16 +20124,16 @@ BEGIN
         WHEN 512 THEN SET vHashlen = 128;
         ELSE CALL throw ('WRONG_ALGORYTHM_IDENTIFICATOR_USED');
     END CASE;
-
+    
     IF LENGTH(vKey) > vHashlen THEN
         SET vKey = UNHEX(SHA2(vKey, vAlg));
     END IF;
-
+    
     SET vKey = RPAD(vKey, vHashlen, 0x00);
-
+    
     SET vIpad = stringXor(vKey, 0x36);
     SET vOpad = stringXor(vKey, 0x5C);
-
+    
     RETURN SHA2(CONCAT(vOpad, UNHEX(SHA2(CONCAT(vIpad, vMsg), vAlg))), vAlg);
 END ;;
 DELIMITER ;
@@ -20117,7 +20156,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `isLeapYear`(vYear INT) RETURNS tinyi
 BEGIN
 
 	RETURN (DAYOFYEAR(CONCAT(vYear, "-02-29")) IS NOT NULL);
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -20276,7 +20315,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `midnight`() RETURNS datetime
     READS SQL DATA
 BEGIN
-
+	
 	RETURN TIMESTAMP(util.VN_CURDATE(), '23:59:59');
 
 END ;;
@@ -20404,7 +20443,7 @@ BEGIN
  * modo 3.
  */
 	DECLARE vYear INT DEFAULT FLOOR(vYearWeek / 100);
-
+    
     IF vYearWeek < YEARWEEK(CONCAT(vYear, '-12-31'), 3) THEN
 		RETURN vYearWeek + 1;
 	ELSE
@@ -20510,16 +20549,16 @@ BEGIN
  */
     DECLARE vLen, vPos INT UNSIGNED;
     DECLARE vResult MEDIUMBLOB;
-
+    
     SET vLen = LENGTH(vString);
     SET vPos = 1;
     SET vResult = '';
-
+    
     WHILE vPos <= vLen DO
         SET vResult = CONCAT(vResult, LPAD(HEX( ORD(SUBSTR(vString, vPos, 1)) ^ vConst), 2, '0'));
         SET vPos = vPos + 1;
     END WHILE;
-
+    
     RETURN UNHEX(vResult);
 END ;;
 DELIMITER ;
@@ -20790,11 +20829,11 @@ BEGIN
 	IF vYear = vCurYear THEN
 		RETURN 'curYear';
 	END IF;
-
+    
 	IF vYear = vCurYear - 1 THEN
 		RETURN 'lastYear';
 	END IF;
-
+	
 	IF vYear = vCurYear - 2 THEN
 		RETURN 'twoYearsAgo';
 	END IF;
@@ -20877,7 +20916,7 @@ BEGIN
  * @param vValue Valor de la variable
  */
 	DECLARE vIndex INT DEFAULT INSTR(USER(), '@');
-
+ 
 	INSERT INTO debug SET
 		`connectionId` = CONNECTION_ID(),
         `user` = LEFT(USER(), vIndex - 1),
@@ -21261,7 +21300,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `time_createTable` */;
+/*!50003 DROP PROCEDURE IF EXISTS `time_generate` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -21269,18 +21308,41 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `time_createTable`(vStarted DATE, vEnded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `time_generate`(vStarted DATE, vEnded DATE)
 BEGIN
+/**
+ * Generate a temporary table between the days passed as parameters
+ *
+ * @param vStarted Start date
+ * @param vEnded End date
+ * @table tmp.time (dated, dayed, weeked, monthed, yeared)
+ */
 	DECLARE vCurrentDate DATE;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.time;
-	CREATE TEMPORARY TABLE tmp.time (dated DATE PRIMARY KEY) ENGINE = MEMORY;
-	SET vCurrentDate = vStarted;
-	WHILE vCurrentDate <= vEnded DO
-		INSERT INTO tmp.time (dated) VALUES (vCurrentDate);
-		SET vCurrentDate = DATE_ADD(vCurrentDate, INTERVAL 1 DAY);
-	END WHILE;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.time(
+		dated DATE PRIMARY KEY,
+		`day` INT,
+		`week` INT,
+		`month` INT,
+		`year` INT
+	) ENGINE = MEMORY;
 
+	IF(vStarted > vEnded) THEN 
+		CALL throw('The started cannot be later than the ended');
+	END IF;
+
+	SET vCurrentDate = vStarted;
+
+	WHILE vCurrentDate <= vEnded DO
+		INSERT INTO tmp.time
+			SET dated = vCurrentDate,
+				`day` =  DAY(vCurrentDate),
+				`week` =  WEEK(vCurrentDate),
+				`month` = MONTH(vCurrentDate),
+				`year` = YEAR(vCurrentDate);
+
+		SET vCurrentDate = vCurrentDate + INTERVAL 1 DAY;
+	END WHILE;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21623,8 +21685,8 @@ CREATE TABLE `address` (
   `isDefaultAddress` tinyint(1) NOT NULL DEFAULT 0,
   `agencyModeFk` int(11) NOT NULL DEFAULT 2,
   `isActive` tinyint(4) NOT NULL DEFAULT 1,
-  `longitude` decimal(11,7) DEFAULT NULL,
-  `latitude` decimal(11,7) DEFAULT NULL,
+  `longitude` decimal(11,7) DEFAULT NULL COMMENT 'Indica la última longitud proporcionada por tabla delivery',
+  `latitude` decimal(11,7) DEFAULT NULL COMMENT 'Indica la última latitud proporcionada por tabla delivery',
   `isEqualizated` tinyint(1) DEFAULT NULL,
   `customsAgentFk` int(11) DEFAULT NULL,
   `incotermsFk` varchar(3) DEFAULT NULL,
@@ -21674,11 +21736,11 @@ BEGIN
 	END IF;
 
 	IF NEW.isEqualizated IS NULL THEN
-		SELECT isEqualizated
+		SELECT isEqualizated 
 				INTO vIsEqualizated
 			FROM client
 			WHERE id = NEW.clientFk;
-
+		
 		SET NEW.isEqualizated = vIsEqualizated;
 	END IF;
 END */;;
@@ -21696,11 +21758,35 @@ 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`.`address_afterInsert`
+	BEFORE INSERT ON `address`
+	FOR EACH ROW
+BEGIN
+	IF (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
+		UPDATE client 
+			SET hasToInvoiceByAddress = TRUE
+			WHERE id = NEW.clientFk;
+	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`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
-
+	
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -21732,30 +21818,37 @@ DELIMITER ;;
 BEGIN
 	-- Recargos de equivalencia distintos implican facturacion por consignatario
 	IF NEW.isEqualizated != OLD.isEqualizated THEN
-		IF
+		IF 
 			(SELECT COUNT(*) FROM
 				(
 					SELECT DISTINCT (isEqualizated = FALSE) as Equ
-						FROM address
+						FROM address 
 						WHERE clientFk = NEW.clientFk
 				) t1
 			) > 1
-		THEN
-			UPDATE client
+		THEN 
+			UPDATE client 
 				SET hasToInvoiceByAddress = TRUE
 				WHERE id = NEW.clientFk;
 		END IF;
 	END IF;
-    IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
+	IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
 		CALL util.throw ('Cannot desactivate the default address');
-    END IF;
+	END IF;
 
 	IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN
-   		INSERT IGNORE INTO ticketRecalc (ticketFk)
-   			SELECT id FROM ticket t
-   				WHERE t.addressFk = NEW.id
-   					AND t.refFk IS NULL;
+		INSERT IGNORE INTO ticketRecalc (ticketFk)
+			SELECT id FROM ticket t 
+				WHERE t.addressFk = NEW.id
+					AND t.refFk IS NULL;
 	END IF;
+
+	IF (NEW.clientFk <> OLD.clientFk OR NEW.isActive <> OLD.isActive  OR NOT (NEW.provinceFk <=> OLD.provinceFk))
+			AND (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
+		UPDATE client 
+			SET hasToInvoiceByAddress = TRUE
+			WHERE id = NEW.clientFk;
+	END IF; 
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21983,6 +22076,21 @@ CREATE TABLE `agencyModeItemType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Combinaciones prohibidas entre agencyMode e itemType al calcular el catálogo de items';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `agencyModePricePercentage`
+--
+
+DROP TABLE IF EXISTS `agencyModePricePercentage`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `agencyModePricePercentage` (
+  `agencyModeFk` int(11) NOT NULL,
+  `percentage` double NOT NULL,
+  PRIMARY KEY (`agencyModeFk`),
+  CONSTRAINT `agencyModePricePercentage_FK` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `agencyTerm`
 --
@@ -22183,8 +22291,8 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BI`
 	BEFORE INSERT ON `autonomy`
 	FOR EACH ROW
-BEGIN
-
+BEGIN 
+	
 	SET NEW.geoFk = zoneGeo_new('autonomy', NEW.`name`,	(SELECT geoFk FROM country WHERE id = NEW.countryFk));
 
 END */;;
@@ -22234,7 +22342,7 @@ DELIMITER ;;
 	AFTER DELETE ON `autonomy`
 	FOR EACH ROW
 BEGIN
-	CALL zoneGeo_delete(OLD.geoFk);
+	CALL zoneGeo_delete(OLD.geoFk); 
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -22309,7 +22417,7 @@ DELIMITER ;;
 	BEFORE INSERT ON `awb`
 	FOR EACH ROW
 BEGIN
-
+	
 	SET NEW.year= year(util.VN_CURDATE());
 
 
@@ -22637,11 +22745,11 @@ DELIMITER ;;
 	BEFORE INSERT ON `budgetNotes`
 	FOR EACH ROW
 BEGIN
-
+	
 	IF ISNULL(NEW.userFk) THEN
-
+	
 		SET NEW.userFk = account.myUser_getId();
-
+	
 	END IF;
 
 END */;;
@@ -22735,7 +22843,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	IF NEW.ended IS NULL THEN
 		SET NEW.payedHolidays = 0;
 	END IF;
@@ -22781,25 +22889,25 @@ BEGIN
 	DECLARE isOverlapping BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	IF NEW.ended IS NULL THEN
 		SET NEW.payedHolidays = 0;
 	END IF;
 
 	IF !(OLD.started <=> NEW.started AND OLD.ended <=> NEW.ended) THEN
-
+		
 		SELECT COUNT(*) > 0 INTO isOverlapping
 			FROM business b
 			WHERE (util.hasDateOverlapped(
-						NEW.started,
+						NEW.started, 
 						IFNULL(NEW.ended, b.started),
 						b.started,
 						IFNULL(b.ended, NEW.started))
 					OR (NEW.ended <=> NULL AND b.ended <=> NULL))
 				AND b.id <> OLD.id
 				AND workerFk = OLD.workerFk;
-
-		IF isOverlapping THEN
+			
+		IF isOverlapping THEN 
 			CALL util.throw ('IS_OVERLAPPING');
 		END IF;
 
@@ -22938,7 +23046,7 @@ CREATE TABLE `buy` (
   `itemFk` int(11) NOT NULL DEFAULT 90,
   `quantity` int(11) DEFAULT 0,
   `dispatched` int(11) NOT NULL DEFAULT 0,
-  `buyingValue` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `buyingValue` decimal(10,4) NOT NULL DEFAULT 0.0000,
   `freightValue` decimal(10,3) NOT NULL DEFAULT 0.000,
   `isIgnored` tinyint(1) NOT NULL DEFAULT 0,
   `stickers` int(11) NOT NULL DEFAULT 0,
@@ -23020,19 +23128,23 @@ trig: BEGIN
 
 	CALL buy_checkGrouping(NEW.`grouping`);
 
-	SELECT t.warehouseInFk, t.landed INTO vWarehouse, vLanding
+	SELECT t.warehouseInFk, t.landed
+		INTO vWarehouse, vLanding
 		FROM entry e
 			JOIN travel t ON t.id = e.travelFk
 		WHERE e.id = NEW.entryFk;
 
-	SELECT b.`grouping`, b.groupingMode INTO vGrouping, vGroupingMode
+	SELECT b.`grouping`, b.groupingMode
+		INTO vGrouping, vGroupingMode
 		FROM buy b
 			JOIN entry e ON e.id = b.entryFk
 			JOIN travel t ON t.id = e.travelFk
 		WHERE t.landed <= vLanding
 			AND b.itemFk = NEW.itemFk
 			AND !b.isIgnored
-		ORDER BY t.warehouseInFk = vWarehouse DESC, t.landed DESC, b.id DESC
+		ORDER BY t.warehouseInFk = vWarehouse DESC,
+			t.landed DESC,
+			b.id DESC
 		LIMIT 1;
 
 	IF NEW.`grouping` IS NULL THEN
@@ -23042,6 +23154,7 @@ trig: BEGIN
 	IF NEW.groupingMode IS NULL THEN
 		SET NEW.groupingMode = vGroupingMode;
 	END IF;
+	
 	-- Generics
 	SELECT i.genericFk INTO vGenericFk
 		FROM item i
@@ -23052,17 +23165,27 @@ trig: BEGIN
 			FROM genericAllocation ga
 				JOIN entry e ON e.id = NEW.entryFk
 				JOIN travel tr on tr.id = e.travelFk
-				WHERE ga.itemFk = vGenericFk
-					AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+			WHERE ga.itemFk = vGenericFk
+				AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+
 		IF vGenericInDate THEN
 			SET NEW.itemOriginalFk = NEW.itemFk;
-
 			SET NEW.itemFk = vGenericFk;
 		END IF;
 	END IF;
+
 	IF NEW.quantity < 0 THEN
-		SET	NEW.isIgnored = TRUE;
+		SET	NEW.isIgnored = TRUE;	
 	END IF;
+
+	IF NEW.weight AND NEW.packing
+		AND (SELECT weightByPiece FROM item WHERE id = NEW.itemFk) IS NULL THEN
+
+		UPDATE item
+			SET weightByPiece = (NEW.weight * 1000) / NEW.packing
+			WHERE id = NEW.itemFk;
+	END IF;
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -23256,7 +23379,7 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER  `vn`.`buy_beforeDelete`
     BEFORE DELETE ON buy
     FOR EACH ROW
-BEGIN
+BEGIN 
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;
@@ -24463,7 +24586,7 @@ BEGIN
 	END IF;
 
 	SET NEW.accountingAccount = 4300000000 + NEW.id;
-
+    
     SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END */;;
 DELIMITER ;
@@ -24600,18 +24723,18 @@ BEGIN
 	IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
 		UPDATE `address` SET isDefaultAddress = 0
 			WHERE clientFk = NEW.id;
-
+			
 		UPDATE `address` SET isDefaultAddress = 1
-			WHERE id = NEW.defaultAddressFk;
+			WHERE id = NEW.defaultAddressFk;      
 	END IF;
 
 	IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
 		INSERT IGNORE INTO ticketRecalc (ticketFk)
-			SELECT id FROM ticket t
+			SELECT id FROM ticket t 
 				WHERE t.clientFk = NEW.id
 					AND t.refFk IS NULL;
 	END IF;
-
+	
 	IF NOT NEW.isActive THEN
 		UPDATE account.`user`
 			SET active = FALSE
@@ -24809,15 +24932,15 @@ DELIMITER ;;
 AFTER INSERT
 ON clientCredit FOR EACH ROW
 BEGIN
-
+	
 	DECLARE vSender VARCHAR(50);
 
 	SELECT u.name INTO vSender
 		FROM account.`user` u
 		WHERE u.id = NEW.workerFk;
-
+	
 	IF vSender IN ('juanvi','pepe') THEN
-
+	
 		CALL `vn`.`mail_insert`('pako@verdnatura.es',
 								NULL,
 								CONCAT('ClientCredit ',vSender, ' ', NEW.clientFk, ' ' , NEW.amount, ' €'),
@@ -24832,23 +24955,6 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
---
--- Table structure for table `clientCreditLimit`
---
-
-DROP TABLE IF EXISTS `clientCreditLimit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `clientCreditLimit` (
-  `id` int(11) NOT NULL,
-  `maxAmount` int(10) unsigned NOT NULL,
-  `roleFk` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `clientCreditLimit_FK_idx` (`roleFk`),
-  CONSTRAINT `clientCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `clientDms`
 --
@@ -25164,11 +25270,8 @@ DROP TABLE IF EXISTS `clientProtected`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `clientProtected` (
   `clientFk` int(11) NOT NULL,
-  `workerFk` int(10) unsigned NOT NULL,
   PRIMARY KEY (`clientFk`),
-  KEY `clientProtected_fk2_idx` (`workerFk`),
-  CONSTRAINT `clientProtected_fk1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `clientProtected_fk2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `clientProtected_fk1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Lista de clientes y comerciales que no se van a ver afectados por las desagsignaciones mensuales automaticas';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -25400,7 +25503,7 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`cmr_beforeDelete`
 	BEFORE DELETE ON `cmr`
 	FOR EACH ROW
-BEGIN
+BEGIN 
 	IF NOT (OLD.companyFk <=> NULL AND OLD.addressFromFk <=> NULL AND OLD.packagesList <=> NULL) THEN
 		CALL util.throw("Can not delete cmr, fields required not empty");
 	END IF;
@@ -25486,39 +25589,39 @@ CREATE TABLE `collection` (
 /*!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`
-	BEFORE UPDATE ON `collection`
-	FOR EACH ROW
-BEGIN
-
-	DECLARE vStateFk INT;
-	DECLARE vTotalLines INT;
-	DECLARE vPickedLines INT;
-
-	IF NEW.saleTotalCount <= NEW.salePickedCount
-		AND (NEW.saleTotalCount != OLD.saleTotalCount
-			OR NEW.salePickedCount != OLD.salePickedCount)
-		THEN
-
-			SELECT id INTO vStateFk
-				FROM vn.state
-				WHERE code = 'PREPARED';
-
-			SET NEW.stateFk = vStateFk;
-
-	END IF;
-
-	IF NEW.saleTotalCount > NEW.salePickedCount
-		AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN
-
-		SELECT id INTO vStateFk
-			FROM vn.state
-			WHERE code = 'ON_PREPARATION';
-
-		SET NEW.stateFk = vStateFk;
-
-	END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`collection_BEFORE_UPDATE`
+	BEFORE UPDATE ON `collection`
+	FOR EACH ROW
+BEGIN
+	
+	DECLARE vStateFk INT;
+	DECLARE vTotalLines INT;
+	DECLARE vPickedLines INT;
+
+	IF NEW.saleTotalCount <= NEW.salePickedCount 
+		AND (NEW.saleTotalCount != OLD.saleTotalCount 
+			OR NEW.salePickedCount != OLD.salePickedCount)
+		THEN 
+		
+			SELECT id INTO vStateFk
+				FROM vn.state 
+				WHERE code = 'PREPARED';
+			
+			SET NEW.stateFk = vStateFk;
+	
+	END IF;
+
+	IF NEW.saleTotalCount > NEW.salePickedCount 
+		AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN 
+
+		SELECT id INTO vStateFk
+			FROM vn.state 
+			WHERE code = 'ON_PREPARATION';
+		
+		SET NEW.stateFk = vStateFk;
+	
+	END IF;
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -25681,7 +25784,7 @@ BEGIN
 	IF NOT (NEW.id <=> OLD.id) THEN
 		SET vJSON = JSON_MERGE(JSON_OBJECT('id', NEW.id), vJSON);
 	END IF;
-
+	
 	IF NOT (NEW.`level` <=> OLD.`level`) THEN
 		SET vJSON = JSON_MERGE(JSON_OBJECT('level', NEW.`level`), vJSON);
 	END IF;
@@ -25701,7 +25804,7 @@ BEGIN
 	IF NOT (NEW.itemPackingTypeFk <=> OLD.itemPackingTypeFk) THEN
 		SET vJSON = JSON_MERGE(JSON_OBJECT('itemPackingTypeFk', NEW.itemPackingTypeFk), vJSON);
 	END IF;
-
+	
 	IF NOT (NEW.trainFk <=> OLD.trainFk) THEN
 		SET vJSON = JSON_MERGE(JSON_OBJECT('trainFk', NEW.trainFk), vJSON);
 	END IF;
@@ -25743,10 +25846,10 @@ BEGIN
 	SET vJSON = JSON_MERGE(JSON_OBJECT('height', OLD.height), vJSON);
 	SET vJSON = JSON_MERGE(JSON_OBJECT('itemPackingTypeFk', OLD.itemPackingTypeFk), vJSON);
 	SET vJSON = JSON_MERGE(JSON_OBJECT('trainFk', OLD.trainFk), vJSON);
-
+	
 	SET vJSON = JSON_MERGE(JSON_OBJECT('userFk', vUserFk), vJSON);
 	SET vJSON = JSON_MERGE(JSON_OBJECT('action', 'delete'), vJSON);
-
+	
 	SET vJSON = util.notification_send(
 		'modified-collection-volumetry',
 		JSON_OBJECT('data', JSON_EXTRACT(vJSON, '$')),
@@ -25921,6 +26024,21 @@ SET character_set_client = utf8;
   1 AS `footnotes` */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `comparativeAddConfig`
+--
+
+DROP TABLE IF EXISTS `comparativeAddConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `comparativeAddConfig` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `period` int(10) unsigned DEFAULT NULL COMMENT 'The number of periods to be regressed for insertion in vn.comparative',
+  `week` int(10) unsigned DEFAULT NULL COMMENT 'The number of weeks to exceed for recalculating the last period',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `comparativeConfig`
 --
@@ -26391,7 +26509,6 @@ CREATE TABLE `cplusCorrectingType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-
 --
 -- Table structure for table `cplusRectificationType`
 --
@@ -26552,7 +26669,7 @@ BEGIN
 	UPDATE `client` c
 		JOIN vn.creditClassification  cc ON cc.client = c.id
         SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification;
-
+        
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -26650,6 +26767,70 @@ CREATE TABLE `delivery` (
   CONSTRAINT `delivery_ticketFk_FK` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Informa de los datos geográficos y temporales de las entregas de los repartidores';
 /*!40101 SET character_set_client = @saved_cs_client */;
+/*!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_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`delivery_beforeInsert`
+	BEFORE INSERT ON `delivery`
+	FOR EACH ROW
+BEGIN
+
+	IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+	THEN
+		UPDATE address
+		SET longitude = NEW.longitude,
+			latitude = NEW.latitude
+		WHERE id IN (
+					SELECT addressFK
+						FROM ticket
+						WHERE id = NEW.ticketFk
+					);
+	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  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`delivery_beforeUpdate`
+	BEFORE UPDATE ON `delivery`
+	FOR EACH ROW
+BEGIN
+
+IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+	THEN
+		UPDATE address
+		SET longitude = NEW.longitude,
+			latitude = NEW.latitude
+		WHERE id IN (
+					SELECT addressFK
+						FROM ticket
+						WHERE id = NEW.ticketFk
+					);
+	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 */ ;
 
 --
 -- Table structure for table `deliveryMethod`
@@ -26821,7 +27002,7 @@ BEGIN
 		JOIN vn.department d ON d.id = b.departmentFk
 		SET b.departmentFk = d.parentFk
 		WHERE b.departmentFk = OLD.id;
-
+		
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -26841,9 +27022,9 @@ DELIMITER ;;
 	AFTER DELETE ON `department`
 	FOR EACH ROW
 BEGIN
-
+	
 	UPDATE vn.department_recalc SET isChanged = TRUE;
-
+	
 	UPDATE vn.business b
 		JOIN vn.department d ON d.id = b.departmentFk
 		SET b.departmentFk = d.parentFk
@@ -27347,20 +27528,20 @@ DELIMITER ;;
 BEGIN
 	DECLARE vHardCopyNumber INT;
 	DECLARE vDmsTypeCode INT;
-
+    	               
 	IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
 		CALL util.throw('this warehouse has not dms');
 	END IF;
 
 	IF NEW.hasFile THEN
-		SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
-            FROM dms
+		SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber 
+            FROM dms 
             WHERE warehouseFk = NEW.warehouseFk;
-
+	
 		SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
     END IF;
-
-	SELECT code INTO vDmsTypeCode
+    
+	SELECT code INTO vDmsTypeCode 
 		FROM dmsType WHERE NEW.dmsTypeFk = id;
 	 IF (vDmsTypeCode ='ticket')  THEN
 	  UPDATE ticket SET isSigned = 1 WHERE id = NEW.reference;
@@ -27380,31 +27561,31 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeUpdate`
-	BEFORE UPDATE ON `dms`
-	FOR EACH ROW
-BEGIN
-	DECLARE vHardCopyNumber INT;
-
-	IF (NEW.hasFile <> 0) AND (OLD.hasFile = 0) AND (NEW.hardCopyNumber IS NULL)
-		OR
-		(NEW.hardCopyNumber = OLD.hardCopyNumber AND OLD.warehouseFk <> NEW.warehouseFk) THEN
-
-		IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
-			SET NEW.warehouseFk = (SELECT id FROM warehouse WHERE name = 'Algemesi');
-		END IF;
-
-		SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
-            FROM dms
-            WHERE warehouseFk = NEW.warehouseFk;
-
-		SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
-    END IF;
-
-	IF ((NEW.hardCopyNumber = 0) OR NEW.hardCopyNumber IS NULL) AND (OLD.hardCopyNumber <> 0)  THEN
-
-		SET NEW.hasFile = 0;
-    END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeUpdate`
+	BEFORE UPDATE ON `dms`
+	FOR EACH ROW
+BEGIN
+	DECLARE vHardCopyNumber INT;
+	
+	IF (NEW.hasFile <> 0) AND (OLD.hasFile = 0) AND (NEW.hardCopyNumber IS NULL)
+		OR 
+		(NEW.hardCopyNumber = OLD.hardCopyNumber AND OLD.warehouseFk <> NEW.warehouseFk) THEN
+	
+		IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN 
+			SET NEW.warehouseFk = (SELECT id FROM warehouse WHERE name = 'Algemesi');
+		END IF;
+	
+		SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber 
+            FROM dms 
+            WHERE warehouseFk = NEW.warehouseFk;
+           
+		SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
+    END IF;
+   
+	IF ((NEW.hardCopyNumber = 0) OR NEW.hardCopyNumber IS NULL) AND (OLD.hardCopyNumber <> 0)  THEN
+    
+		SET NEW.hasFile = 0;
+    END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -27423,14 +27604,14 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeDelete`
 	BEFORE DELETE ON `dms`
 	FOR EACH ROW
-BEGIN
+BEGIN 
 	DECLARE vCanNotBeDeleted INT;
-	SELECT COUNT(*) INTO vCanNotBeDeleted
-		FROM dmsType dt
-		WHERE NOT (code <=> 'trash')
+	SELECT COUNT(*) INTO vCanNotBeDeleted 
+		FROM dmsType dt 
+		WHERE NOT (code <=> 'trash') 
 			AND dt.id = OLD.dmsTypeFk;
-
-	IF vCanNotBeDeleted THEN
+			
+	IF vCanNotBeDeleted THEN 
 		CALL util.throw('A dms can not be deleted');
 	END IF;
 END */;;
@@ -27513,6 +27694,20 @@ CREATE TABLE `docuwareConfig` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `docuwareTablet`
+--
+
+DROP TABLE IF EXISTS `docuwareTablet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `docuwareTablet` (
+  `tablet` varchar(100) NOT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`tablet`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `dua`
 --
@@ -28003,7 +28198,7 @@ BEGIN
 	END IF;
 
 	IF NOT (NEW.travelFk <=> OLD.travelFk)
-	OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN
+	OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 
 		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
 	END IF;
 END */;;
@@ -28469,11 +28664,11 @@ CREATE TABLE `expedition` (
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expedition_beforeInsert`
 	BEFORE INSERT ON `expedition`
@@ -28484,17 +28679,17 @@ BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF NEW.freightItemFk IS NOT NULL THEN
+	IF NEW.freightItemFk IS NOT NULL THEN 
 
 		UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
 
-		SELECT IFNULL(MAX(counter),0) +1 INTO intcounter
-            FROM expedition e
-				INNER JOIN ticket t1 ON e.ticketFk = t1.id
-                LEFT JOIN ticketState ts ON ts.ticket = t1.id
-				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
+		SELECT IFNULL(MAX(counter),0) +1 INTO intcounter 
+            FROM expedition e 
+				INNER JOIN ticket t1 ON e.ticketFk = t1.id 
+                LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
+				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) 
                     AND t1.warehouseFk = t2.warehouseFk
-			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk
+			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk 
                 AND t1.agencyModeFk = t2.agencyModeFk;
 
 		SET NEW.`counter` = intcounter;
@@ -28521,9 +28716,9 @@ BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NEW.counter <> OLD.counter THEN
-		IF (SELECT COUNT(*) FROM expedition e
+		IF (SELECT COUNT(*) FROM expedition e 
 				INNER JOIN ticket t1 ON e.ticketFk = t1.id
-				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
+				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) 
 			WHERE t1.id = NEW.ticketFk AND counter = NEW.counter) > 0 THEN
 			SET NEW.id = NULL;
 		END IF;
@@ -28547,11 +28742,11 @@ DELIMITER ;;
 	BEFORE DELETE ON `expedition`
 	FOR EACH ROW
 BEGIN
-    UPDATE ticket t
-        SET packages = (SELECT COUNT(counter)-1
+    UPDATE ticket t 
+        SET packages = (SELECT COUNT(counter)-1 
 		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
-		WHERE t.id = OLD.ticketFk;
-
+		WHERE t.id = OLD.ticketFk;	
+        
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28690,13 +28885,13 @@ DELIMITER ;;
 BEGIN
 
 	DECLARE vNewPosition INT;
-
+    
 	SELECT MAX(position) + 1 INTO vNewPosition
 		FROM vn.expeditionPallet
         WHERE truckFk = NEW.truckFk;
-
+   
 	SET NEW.position = IFNULL(vNewPosition,1);
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28795,7 +28990,7 @@ DELIMITER ;;
 BEGIN
 
 	SET NEW.workerFk = vn.getUser();
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28880,7 +29075,7 @@ BEGIN
 	UPDATE vn.expedition e
 		SET e.stateTypeFk = NEW.typeFk
 		WHERE e.id = NEW.expeditionFk;
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -29108,7 +29303,7 @@ CREATE TABLE `expense` (
   `isWithheld` tinyint(4) NOT NULL DEFAULT 0,
   `code` varchar(25) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `expense_UN` (`code`)
+  UNIQUE KEY `expence_UN` (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -29792,9 +29987,9 @@ CREATE TABLE `invoiceCorrection` (
   KEY `invoiceCorrectionTypeFk_idx` (`invoiceCorrectionTypeFk`),
   CONSTRAINT `corrected_fk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `correcting_fk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `cplusInvoiceTyoeFk` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `invoiceCorrectionType_Fk33` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `invoiceCorrection_ibfk_1` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE
+  CONSTRAINT `cplusRectificationType_FK` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceCorrectionType_FK` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `siiTypeInvoiceOut_FK` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Relacion entre las facturas rectificativas y las rectificadas.';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -29876,12 +30071,12 @@ CREATE TABLE `invoiceIn` (
   KEY `recibida_ibfk_6` (`cplusRectificationTypeFk`),
   KEY `recibida_ibfk_7` (`siiTrascendencyInvoiceInFk`),
   KEY `invoiceIn_withholdingFk_idx` (`withholdingSageFk`),
-  KEY `invoiceIn_expenseFkDeductible_idx` (`expenseFkDeductible`),
+  KEY `invoiceIn_expenceFkDeductible_idx` (`expenseFkDeductible`),
   KEY `invoiceIn_fk_editor` (`editorFk`),
   KEY `invoiceIn_FK` (`currencyFk`),
   CONSTRAINT `invoiceInCompany_Fk` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceIn_FK` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `invoiceIn_expenseFkDeductible` FOREIGN KEY (`expenseFkDeductible`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_expenceFkDeductible` FOREIGN KEY (`expenseFkDeductible`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceIn_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
   CONSTRAINT `invoiceIn_ibfk_3` FOREIGN KEY (`cplusSubjectOpFk`) REFERENCES `cplusSubjectOp` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceIn_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `cplusTaxBreak` (`id`) ON UPDATE CASCADE,
@@ -29912,42 +30107,42 @@ BEGIN
 	DECLARE vWithholdingSageFk INT;
 
 	SET NEW.editorFk = account.myUser_getId();
-
-	SELECT  withholdingSageFk INTO  vWithholdingSageFk
-		FROM vn.supplier
+	
+	SELECT  withholdingSageFk INTO  vWithholdingSageFk 
+		FROM vn.supplier 
 		WHERE id = NEW.supplierFk;
 
-	SET NEW.withholdingSageFk = vWithholdingSageFk;
-
-	SELECT countryFk, isActive INTO vIssuingCountry, vActive
-		FROM vn.supplier
+	SET NEW.withholdingSageFk = vWithholdingSageFk; 
+	
+	SELECT countryFk, isActive INTO vIssuingCountry, vActive 
+		FROM vn.supplier 
 		WHERE id = NEW.supplierFk;
-
-	SELECT countryFk INTO vhostCountry
-		FROM vn.supplier
+	
+	SELECT countryFk INTO vhostCountry 
+		FROM vn.supplier 
 		WHERE id = NEW.companyFk;
 
 	IF vActive = 0 THEN
 		CALL util.throw('INACTIVE_PROVIDER');
 	END IF;
-
-    IF (SELECT COUNT(*) FROM vn.invoiceIn
-    		WHERE supplierRef = NEW.supplierRef
-    			AND supplierFk = NEW.supplierFk
+        
+    IF (SELECT COUNT(*) FROM vn.invoiceIn 
+    		WHERE supplierRef = NEW.supplierRef 
+    			AND supplierFk = NEW.supplierFk 
     			AND YEAR(issued) = YEAR(NEW.issued)
     ) THEN
 		CALL util.throw('reference duplicated');
     END IF;
-
+    
 	SELECT CASE WHEN (SELECT account FROM vn.supplier  where id = NEW.supplierFk) LIKE '___3______' THEN 'C'
-				WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
+				WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry 
 							where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'R'
-				WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
-							where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E'
+				WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry 
+							where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E' 
 				WHEN (SELECT vIssuingCountry<>vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
-							where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W'
+							where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W'	
 			END INTO vSerie;
-
+	
 	SET NEW.serial =  IFNULL(vSerie,'R');
 
 END */;;
@@ -29974,9 +30169,9 @@ BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF (SELECT COUNT(*) FROM vn.invoiceIn
-			WHERE supplierRef = NEW.supplierRef
-				AND supplierFk = NEW.supplierFk
+	IF (SELECT COUNT(*) FROM vn.invoiceIn 
+			WHERE supplierRef = NEW.supplierRef 
+				AND supplierFk = NEW.supplierFk 
 				AND YEAR(issued) = YEAR(NEW.issued)
 				AND id <> NEW.id
 	) THEN
@@ -29986,7 +30181,7 @@ BEGIN
 	IF 	NEW.supplierFk != OLD.supplierFk THEN
 		CALL supplier_checkIsActive(NEW.supplierFk);
 		SELECT withholdingSageFk INTO vWithholdingSageFk
-				FROM vn.supplier
+				FROM vn.supplier 
 				WHERE id = NEW.supplierFk;
 		SET NEW.withholdingSageFk = vWithholdingSageFk;
 	END IF;
@@ -30011,23 +30206,23 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 
-	IF NEW.issued != OLD.issued
+	IF NEW.issued != OLD.issued    
 		OR NEW.currencyFk != OLD.currencyFk THEN
 
 		UPDATE invoiceInTax iit
 				JOIN invoiceIn ii ON ii.id = iit.invoiceInFk
 				LEFT JOIN referenceRate rr ON rr.dated = ii.issued
-					AND rr.currencyFk = ii.currencyFk
+					AND rr.currencyFk = ii.currencyFk 
 			SET iit.taxableBase = IF(iit.foreignValue IS NULL, iit.taxableBase, iit.foreignValue / rr.value)
 			WHERE ii.id = NEW.id;
-
+		
 		UPDATE invoiceInDueDay iidd
 				JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk
 				LEFT JOIN referenceRate rr ON rr.dated = ii.issued
-					AND rr.currencyFk = ii.currencyFk
+					AND rr.currencyFk = ii.currencyFk 
 			SET iidd.amount = IF(iidd.foreignValue IS NULL, iidd.amount, iidd.foreignValue / rr.value)
-			WHERE ii.id = NEW.id;
-
+			WHERE ii.id = NEW.id;    
+        
     END IF;
 
 END */;;
@@ -30122,13 +30317,13 @@ BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
 	SET NEW.editorFk = account.myUser_getId();
-
-    SELECT isNotified INTO vIsNotified
-		FROM vn.invoiceIn ii
+    
+    SELECT isNotified INTO vIsNotified 
+		FROM vn.invoiceIn ii 
 			JOIN vn.supplier s ON s.id = ii.supplierFk
             JOIN vn.payMethod pm ON pm.id = s.payMethodFk
 		WHERE ii.id = NEW.invoiceInFk;
-
+        
 	IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
     THEN
 		CALL mail_insert(
@@ -30136,12 +30331,12 @@ BEGIN
             'begonya@verdnatura.es',
             'Añadido vencimiento en el pasado',
 			CONCAT(
-				account.myUser_getName(), ' ha añadido un vencimiento de ',
+				account.myUser_getName(), ' ha añadido un vencimiento de ', 
             	NEW.amount, '€ en una fecha pasada en la recibida ', NEW.invoiceInFk
             )
         );
 	END IF;
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -30164,13 +30359,13 @@ BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
 	SET NEW.editorFk = account.myUser_getId();
-
-    SELECT isNotified INTO vIsNotified
-		FROM vn.invoiceIn ii
+    
+    SELECT isNotified INTO vIsNotified 
+		FROM vn.invoiceIn ii 
 			JOIN vn.supplier s ON s.id = ii.supplierFk
             JOIN vn.payMethod pm ON pm.id = s.payMethodFk
 		WHERE ii.id = NEW.invoiceInFk;
-
+        
 	IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
     THEN
 		CALL mail_insert(
@@ -30178,12 +30373,12 @@ BEGIN
             'begonya@verdnatura.es',
             'Añadido vencimiento en el pasado',
 			CONCAT(
-				account.myUser_getName(), ' ha añadido un vencimiento de ',
+				account.myUser_getName(), ' ha añadido un vencimiento de ', 
             	NEW.amount,'€ en una fecha pasada en la recibida ',NEW.invoiceInFk
             )
 		);
 	END IF;
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -30292,7 +30487,7 @@ CREATE TABLE `invoiceInSage` (
   KEY `invoiceInSage_taxTypeSageFk` (`taxTypeSageFk`),
   KEY `invoiceInSage_transactionTypeSageFk` (`transactionTypeSageFk`),
   KEY `invoiceInSage_idx` (`expenseFk`),
-  CONSTRAINT `invoiceInSage_expenseFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInSage_expenceFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceInSage_invoiceInSerialFk` FOREIGN KEY (`invoiceInSerialFk`) REFERENCES `invoiceInSerial` (`code`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceInSage_taxClassFk` FOREIGN KEY (`taxClassFk`) REFERENCES `taxClass` (`code`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceInSage_taxTypeSageFk` FOREIGN KEY (`taxTypeSageFk`) REFERENCES `sage`.`TiposIva` (`CodigoIva`) ON UPDATE CASCADE,
@@ -30346,7 +30541,7 @@ CREATE TABLE `invoiceInTax` (
   KEY `invoiceInTax_transactionTypeSageFk_idx` (`transactionTypeSageFk`),
   KEY `invoiceInTax_idx` (`expenseFk`),
   KEY `invoiceInTax_fk_editor` (`editorFk`),
-  CONSTRAINT `invoiceInTax_expenseFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInTax_expenceFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceInTax_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
   CONSTRAINT `invoiceInTax_ibfk_5` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `invoiceInTax_transactionTypeSageFk` FOREIGN KEY (`transactionTypeSageFk`) REFERENCES `sage`.`TiposTransacciones` (`CodigoTransaccion`) ON UPDATE CASCADE,
@@ -30387,7 +30582,7 @@ DELIMITER ;;
 	BEFORE UPDATE ON `invoiceInTax`
 	FOR EACH ROW
 BEGIN
-	IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN
+	IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN 
 		CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
 	END IF;
 
@@ -30627,10 +30822,10 @@ CREATE TABLE `invoiceOutExpense` (
   `expenseFk` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
   `created` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
-  KEY `invoiceOutExpense_FK_1_idx` (`invoiceOutFk`),
-  KEY `invoiceOutExpense_expenseFk_idx` (`expenseFk`),
-  CONSTRAINT `invoiceOutExpense_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `invoiceOutExpense_expenseFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE
+  KEY `invoiceOutExpence_FK_1_idx` (`invoiceOutFk`),
+  KEY `invoiceOutExpence_expenceFk_idx` (`expenseFk`),
+  CONSTRAINT `invoiceOutExpence_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `invoiceOutExpence_expenceFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -30791,11 +30986,11 @@ CREATE TABLE `item` (
   KEY `item_size_IDX` (`size`) USING BTREE,
   KEY `item_size_IDX2` (`longName`) USING BTREE,
   KEY `item_lastUsed_IDX` (`lastUsed`) USING BTREE,
-  KEY `item_expenseFk_idx` (`expenseFk`),
+  KEY `item_expenceFk_idx` (`expenseFk`),
   KEY `item_fk_editor` (`editorFk`),
   CONSTRAINT `item_FK` FOREIGN KEY (`genericFk`) REFERENCES `item` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `item_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `itemType` (`id`),
-  CONSTRAINT `item_expenseFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `item_expenceFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `item_family` FOREIGN KEY (`family`) REFERENCES `itemFamily` (`code`) ON UPDATE CASCADE,
   CONSTRAINT `item_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
   CONSTRAINT `item_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `origin` (`id`) ON UPDATE CASCADE,
@@ -31326,15 +31521,15 @@ BEGIN
 	IF NEW.itemFk IN (95, 98) THEN
 		SET NEW.cm3 = 0;
     END IF;
-
+    
 	IF !(NEW.cm3delivery <=> OLD.cm3delivery) THEN
 		INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
-			SELECT r.id
+			SELECT r.id 
 				FROM vn.itemCost ic
 					JOIN vn.sale s ON s.itemFk = ic.itemFk
-					JOIN vn.ticket t ON t.id = s.ticketFk  AND t.warehouseFk = ic.warehouseFk
+					JOIN vn.ticket t ON t.id = s.ticketFk  AND t.warehouseFk = ic.warehouseFk 
 					JOIN vn.route r ON r.id = t.routeFk
-				WHERE r.isOk = FALSE
+				WHERE r.isOk = FALSE 
 					AND ic.itemFk = NEW.itemFk
 					AND r.created >= util.VN_CURDATE()
 				GROUP BY r.id;
@@ -31657,10 +31852,10 @@ DELIMITER ;;
 	BEFORE INSERT ON `itemShelving`
 	FOR EACH ROW
 BEGIN
-
+	
 	SET NEW.userFk = account.myUser_getId();
 
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -31762,8 +31957,8 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_DELETE`
 	BEFORE DELETE ON `itemShelving`
 	FOR EACH ROW
-INSERT INTO vn.itemShelvingLog(itemShelvingFk,
-									workerFk,
+INSERT INTO vn.itemShelvingLog(itemShelvingFk, 
+									workerFk, 
 									accion,
 									shelvingFk,
 									itemFk)
@@ -31948,7 +32143,7 @@ DELIMITER ;;
 BEGIN
 
 	UPDATE vn.sale
-		SET isPicked = TRUE
+		SET isPicked = TRUE 
         WHERE id = NEW.saleFk;
 
 END */;;
@@ -32039,20 +32234,6 @@ SET character_set_client = utf8;
   1 AS `removed` */;
 SET character_set_client = @saved_cs_client;
 
---
--- Temporary table structure for view `itemShelvingStock_byWarehouse`
---
-
-DROP TABLE IF EXISTS `itemShelvingStock_byWarehouse`;
-/*!50001 DROP VIEW IF EXISTS `itemShelvingStock_byWarehouse`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingStock_byWarehouse` AS SELECT
- 1 AS `itemFk`,
-  1 AS `visible`,
-  1 AS `warehouseFk` */;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Table structure for table `itemTag`
 --
@@ -32138,9 +32319,9 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeUpdate`
 	BEFORE UPDATE ON `itemTag`
 	FOR EACH ROW
-BEGIN
+BEGIN 
 	SET NEW.editorFk = account.myUser_getId();
-
+	
     IF !(OLD.`value` <=> NEW.`value`)
     OR !(OLD.intValue <=> NEW.intValue) THEN
 		SET NEW.intValue = itemTag_getIntValue(NEW.`value`);
@@ -32173,7 +32354,7 @@ trig: BEGIN
 	IF @isTriggerDisabled OR visTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
-
+ 	
 	SET vItemFk = NEW.itemFk;
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
   	CREATE TEMPORARY TABLE tmp.item
@@ -32680,7 +32861,7 @@ DELIMITER ;;
 	BEFORE INSERT ON `machine`
 	FOR EACH ROW
 BEGIN
-
+	
 	SET NEW.workerFk = vn.getUser();
 
 END */;;
@@ -32814,9 +32995,9 @@ DELIMITER ;;
 BEGIN
 
 	IF NEW.sender IS NOT NULL THEN
-
+	
 		SET NEW.receiver = NEW.sender;
-
+	
 	END IF;
 
 END */;;
@@ -32879,8 +33060,8 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	IF (NEW.code IS NULL) THEN
-		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
-		    FROM information_schema.TABLES
+		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT 
+		    FROM information_schema.TABLES 
 		    WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
     END IF;
 END */;;
@@ -33216,6 +33397,24 @@ CREATE TABLE `mrwServiceWeekday` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Configuración de los servicios en relación con el día de la semana para MRW';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `negativeOrigin`
+--
+
+DROP TABLE IF EXISTS `negativeOrigin`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `negativeOrigin` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `itemFk` int(11) NOT NULL,
+  `type` enum('FALTAS','CONTENEDOR','ENTRADAS','OVERBOOKING') NOT NULL,
+  `dated` date DEFAULT curdate(),
+  `quantity` decimal(10,2) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique_constraint` (`itemFk`,`type`,`dated`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `newBornSales`
 --
@@ -33320,10 +33519,12 @@ CREATE TABLE `operator` (
   KEY `operator_FK_2` (`itemPackingTypeFk`),
   KEY `operator_FK_3` (`warehouseFk`),
   KEY `operator_FK_5` (`labelerFk`),
+  KEY `operator_FK_4` (`sectorFk`),
   CONSTRAINT `operator_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `operator_FK_1` FOREIGN KEY (`trainFk`) REFERENCES `train` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `operator_FK_2` FOREIGN KEY (`itemPackingTypeFk`) REFERENCES `itemPackingType` (`code`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `operator_FK_3` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `operator_FK_4` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `operator_FK_5` FOREIGN KEY (`labelerFk`) REFERENCES `printer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -33985,7 +34186,7 @@ DELIMITER ;;
 BEGIN
 
 	-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -34110,13 +34311,13 @@ BEGIN
 			SELECT account INTO cuenta_banco
 				FROM bank
 				WHERE id = NEW.bankFk;
-
+				
 			SELECT account INTO cuenta_proveedor
 				FROM supplier
 				WHERE id = NEW.supplierFk;
-
+			
 			CALL vn.ledger_next(vNewBookEntry);
-
+			
 			INSERT INTO XDiario (	ASIEN,
 									FECHA,
 									SUBCTA,
@@ -34142,7 +34343,7 @@ BEGIN
 									cuenta_banco CONTRA,
 									NEW.amount EURODEBE,
 									0 EUROHABER) gf;
-
+				
 			IF NEW.bankingFees <> 0 THEN
 				INSERT INTO XDiario (	ASIEN,
 										FECHA,
@@ -34164,7 +34365,7 @@ BEGIN
 						FROM supplier s
 							JOIN country c ON s.countryFk = c.id
 						WHERE s.id = NEW.supplierFk;
-			END IF;
+			END IF;		
 		END IF;
 
 		SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received);
@@ -34172,15 +34373,15 @@ BEGIN
 		SELECT isActive INTO isSupplierActive
 			FROM supplier
 			WHERE id = NEW.supplierFk;
-
+			
 		IF isSupplierActive = FALSE THEN
 			CALL util.throw('SUPPLIER_INACTIVE');
 		END IF;
-
+	
 		IF ISNULL(NEW.workerFk) THEN
 			SET NEW.workerFk = account.myUser_getId();
 		END IF;
-
+	
 	END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -34202,12 +34403,12 @@ DELIMITER ;;
 BEGIN
 	DECLARE vIsPayMethodChecked BOOLEAN;
 	DECLARE vEmail VARCHAR(150);
-
+		
 	SELECT isPayMethodChecked INTO vIsPayMethodChecked
 			FROM supplier
 			WHERE id = NEW.supplierFk;
-
-
+			
+	
 	IF vIsPayMethodChecked = FALSE THEN
 
 		SELECT notificationEmail INTO vEmail
@@ -34964,9 +35165,12 @@ CREATE TABLE `productionConfig` (
   `orderMode` enum('Location','Age') NOT NULL DEFAULT 'Location',
   `stockScopeDays` int(11) DEFAULT 1 COMMENT 'Días a futuro al revisar el stock',
   `shortageAddressFk` int(11) DEFAULT NULL COMMENT 'Consignatario por defecto para añadir un item de alta',
+  `clientSelfConsumptionFk` int(11) DEFAULT NULL COMMENT 'Cliente para crear el ticket de autoconsumo',
   PRIMARY KEY (`id`),
   KEY `productionConfig_FK` (`shortageAddressFk`),
-  CONSTRAINT `productionConfig_FK` FOREIGN KEY (`shortageAddressFk`) REFERENCES `address` (`id`) ON UPDATE CASCADE
+  KEY `productionConfig_FK_1` (`clientSelfConsumptionFk`),
+  CONSTRAINT `productionConfig_FK` FOREIGN KEY (`shortageAddressFk`) REFERENCES `address` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `productionConfig_FK_1` FOREIGN KEY (`clientSelfConsumptionFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Recoge los parámetros que condicionan la producción';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -35120,11 +35324,11 @@ DELIMITER ;;
 BEFORE INSERT
 ON projectNotes FOR EACH ROW
 BEGIN
-
+	
 	IF ISNULL(NEW.userFk) THEN
-
+	
 		SET NEW.userFk = account.myUser_getId();
-
+	
 	END IF;
 
 END */;;
@@ -35286,10 +35490,10 @@ DELIMITER ;;
 	BEFORE INSERT ON `province`
 	FOR EACH ROW
 BEGIN
-
+	
     SET NEW.geoFk = zoneGeo_new('province', NEW.`name`,
 		(SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
-
+	
 	SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk);
 
 END */;;
@@ -35310,14 +35514,14 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_beforeUpdate`
 	BEFORE UPDATE ON `province`
 	FOR EACH ROW
-BEGIN
-
+BEGIN 
+	
 	IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
-
+	
 		SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk);
 
 	END IF;
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -35333,19 +35537,19 @@ 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`.`province_afterUpdate`
-	AFTER UPDATE ON `province`
-	FOR EACH ROW
-BEGIN
-	IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
-		CALL zoneGeo_setParent(NEW.geoFk,
-			(SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
-	END IF;
-
-	IF !(OLD.`name` <=> NEW.`name`) THEN
-		UPDATE zoneGeo SET `name` = NEW.`name`
-			WHERE id = NEW.geoFk;
-	END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_afterUpdate`
+	AFTER UPDATE ON `province`
+	FOR EACH ROW
+BEGIN
+	IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
+		CALL zoneGeo_setParent(NEW.geoFk,
+			(SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
+	END IF;
+
+	IF !(OLD.`name` <=> NEW.`name`) THEN
+		UPDATE zoneGeo SET `name` = NEW.`name`
+			WHERE id = NEW.geoFk;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -35365,7 +35569,7 @@ DELIMITER ;;
 	AFTER DELETE ON `province`
 	FOR EACH ROW
 BEGIN
-	CALL zoneGeo_delete(OLD.geoFk);
+	CALL zoneGeo_delete(OLD.geoFk); 
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -35589,20 +35793,20 @@ CREATE TABLE `receipt` (
 /*!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`.`receipt_beforeInsert`
-	BEFORE INSERT ON `receipt`
-	FOR EACH ROW
-BEGIN
-	DECLARE vIsAutoConciliated BOOLEAN;
-
-	IF NEW.isConciliate = FALSE THEN
-		SELECT isAutoConciliated INTO vIsAutoConciliated
-			FROM accounting a
-				JOIN accountingType at2 ON at2.id = a.accountingTypeFk
-			WHERE a.id = NEW.bankFk;
-
-		SET NEW.isConciliate = vIsAutoConciliated;
-	END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_beforeInsert`
+	BEFORE INSERT ON `receipt`
+	FOR EACH ROW
+BEGIN
+	DECLARE vIsAutoConciliated BOOLEAN;
+
+	IF NEW.isConciliate = FALSE THEN
+		SELECT isAutoConciliated INTO vIsAutoConciliated
+			FROM accounting a
+				JOIN accountingType at2 ON at2.id = a.accountingTypeFk
+			WHERE a.id = NEW.bankFk;
+	
+		SET NEW.isConciliate = vIsAutoConciliated;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -35658,18 +35862,18 @@ 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`.`receipt_afterUpdate`
-	AFTER UPDATE ON `receipt`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
-		CALL mail_insert(
-			'finanzas@verdnatura.es',
-			NULL,
-			CONCAT('Cambios de recibos del cliente: ', NEW.clientFk),
-            CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed)
-        );
-	END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate`
+	AFTER UPDATE ON `receipt`
+	FOR EACH ROW
+BEGIN
+	IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
+		CALL mail_insert(
+			'finanzas@verdnatura.es',
+			NULL,
+			CONCAT('Cambios de recibos del cliente: ', NEW.clientFk),
+            CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed)
+        );
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -35953,6 +36157,23 @@ SET character_set_client = utf8;
   1 AS `hasLogin` */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `roleCreditLimit`
+--
+
+DROP TABLE IF EXISTS `roleCreditLimit`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `roleCreditLimit` (
+  `id` int(11) NOT NULL,
+  `maxAmount` int(10) unsigned NOT NULL,
+  `roleFk` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `clientCreditLimit_FK_idx` (`roleFk`),
+  CONSTRAINT `roleCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `route`
 --
@@ -35963,6 +36184,7 @@ DROP TABLE IF EXISTS `route`;
 CREATE TABLE `route` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `workerFk` int(10) unsigned DEFAULT NULL,
+  `firstEditorFk` int(10) unsigned NOT NULL COMMENT 'Usuario creador de la ruta',
   `created` date NOT NULL,
   `vehicleFk` int(10) unsigned DEFAULT NULL,
   `agencyModeFk` int(11) DEFAULT NULL,
@@ -36015,13 +36237,16 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	DECLARE vDefaultAgencyModeFk INT;
+	DECLARE vUserFk INT ;
 
-	SET NEW.editorFk = account.myUser_getId();
-
+	SET vUserFk = account.myUser_getId();
+	SET NEW.editorFk = vUserFk;
+	SET NEW.firstEditorFk = vUserFk;
+	
 	SET NEW.commissionWorkCenterFk = (
 			SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
 				FROM vn.routeConfig r
-					LEFT JOIN vn.business b ON b.workerFk = account.myUser_getId()
+					LEFT JOIN vn.business b ON b.workerFk = vUserFk
 						AND NEW.created BETWEEN b.started AND IFNULL(b.ended, NEW.created));
 
 	IF ISNULL(NEW.agencyModeFk) THEN
@@ -36029,7 +36254,7 @@ BEGIN
 			FROM routeDefaultAgencyMode r
 				JOIN business b ON b.workCenterFk = r.workCenterFK
 				JOIN worker w ON w.businessFk = b.id
-			WHERE b.workerFk = account.myUser_getId();
+			WHERE b.workerFk = vUserFk;
 
 		SET NEW.agencyModeFk = vDefaultAgencyModeFk;
 	END IF;
@@ -36051,7 +36276,7 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_afterInsert`
 	AFTER INSERT ON `route`
 	FOR EACH ROW
-BEGIN
+BEGIN	
 	CALL route_calcCommission(NEW.id);
 END */;;
 DELIMITER ;
@@ -36073,16 +36298,16 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	DECLARE vKmMax INT;
-
+	
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	IF NEW.isOk <> FALSE AND OLD.isOk = FALSE THEN
-			SET NEW.m3 = ( SELECT SUM(litros)/1000
-								FROM  vn.saleVolume s
-									JOIN vn.ticket t ON s.ticketFk = t.id
+			SET NEW.m3 = ( SELECT SUM(litros)/1000 
+								FROM  vn.saleVolume s 
+									JOIN vn.ticket t ON s.ticketFk = t.id 
 								WHERE t.routeFk = NEW.id);
 	END IF;
-
+   
     IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN
         CALL util.throw ('KmEnd menor que kmStart');
     END IF;
@@ -36112,18 +36337,18 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_afterUpdate`
 	AFTER UPDATE ON `route`
 	FOR EACH ROW
-BEGIN
+BEGIN	
 	IF IFNULL(NEW.gestdocFk,0) <> IFNULL(OLD.gestdocFk,0) AND NEW.gestdocFk > 0 THEN
 		-- JGF 09/09/14 cuando se añade un gestdoc a una ruta, se le asigna automagicamente a todos sus Tickets
-
+		
 		-- Inserta el gestdoc en todos los tickets de la ruta
 		INSERT INTO ticketDms(ticketFk,dmsFk)
 			SELECT id, NEW.gestdocFk FROM ticket WHERE routeFk = NEW.id
 		ON DUPLICATE KEY UPDATE dmsFk = NEW.gestdocFk;
 
-		-- Update del firmado
-		UPDATE ticket t
-            JOIN ticketDms tg ON t.id = tg.ticketFk
+		-- Update del firmado 
+		UPDATE ticket t 
+            JOIN ticketDms tg ON t.id = tg.ticketFk 
 			SET isSigned = 1  WHERE t.routeFk = NEW.id;
 	END IF;
 
@@ -36193,6 +36418,7 @@ CREATE TABLE `routeCommission` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `routeFk` int(10) unsigned NOT NULL,
   `workCenterFk` int(11) DEFAULT NULL,
+  `firstEditorFk` int(10) unsigned NOT NULL COMMENT 'Usuario creador de la ruta',
   `km` decimal(5,2) DEFAULT NULL,
   `m3` decimal(5,2) DEFAULT NULL,
   `yearlyKm` decimal(5,2) DEFAULT NULL,
@@ -36203,6 +36429,7 @@ CREATE TABLE `routeCommission` (
   PRIMARY KEY (`id`),
   KEY `routeCommission_routeFk_idx` (`routeFk`),
   KEY `routeCommission_workCenterFk_idx` (`workCenterFk`),
+  KEY `routeCommission_firstEditorFk` (`firstEditorFk`),
   CONSTRAINT `routeCommission_routeFk` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `routeCommission_workCenterFk` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@@ -36332,7 +36559,7 @@ CREATE TABLE `routeLog` (
   `action` set('insert','update','delete') NOT NULL,
   `creationDate` timestamp NULL DEFAULT current_timestamp(),
   `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
-  `changedModel` enum('Route') NOT NULL DEFAULT 'Route',
+  `changedModel` enum('Route','RoutesMonitor') NOT NULL DEFAULT 'Route',
   `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
   `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
   `changedModelId` int(11) NOT NULL,
@@ -36434,15 +36661,84 @@ CREATE TABLE `routesMonitor` (
   `m3boxes` decimal(10,1) DEFAULT NULL,
   `bufferFk` int(11) DEFAULT NULL COMMENT 'Buffer del sorter por el que se quiere sacar esa ruta',
   `isPickingAllowed` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Los tickets de esta ruta se pueden preparar',
+  `editorFk` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`routeFk`),
   KEY `routesMonitor_FK` (`bufferFk`),
   KEY `routesMonitor_FK_2` (`beachFk`),
   KEY `routesMonitor_FK_1` (`dockFk`),
+  KEY `routesMonitor_FK_3` (`expeditionTruckFk`),
+  KEY `routesMonitor_fk_editor` (`editorFk`),
   CONSTRAINT `routesMonitor_FK` FOREIGN KEY (`bufferFk`) REFERENCES `srt`.`buffer` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `routesMonitor_FK_1` FOREIGN KEY (`dockFk`) REFERENCES `dock` (`code`) ON UPDATE CASCADE,
-  CONSTRAINT `routesMonitor_FK_2` FOREIGN KEY (`beachFk`) REFERENCES `beach` (`code`) ON UPDATE CASCADE
+  CONSTRAINT `routesMonitor_FK_2` FOREIGN KEY (`beachFk`) REFERENCES `beach` (`code`) ON UPDATE CASCADE,
+  CONSTRAINT `routesMonitor_FK_3` FOREIGN KEY (`expeditionTruckFk`) REFERENCES `expeditionTruck` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `routesMonitor_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
+/*!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`.`routesMonitor_beforeInsert`
+	BEFORE INSERT ON `routesMonitor`
+	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`.`routesMonitor_beforeUpdate`
+	BEFORE UPDATE ON `routesMonitor`
+	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`.`routesMonitor_afterDelete`
+	AFTER DELETE ON `routesMonitor`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO routeLog
+		SET `action` = 'delete',
+			`changedModel` = 'RoutesMonitor',
+			`changedModelId` = OLD.routeFk,
+			`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 */ ;
 
 --
 -- Table structure for table `sale`
@@ -36539,11 +36835,6 @@ BEGIN
 					AND r.created >= util.VN_CURDATE()
 				GROUP BY r.id;
 	END IF;
-
-	IF NEW.quantity = 0 THEN
-		CALL util.debugAdd('saleZeroQuantity',
-			CONCAT('[', user(), ']', ' Inserted sale: ', NEW.id));
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -36563,20 +36854,20 @@ DELIMITER ;;
 	BEFORE UPDATE ON `sale`
 	FOR EACH ROW
 BEGIN
-/*
+/*		
 	IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN
 		CALL util.throw('Cannot insert a service item into a ticket');
 	END IF;
 */
 	SET NEW.editorFk = account.myUser_getId();
-
+	
 	IF NEW.discount > 100 THEN
 		SET NEW.discount = 0;
 	END IF;
 
 	IF old.discount > 0 AND  NEW.discount = 0 THEN
 		INSERT INTO ticketLog
-		SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert',
+		SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert', 
 			description = CONCAT('Cambio de descuento del item :', ' ', new.itemFk, ' de ', old.discount ,' a 0 ');
 	END IF;
 END */;;
@@ -36682,11 +36973,6 @@ BEGIN
 			JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk
 			SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1);
 	END IF;
-
-	IF NEW.quantity = 0 THEN
-		CALL util.debugAdd('saleZeroQuantity',
-			CONCAT('[', user(), ']', ' Updated sale: ', NEW.id));
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -36708,11 +36994,11 @@ DELIMITER ;;
 BEGIN
 	IF OLD.quantity > 0 THEN
 		INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
-			SELECT r.id
+			SELECT r.id 
 				FROM  vn.sale s
 					JOIN vn.ticket t ON t.id = s.ticketFk
 					JOIN vn.route r ON r.id = t.routeFk
-				WHERE r.isOk = FALSE
+				WHERE r.isOk = FALSE 
 					AND s.id = OLD.id
 					AND r.created >= util.VN_CURDATE()
 				GROUP BY r.id;
@@ -36814,10 +37100,10 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`BEFORE_INSERT`
 	BEFORE INSERT ON `saleBuy`
 	FOR EACH ROW
-BEGIN
-
+BEGIN 
+		
 		SET NEW.workerFk = vn.getUser();
-
+	
 	END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -36836,13 +37122,13 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_AI`
 	AFTER INSERT ON `saleBuy`
 	FOR EACH ROW
-BEGIN
+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 */ ;
@@ -37108,14 +37394,14 @@ DELIMITER ;;
 	AFTER INSERT ON `saleTracking`
 	FOR EACH ROW
 BEGIN
-
-	IF NEW.isChecked THEN
-
+	
+	IF NEW.isChecked THEN 
+	
 		UPDATE vn.sale s
-			SET s.isPicked = TRUE
+			SET s.isPicked = TRUE 
 			WHERE s.id = NEW.saleFk
 				AND s.isPicked = 0;
-
+	
 	END IF;
 
 END */;;
@@ -37392,9 +37678,7 @@ CREATE TABLE `sector` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `description` varchar(45) NOT NULL,
   `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
-  `isPreviousPreparedByPacking` tinyint(4) NOT NULL DEFAULT 1,
   `code` varchar(15) DEFAULT NULL,
-  `isPreviousPrepared` tinyint(1) NOT NULL DEFAULT 0,
   `isPackagingArea` tinyint(1) NOT NULL DEFAULT 0,
   `reportFk` tinyint(3) unsigned DEFAULT NULL,
   `sonFk` int(11) DEFAULT NULL,
@@ -37404,12 +37688,15 @@ CREATE TABLE `sector` (
   `isHideForPickers` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'sector a ocultar a los sacadores',
   `isReserve` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Sectores de reserva, como Albenfruit o Fuentes',
   `mainPrinterFk` tinyint(3) unsigned DEFAULT NULL,
+  `typeFk` int(10) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_UNIQUE` (`code`),
   KEY `sector_fk1_idx` (`warehouseFk`),
   KEY `sector_report` (`reportFk`),
   KEY `sector_FK` (`sonFk`,`warehouseFk`),
   KEY `sector_FK_1` (`mainPrinterFk`),
+  KEY `sectorType_FK` (`typeFk`),
+  CONSTRAINT `sectorType_FK` FOREIGN KEY (`typeFk`) REFERENCES `sectorType` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `sector_FK_1` FOREIGN KEY (`mainPrinterFk`) REFERENCES `printer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `sector_fk1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `sector_report` FOREIGN KEY (`reportFk`) REFERENCES `report` (`id`)
@@ -37480,6 +37767,20 @@ CREATE TABLE `sectorProductivity` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `sectorType`
+--
+
+DROP TABLE IF EXISTS `sectorType`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sectorType` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `description` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `sendingConfig`
 --
@@ -37563,9 +37864,9 @@ BEGIN
 	IF NEW.workerFk = NEW.workerSubstitute THEN
 		CALL util.throw ('worker and workerSubstitute must be different');
 	ELSE
-		 INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated)
-			SELECT NEW.workerFk, NEW.workerSubstitute, dated
-				FROM time
+		 INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) 
+			SELECT NEW.workerFk, NEW.workerSubstitute, dated 
+				FROM time 
                 WHERE dated BETWEEN NEW.started AND NEW.ended;
     END IF;
 END */;;
@@ -37590,14 +37891,14 @@ BEGIN
 	IF NEW.workerFk = NEW.workerSubstitute THEN
 		CALL util.throw ('worker and workerSubstitute must be different');
 	ELSE
-		DELETE sc FROM sharingCartDaily sc
-			WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND
-				  sc.ownerFk = OLD.workerFk AND
+		DELETE sc FROM sharingCartDaily sc  
+			WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND 
+				  sc.ownerFk = OLD.workerFk AND 
 				  sc.substituteFk = OLD.workerSubstitute;
-
-        INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated)
-			SELECT NEW.workerFk, NEW.workerSubstitute, dated
-				FROM time
+                  
+        INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) 
+			SELECT NEW.workerFk, NEW.workerSubstitute, dated 
+				FROM time 
                 WHERE dated BETWEEN NEW.started AND NEW.ended;
 
     END IF;
@@ -37620,9 +37921,9 @@ DELIMITER ;;
 	BEFORE DELETE ON `sharingCart`
 	FOR EACH ROW
 BEGIN
-	DELETE sc FROM sharingCartDaily sc
-		WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND
-			  sc.ownerFk = OLD.workerFk AND
+	DELETE sc FROM sharingCartDaily sc  
+		WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND 
+			  sc.ownerFk = OLD.workerFk AND 
 			  sc.substituteFk = OLD.workerSubstitute;
 END */;;
 DELIMITER ;
@@ -38068,7 +38369,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	UPDATE vn2008.Clientes c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client
+		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
 END */;;
@@ -38092,12 +38393,12 @@ DELIMITER ;;
 BEGIN
 	IF NEW.dateLeaving IS NOT NULL THEN
 		UPDATE vn2008.Clientes c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client
+			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
 	ELSE
 		UPDATE vn2008.Clientes c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client
+			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
 	END IF;
@@ -38121,7 +38422,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	UPDATE vn2008.Clientes c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client
+		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit  WHERE ci.id = OLD.creditInsurance;
 END */;;
@@ -39336,7 +39637,7 @@ DELIMITER ;;
 	AFTER INSERT ON `ticket`
 	FOR EACH ROW
 BEGIN
-
+	
 	DECLARE vClientType VARCHAR(255);
 	DECLARE vStateCode VARCHAR(255);
 	DECLARE vTransferorFirstShipped DATE;
@@ -39364,7 +39665,7 @@ BEGIN
 		INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped)
 			VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE())
 		ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE();
-
+	
 	END IF;
 
 END */;;
@@ -39387,6 +39688,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	DECLARE vNewTime TIME;
+	DECLARE vHasTicketRefund BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
 
@@ -39446,6 +39748,15 @@ 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 ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -39479,7 +39790,7 @@ BEGIN
 	END IF;
 
 	IF NEW.routeFk <> OLD.routeFk THEN
-		UPDATE expedition
+		UPDATE expedition 
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 	END IF;
@@ -39502,11 +39813,11 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeDelete`
 	BEFORE DELETE ON `ticket`
 	FOR EACH ROW
-BEGIN
-	INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
-		SELECT r.id
+BEGIN	
+	INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) 
+		SELECT r.id 
 			FROM vn.route r
-			WHERE r.isOk = FALSE
+			WHERE r.isOk = FALSE 
 				AND r.id = OLD.routeFk
 				AND r.created >= util.VN_CURDATE()
 			GROUP BY r.id;
@@ -39583,31 +39894,31 @@ CREATE TABLE `ticketCollection` (
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER ticketCollection_afterDelete
-AFTER DELETE
-ON ticketCollection FOR EACH ROW
-BEGIN
-
-	DECLARE vSalesRemaining INT;
-
-	SELECT count(*) INTO vSalesRemaining
-		FROM vn.ticketCollection tc
-			JOIN sale s ON s.ticketFk = tc.ticketFk
-		WHERE collectionFk = OLD.collectionFk
-			AND tc.id != OLD.id;
-
-	IF NOT vSalesRemaining THEN
-
-		DELETE FROM vn.collection WHERE id = OLD.collectionFk;
-
-	ELSE
-
-		UPDATE vn.collection
-			SET saleTotalCount = vSalesRemaining
-			WHERE id = OLD.collectionFk;
-
-	END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER ticketCollection_afterDelete
+AFTER DELETE
+ON ticketCollection FOR EACH ROW
+BEGIN 
+	
+	DECLARE vSalesRemaining INT;
+
+	SELECT count(*) INTO vSalesRemaining
+		FROM vn.ticketCollection tc
+			JOIN sale s ON s.ticketFk = tc.ticketFk 
+		WHERE collectionFk = OLD.collectionFk
+			AND tc.id != OLD.id;
+		
+	IF NOT vSalesRemaining THEN
+	
+		DELETE FROM vn.collection WHERE id = OLD.collectionFk;
+	
+	ELSE
+	
+		UPDATE vn.collection 
+			SET saleTotalCount = vSalesRemaining
+			WHERE id = OLD.collectionFk;
+		
+	END IF;
+		
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -39705,13 +40016,13 @@ DELIMITER ;;
 	BEFORE DELETE ON `ticketDms`
 	FOR EACH ROW
 BEGIN
-    UPDATE dms
-        SET dmsTypeFk = (SELECT id
-							FROM dmsType
+    UPDATE dms 
+        SET dmsTypeFk = (SELECT id 
+							FROM dmsType 
                             WHERE `code` = 'trash'
 						)
-		WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE)
-										FROM ticketDms
+		WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) 
+										FROM ticketDms 
 										WHERE dmsFk = OLD.dmsFk
 								  ) ;
 END */;;
@@ -40187,7 +40498,7 @@ DELIMITER ;;
 BEGIN
 
 	SET NEW.workerFk = vn.getUser();
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -40515,7 +40826,7 @@ DELIMITER ;;
 BEGIN
 
 	CALL ticket_requestRecalc(NEW.ticketFk);
-
+    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -40585,7 +40896,7 @@ BEGIN
 			`changedModel` = 'TicketService',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
+			
 	CALL ticket_requestRecalc(OLD.ticketFk);
 
 END */;;
@@ -40607,8 +40918,8 @@ CREATE TABLE `ticketServiceType` (
   `name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL,
   `expenseFk` varchar(10) NOT NULL DEFAULT '7050000000',
   PRIMARY KEY (`id`),
-  KEY `ticketServiceType_expenseFk_idx` (`expenseFk`),
-  CONSTRAINT `ticketServiceType_expenseFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE
+  KEY `ticketServiceType_expenceFk_idx` (`expenseFk`),
+  CONSTRAINT `ticketServiceType_expenceFk` FOREIGN KEY (`expenseFk`) REFERENCES `expense` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Lista de los posibles servicios a elegir';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -40640,14 +40951,12 @@ SET character_set_client = utf8;
 /*!50001 CREATE VIEW `ticketState` AS SELECT
  1 AS `updated`,
   1 AS `stateFk`,
-  1 AS `workerFk`,
+  1 AS `userFk`,
   1 AS `ticketFk`,
   1 AS `state`,
   1 AS `productionOrder`,
   1 AS `alertLevel`,
   1 AS `code`,
-  1 AS `ticket`,
-  1 AS `worker`,
   1 AS `isPreviousPreparable`,
   1 AS `isPicked` */;
 SET character_set_client = @saved_cs_client;
@@ -40685,11 +40994,11 @@ CREATE TABLE `ticketTracking` (
   `notes` varchar(255) DEFAULT NULL,
   `created` timestamp NULL DEFAULT current_timestamp(),
   `ticketFk` int(11) DEFAULT NULL,
-  `workerFk` int(10) unsigned DEFAULT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
   `supervisorFk` int(10) unsigned DEFAULT NULL,
   `editorFk` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `currante` (`workerFk`),
+  KEY `currante` (`userFk`),
   KEY `responsable` (`supervisorFk`),
   KEY `ticket` (`ticketFk`),
   KEY `inter_state` (`stateFk`),
@@ -40698,7 +41007,7 @@ CREATE TABLE `ticketTracking` (
   KEY `ticketTracking_created_IDX` (`created`) USING BTREE,
   CONSTRAINT `inter_state` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `responsable` FOREIGN KEY (`supervisorFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `ticketTracking_FK3` FOREIGN KEY (`workerFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `ticketTracking_FK3` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticketTracking_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
   CONSTRAINT `ticketTracking_ibfk_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@@ -40737,11 +41046,11 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
  	DECLARE vNumTicketsPrepared INT;
-
+	
 	REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name)
 		SELECT NEW.ticketFk, NEW.id, `name`
 			FROM state
-			WHERE id = NEW.stateFk;
+			WHERE id = NEW.stateFk; 
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -40784,21 +41093,21 @@ BEGIN
 	DECLARE vTicketFk INT;
     DECLARE vTicketTrackingFk INT;
     DECLARE vStateName VARCHAR(15);
-
+    
 	IF NEW.stateFk <> OLD.stateFk THEN
 		REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name)
 			SELECT NEW.ticketFk, NEW.id, `name`
 				FROM state
 				WHERE id = NEW.stateFk;
     END IF;
-
+    
     IF NEW.ticketFk <> OLD.ticketFk THEN
 		SELECT i.ticketFk, i.id, s.`name`
-			INTO vTicketFk, vTicketTrackingFk, vStateName
-			FROM ticketTracking i
-				JOIN state s ON i.stateFk = s.id
-			WHERE ticketFk = NEW.ticketFk
-			ORDER BY created DESC
+			INTO vTicketFk, vTicketTrackingFk, vStateName 
+			FROM ticketTracking i 
+				JOIN state s ON i.stateFk = s.id 
+			WHERE ticketFk = NEW.ticketFk 
+			ORDER BY created DESC 
 			LIMIT 1;
 
 		IF vTicketFk > 0 THEN
@@ -40840,18 +41149,18 @@ BEGIN
 			`changedModel` = 'TicketTracking',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
+	
 	CALL util.debugAdd('deletedState',
 		CONCAT('interFk: ', OLD.id,
 			' ticketFk: ', OLD.ticketFk,
 			' stateFk: ', OLD.stateFk));
 
 	SELECT i.ticketFk, i.id, s.`name`
-		INTO vTicketFk, vTicketTrackingFk, vStateName
-		FROM ticketTracking i
-			JOIN state s ON i.stateFk = s.id
-		WHERE ticketFk = OLD.ticketFk
-		ORDER BY created DESC
+		INTO vTicketFk, vTicketTrackingFk, vStateName 
+		FROM ticketTracking i 
+			JOIN state s ON i.stateFk = s.id 
+		WHERE ticketFk = OLD.ticketFk 
+		ORDER BY created DESC 
 		LIMIT 1;
 
 	IF vTicketFk > 0 THEN
@@ -41459,16 +41768,16 @@ 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_unicode_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_beforeUpdate`
 	BEFORE UPDATE ON `travel`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
+/*
 	IF ((NOT NEW.shipped <=> OLD.shipped )
 		OR (NOT NEW.landed <=> OLD.landed )
 		OR (NOT NEW.warehouseInFk <=> OLD.warehouseInFk )
@@ -41476,7 +41785,7 @@ BEGIN
 		AND (OLD.totalEntries AND OLD.landed < CURDATE()) THEN
 		CALL util.throw("Cannot past travels with entries");
 	END IF;
-
+*/
 	IF NOT (NEW.landed <=> OLD.landed)
 	OR NOT (NEW.shipped <=> OLD.shipped) THEN
 		CALL travel_checkDates(NEW.shipped, NEW.landed);
@@ -41520,7 +41829,7 @@ BEGIN
 	CALL stock.log_add('travel', NEW.id, OLD.id);
 
 	IF !(NEW.shipped <=> OLD.shipped) THEN
-		UPDATE entry
+		UPDATE entry 
 			SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
 			WHERE travelFk = NEW.id;
 	END IF;
@@ -41800,7 +42109,10 @@ CREATE TABLE `userConfig` (
   `created` timestamp NULL DEFAULT current_timestamp(),
   `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `darkMode` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Salix interface dark mode',
-  PRIMARY KEY (`userFk`)
+  `tabletFk` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`userFk`),
+  KEY `tabletFk` (`tabletFk`),
+  CONSTRAINT `userConfig_ibfk_1` FOREIGN KEY (`tabletFk`) REFERENCES `docuwareTablet` (`tablet`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Configuración de usuario en Salix';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -42085,7 +42397,10 @@ CREATE TABLE `viaexpressConfig` (
   `password` varchar(100) NOT NULL,
   `defaultWeight` decimal(10,2) NOT NULL,
   `deliveryType` varchar(5) NOT NULL,
-  PRIMARY KEY (`id`)
+  `agencyModeFk` int(11) DEFAULT NULL COMMENT 'Indica el agencyMode que es interdia',
+  PRIMARY KEY (`id`),
+  KEY `viaexpressConfig_agencyMode_Fk` (`agencyModeFk`),
+  CONSTRAINT `viaexpressConfig_agencyMode_Fk` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -43232,9 +43547,9 @@ DELIMITER ;;
 	AFTER INSERT ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
-	IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN
+	IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN 
 		CALL util.throw('date in the future');
-	END IF;
+	END IF;            
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -43509,7 +43824,7 @@ CREATE TABLE `zone` (
   `hour` datetime NOT NULL,
   `agencyModeFk` int(11) NOT NULL,
   `travelingDays` int(11) NOT NULL DEFAULT 1,
-  `price` double NOT NULL DEFAULT 0,
+  `price` double NOT NULL DEFAULT 0 CHECK (`price` > 0),
   `bonus` double NOT NULL DEFAULT 0,
   `isVolumetric` tinyint(1) NOT NULL DEFAULT 0,
   `inflation` decimal(5,2) NOT NULL DEFAULT 1.00,
@@ -43649,13 +43964,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE VIEW `zoneEstimatedDelivery` AS SELECT
  1 AS `zoneFk`,
-  1 AS `hourTheoretical`,
-  1 AS `totalVolume`,
-  1 AS `remainingVolume`,
-  1 AS `speed`,
-  1 AS `hourEffective`,
-  1 AS `minutesLess`,
-  1 AS `etc` */;
+  1 AS `zoneClosureHour`,
+  1 AS `zoneHour`,
+  1 AS `volume`,
+  1 AS `hasToRecalcPrice`,
+  1 AS `m3`,
+  1 AS `minSpeed` */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -43785,10 +44099,10 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BI`
 	BEFORE INSERT ON `zoneExclusion`
 	FOR EACH ROW
-BEGIN
+BEGIN 
 	SET NEW.editorFk = account.myUser_getId();
 	SET NEW.userFk = account.myUser_getId();
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -43807,10 +44121,10 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BU`
 	BEFORE UPDATE ON `zoneExclusion`
 	FOR EACH ROW
-BEGIN
+BEGIN 
 	SET NEW.editorFk = account.myUser_getId();
 	SET NEW.userFk = account.myUser_getId();
-
+	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -44209,8 +44523,8 @@ DELIMITER ;;
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
 					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL 2 MONTH
-						OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH
+						OR t.created > util.VN_CURDATE() - INTERVAL 2 MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH 
 				);
 END */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
@@ -44223,14 +44537,14 @@ 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_results = utf8mb3 */ ;;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
+/*!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' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`jgallego`@`%`*/ /*!50106 EVENT `client_unassignSalesPerson` ON SCHEDULE EVERY 1 DAY STARTS '2023-06-01 03:30:00' ON COMPLETION PRESERVE DISABLE ON SLAVE DO CALL client_unassignSalesPerson */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `client_unassignSalesPerson` ON SCHEDULE EVERY 1 DAY STARTS '2023-06-01 03:30:00' ON COMPLETION PRESERVE DISABLE ON SLAVE DO CALL client_unassignSalesPerson */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;;
@@ -44348,9 +44662,9 @@ DELIMITER ;;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `itemImageQueue_check` ON SCHEDULE EVERY 1 HOUR STARTS '2023-07-28 00:00:00' ON COMPLETION PRESERVE DISABLE ON SLAVE DO BEGIN
-	DELETE FROM itemImageQueue
-		WHERE attempts >= (SELECT downloadMaxAttempts FROM itemConfig);
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `itemImageQueue_check` ON SCHEDULE EVERY 1 HOUR STARTS '2023-07-28 00:00:00' ON COMPLETION PRESERVE DISABLE ON SLAVE DO BEGIN
+	DELETE FROM itemImageQueue
+		WHERE attempts >= (SELECT downloadMaxAttempts FROM itemConfig);
 END */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;;
@@ -44715,7 +45029,7 @@ BEGIN
  	DECLARE vGeoFk INT;
 
 	SELECT p.geoFk INTO vGeoFk
-		FROM address a
+		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
 			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
 		WHERE a.id = vSelf
@@ -44742,12 +45056,12 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `barcodeToItem`(vBarcode VARCHAR(22)) RETURNS int(11)
     DETERMINISTIC
 BEGIN
-
+	
 /**
  * Obtiene el id del artículo
  *
  * @param vBarcode código de barras
- *
+ * 
  * return id del item
  */
 
@@ -44757,35 +45071,35 @@ BEGIN
 		FROM vn.item
         WHERE id = vBarcode OR comment = vBarcode
        	LIMIT 1;
-
-	IF vItemFk THEN
+        
+	IF vItemFk THEN 
 		RETURN vItemFk;
 	END IF;
 
-	SELECT itemFk INTO vItemFk
-		FROM buy
+	SELECT itemFk INTO vItemFk 
+		FROM buy 
         WHERE id = vBarcode;
-
-    IF vItemFk THEN
+	
+    IF vItemFk THEN 
 		RETURN vItemFk;
 	END IF;
-
-	SELECT itemFk INTO vItemFk
-		FROM itemBarcode
+    
+	SELECT itemFk INTO vItemFk 
+		FROM itemBarcode 
         WHERE code = vBarcode;
-
-   IF vItemFk THEN
+       
+   IF vItemFk THEN 
 		RETURN vItemFk;
 	END IF;
 
-	SELECT i.id INTO vItemFk
+	SELECT i.id INTO vItemFk 
 	        	FROM vn.item i
 	        	WHERE i.name LIKE CONCAT('%',vBarcode,'%')
 	        	ORDER BY i.id ASC
 	       		LIMIT 1;
-
+	       
 	RETURN vItemFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -44849,7 +45163,7 @@ BEGIN
 	DECLARE vItem INT;
 	DECLARE vPackaging VARCHAR(10);
 
-	SELECT itemFk, packageFk INTO vItem, vPackaging
+	SELECT itemFk, packagingFk INTO vItem, vPackaging
 		FROM buy
 		WHERE id = vSelf;
 
@@ -44878,16 +45192,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `catalog_componentReverse`(vWarehouse
     DETERMINISTIC
 BEGIN
 	/* Calcula los componentes para un cliente a partir de un coste y volumen
-	* @param vWarehouse
+	* @param vWarehouse 
 	* @param vCost Valor de coste del articulo
 	* @param vM3 m3 del articulo
-    * @param vAddressFk
+    * @param vAddressFk 
     * @param vZoneFk
-	* @return vRetailedPrice precio de venta sin iva
+	* @return vRetailedPrice precio de venta sin iva 
 	* @return tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
 	*/
-
-    DECLARE vBoxVolume BIGINT;
+    
+    DECLARE vBoxVolume BIGINT;    
     DECLARE vCustomer INT;
     DECLARE vComponentRecovery INT DEFAULT 17;
 	DECLARE vComponentMana INT DEFAULT 39;
@@ -44896,11 +45210,11 @@ BEGIN
 	DECLARE vComponentCost INT DEFAULT 28;
     DECLARE vRetailedPrice DECIMAL(10,2);
 	DECLARE vItem INT DEFAULT 98;
-
+    
 	SELECT volume INTO vBoxVolume
 		FROM vn.packaging
         WHERE id = '94';
-
+    
     SELECT clientFk INTO vCustomer FROM address WHERE id = vAddressFk;
 
     DROP TEMPORARY TABLE IF EXISTS tmp.catalog_component;
@@ -44924,7 +45238,7 @@ BEGIN
 	-- Margen
 	-- No se aplica margen, cau 12589
 /*	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost
+		SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost 
 			FROM vn.rate
 				WHERE dated <= util.VN_CURDATE()
 					AND warehouseFk = vWarehouse
@@ -44933,7 +45247,7 @@ BEGIN
 		*/
 	-- Recobro
 	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3)
+		SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) 
 			FROM bi.claims_ratio
 				WHERE Id_Cliente = vCustomer AND recobro > 0.009;
 
@@ -44950,7 +45264,7 @@ BEGIN
 				ROUND(
 						vM3
 						* (z.price - z.bonus)
-						* z.inflation
+						* z.inflation 
 						/ vBoxVolume, 4
 						)
 			FROM zone z
@@ -45044,7 +45358,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `clientTaxArea`(vClientId INT, vCompa
     READS SQL DATA
 BEGIN
 /**
-* Devuelve el area de un cliente,
+* Devuelve el area de un cliente, 
 * intracomunitario, extracomunitario o nacional.
 *
 * @param vClient Id del cliente
@@ -45077,37 +45391,37 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `client_getDebt`(`vClient` INT, `vDate` DATE) RETURNS decimal(10,2)
     READS SQL DATA
-BEGIN
-/**
- * Returns the risk of a customer.
- *
- * @param vClient client id
- * @param vDate date to check the risk
- * @return Client risk
- */
-	DECLARE vDebt DECIMAL(10,2);
-    DECLARE vHasDebt BOOLEAN;
-
-	SELECT COUNT(*) INTO vHasDebt
-		FROM `client` c
-		WHERE c.id = vClient AND c.typeFk = 'normal';
-
-	IF NOT vHasDebt THEN
-		RETURN 0;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt (clientFk INT);
-	INSERT INTO tmp.clientGetDebt SET clientFk = vClient;
-
-	CALL vn.client_getDebt(vDate);
-
-	SELECT risk INTO vDebt FROM tmp.risk;
-
-	DROP TEMPORARY TABLE
-		tmp.clientGetDebt,
-		tmp.risk;
-
-	RETURN vDebt;
+BEGIN
+/**
+ * Returns the risk of a customer.
+ *
+ * @param vClient client id
+ * @param vDate date to check the risk
+ * @return Client risk
+ */
+	DECLARE vDebt DECIMAL(10,2);
+    DECLARE vHasDebt BOOLEAN;
+
+	SELECT COUNT(*) INTO vHasDebt
+		FROM `client` c
+		WHERE c.id = vClient AND c.typeFk = 'normal';
+	
+	IF NOT vHasDebt THEN
+		RETURN 0;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt (clientFk INT);
+	INSERT INTO tmp.clientGetDebt SET clientFk = vClient;
+
+	CALL vn.client_getDebt(vDate);
+
+	SELECT risk INTO vDebt FROM tmp.risk;
+
+	DROP TEMPORARY TABLE
+		tmp.clientGetDebt,
+		tmp.risk;
+
+	RETURN vDebt;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -45183,8 +45497,8 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPerson`(vClientFk INT
     DETERMINISTIC
 BEGIN
 /**
- * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo
- * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de
+ * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo 
+ * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de 
  * sharingcart y tercero la de clientes.
  *
  * @param vClientFk El id del cliente
@@ -45222,29 +45536,29 @@ BEGIN
 
 		l: LOOP
 			SELECT workerSubstitute INTO vWorkerSubstituteFk
-				FROM sharingCart
+				FROM sharingCart 
 				WHERE util.VN_CURDATE() BETWEEN started AND ended
 					AND workerFk = vSalesPersonFk
 				ORDER BY id
 				LIMIT 1;
-
+				
 			IF vWorkerSubstituteFk IS NULL THEN
 				LEAVE l;
 			END IF;
-
+				
 			SELECT COUNT(*) > 0 INTO vLoop
 				FROM tmp.stack WHERE substitute = vWorkerSubstituteFk;
 
 			IF vLoop THEN
 				LEAVE l;
 			END IF;
-
+			
 			INSERT INTO tmp.stack SET
 				substitute = vWorkerSubstituteFk;
-
+			
 			SET vSalesPersonFk = vWorkerSubstituteFk;
 		END LOOP;
-
+		
 		DROP TEMPORARY TABLE tmp.stack;
 	END IF;
 
@@ -45278,11 +45592,11 @@ BEGIN
  **/
     DECLARE vClientFk INT;
     DECLARE vDated DATE;
-
+    
     SELECT clientFk, shipped
 		INTO vClientFk, vDated
         FROM ticket WHERE id = vTicketFk;
-
+        
 	RETURN client_getSalesPerson(vClientFk, vDated);
 END ;;
 DELIMITER ;
@@ -45313,12 +45627,12 @@ BEGIN
  **/
     DECLARE vWorkerCode CHAR(3);
     DECLARE vSalesPersonFk INT;
-
+    
     SET vSalesPersonFk = client_getSalesPerson(vClientFk, vDated);
 
 	SELECT code
 		INTO vWorkerCode
-		FROM worker
+		FROM worker 
 		WHERE id = vSalesPersonFk;
 
 	RETURN vWorkerCode;
@@ -45351,11 +45665,11 @@ BEGIN
  **/
     DECLARE vClientFk INT;
     DECLARE vDated DATE;
-
+    
     SELECT clientFk, shipped
 		INTO vClientFk, vDated
         FROM ticket WHERE id = vTicketFk;
-
+        
 	RETURN client_getSalesPersonCode(vClientFk, vDated);
 END ;;
 DELIMITER ;
@@ -45365,6 +45679,38 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `client_hasDifferentCountries` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_hasDifferentCountries`(vClientFk INT) RETURNS tinyint(1)
+    READS SQL DATA
+BEGIN
+/**
+ * Return if client have address in different countries.
+ *
+ * @param vClientFk The id client
+ * @return BOOL
+ **/
+	RETURN (SELECT COUNT(DISTINCT c.id) > 1 
+		FROM `address` a
+			JOIN province p ON p.id = a.provinceFk 
+			JOIN country c ON c.id = p.countryFk 
+		WHERE a.clientFk = vClientFk
+			AND a.isActive);
+	
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP FUNCTION IF EXISTS `collection_isPacked` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -45447,7 +45793,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `currentRate`(vCurrencyFk INT, vDated
 BEGIN
 
 	DECLARE curRate DECIMAL(10,4);
-
+    
     SELECT value INTO curRate
 		FROM referenceRate
         WHERE dated <= vDated
@@ -45478,23 +45824,23 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `deviceProductionUser_accessGranted`(
 BEGIN
 	/*
 	 * Comprueba si el usuario puede entrar en la aplicacion de almacen con ese movil
-	 *
+	 * 
 	 * */
-
+	
 	/*DECLARE vIsGranted BOOLEAN;
 	DECLARE vDeviceProductionFk INT(11) DEFAULT NULL;
 
-	SELECT dp.id INTO vDeviceProductionFk
-		FROM vn.deviceProduction dp
+	SELECT dp.id INTO vDeviceProductionFk 
+		FROM vn.deviceProduction dp 
 		WHERE dp.android_id = android_id;
 
 	IF vDeviceProductionFk THEN
-
-		SELECT COUNT(*) INTO vIsGranted
-			FROM vn.deviceProductionUser dpu
-			WHERE dpu.userFk = vUserFK
+		
+		SELECT COUNT(*) INTO vIsGranted 
+			FROM vn.deviceProductionUser dpu 
+			WHERE dpu.userFk = vUserFK 
 				AND dpu.deviceProductionFk = vDeviceProductionFk;
-
+	
 		RETURN vIsGranted;
 	END IF;*/
 	RETURN TRUE;
@@ -45519,7 +45865,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `duaTax_getRate`(vDuaFk INT, vTaxClas
 BEGIN
 /**
  * Devuelve el rate para un Dua teniendo en cuenta la fecha de opreción del DUA
- *
+ * 
  * @param vDuaFk Identificador de  la tabla dua
  * @param vTaxClassFk Identificador del IVA de la tabla invoiceInTaxBookingAccount
  */
@@ -45553,24 +45899,24 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS in
     READS SQL DATA
 BEGIN
 /**
- * Devuelve el numero de entrada para el ekt
- *
+ * Devuelve el numero de entrada para el ekt 
+ * 
  * @param vEktFk Identificador de edi.ekt
- */
+ */	
 	DECLARE vTravelFk INT;
 	DECLARE vEntryFk INT DEFAULT 0;
 	DECLARE vEntryAssignFk INT;
 
-	SELECT ea.id
+	SELECT ea.id 
 		INTO vEntryAssignFk
 		FROM edi.ekt e
-			JOIN vn.ektEntryAssign ea ON
+			JOIN vn.ektEntryAssign ea ON 
 				IFNULL(ea.sub, e.sub) <=> e.sub AND
 				IFNULL(ea.kop, e.kop) <=> e.kop AND
 				IFNULL(ea.pro, e.pro) <=> e.pro AND
 				IFNULL(ea.auction, e.auction) <=> e.auction
 		WHERE e.id = vEktFk
-		ORDER BY
+		ORDER BY 
 			IF(ea.sub,1,0) * 1000 +
 			IF(ea.kop,1,0) * 100 +
 			IF(ea.pro,1,0) * 10 +
@@ -45581,7 +45927,7 @@ BEGIN
 
 	IF vTravelFk THEN
 
-		SELECT MAX(e.id)
+		SELECT MAX(e.id) 
 			INTO vEntryFk
 			FROM vn.entry e
 				JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
@@ -45596,13 +45942,13 @@ BEGIN
 			INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, reference, pro, auction)
 				SELECT vTravelFk, ea.supplierFk, ea.companyFk, cu.id, ea.kop, ea.sub, ea.ref, ea.pro, ea.auction
 					FROM vn.ektEntryAssign ea
-						JOIN vn.currency cu ON cu.code = 'EUR'
+						JOIN vn.currency cu ON cu.code = 'EUR'	
 					WHERE ea.id = vEntryAssignFk;
 
 			SET vEntryFk = LAST_INSERT_ID();
 		END IF;
 
-		UPDATE vn.ektEntryAssign
+		UPDATE vn.ektEntryAssign 
 			SET entryFk = vEntryFk
 			WHERE id = vEntryAssignFk;
 
@@ -45636,7 +45982,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getTravel`(vEntryAssignFk INT, v
 BEGIN
 /**
  * Devuelve un vn.travel.id
- *
+ * 
  * @param vEntryAssignFk Identificador de vn.entryAssign
  */
 	DECLARE vTravelFk INT;
@@ -45697,36 +46043,36 @@ BEGIN
     DECLARE vCurrentCommission INT;
     DECLARE vIsCurrencyUsd INT;
     DECLARE vLastEntryFk INT;
-
+    
     SELECT count(*) INTO vIsCurrencyUsd
             FROM currency c
             WHERE c.code = 'USD' AND id = vCurrencyFk;
-
+    
     IF NOT vIsCurrencyUsd THEN
-
+    
 		SELECT e.id INTO vLastEntryFk
 			FROM vn.entry e
 				JOIN vn.travel tr ON tr.id = e.travelFk
                 WHERE e.supplierFk = vSupplierFk
                 ORDER BY tr.landed DESC
                 LIMIT 1;
-
+        
         IF vLastEntryFk THEN
-
+        
 			SELECT commission INTO vCurrentCommission
 				FROM vn.entry
                 WHERE id = vLastEntryFk;
-
+        
         ELSE
-
+        
 			SELECT commission INTO vCurrentCommission
 				FROM supplier s
 				WHERE s.id = vSupplierFk;
-
+        
 		END IF;
-
+        
         RETURN vCurrentCommission;
-
+        
     ELSE
 
 		SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
@@ -45735,11 +46081,11 @@ BEGIN
 			WHERE t.id = vTravelFk
 			ORDER BY r.`dated` DESC
 			LIMIT 1;
-
+        
 		RETURN IFNULL(vCommission, 0);
-
+    
     END IF;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -45790,10 +46136,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `entry_getForLogiflora`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
     READS SQL DATA
 BEGIN
-
+	
 	/**
 	 * Devuelve una entrada para Logiflora. Si no existe la crea.
-	 *
+	 * 
 	 * @param vLanded Fecha de llegada al almacén
 	 * @param vWarehouseFk Identificador de vn.warehouse
 	 */
@@ -45801,51 +46147,51 @@ BEGIN
 	DECLARE vTravelFk INT;
 	DECLARE vEntryFk INT;
     	DECLARE previousEntryFk INT;
-
+ 
     SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk);
-
+    
     IF vLanded THEN
-
-		SELECT IFNULL(MAX(id),0) INTO vEntryFk
+    
+		SELECT IFNULL(MAX(id),0) INTO vEntryFk 
 			FROM vn.entry
-			WHERE travelFk = vTravelFk
+			WHERE travelFk = vTravelFk 
 				AND isRaid;
 
 		IF NOT vEntryFk THEN
-
+		
 			INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid)
 				SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE
 					FROM vn.supplier s
 						JOIN vn.company c ON c.code = 'VNL'
 						JOIN vn.currency cu ON cu.code = 'EUR'
 					WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-
-			SELECT MAX(id) INTO vEntryFk
+					
+			SELECT MAX(id) INTO vEntryFk 
 				FROM vn.entry
 				WHERE travelFk = vTravelFk;
-
+				
 		END IF;
+        
+	END IF;	
 
-	END IF;
-
-	SELECT entryFk INTO previousEntryFk
+	SELECT entryFk INTO previousEntryFk 
 		FROM edi.warehouseFloramondo wf
         	WHERE wf.warehouseFk = vWarehouseFk;
-
+    
 	IF IFNULL(previousEntryFk,0) != vEntryFk THEN
-
-		UPDATE buy b
-			SET b.printedStickers = 0
+		
+		UPDATE buy b 
+			SET b.printedStickers = 0 
 			WHERE entryFk = previousEntryFk;
 
 		DELETE FROM buy WHERE entryFk = previousEntryFk;
-
+        
 		DELETE FROM entry WHERE id = previousEntryFk;
-
+  
 	END IF;
-
+	
 	RETURN vEntryFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -45878,21 +46224,21 @@ BEGIN
 
 	SELECT IFNULL(a.isUeeMember, c.isUeeMember), c.id
 			INTO vIsUeeSupplier, vSupplierCountry
-		FROM entry e
-			JOIN supplier s ON s.id = e.supplierFk
-			JOIN country c ON c.id = s.countryFk
+		FROM entry e 
+			JOIN supplier s ON s.id = e.supplierFk 
+			JOIN country c ON c.id = s.countryFk  
 			LEFT JOIN province p ON p.id = s.provinceFk
 			LEFT JOIN autonomy a ON a.id = p.autonomyFk
 		WHERE e.id = vSelf;
-
+        
 	SELECT IFNULL(a.isUeeMember, c.isUeeMember), c.id
 			INTO vIsUeeCompany, vCompanyCountry
-		FROM entry e
-			JOIN supplier s ON s.id = e.companyFk
-			JOIN country c ON c.id = s.countryFk
+		FROM entry e 
+			JOIN supplier s ON s.id = e.companyFk 
+			JOIN country c ON c.id = s.countryFk  
 			LEFT JOIN province p ON p.id = s.provinceFk
 			LEFT JOIN autonomy a ON a.id = p.autonomyFk
-		WHERE e.id = vSelf;
+		WHERE e.id = vSelf;        
 
 
 	RETURN vIsUeeCompany AND vIsUeeSupplier AND (vSupplierCountry <> vCompanyCountry);
@@ -45957,17 +46303,17 @@ BEGIN
 	DECLARE vHasDistinctRoutes BOOL;
 
 	SELECT t.routeFk INTO vRouteFk
-		FROM vn.expedition e
+		FROM vn.expedition e 
 			JOIN vn.ticket t ON e.ticketFk = t.id
 		WHERE e.id = vExpeditionFk;
-
+	
 	SELECT COUNT(*) > 0 INTO vHasDistinctRoutes
 		FROM vn.expeditionScan es
 			JOIN vn.expedition e ON es.expeditionFk = e.id
 			JOIN vn.ticket t ON e.ticketFk = t.id
 				WHERE es.palletFk = vPalletFk
 				AND t.routeFk <> vRouteFk;
-
+		
 	RETURN vHasDistinctRoutes;
 
 END ;;
@@ -46028,27 +46374,27 @@ BEGIN
 	DECLARE vDeliveryType INTEGER DEFAULT 0;
 	DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE;
 	DECLARE vCode VARCHAR(45);
-
+		
 	SELECT am.deliveryMethodFk
-	INTO vDeliveryType
+	INTO vDeliveryType 
 		FROM ticket t
 			JOIN agencyMode am ON am.id = t.agencyModeFk
 	WHERE t.id = vTicket;
-
+		
 		CASE vDeliveryType
 			WHEN 1 THEN -- AGENCIAS
 				SET vCode = 'DELIVERED';
-
+					   
 			WHEN 2 THEN -- REPARTO
 				SET vCode = 'ON_DELIVERY';
-
+					
 			ELSE -- MERCADO, OTROS
 				SELECT MIN(t.warehouseFk <> w.id) INTO isWaitingForPickUp
-					FROM ticket t
+					FROM ticket t 
 						LEFT JOIN warehouse w
 							ON w.pickUpagencyModeFk = t.agencyModeFk
 					WHERE t.id = vTicket;
-
+						
 			IF isWaitingForPickUp THEN
 				SET vCode = 'WAITING_FOR_PICKUP';
 					ELSE
@@ -46078,28 +46424,28 @@ BEGIN
 	DECLARE vDeliveryType INTEGER DEFAULT 0;
 		DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE;
 		DECLARE vCode VARCHAR(45);
-
-	SELECT
+		
+	SELECT 
 		a.Vista
-	INTO vDeliveryType
+	INTO vDeliveryType 
 		FROM vn2008.Tickets t
 			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
 	WHERE Id_Ticket = vTicket;
-
+		
 		CASE vDeliveryType
 			WHEN 1 THEN -- AGENCIAS
 				SET vCode = 'DELIVERED';
-
+					   
 			WHEN 2 THEN -- REPARTO
 				SET vCode = 'ON_DELIVERY';
-
+					
 			ELSE -- MERCADO, OTROS
 				SELECT t.warehouse_id <> w.warehouse_id INTO isWaitingForPickUp
-					FROM vn2008.Tickets t
-						LEFT JOIN vn2008.warehouse_pickup w
+					FROM vn2008.Tickets t 
+						LEFT JOIN vn2008.warehouse_pickup w 
 							ON w.agency_id = t.Id_Agencia AND w.warehouse_id = t.warehouse_id
 					WHERE t.Id_Ticket = vTicket;
-
+						
 			IF isWaitingForPickUp THEN
 				SET vCode = 'WAITING_FOR_PICKUP';
 					ELSE
@@ -46153,8 +46499,8 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `getInventoryDate`() RETURNS date
     DETERMINISTIC
-BEGIN
-	RETURN vn2008.date_inv();
+BEGIN
+	RETURN (SELECT inventoried FROM config LIMIT 1);
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46207,16 +46553,16 @@ BEGIN
     DECLARE vReturn DATE;
 	DECLARE vDuaDate DATE;
 	DECLARE vDuaDateDay INT;
-
+	
 	SELECT TIMESTAMPADD(DAY, vGapDays, vDated) INTO vDuaDate;
 
 	IF vDuaDate = CONCAT(YEAR(vDuaDate), '-03-01') THEN
-			SET vDuaDate = TIMESTAMPADD (DAY , -1, vDuaDate);
+			SET vDuaDate = TIMESTAMPADD (DAY , -1, vDuaDate); 
 	ELSEIF vDuaDate = CONCAT(YEAR(vDuaDate), '-02-29') THEN
-			SET vDuaDate = TIMESTAMPADD (DAY , -2, vDuaDate);
+			SET vDuaDate = TIMESTAMPADD (DAY , -2, vDuaDate); 
 	END IF;
 
-	IF MONTH(vDuaDate) = 2 AND vPayDay = 30  THEN
+	IF MONTH(vDuaDate) = 2 AND vPayDay = 30  THEN 
 		IF util.isLeapYear(YEAR(vDuaDate)) THEN
 			SET vPayDay = 29;
 		ELSE
@@ -46224,7 +46570,7 @@ BEGIN
 		END IF;
 	END IF;
 
-	SELECT DAY(vDuaDate) INTO vDuaDateDay;
+	SELECT DAY(vDuaDate) INTO vDuaDateDay;   
 	RETURN TIMESTAMPADD(MONTH, (vDuaDateDay > vPayDay), DATE_FORMAT(vDuaDate, CONCAT('%y/%m/', vPayDay)));
 END ;;
 DELIMITER ;
@@ -46246,11 +46592,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `getShipmentHour`(vTicket INT) RETURN
     READS SQL DATA
 BEGIN
 	DECLARE vShipmentHour INT;
-
+    
     SELECT HOUR(shipped) INTO vShipmentHour
 		FROM ticket
 		WHERE id = vTicket;
-
+    
     IF vShipmentHour = 0
     THEN
  		DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer;
@@ -46265,11 +46611,11 @@ BEGIN
 				JOIN agencyMode am on am.id = t.agencyModeFk
 				JOIN address a on a.id = t.addressFk
 				WHERE t.id = vTicket;
-
-		SELECT Hora INTO vShipmentHour
+    
+		SELECT Hora INTO vShipmentHour 
 			FROM tmp.production_buffer;
     END IF;
-
+        
 	RETURN vShipmentHour;
 END ;;
 DELIMITER ;
@@ -46294,12 +46640,12 @@ BEGIN
 
 	SELECT rate3 INTO price
 		FROM vn.priceFixed
-		WHERE itemFk = vItemFk
+		WHERE itemFk = vItemFk 
 			AND util.VN_CURDATE() BETWEEN started AND ended ORDER BY created DESC LIMIT 1;
 
-	SELECT `value` INTO price
+	SELECT `value` INTO price 
 		FROM vn.specialPrice
-		WHERE itemFk =  vItemFk
+		WHERE itemFk =  vItemFk 
 			AND clientFk = vClientFk ;
 RETURN price;
 END ;;
@@ -46323,7 +46669,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `getTicketTrolleyLabelCount`(vTicket
 BEGIN
 	DECLARE vLabelCount INT DEFAULT 0;
 
-	SELECT labelCount INTO vLabelCount
+	SELECT labelCount INTO vLabelCount 
 		FROM ticketTrolley
 		WHERE ticket = vTicket;
 
@@ -46390,48 +46736,83 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP FUNCTION IF EXISTS `hasAnyNegativeBase` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `hasAnyNegativeBase`() RETURNS tinyint(1)
     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;
-	CREATE TEMPORARY TABLE tmp.ticket
-		(KEY (ticketFk))
-		ENGINE = MEMORY
-		SELECT id ticketFk
-			FROM tmp.ticketToInvoice;
+    CALL getTaxBases();
 
-	CALL ticket_getTax(NULL);
+	SELECT negative INTO hasAnyNegativeBase
+        FROM tmp.taxBases
+        LIMIT 1;
 
-	SELECT COUNT(*) INTO hasAnyNegativeBase
-		FROM(
-			SELECT SUM(taxableBase) as taxableBase
-				FROM tmp.ticketTax
-				GROUP BY pgcFk
-				HAVING taxableBase < 0
-			) t;
-
-	DROP TEMPORARY TABLE tmp.ticketTax;
-	DROP TEMPORARY TABLE tmp.ticket;
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
 
 	RETURN hasAnyNegativeBase;
 
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `hasAnyPositiveBase` */;
+/*!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_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `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 ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46453,17 +46834,17 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `hasItemsInSector`(vTicketFk INT, vSe
 BEGIN
 
 	DECLARE vItemCount INT;
-
+    
     SELECT count(*) INTO vItemCount
-		FROM vn.sale s
+		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
             JOIN vn.shelving sh ON sh.code = ish.shelvingFk
             JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;
-
+            
 	RETURN vItemCount;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46486,7 +46867,7 @@ BEGIN
 	DECLARE vCountry INT;
 	DECLARE hasSomeNegativeBase BOOLEAN;
 
-	SELECT s.countryFk
+	SELECT s.countryFk 
 			INTO vCountry
 		FROM supplier s
 			JOIN ticket t ON t.companyFk = s.id
@@ -46495,9 +46876,9 @@ BEGIN
 	SELECT COUNT(*) INTO hasSomeNegativeBase
 		FROM (
 			SELECT SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)) taxableBase
-				FROM sale s
+				FROM sale s 
 					JOIN item i ON i.id = s.itemFk
-					JOIN itemTaxCountry itc
+					JOIN itemTaxCountry itc 
 						ON itc.itemFk = i.id AND itc.countryFk = vCountry
 					WHERE s.ticketFk = vTicket
 				GROUP BY itc.taxClassFk
@@ -46527,12 +46908,12 @@ BEGIN
 	DECLARE totalAmount DECIMAL(10,2);
 
 	SELECT SUM(vat) INTO totalAmount
-		FROM (
+		FROM (	
 			SELECT iot.vat
 				FROM invoiceOutTax iot
 					JOIN invoiceOut io ON io.id = iot.invoiceOutFk
 				WHERE io.ref = vInvoiceRef
-			UNION ALL
+			UNION ALL 
 			SELECT ioe.amount
 				FROM invoiceOutExpense ioe
 					JOIN invoiceOut io ON io.id = ioe.invoiceOutFk
@@ -46563,23 +46944,23 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOut_getMaxIssued`(vSerial VAR
     READS SQL DATA
 BEGIN
 /**
- * Retorna la fecha a partir de la cual es válido emitir una factura
+ * Retorna la fecha a partir de la cual es válido emitir una factura 
  *
- * @param vSerial Serie de facturación
+ * @param vSerial Serie de facturación 
  * @param vCompanyFk Empresa factura emitida
  * @param vYear Año contable
  * @return vInvoiceOutIssued fecha factura válida
  */
 	DECLARE vInvoiceOutIssued DATE;
 	DECLARE vFirstDayOfYear DATE;
-
+	
 	SET vFirstDayOfYear := MAKEDATE(vYear, 1);
 
-	SELECT IFNULL(MAX(io.issued), vFirstDayOfYear) INTO vInvoiceOutIssued
+	SELECT IFNULL(MAX(io.issued), vFirstDayOfYear) INTO vInvoiceOutIssued 
 		FROM invoiceOut io
 		WHERE io.serial = vSerial
 			AND io.companyFk = vCompanyFk
-			AND io.issued BETWEEN vFirstDayOfYear
+			AND io.issued BETWEEN vFirstDayOfYear 
 				AND util.lastDayOfYear(vFirstDayOfYear);
 
 	RETURN vInvoiceOutIssued;
@@ -46605,7 +46986,7 @@ BEGIN
 	DECLARE vIssued DATE;
 	DECLARE vSerial VARCHAR(15);
 
-	SELECT issued, ref
+	SELECT issued, ref 
 		INTO vIssued, vSerial
 		FROM invoiceOut WHERE id = vSelf;
 
@@ -46677,9 +47058,9 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceSerial`(vClientFk INT, vCompa
     DETERMINISTIC
 BEGIN
 	/**
-	* Obtiene la serie de de una factura
+	* Obtiene la serie de de una factura 
 	* dependiendo del area del cliente.
-	*
+	* 
 	* @param vClientFk Id del cliente
 	* @param vCompanyFk Id de la empresa
 	* @param vType Tipo de factura ["R", "M", "G"]
@@ -46760,18 +47141,18 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `isLogifloraDay`(vShipped DATE, vWarehouse INT) RETURNS tinyint(1)
     DETERMINISTIC
 BEGIN
-
+		
 	DECLARE vIsLogifloraDay BOOLEAN;
 
 	SELECT COUNT(*) INTO vIsLogifloraDay
 			FROM edi.warehouseFloramondo wf
-				JOIN vn.floramondoConfig fc
+				JOIN vn.floramondoConfig fc 
 			WHERE wf.warehouseFk = vWarehouse
 				AND vShipped BETWEEN DATE(TIMESTAMPADD(DAY, wf.travellingDays , fc.nextLanded))
 					AND  DATE(TIMESTAMPADD(DAY, wf.travellingDays + wf.dayRange , fc.nextLanded));
-
+			
 	RETURN vIsLogifloraDay;
-
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46808,7 +47189,7 @@ BEGIN
 			WHERE sl.scan_id = vScanId
 				AND t.Id_Ruta
 		) t1;
-
+			
 	RETURN vDistinctRoutesInThePallet = 1;
 END ;;
 DELIMITER ;
@@ -46832,20 +47213,20 @@ BEGIN
 
 	DECLARE vPacking INTEGER DEFAULT 0;
     DECLARE vItemFk INTEGER;
-
+    
     SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
-    SELECT IFNULL(packing,0) INTO vPacking
-		FROM vn.buy
+    
+    SELECT IFNULL(packing,0) INTO vPacking 
+		FROM vn.buy 
         WHERE id = CAST(vBarcode AS DECIMAL(18,0));
-
-
-
-
+    
+    
+    
+    
     IF NOT vPacking THEN
 		CALL cache.last_buy_refresh(FALSE);
 		SELECT IFNULL(packing,1) INTO vPacking
-			FROM
+			FROM 
 			(SELECT packing , created
 				FROM vn.itemShelving
 				WHERE itemFk = vItemFk
@@ -46858,11 +47239,11 @@ BEGIN
 			) packings
 			ORDER BY created desc
 			LIMIT 1;
-
+	
     END IF;
-
+        
 	RETURN vPacking;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46887,11 +47268,11 @@ BEGIN
 	DECLARE vColumn INT;
     DECLARE vClosestParkingFk INT;
     DECLARE vSectorFk INT;
-
+    
 	SELECT p.column, sectorFk INTO vColumn, vSectorFk
 		FROM vn.parking p
         WHERE p.id = vParkingFk;
-
+    
     SELECT itemShelvingFk INTO vClosestParkingFk
 		FROM
 		(
@@ -46901,12 +47282,12 @@ BEGIN
                     JOIN vn.itemPlacementSupplyList ipsl ON ipsl.sectorFk = ispss.sectorFk AND ipsl.itemFk = ispss.itemFk
 				WHERE p.sectorFk = vSectorFk
 					AND ipsl.saldo > 0
-		) sub
+		) sub 
         ORDER BY distance
         LIMIT 1;
-
+            
 	RETURN vClosestParkingFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -46928,17 +47309,17 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `itemsInSector_get`(vTicketFk INT, vS
 BEGIN
 
 	DECLARE vItemCount INT;
-
+    
     SELECT count(*) INTO vItemCount
-		FROM vn.sale s
+		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
             JOIN vn.shelving sh ON sh.code = ish.shelvingFk
             JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;
-
+            
 	RETURN vItemCount;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47011,29 +47392,29 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `item_getPackage`(vItemFk INT) RETURNS varchar(50) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
     DETERMINISTIC
 BEGIN
-
+	
 		DECLARE vDiameter INT;
 		DECLARE vPackageFk VARCHAR(50);
 		DECLARE vCoeficient DOUBLE DEFAULT 1.08;
-
+	
 		SELECT MAX(LEFT(value,3)) INTO vDiameter
-			FROM vn.itemTag it
+			FROM vn.itemTag it 
 				JOIN vn.tag t ON t.id = it.tagFk
 			WHERE it.itemFk = vItemFk
 				AND t.overwrite = 'diameter';
-
+	
 		SELECT 8000 + FLOOR(vc.ccLength * vc.ccWidth / (vCoeficient * PI() * (vDiameter / 2) * (vDiameter / 2)))
 			INTO vPackageFk
 			FROM vn.volumeConfig vc;
-
+		
 		INSERT IGNORE INTO vn.packaging(id, width, `depth`)
-			SELECT vPackageFk,
-					FLOOR(vc.ccWidth / FLOOR(vc.ccWidth / vDiameter)),
+			SELECT vPackageFk, 
+					FLOOR(vc.ccWidth / FLOOR(vc.ccWidth / vDiameter)), 
 					FLOOR(vc.ccLength / FLOOR(vc.ccLength / vDiameter))
 			FROM vn.volumeConfig vc;
-
+			
 		RETURN vPackageFk;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47070,7 +47451,7 @@ BEGIN
 		FROM packaging p
 			JOIN item i ON i.id = vSelf
 		WHERE p.id = vPackaging;
-
+		
 	RETURN vVolume;
 
 END ;;
@@ -47091,7 +47472,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `lastDayOfWeek`(vYear INT, vWeek INT) RETURNS date
     DETERMINISTIC
-BEGIN
+BEGIN	
 /**
  * Returns the date of the last day of the week
  *
@@ -47130,16 +47511,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `machine_checkPlate`(vPlate VARCHAR(1
 BEGIN
 /**
  * Comprueba si existe matrícula
- *
+ * 
  * @param vPlate matrícula del vehículo
  * @return Devuelve TRUE en caso de que exista
- *
+ * 
  */
-
+	
 	IF (SELECT COUNT(*)
-			FROM machine m
+			FROM machine m 
 			WHERE m.plate = vPlate
-	   ) THEN
+	   ) THEN	
 		RETURN TRUE;
 	ELSE
 		RETURN FALSE;
@@ -47166,9 +47547,9 @@ BEGIN
 	DECLARE result INT;
 	DECLARE vSenderFk INT;
 
-	SELECT id INTO vSenderFk
+	SELECT id INTO vSenderFk 
 		FROM account.user WHERE `name` = account.myUser_getName();
-
+		
 	RETURN (SELECT messageSendWithUser(vSenderFk, vRecipient, vMessage));
 END ;;
 DELIMITER ;
@@ -47195,9 +47576,9 @@ BEGIN
 	DECLARE vSendDate DATETIME DEFAULT util.VN_NOW();
 	DECLARE vSender VARCHAR(255) CHARSET utf8;
 
-	SELECT `name` INTO vSender
+	SELECT `name` INTO vSender 
 		FROM account.user WHERE id = vSenderFK;
-
+        
 	SET vRecipient = LOWER(vRecipient);
 
 	DROP TEMPORARY TABLE IF EXISTS tRecipients;
@@ -47218,7 +47599,7 @@ BEGIN
 
 	IF vCount = 0 THEN
 		RETURN vCount;
-	END IF;
+	END IF;    
 
 	SET vUuid = UUID();
 
@@ -47229,7 +47610,7 @@ BEGIN
 			message = vMessage,
 			sendDate = vSendDate;
 
-	INSERT INTO messageInbox (uuid, sender, recipient, finalRecipient, message, sendDate)
+	INSERT INTO messageInbox (uuid, sender, recipient, finalRecipient, message, sendDate) 
 		SELECT vUuid, vSender, vRecipient, finalRecipient, vMessage, vSendDate
 			FROM tRecipients;
 
@@ -47303,7 +47684,7 @@ BEGIN
 	-- Devuelte el volumen total de la orden sumada
 	DECLARE vWarehouseId INTEGER;
 	DECLARE vVolume DECIMAL(10,3);
-
+ 
     SELECT IFNULL(SUM(o.amount * ic.cm3delivery)/1000000,0) INTO vVolume
 		FROM hedera.orderRow o
 			JOIN item i ON i.id = o.itemFk
@@ -47380,7 +47761,7 @@ BEGIN
 				WHERE cb.id = packagingReturnFk;
 
 		 SET vValue = IF (vAmount IS NULL,
-				IFNULL(base,0),
+				IFNULL(base,0), 
 				vAmount / IFNULL(upload, 0) + IFNULL(base, 0));
 	ELSE
 		SET vValue = IFNULL(price, 0) + IFNULL(base, 0);
@@ -47441,20 +47822,20 @@ BEGIN
 
 	DECLARE vRouteFk INT;
     DECLARE vAddressFk INT;
-
+    
     DECLARE vLanded DATE;
     DECLARE vZoneFk INT;
     DECLARE vSignificativeFriendship INT DEFAULT 6;
     DECLARE vVolumeMax DECIMAL(5,1) DEFAULT 10;
-
+    
     SELECT addressFk, zoneFk, landed INTO vAddressFk, vZoneFk, vLanded
-		FROM vn.ticket
+		FROM vn.ticket 
         WHERE id = vTicketFk;
-
+	
     -- Se inicia la selección de rutas posibles con aquellas cuyas agencias alguna vez han estado asociadas con nuestra zona
     DROP TEMPORARY TABLE IF EXISTS tmp.route;
 	CREATE TEMPORARY TABLE tmp.route
-		SELECT 	r.id routeFk,
+		SELECT 	r.id routeFk, 
 				zf.friendship zoneFriendship
 			FROM vn.route r
 				JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
@@ -47462,16 +47843,16 @@ BEGIN
 				AND zf.zoneFk = vZoneFk
                 AND r.created = vLanded
             ORDER BY friendship;
-
+	
     -- Se eliminan aquellas que superan el volumen máximo
     DELETE r.*
-		FROM tmp.route r
+		FROM tmp.route r 
 			JOIN (SELECT routeFk, sum(volume) volume
 					FROM vn.saleVolume
 						WHERE landed = vLanded
 					GROUP BY routeFk) sub ON sub.routeFk = r.routeFk
 			WHERE sub.volume > vVolumeMax;
-
+    
     -- Se ordenan las que quedan en función con la afinidad del resto de consignatarios de cada ruta
 	SELECT routeFk INTO vRouteFk
 		FROM
@@ -47483,7 +47864,7 @@ BEGIN
 				ORDER BY zoneFriendship DESC, friendshipSum DESC
         ) sub
         LIMIT 1;
-
+	
 	RETURN vRouteFk;
 END ;;
 DELIMITER ;
@@ -47508,9 +47889,9 @@ BEGIN
 	DECLARE vRouteFk INT;
     DECLARE vAddressFk INT;
     DECLARE vShipped DATETIME;
-
+    
     SELECT addressFk, date(shipped) INTO vAddressFk, vShipped
-		FROM vn.ticket
+		FROM vn.ticket 
         WHERE id = vTicketFk;
 
 	SELECT routeFk INTO vRouteFk
@@ -47524,7 +47905,7 @@ BEGIN
 				ORDER BY friendshipSum DESC
         ) sub
         LIMIT 1;
-
+	
 	RETURN vRouteFk;
 END ;;
 DELIMITER ;
@@ -47548,20 +47929,20 @@ BEGIN
 
 	DECLARE vRouteFk INT;
     DECLARE vAddressFk INT;
-
+    
     DECLARE vLanded DATE;
     DECLARE vZoneFk INT;
     DECLARE vSignificativeFriendship INT DEFAULT 6;
     DECLARE vVolumeMax DECIMAL(5,1) DEFAULT 10;
-
+    
     SELECT addressFk, zoneFk, landed INTO vAddressFk, vZoneFk, vLanded
-		FROM vn.ticket
+		FROM vn.ticket 
         WHERE id = vTicketFk;
-
+	
     -- Se inicia la selección de rutas posibles con aquellas cuyas agencias alguna vez han estado asociadas con nuestra zona
     DROP TEMPORARY TABLE IF EXISTS tmp.route;
 	CREATE TEMPORARY TABLE tmp.route
-		SELECT 	r.id routeFk,
+		SELECT 	r.id routeFk, 
 				zf.friendship zoneFriendship
 			FROM vn.route r
 				JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
@@ -47569,16 +47950,16 @@ BEGIN
 				AND zf.zoneFk = vZoneFk
                 AND r.created = vLanded
             ORDER BY friendship;
-
+	
     -- Se eliminan aquellas que superan el volumen máximo
     DELETE r.*
-		FROM tmp.route r
+		FROM tmp.route r 
 			JOIN (SELECT routeFk, sum(volume) volume
 					FROM vn.saleVolume
 						WHERE landed = vLanded
 					GROUP BY routeFk) sub ON sub.routeFk = r.routeFk
 			WHERE sub.volume > vVolumeMax;
-
+    
     -- Se ordenan las que quedan en función con la afinidad del resto de consignatarios de cada ruta
 	SELECT routeFk INTO vRouteFk
 		FROM
@@ -47590,7 +47971,7 @@ BEGIN
 				ORDER BY zoneFriendship DESC, friendshipSum DESC
         ) sub
         LIMIT 1;
-
+	
 	RETURN vRouteFk;
 END ;;
 DELIMITER ;
@@ -47611,26 +47992,26 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `specie_IsForbidden`(vItemFk INT, vAddressFk INT) RETURNS tinyint(1)
     READS SQL DATA
 BEGIN
-
+	
 	DECLARE vIsForbbiden BOOL;
 	DECLARE vLeft INT;
 
 	SELECT zg.lft INTO vLeft
-		FROM vn.address a
-			JOIN vn.zoneGeo zg ON zg.name = a.postalCode
+		FROM vn.address a 
+			JOIN vn.zoneGeo zg ON zg.name = a.postalCode 
 		WHERE a.id = vAddressFk;
-
+	
 	SELECT sgi.isForbidden INTO vIsForbbiden
-		FROM vn.specieGeoInvasive sgi
-			JOIN vn.zoneGeo zg ON zg.id = sgi.zoneGeofk
+		FROM vn.specieGeoInvasive sgi 
+			JOIN vn.zoneGeo zg ON zg.id = sgi.zoneGeofk 
 			JOIN vn.itemBotanical ib ON ib.genusFk = sgi.genusFk AND sgi.specieFk IN ('sp.',ib.specieFk)
 		WHERE vLeft BETWEEN zg.lft AND zg.rgt
 			AND ib.itemFk = vItemFk
-		ORDER BY zg.`depth` DESC
+		ORDER BY zg.`depth` DESC 
 		LIMIT 1;
 
 	RETURN IFNULL(vIsForbbiden, FALSE);
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47650,7 +48031,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `testCIF`(vCIF VARCHAR(9)) RETURNS varchar(10) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
     DETERMINISTIC
 BEGIN
-
+	
 	DECLARE vLetraInicial VARCHAR(1);
 	DECLARE vLetraFinal VARCHAR(1);
 	DECLARE vParteNumerica VARCHAR(7);
@@ -47662,60 +48043,60 @@ BEGIN
 	SET vLetraInicial = SUBSTR(vCIF, 1, 1);
 	SET vLetraFinal = SUBSTR(vCIF, 9, 1);
     SET vParteNumerica = SUBSTR(vCIF, 2, 7);
-
-    WHILE i < 7 DO
-
+ 
+    WHILE i < 7 DO   
+    
     	SET i = i + 1;
-
+    
     	SET vNumero = CAST(SUBSTR(vParteNumerica, i, 1) AS DECIMAL(1,0));
-
+    
     	IF i MOD 2 THEN
-
+    	
     		SET vNumero = vNumero * 2;
     		SET vNumero = vNumero MOD 10 + FLOOR(vNumero/10);
-
+    	
     	END IF;
-
+   	
     	SET vSuma = vSuma +  vNumero;
-
+    
     END WHILE;
-
+   
    	SET vSuma = vSuma MOD 10;
-
+   
    	IF vSuma > 0 THEN
-
+   	
     	SET vSuma = 10 - vSuma;
-
+   
     END IF;
-
+    
     -- Comprobación de dígito de control
     IF CAST(vLetraFinal AS DECIMAL(1,0)) = vSuma THEN
-
+    
     	SET vResult = TRUE;
-
+    
     END IF;
-
+   
    	IF vSuma = 0 THEN
-
+   	
    		SET vSuma = 10;
-
+   	
    	END IF;
-
+   
    	IF  CHAR(64 + vSuma) = vLetraFinal THEN
-
+    
     	SET vResult = TRUE;
-
+    
     END IF;
-
+      
     -- Sólo se aceptan letras como caracter inicial
     IF ASCII(vLetraInicial) < 65 OR ASCII(vLetraInicial) > 87 THEN  -- Ha de ser entre la A y la W
-
+    
     	SET vResult = FALSE;
-
+    
     END IF;
-
+   
     RETURN vResult;
-
+   
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47735,7 +48116,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `testNIE`(vNIE VARCHAR(9)) RETURNS tinyint(1)
     DETERMINISTIC
 BEGIN
-
+	
 	DECLARE vIndice INT;
 	DECLARE vNumero VARCHAR(7);
 	DECLARE vOperador VARCHAR(9);
@@ -47744,45 +48125,45 @@ BEGIN
 	DECLARE vLetraFinal VARCHAR(1);
 	DECLARE vLetrasFinalesPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
 	DECLARE vLetraInicialEsIncorrecta BOOL DEFAULT FALSE;
-
+	 
 	SET vLetraInicial = SUBSTR(vNIE, 1, 1);
 	SET vLetraFinal = SUBSTR(vNIE, 9, 1);
 	SET vNumero = SUBSTR(vNIE, 2, 7);
 
  	CASE vLetraInicial
-
+    
 	   WHEN 'X' THEN
-
+	   
 	        SET vOperador = "0";
-
+	        
 	   WHEN 'Y' THEN
-
+	   
 	        SET vOperador = "1";
-
+	        
 	   WHEN 'Z' THEN
-
+	   
 	        SET vOperador = "2";
-
+	       
 	   ELSE
-
+	   
 	   		SET vLetraInicialEsIncorrecta = TRUE;
-
+    
    	END CASE;
-
+    
    	SET vOperador = CONCAT(vOperador, vNumero);
     SET vParteNumerica = CAST(vOperador AS DECIMAL(8,0));
     SET vIndice = Round(vParteNumerica Mod 23, 0) + 1;
 
    	IF SUBSTR(vLetrasFinalesPosibles, vIndice, 1) = vLetraFinal AND vLetraInicialEsIncorrecta = FALSE THEN
-
+    
    		RETURN TRUE;
-
+   	
    	ELSE
-
+   	
    		RETURN FALSE;
-
+   	
    	END IF;
-
+   
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47807,23 +48188,23 @@ BEGIN
  	DECLARE vParteNumerica DECIMAL(8,0);
  	DECLARE vLetra VARCHAR(1);
  	DECLARE vLetrasPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
-
+ 
     SET vLetra = SUBSTRING(vNIF, 9, 1);
-
+   
    	SET vParteNumerica = CAST(SUBSTRING(vNIF, 1, 8) AS DECIMAL(8,0));
-
+   
     SET vIndice = Round(vParteNumerica MOD 23, 0) + 1;
-
+    
     If SUBSTRING(vLetrasPosibles, vIndice, 1) = vLetra Then
-
+       
         RETURN TRUE;
-
+       
     ELSE
-
+        
 		RETURN FALSE;
-
+    
     END IF;
-
+   
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47843,21 +48224,21 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `ticketCollection_getNoPacked`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
     DETERMINISTIC
 BEGIN
-
+	
 	/*
 	 * return message with tickets and collection if there is tickets of a collection without expeditions
-	 *
+	 * 
 	 * @param vCollectionFk the collection to check
 	 * @return an array with collection and tickets without expeditions
-	 *
+	 * 
 	 */
-
+	
 	DECLARE vAnswer VARCHAR(100) DEFAULT '';
 
 	IF collection_isPacked(vCollectionFk) = FALSE THEN
 		SELECT CONCAT('Colección: ',tc.collectionFk,'  Tickets: ' , GROUP_CONCAT(tc.ticketFk) ) INTO vAnswer
 			FROM vn.ticketCollection tc
-				LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+				LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk 
 			WHERE tc.collectionFk = vCollectionFk
 				AND ISNULL(e.id);
 	END IF;
@@ -47903,9 +48284,9 @@ BEGIN
 	DROP TEMPORARY TABLE
 		tmp.ticket,
 		tmp.ticketTotal;
-
+	
 	RETURN vTotal;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -47925,7 +48306,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `ticketPositionInPath`(vTicketId INT) RETURNS varchar(10) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
     DETERMINISTIC
 BEGIN
-
+	
  DECLARE vRestTicketsMaxOrder INT;
  DECLARE vRestTicketsMinOrder INT;
  DECLARE vRestTicketsPacking INT;
@@ -47937,7 +48318,7 @@ BEGIN
  DECLARE vExpeditionsCount INT;
  DECLARE vIsValenciaPath BOOLEAN DEFAULT FALSE;
 
-SELECT `order`
+SELECT `order` 
  INTO PACKING_ORDER
   FROM state
   WHERE code = 'PACKING';
@@ -47945,10 +48326,10 @@ SELECT `order`
 SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)
  INTO vMyPath, vMyWarehouse, vMyProductionOrder
   FROM ticket t
-   LEFT JOIN ticketState ts on ts.ticket = t.id
+   LEFT JOIN ticketState ts on ts.ticketFk = t.id
   WHERE t.id = vTicketId;
 
-SELECT (ag.`name` = 'VN_VALENCIA')
+SELECT (ag.`name` = 'VN_VALENCIA') 
  INTO vIsValenciaPath
   FROM vn2008.Rutas r
    JOIN vn2008.Agencias a on a.Id_Agencia = r.Id_Agencia
@@ -47962,19 +48343,19 @@ IF vIsValenciaPath THEN -- Rutas Valencia
    FROM expedition e
     JOIN ticket t ON t.id = e.ticketFk
    WHERE t.routeFk = vMyPath;
-
+   
  SELECT MAX(ts.productionOrder), MIN(ts.productionOrder)
   INTO vRestTicketsMaxOrder, vRestTicketsMinOrder
    FROM ticket t
-    LEFT JOIN ticketState ts on t.id = ts.ticket
+    LEFT JOIN ticketState ts on t.id = ts.ticketFk
    WHERE t.routeFk = vMyPath
     AND t.warehouseFk = vMyWarehouse
     AND t.id != vTicketid;
 
- SELECT COUNT(*)
+ SELECT COUNT(*) 
   INTO vRestTicketsPacking
    FROM ticket t
-    LEFT JOIN ticketState ts on t.id = ts.ticket
+    LEFT JOIN ticketState ts on t.id = ts.ticketFk
    WHERE ts.productionOrder = PACKING_ORDER
     AND t.routeFk = vMyPath
     AND t.warehouseFk = vMyWarehouse
@@ -48026,9 +48407,9 @@ BEGIN
 					LEFT JOIN vn2008.movement_label l ON l.Id_Movimiento = s.id
 				WHERE ticketFk = vTicketFk
 		) sub;
-
+        
 	RETURN IFNULL(vSplitCounter,'--');
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48077,21 +48458,21 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ticketTotalVolumeBoxes`(vTicketId IN
     DETERMINISTIC
 BEGIN
 
-/*
+/* 
  *  Devuelve el volumen estimado del ticket sumado, en cajas
  *
  *	vTicketId Numero de ticket
- *
+ *	
  */
 
 	DECLARE vVolumeBoxM3 DOUBLE;
     DECLARE vTicketTotalVolumeBoxes DECIMAL(10,1);
     DECLARE vVnBoxId VARCHAR(10) DEFAULT '94';
-
+    
     SELECT volume / 1000000 INTO vVolumeBoxM3 FROM packaging WHERE id = vVnBoxId;
-
+    
     SET vTicketTotalVolumeBoxes = ticketTotalVolume(vTicketId) / vVolumeBoxM3;
-
+    
     RETURN vTicketTotalVolumeBoxes;
 
 END ;;
@@ -48116,7 +48497,7 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 
 	SELECT warehouseFk INTO vWarehouseFk
-		FROM ticket
+		FROM ticket 
 		WHERE id = vTicketFk;
 
 	RETURN vWarehouseFk;
@@ -48139,18 +48520,18 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_CC_volume`(vTicketFk INT) RETURNS decimal(10,1)
     READS SQL DATA
 BEGIN
-
+	
 	DECLARE vCC DECIMAL(10,1);
 
 	SELECT sum(sv.volume * IF(i.itemPackingTypeFk = 'H', vc.dutchCompressionRate, 1)) / (p.volume / 1000000)
 		INTO vCC
-		FROM vn.saleVolume sv
-			JOIN vn.sale s ON s.id = sv.saleFk
-			JOIN vn.item i ON i.id = s.itemFk
+		FROM vn.saleVolume sv 
+			JOIN vn.sale s ON s.id = sv.saleFk 
+			JOIN vn.item i ON i.id = s.itemFk 
 			JOIN vn.packaging p ON p.id = 'CC'
-			JOIN vn.volumeConfig vc
+			JOIN vn.volumeConfig vc 
 		WHERE sv.ticketFk = vTicketFk;
-
+	
 	RETURN vCC;
 
 END ;;
@@ -48172,44 +48553,44 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_get`(vParamFk INT) RETURNS int(11)
     READS SQL DATA
 proc:BEGIN
-
+	
 	/* Devuelve el número de ticket o collection consultando en varias tablas posibles
-	 *
+	 * 
 	 * @param vParamFk Número a validar
 	 * @return vValidFk Identificador validado
 	 */
-
+	
 	DECLARE vValidFk INT;
 
 	-- Tabla vn.saleGroup
 	SELECT s.ticketFk INTO vValidFk
 		FROM vn.sale s
 			JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
-			JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
+			JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk 
 		WHERE sg.id = vParamFk
 			AND sg.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE())
 		LIMIT 1;
-
+	
 	IF vValidFk THEN
-
+	
 		RETURN vValidFk;
-
+	
 		LEAVE proc;
-
+	
 	END IF;
 
 	-- Tabla vn.collection
 	SELECT c.id INTO vValidFk
-		FROM vn.collection c
+		FROM vn.collection c 
 		WHERE c.id = vParamFk
 			AND c.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE());
-
+	
 	IF vValidFk THEN
-
+	
 		RETURN vValidFk;
-
+	
 		LEAVE proc;
-
+	
 	END IF;
 
 	-- Tabla vn.ticket
@@ -48217,17 +48598,17 @@ proc:BEGIN
 		FROM vn.ticket t
 		WHERE t.id = vParamFk
 			AND t.shipped > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE());
-
+	
 	IF vValidFk THEN
-
+	
 		RETURN vValidFk;
-
+	
 		LEAVE proc;
-
+	
 	END IF;
 
 	RETURN NULL;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48253,8 +48634,8 @@ BEGIN
  * @vTicketFk Id del ticket a calcular
  */
 	DECLARE deliveryPrice DECIMAL (10,2);
-
-	IF (SELECT isVolumetric FROM ticket t JOIN zone z ON t.zoneFk = z.id
+    
+	IF (SELECT isVolumetric FROM ticket t JOIN zone z ON t.zoneFk = z.id 
 			WHERE t.id = vTicketFk) THEN
 		SELECT SUM(sv.freight) INTO deliveryPrice
 			FROM vn.saleVolume sv
@@ -48265,7 +48646,7 @@ BEGIN
 				LEFT JOIN expedition e ON e.ticketFk = t.id
 				JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 			WHERE t.id = vTicketFk;
-
+		
 	END IF;
 	RETURN deliveryPrice;
 END ;;
@@ -48289,16 +48670,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_getWeight`(vTicketFk INT) RET
 BEGIN
 /**
  * Devuelve el peso total del ticket
- *
+ * 
  * @return Total peso
  */
-
+	
 	DECLARE vWeight DECIMAL(10,3);
 
     SELECT sum(weight) INTO vWeight
 		FROM saleVolume
 		WHERE ticketFk = vTicketFk;
-
+	
     RETURN vWeight;
 
 END ;;
@@ -48320,15 +48701,15 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_HasUbication`(vTicketFk INT) RETURNS tinyint(1)
     READS SQL DATA
 BEGIN
-
+	
 	DECLARE hasUbication BOOL;
 
 	SELECT COUNT(*) INTO hasUbication
 		FROM vn.ticket t
 			JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-		WHERE rm.beachFk
+		WHERE rm.beachFk 
 			AND t.id = vTicketFk;
-
+	
 	RETURN hasUbication;
 
 END ;;
@@ -48477,7 +48858,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `timeWorkerControl_getDirection`(vUse
     READS SQL DATA
 BEGIN
 /**
- * Verifica la dirección de la fichada
+ * Verifica la dirección de la fichada 
  * @param vUserFk Identificador del trabajador
  * @param vTimed Hora de la fichada
  * @return Retorna sentido de la fichada 'in, out, middle'
@@ -48490,40 +48871,40 @@ BEGIN
     DECLARE vDayStayMax INT;
     DECLARE vTimedSeconds INT;
     DECLARE vLastTimeIn INT;
-
+	
     SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds;
-
+    
     SELECT dayStayMax INTO vDayStayMax
 		FROM vn.workerTimeControlParams;
 
     SELECT timed, direction INTO vNext,vNextDirection
-		FROM vn.workerTimeControl
-        WHERE userFk = vUserFk
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
 			AND direction IN ('in','out')
             AND timed > vTimed
 		ORDER BY timed ASC
         LIMIT 1;
-
+        
     SELECT timed, direction INTO vPrevious, vPreviousDirection
-		FROM vn.workerTimeControl
-        WHERE userFk = vUserFk
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
 			AND direction IN ('in','out')
             AND timed < vTimed
 		ORDER BY timed DESC
-        LIMIT 1;
-
-    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN
+        LIMIT 1;   
+	
+    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN 
 		RETURN 'middle';
 	END IF;
-
-
+    
+    
     IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN
-		IF vPreviousDirection = 'in' THEN
+		IF vPreviousDirection = 'in' THEN 
 			RETURN 'out';
 		ELSE
 			SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn
-				FROM vn.workerTimeControl
-				WHERE userFk = vUserFk
+				FROM vn.workerTimeControl 
+				WHERE userFk = vUserFk 
 					AND direction ='in'
 					AND timed < vPrevious;
 			IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN
@@ -48577,11 +48958,11 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `travel_getForLogiflora`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
     READS SQL DATA
 BEGIN
-
+	
 	/**
 	 * Devuelve un número de travel para compras de Logiflora a partir de la fecha de llegada y del almacén.
 	 * Si no existe lo genera.
-	 *
+	 * 
 	 * @param vLanded Fecha de llegada al almacén
 	 * @param vWarehouseFk Identificador de vn.warehouse
 	 */
@@ -48589,8 +48970,8 @@ BEGIN
 	DECLARE vTravelFk INT;
 
 	IF vLanded THEN
-
-		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
+	
+		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk 
 			FROM vn.travel tr
 				JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
 				JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
@@ -48601,14 +48982,14 @@ BEGIN
 				AND landed = vLanded;
 
 		IF NOT vTravelFk THEN
-
+		
 			INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
-				SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id
-					FROM vn.warehouse wOut
+				SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id 
+					FROM vn.warehouse wOut 
 						JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
 					WHERE wOut.name = 'Holanda';
-
-			SELECT MAX(tr.id) INTO vTravelFk
+					
+			SELECT MAX(tr.id) INTO vTravelFk 
 				FROM vn.travel tr
 					JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
 					JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
@@ -48616,11 +48997,11 @@ BEGIN
 							AND wOut.name = 'Holanda'
 							AND landed = vLanded;
 		END IF;
-
+        
 	END IF;
-
+    
 	RETURN vTravelFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48647,21 +49028,21 @@ BEGIN
 	DECLARE vChar INT;
 
 	SET vLength = length(vString);
-
+    
     WHILE vLength > 0 DO
-
+    
 		SET vChar = MID(vString,vLength,1);
-
+        
 		SET vSeed = vSeed + ASCII(vChar);
-
+        
 		SET vLength = vLength - 1;
-
+    
     END WHILE;
 
 	SET vCode = FLOOR(SQRT(vSeed)*1000000) mod 1000;
 
 	RETURN vCode;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48688,21 +49069,21 @@ BEGIN
 	DECLARE vChar INT;
 
 	SET vLength = length(vString);
-
+    
     WHILE vLength > 0 DO
-
+    
 		SET vChar = MID(vString,vLength,1);
-
+        
 		SET vSeed = vSeed + ASCII(vChar);
-
+        
 		SET vLength = vLength - 1;
-
+    
     END WHILE;
 
 	SET vCode = FLOOR(SQRT(vSeed)*1000000) mod 1000;
 
 	RETURN vCode;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48763,15 +49144,15 @@ BEGIN
  * @param vTimeOut
  * @return vNigthlyHours
  */
-	DECLARE vNigthlyHours DECIMAL(5,2);
+	DECLARE vNigthlyHours DECIMAL(5,2); 
 	DECLARE vSecondsPerHour INT(4) DEFAULT 3600;
-
+	
 	SELECT GREATEST(0, TIMESTAMPDIFF(SECOND,
-				IF(TIME(vTimeIn) BETWEEN endNightlyHours AND startNightlyHours,
-						CONCAT(DATE(vTimeIn), ' ', startNightlyHours),
+				IF(TIME(vTimeIn) BETWEEN endNightlyHours AND startNightlyHours, 
+						CONCAT(DATE(vTimeIn), ' ', startNightlyHours), 
 						vTimeIn),
-				IF(TIME(vTimeOut) BETWEEN endNightlyHours AND startNightlyHours,
-						CONCAT(DATE(vTimeOut), ' ', endNightlyHours),
+				IF(TIME(vTimeOut) BETWEEN endNightlyHours AND startNightlyHours, 
+						CONCAT(DATE(vTimeOut), ' ', endNightlyHours), 
 						vTimeOut))) / vSecondsPerHour INTO vNigthlyHours
 		FROM vn.workerTimeControlConfig;
 
@@ -48803,47 +49184,47 @@ BEGIN
 
     SELECT dayStayMax INTO vDayStayMax
 		FROM workerTimeControlParams;
-
+        
     SELECT timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection;
 
 	IF vDirection = 'out' THEN
-
+	
 		SELECT MAX(timed) INTO vLastIn
-			FROM workerTimeControl
-			WHERE userFk = vUserFk
+			FROM workerTimeControl 
+			WHERE userFk = vUserFk 
 				AND direction = 'in'
 				AND timed < vTimed;
-
+	
 		UPDATE  workerTimeControl wtc
 			SET wtc.direction = 'middle'
 			WHERE userFk = vUserFk
 				AND direction = 'out'
 				AND timed BETWEEN vLastIn AND vTimed;
-
+	
 	ELSE IF vDirection = 'in' THEN
-
-            SELECT COUNT(*) INTO vHasDirectionOut
+			
+            SELECT COUNT(*) INTO vHasDirectionOut 
 				FROM workerTimeControl wtc
-				WHERE userFk = vUserFk
+				WHERE userFk = vUserFk 
 					AND direction = 'out'
-					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);          
 
 			UPDATE  workerTimeControl wtc
 				SET wtc.direction = IF (vHasDirectionOut,'middle','out')
 				WHERE userFk = vUserFk
 					AND direction = 'in'
-					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);  
 
 		 END IF;
      END IF;
-
+	
 	INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual)
 		VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual);
-
+        
 	SET vLastInsertedId = LAST_INSERT_ID();
-
+    
     CALL workerTimeControlSOWP(vUserFk, vTimed);
-
+    
 	RETURN vLastInsertedId;
 END ;;
 DELIMITER ;
@@ -48872,47 +49253,47 @@ BEGIN
 
     SELECT dayStayMax INTO vDayStayMax
 		FROM workerTimeControlParams;
-
+        
     SELECT timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection;
 
 	IF vDirection = 'out' THEN
-
+	
 		SELECT MAX(timed) INTO vLastIn
-			FROM workerTimeControl
-			WHERE userFk = vUserFk
+			FROM workerTimeControl 
+			WHERE userFk = vUserFk 
 				AND direction = 'in'
 				AND timed < vTimed;
-
+	
 		UPDATE  workerTimeControl wtc
 			SET wtc.direction = 'middle'
 			WHERE userFk = vUserFk
 				AND direction = 'out'
 				AND timed BETWEEN vLastIn AND vTimed;
-
+	
 	ELSE IF vDirection = 'in' THEN
-
-            SELECT COUNT(*) INTO vHasDirectionOut
+			
+            SELECT COUNT(*) INTO vHasDirectionOut 
 				FROM workerTimeControl wtc
-				WHERE userFk = vUserFk
+				WHERE userFk = vUserFk 
 					AND direction = 'out'
-					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);          
 
 			UPDATE  workerTimeControl wtc
 				SET wtc.direction = IF (vHasDirectionOut,'middle','out')
 				WHERE userFk = vUserFk
 					AND direction = 'in'
-					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);  
 
 		 END IF;
      END IF;
-
+	
 	INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual)
 		VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual);
-
+        
 	SET vLastInsertedId = LAST_INSERT_ID();
-
+    
     CALL workerTimeControlSOWP(vUserFk, vTimed);
-
+    
 	RETURN vLastInsertedId;
 END ;;
 DELIMITER ;
@@ -49006,6 +49387,45 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `worker_isInDepartment` */;
+/*!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_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `worker_isInDepartment`(vDepartmentCode VARCHAR(255)) RETURNS int(11)
+    DETERMINISTIC
+BEGIN
+/**
+ * Devuelve booleano si el trabajador conectado pertenece
+ * al departamento vDepartmentCode o a sus departamentos subordinados
+ *
+ * @param vDepartmentCode code del departamento que se desea comprobar.
+ * @return Devuelve verdadero si es jefe del empleado por escala jerárquica.
+ */
+	DECLARE vIsInDepartment BOOLEAN;
+	WITH RECURSIVE department AS (
+		SELECT d.id FROM vn.department d WHERE code = vDepartmentCode
+			UNION
+		SELECT d.id
+			FROM department ds
+				JOIN vn.department d ON ds.id = d.parentFk
+		)
+		SELECT COUNT(*) INTO vIsInDepartment FROM department ds
+			JOIN vn.workerDepartment wd ON wd.departmentFk = ds.id
+			WHERE wd.workerFk = account.myUser_getId();
+
+	RETURN vIsInDepartment;
+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_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP FUNCTION IF EXISTS `worker_isWorking` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -49023,17 +49443,17 @@ BEGIN
  * @return Devuelve TRUE en caso de que este trabajando. Si se encuentra en un descanso devolverá FALSE
  */
 	DECLARE vLastIn DATETIME ;
-
+	
 	SELECT MAX(timed) INTO vLastIn
-		FROM vn.workerTimeControl
+		FROM vn.workerTimeControl 
 		WHERE userFk = vWorkerFk AND
 		      direction = 'in';
 
-	IF (SELECT MOD(COUNT(*),2)
-			FROM vn.workerTimeControl
-			WHERE userFk = vWorkerFk AND
+	IF (SELECT MOD(COUNT(*),2) 						
+			FROM vn.workerTimeControl 
+			WHERE userFk = vWorkerFk AND 
                   timed >= vLastIn
-	   ) THEN
+	   ) THEN	
 		RETURN TRUE;
 	ELSE
 		RETURN FALSE;
@@ -49127,7 +49547,7 @@ BEGIN
 		SET `type` = vType,
 			`name` = vName,
 			parentFk = vParentFk;
-
+            
 	SET vSelf = LAST_INSERT_ID();
 
 	UPDATE zoneGeoRecalc SET isChanged = TRUE;
@@ -49151,7 +49571,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `addNoteFromDelivery`(idTicket INT,nota TEXT)
 BEGIN
-
+	
 	DECLARE observationTypeFk INT DEFAULT 3; /*3 = REPARTIDOR*/
 
 	INSERT INTO ticketObservation(ticketFk,observationTypeFk,description)
@@ -49179,23 +49599,23 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `addressTaxArea`()
     READS SQL DATA
 BEGIN
 /**
- * Devuelve el taxArea para un conjunto de Consignatarios y empresas,
+ * Devuelve el taxArea para un conjunto de Consignatarios y empresas, 
  *
  * @table tmp.addressCompany(addressFk, companyFk) valores a calcular
  * @return tmp.addressTaxArea(addressFk,companyFk)
  */
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea;
 	CREATE TEMPORARY TABLE tmp.addressTaxArea
 		(PRIMARY KEY (addressFk, companyFk))
 		ENGINE = MEMORY
-		SELECT CASE
-			WHEN (NOT IFNULL(auClient.isUeeMember, cClient.isUeeMember) OR NOT cSupplier.isUeeMember)
-					AND NOT (auSupplier.id <=> auClient.id) THEN
+		SELECT CASE 
+			WHEN (NOT IFNULL(auClient.isUeeMember, cClient.isUeeMember) OR NOT cSupplier.isUeeMember) 
+					AND NOT (auSupplier.id <=> auClient.id) THEN 
 				'WORLD'
-			WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.isVies THEN
+			WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.isVies THEN 
 				'CEE'
-			WHEN a.isEqualizated AND cClient.code = 'ES' THEN
+			WHEN a.isEqualizated AND cClient.code = 'ES' THEN 
 				'EQU'
 			ELSE
 				'NATIONAL'
@@ -49236,27 +49656,27 @@ BEGIN
 * @param vAddress id de la direccion
 * @param vWarehouse id del warehouse
 * @return vShipped la primera fecha disponible y vLanded la fecha de llegada/recojida
-*/
+*/    
 DECLARE vAgency INT;
 DECLARE vShipped DATE;
 DECLARE vLanded DATE DEFAULT util.VN_CURDATE();
 	SELECT agencyFk INTO vAgency FROM agencyMode WHERE id= vAgencyMode;
 
 	l: LOOP
-
+    
 		CALL agencyHourGetShipped(vLanded,vAddress,vAgency);
-        SELECT shipped INTO vShipped
+        SELECT shipped INTO vShipped 
 			FROM tmp.agencyHourGetShipped
 			WHERE warehouseFk = vWarehouse LIMIT 1;
-
+	
 	IF vShipped THEN
 		LEAVE l;
 	END IF;
-
+    
     SET vLanded = DATE_ADD(vLanded, INTERVAL +1 DAY);
-
+    
 	END LOOP;
-
+    
     SELECT vShipped,vLanded;
 END ;;
 DELIMITER ;
@@ -49307,7 +49727,7 @@ BEGIN
             LIMIT 1
         ) t
         WHERE IF(vDated = util.VN_CURDATE(), t.maxHour > HOUR(util.VN_NOW()), TRUE) AND t.substractDay < 225;
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -49330,14 +49750,14 @@ BEGIN
   * DEPRECATED usar zoneGetWarehouse
  * Devuelve el listado de agencias disponibles para la fecha,
  * dirección y warehouuse pasadas
- *
+ * 
  * @param vAddress no puede ser NULL
  *  @param vWarehouse warehouse donde comprobaremos las agencias y fecha
  * @param vDate Fecha de recogida
  * @table agencyModeWarehouseList Listado de agencias disponibles
  */
 	DECLARE vAgency INT;
-	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vDone BOOL DEFAULT FALSE;    
 	DECLARE vCur CURSOR FOR
 		SELECT DISTINCT a.id
 			FROM agency a
@@ -49361,13 +49781,13 @@ BEGIN
 		PRIMARY KEY(id)
 	)
 	ENGINE = MEMORY;
-
+  
 	OPEN vCur;
 	FETCH vCur INTO vAgency;
 
 	WHILE NOT vDone
 	DO
-
+	
 		INSERT INTO tmp.agencyModeWarehouseList
 			SELECT am.id, am.name, am.description,am.deliveryMethodFk, TIMESTAMPADD(DAY, -ah.substractDay, vDate), w.name
 						FROM agencyHour ah
@@ -49396,7 +49816,7 @@ BEGIN
 	END WHILE;
 
 	CLOSE vCur;
-
+    
 	SELECT * FROM tmp.agencyModeWarehouseList;
 	DROP TEMPORARY TABLE tmp.agencyModeWarehouseList;
 END ;;
@@ -49422,9 +49842,9 @@ BEGIN
 	CALL vn.agencyHourGetShipped(vDate, vAddress, vAgency);
 
 	SELECT * FROM tmp.agencyHourGetShipped;
-
+    
    DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -49462,7 +49882,7 @@ BEGIN
 
 	DECLARE cWarehouses CURSOR FOR
 		SELECT warehouseFk, shipped FROM tmp.zoneGetShipped;
-
+			
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
 		SET vDone = TRUE;
 
@@ -49471,7 +49891,7 @@ BEGIN
 	CALL vn.zone_getShipped (vDate, vAddress, vAgencyMode, FALSE);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.availableCalc;
-	CREATE TEMPORARY TABLE tmp.availableCalc(
+	CREATE TEMPORARY TABLE tmp.availableCalc(	
 		calcFk INT UNSIGNED,
 		PRIMARY KEY (calcFk)
 	)
@@ -49482,7 +49902,7 @@ BEGIN
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH cWarehouses INTO vWarehouse, vShipment;
-
+		
 		IF vDone THEN
 			LEAVE l;
 		END IF;
@@ -49515,7 +49935,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `bankEntity_checkBic`(vBic VARCHAR(2
 BEGIN
 	/**
 	 * If the bic length is Incorrect throw exception
-	 *
+	 * 
 	 * @param vBic bic code
 	 */
 
@@ -49523,7 +49943,7 @@ BEGIN
 
 	SELECT bicLength INTO vConfigBicLenght
 		FROM vn.bankEntityConfig bec;
-
+	
 	IF LENGTH(vBic) <> vConfigBicLenght THEN
 		CALL util.throw(CONCAT('bic must be of length ', vConfigBicLenght ));
 	END IF;
@@ -49550,14 +49970,14 @@ BEGIN
 * Manda correo cuando caduca un seguro
 * de los leasing
 *
-*/
+*/ 
 	INSERT INTO mail (receiver,replyTo,subject,body)
 		SELECT 'administracion@verdnatura.es' receiver,
 				'noreply@verdnatura.es' replyTo,
 				CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') subject,
 				CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') body
-			FROM  vn.bankPolicy bp
-				LEFT JOIN vn.supplier s
+			FROM  vn.bankPolicy bp 
+				LEFT JOIN vn.supplier s 
 					ON s.id = bp.supplierFk
 				LEFT JOIN vn.bank b
 					ON b.id = bp.bankFk
@@ -49786,19 +50206,19 @@ BEGIN
 	DECLARE vIsFeedStock BOOL;
 	DECLARE vWeight DECIMAL(10,2);
 	DECLARE vPacking INT;
-
-	SELECT b.entryFk,
-			b.itemFk,
-			i.packingOut,
-			ic.merchandise,
+   
+	SELECT b.entryFk, 
+			b.itemFk, 
+			i.packingOut, 
+			ic.merchandise, 
 			vc.standardFlowerBox,
 			b.weight,
-			b.packing
-		INTO
-			vEntryFk,
-			vItemFk,
-			vPackingOut,
-			vIsMerchandise,
+			b.packing 
+		INTO 
+			vEntryFk, 
+			vItemFk, 
+			vPackingOut, 
+			vIsMerchandise, 
 			vStandardFlowerBox,
 			vWeight,
 			vPacking
@@ -49806,7 +50226,7 @@ BEGIN
 			LEFT JOIN item i ON i.id = b.itemFk
 			LEFT JOIN itemType it ON it.id = i.typeFk
 			LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-			LEFT JOIN packaging p ON p.id = b.packagingFk AND NOT p.isBox
+			LEFT JOIN packaging p ON p.id = b.packagingFk AND NOT p.isBox 
 			JOIN volumeConfig vc ON TRUE
 		WHERE b.id = vSelf;
 
@@ -49823,7 +50243,7 @@ BEGIN
 			warehouseFk = vWarehouse,
 			cm3 = buy_getUnitVolume(vSelf),
 			cm3Delivery = IFNULL((vStandardFlowerBox * 1000) / vPackingOut, buy_getUnitVolume(vSelf));
-
+		
 		IF vWeight AND vPacking THEN
 			UPDATE itemCost SET
 					grams = vWeight * 1000 / vPacking
@@ -49844,7 +50264,7 @@ BEGIN
 				WHERE b.id = vSelf;
 
 	END IF;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -49891,10 +50311,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getSplit`(vSelf INT, vDated DATE)
 BEGIN
 /**
- * Devuelve tantos registros como etiquetas se necesitan para cada uno de los cubos o cajas de
- * las ventas correspondientes a la compra que se pasa como parámetro, en los almacenes que tienen
+ * Devuelve tantos registros como etiquetas se necesitan para cada uno de los cubos o cajas de 
+ * las ventas correspondientes a la compra que se pasa como parámetro, en los almacenes que tienen 
  * habilitada la venta de productos con stock virtual, aunque los productos pueden ser de cualquier tipo.
- *
+ * 
  * @param vSelf Identificador de vn.buy
  * @param vDated Fecha de preparación de las ventas que queremos etiquetar
  */
@@ -49969,7 +50389,7 @@ BEGIN
 		WHILE vLabels >= vCounter DO
 			INSERT INTO tmp.split
 				SET
-				id = vSaleFk,
+				id = vSaleFk, 
 				labels = vLabels,
 				counter = vCounter;
 
@@ -49991,11 +50411,11 @@ BEGIN
 	-- Devuelve los splits creados
 	SELECT CONCAT(sp.counter,'/',sp.labels) labels,
 		COALESCE(sfc.nickname, sfa.nickname, a.nickname) destination,
-		s.itemFk,
-		i.longName,
-		i.`size`,
-		vn.ticketSplitCounter(t.id) counter,
-		IF(sfa.id OR sfc.id,
+		s.itemFk, 
+		i.longName, 
+		i.`size`, 
+		vn.ticketSplitCounter(t.id) counter, 
+		IF(sfa.id OR sfc.id, 
 			a.nickname,
 			CONCAT(a.id, ' ', p.`name`,' (', c.`code`,')')) destination2
 		FROM tmp.split sp
@@ -50040,12 +50460,12 @@ BEGIN
 			item_getVolume(b.itemFk, b.packagingFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) carros ,
 			CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
 			item_getVolume(b.itemFk, b.packagingFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) espais
-		FROM buy b
+		FROM buy b 
 			JOIN tmp.buy tb ON tb.buyFk = b.id
 			JOIN volumeConfig vc
 			JOIN item i ON i.id = b.itemFk
 			JOIN itemType it ON it.id = i.typeFk
-			LEFT JOIN temperature t ON t.code = it.temperatureFk
+			LEFT JOIN temperature t ON t.code = it.temperatureFk 
 		GROUP BY Temp;
 END ;;
 DELIMITER ;
@@ -50065,21 +50485,21 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByAgency`(vDated DATE, vAgencyFk INT)
 BEGIN
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.buy;
 	CREATE TEMPORARY TABLE tmp.buy (buyFk INT NOT NULL, PRIMARY KEY (buyFk)) ENGINE = MEMORY;
 
-	INSERT INTO tmp.buy
+	INSERT INTO tmp.buy 
 		SELECT b.id
-			FROM buy b
-				JOIN entry e ON e.id = b.entryFk
-				JOIN travel t ON t.id = e.travelFk
+			FROM buy b 
+				JOIN entry e ON e.id = b.entryFk 
+				JOIN travel t ON t.id = e.travelFk 
 			WHERE t.landed = vDated
 				AND t.agencyModeFk IN (0, vAgencyFk);
 
 	CALL buy_getVolume();
 	DROP TEMPORARY TABLE tmp.buy;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -50098,19 +50518,19 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByEntry`(vEntryFk INT)
 BEGIN
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.buy;
 	CREATE TEMPORARY TABLE tmp.buy (buyFk INT NOT NULL, PRIMARY KEY (buyFk)) ENGINE = MEMORY;
-
-	INSERT INTO tmp.buy
+	
+	INSERT INTO tmp.buy 
 		SELECT b.id
-			FROM buy b
-				JOIN entry e ON e.id = b.entryFk
+			FROM buy b 
+				JOIN entry e ON e.id = b.entryFk 
 			WHERE e.id = vEntryFk;
 
 	CALL buy_getVolume();
 	DROP TEMPORARY TABLE tmp.buy;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -50118,14 +50538,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `buy_recalcPrices` */;
 /*!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_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_recalcPrices`()
 BEGIN
@@ -50137,7 +50557,7 @@ BEGIN
 	DECLARE vLanded DATE;
 	DECLARE vWarehouseFk INT;
 	DECLARE vHasNotPrice BOOL;
-	DECLARE vBuyingValue DECIMAL(10,3);
+	DECLARE vBuyingValue DECIMAL(10,4);
 	DECLARE vPackagingFk VARCHAR(10);
 	DECLARE vIsWarehouseFloramondo BOOL;
 
@@ -50198,12 +50618,12 @@ BEGIN
  * inserta en tmp.buyRecalc las compras de un awb
  *
  * @param awbFk
- */
+ */  
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
 
 	CREATE TEMPORARY TABLE tmp.buyRecalc
 		SELECT b.id
-			FROM buy b
+			FROM buy b 
 				JOIN entry e ON e.id = b.entryFk
 				JOIN duaEntry de ON de.entryFk = e.id
 				JOIN dua d ON d.id = de.duaFk
@@ -50235,7 +50655,7 @@ BEGIN
  * Recalcula los precios de una compra
  *
  * @param vBuyFk
- */
+ */  
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
 
 	CREATE TEMPORARY TABLE tmp.buyRecalc
@@ -50266,12 +50686,12 @@ BEGIN
  * Recalcula los precios de una entrada
  *
  * @param vEntryFk
- */
+ */  
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
 
 	CREATE TEMPORARY TABLE tmp.buyRecalc
 		SELECT b.id
-			FROM buy b
+			FROM buy b 
 			WHERE b.entryFk = vEntryFk;
 
 	CALL buy_recalcPrices();
@@ -50311,12 +50731,12 @@ BEGIN
 			LIMIT 0;
 
 	INSERT INTO tBuy(buyFk)
-		SELECT b.id
+		SELECT b.id 
 			FROM buy b
 				JOIN tmp.ekt t ON t.ektFk = b.ektFk
 				JOIN vn.entry en ON en.id = b.entryFk
 				JOIN vn.travel tr ON tr.id = en.travelFk
-				JOIN vn.warehouse w ON w.id = tr.warehouseInFk
+				JOIN vn.warehouse w ON w.id = tr.warehouseInFk 
 				JOIN vn.country c ON c.id = w.countryFk AND c.code = 'NL';
 
 	SELECT b.id buy, i.doPhoto do_photo, b.stickers - CAST(b.printedStickers AS INT) stickersToPrint
@@ -50382,7 +50802,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_updatePacking`(vWarehouseFk INT, vItemFk INT, vPacking INT)
 BEGIN
 /**
- * Actualiza packing
+ * Actualiza packing 
  *
  * @param vWarehouseFk warehouse del item
  * @param vItemFk id del item
@@ -50392,8 +50812,8 @@ BEGIN
 
 	UPDATE buy b
 			JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
-		SET b.packing = vPacking
-		WHERE bu.warehouseFk = vWarehouseFk
+		SET b.packing = vPacking 
+		WHERE bu.warehouseFk = vWarehouseFk 
 			AND bu.itemFk = vItemFk;
 
 	DROP TEMPORARY TABLE tmp.buyUltimate;
@@ -50432,7 +50852,7 @@ BEGIN
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
 	CREATE TEMPORARY TABLE tmp.item
-		ENGINE = MEMORY
+		ENGINE = MEMORY 
 		SELECT vItemFk itemFk;
 
 	CALL catalog_calculate(vLanded, vAddressFk, vAgencyModeFk);
@@ -50454,7 +50874,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calculate`(vLanded DATE, vAddressFk INT, vAgencyModeFk INT)
-BEGIN
+BEGIN	
 /**
  * Calcula los articulos disponibles y sus precios
  *
@@ -50462,7 +50882,7 @@ BEGIN
  * @param vLanded Fecha de recepcion de mercancia
  * @param vAddressFk Id del consignatario
  * @param vAgencyModeFk Id de la agencia
- * @return tmp.ticketCalculateItem(itemFk, available, producer,
+ * @return tmp.ticketCalculateItem(itemFk, available, producer, 
  *			item, size, stems, category, inkFk, image, origin, price)
  * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
  * @return tmp.ticketComponent
@@ -50497,22 +50917,22 @@ BEGIN
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
 	CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
-		itemFk INT(11) NOT NULL,
+		itemFk INT(11) NOT NULL, 
 		available INT(11),
-		producer VARCHAR(50),
-		item VARCHAR(50),
-		size INT(10) UNSIGNED,
-		stems INT(11),
-		category VARCHAR(3),
-		inkFk VARCHAR(3),
+		producer VARCHAR(50), 
+		item VARCHAR(50), 
+		size INT(10) UNSIGNED,  
+		stems INT(11),  
+		category VARCHAR(3), 
+		inkFk VARCHAR(3),  
 		image VARCHAR(50),
-		origin VARCHAR(3),
+		origin VARCHAR(3), 
 		price DECIMAL(10,2),
 		priceKg DECIMAL(10,2),
 		`grouping` INT(10) UNSIGNED,
 		PRIMARY KEY `itemFk` (`itemFk`)
 	) ENGINE = MEMORY DEFAULT CHARSET=utf8;
-
+	
 	OPEN cTravelTree;
 
 	l: LOOP
@@ -50534,20 +50954,20 @@ BEGIN
 					bu.buyFk,
 					vZoneFk
 				FROM `cache`.available a
-					LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id
+					LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id 
 														AND anr.calc_id = vAvailableNoRaidsCalc
 					JOIN tmp.item i ON i.itemFk = a.item_id
 					JOIN vn.item it ON it.id = i.itemFk
 					JOIN vn.`zone` z ON z.id = vZoneFk
-					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id
-					LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk
-					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
+					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id	
+					LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk	
+					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID 
 					LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
 					LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
 									FROM vn.addressFilter af
-										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed
-												FROM vn.address ad
-													JOIN vn.province p ON p.id = ad.provinceFk
+										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed 
+												FROM vn.address ad 
+													JOIN vn.province p ON p.id = ad.provinceFk 
 												WHERE ad.id = vAddressFk
 											) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
 													AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
@@ -50564,13 +50984,13 @@ BEGIN
 					JOIN vn.itemType itt ON itt.id = it.typeFk
 					JOIN vn.itemCategory itc on itc.id = itt.categoryFk
 					JOIN vn.address ad ON ad.id = vAddressFk
-					LEFT JOIN vn.clientItemType cit
+					LEFT JOIN vn.clientItemType cit 
 						ON cit.clientFk = ad.clientFk
 							AND cit.itemTypeFk = itt.id
-					LEFT JOIN vn.zoneItemType zit
+					LEFT JOIN vn.zoneItemType zit 
 						ON zit.zoneFk = vZoneFk
 							AND zit.itemTypeFk = itt.id
-					LEFT JOIN vn.agencyModeItemType ait
+					LEFT JOIN vn.agencyModeItemType ait 
 						ON ait.agencyModeFk = vAgencyModeFk
 							AND ait.itemTypeFk = itt.id
 				WHERE a.calc_id = vAvailableCalc
@@ -50663,7 +51083,7 @@ BEGIN
  * Calcula los componentes de los articulos de tmp.ticketLot
  *
  * @param vZoneFk para calcular el transporte
- * @param vAddressFk Consignatario
+ * @param vAddressFk Consignatario 
  * @param vShipped dia de salida del pedido
  * @param vWarehouseFk warehouse de salida del pedido
  * @table tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
@@ -50677,7 +51097,7 @@ BEGIN
 	SELECT clientFk INTO vClientFK
 		FROM address
 		WHERE id = vAddressFk;
-
+	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentCalculate
 	(PRIMARY KEY (itemFk, warehouseFk))
 	ENGINE = MEMORY
@@ -50689,7 +51109,7 @@ BEGIN
 			IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
 			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
 			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
-			tl.buyFk,
+			tl.buyFk, 
 			i.typeFk,
 			IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
 		FROM tmp.ticketLot tl
@@ -50697,7 +51117,7 @@ BEGIN
 			JOIN item i ON i.id = tl.itemFk
 			JOIN itemType it ON it.id = i.typeFk
 			JOIN itemCategory ic ON ic.id = it.categoryFk
-			LEFT JOIN specialPrice sp ON sp.itemFk = i.id
+			LEFT JOIN specialPrice sp ON sp.itemFk = i.id 
 				AND sp.clientFk = vClientFk
 			LEFT JOIN (
 					SELECT * FROM (
@@ -50716,7 +51136,7 @@ BEGIN
 							LIMIT 10000000000000000000
 								) tpf
 						GROUP BY tpf.itemFk, tpf.warehouseFk
-						) pf ON pf.itemFk = tl.itemFk
+						) pf ON pf.itemFk = tl.itemFk 
 								AND pf.warehouseFk = tl.warehouseFk
 		WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01
 			AND ic.merchandise
@@ -50748,10 +51168,10 @@ BEGIN
 			FROM tmp.ticketComponent tc
 				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
 			GROUP BY tc.itemFk, warehouseFk;
-
+			
 	-- RECOBRO
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
-		SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
+		SELECT tcb.warehouseFk, tcb.itemFk, c2.id, 
 			ROUND(tcb.base *
 							LEAST(
 								MAX(GREATEST(IFNULL(cr.priceIncreasing,0),
@@ -50782,29 +51202,29 @@ BEGIN
 				ROUND(base * wm.pricesModifierRate, 3) manaAuto
 			FROM tmp.ticketComponentBase tcb
 				JOIN `client` c on c.id = vClientFk
-				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk
+				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk 
 				JOIN vn.component c2 ON c2.code = 'autoMana'
 			WHERE wm.isPricesModifierActivated
 			HAVING manaAuto <> 0;
-
+	
 	-- Precios especiales
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
 		SELECT tcb.warehouseFk,
 				tcb.itemFk,
 				c2.id,
 				GREATEST(
-						IFNULL(ROUND(tcb.base * c2.tax, 4), 0),
+						IFNULL(ROUND(tcb.base * c2.tax, 4), 0), 
 						IF(i.hasMinPrice, i.minPrice,0) - tcc.rate3
 						) cost
 			FROM tmp.ticketComponentBase tcb
 				JOIN vn.component c2 ON c2.code = 'lastUnitsDiscount'
-				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk
+				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
 				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
 				JOIN vn.item i ON i.id = tcb.itemFk
 			WHERE sp.value IS NULL
 				AND i.supplyResponseFk IS NULL;
 
-	-- Individual
+	-- Individual 
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
 		SELECT	tcb.warehouseFk,
 				tcb.itemFk,
@@ -50815,10 +51235,10 @@ BEGIN
 				JOIN vn.client c ON c.id = vClientFk
 				JOIN vn.businessType bt ON bt.code = c.businessTypeFk
 			WHERE bt.code = 'individual';
-
+	
 	-- Venta por paquetes
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
-		SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3
+		SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3 
 			FROM tmp.ticketComponentCalculate tcc
 				JOIN vn.component c2 ON c2.code = 'salePerPackage'
 				JOIN buy b ON b.id = tcc.buyFk
@@ -50830,7 +51250,7 @@ BEGIN
 		SELECT vZoneFk id;
 
 	CALL zone_getOptionsForShipment(vShipped, TRUE);
-
+	
 	-- Reparto
 	INSERT INTO tmp.ticketComponent
 		SELECT tcc.warehouseFK,
@@ -50844,7 +51264,7 @@ BEGIN
 			JOIN agencyMode am ON am.id = z.agencyModeFk
 			JOIN vn.volumeConfig vc
 			JOIN vn.component c2 ON c2.code = 'delivery'
-			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
+			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk 
 				AND ic.itemFk = tcc.itemFk
 			HAVING cost <> 0;
 
@@ -50897,9 +51317,9 @@ BEGIN
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
 			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
 					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 1) = 1
+			WHERE IFNULL(tcs.classRate, 1) = 1 
 				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
@@ -50936,7 +51356,7 @@ BEGIN
 			SELECT * FROM tmp.ticketComponentRate ORDER BY price LIMIT 10000000000000000000
 		) t
 		GROUP BY itemFk, warehouseFk, `grouping`;
-
+	
 	DROP TEMPORARY TABLE
 		tmp.ticketComponentCalculate,
 		tmp.ticketComponentSum,
@@ -50961,7 +51381,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPrepare`()
 BEGIN
-
+              
     DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
     CREATE TEMPORARY TABLE tmp.ticketComponent (
 		`warehouseFk` INT UNSIGNED NOT NULL,
@@ -50971,9 +51391,9 @@ BEGIN
 		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
 		UNIQUE `fkItemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC)
 	)ENGINE=MEMORY DEFAULT CHARSET=utf8;
-
+        
     DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
-    CREATE TEMPORARY TABLE tmp.ticketComponentPrice (
+    CREATE TEMPORARY TABLE tmp.ticketComponentPrice (  
 		`warehouseFk` INT UNSIGNED NOT NULL,
 		`itemFk` INT NOT NULL,
 		`rate` INT NOT NULL,
@@ -50982,7 +51402,7 @@ BEGIN
         `priceKg` DECIMAL(10,4),
 		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
 		UNIQUE `fkItemWarehouseRate` (`itemFk` ASC, `warehouseFk` ASC, `rate` ASC)
-	)ENGINE=MEMORY DEFAULT CHARSET=utf8;
+	)ENGINE=MEMORY DEFAULT CHARSET=utf8;    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -51001,7 +51421,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPurge`()
 BEGIN
-	DROP TEMPORARY TABLE
+	DROP TEMPORARY TABLE 
         tmp.ticketComponentPrice,
         tmp.ticketComponent,
         tmp.ticketLot;
@@ -51056,7 +51476,7 @@ BEGIN
 	DELETE FROM sms WHERE created < v18Month;
 	DELETE FROM saleTracking WHERE created < vOneYearAgo;
 	DELETE FROM ticketTracking WHERE created < v18Month;
-	DELETE tobs FROM ticketObservation tobs
+	DELETE tobs FROM ticketObservation tobs 
 		JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
 	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
 	DELETE FROM sharingCart where ended < vDateShort;
@@ -51135,12 +51555,12 @@ BEGIN
 		FROM vn.travel t
 		LEFT JOIN vn.entry e ON e.travelFk = t.id
 		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
-
+	
 	UPDATE dms d
-			JOIN dmsType dt ON dt.id = d.dmsTypeFk
-		SET d.dmsTypeFk = vTrashId
+			JOIN dmsType dt ON dt.id = d.dmsTypeFk 
+		SET d.dmsTypeFk = vTrashId 
 		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
-
+	
 	-- borrar entradas sin compras
 	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
 	CREATE TEMPORARY TABLE tmp.entryToDelete
@@ -51159,7 +51579,7 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.routeToDelete
 		SELECT *
 		FROM vn.route r
-		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
+		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());   
 
 	UPDATE tmp.routeToDelete tmp
 		JOIN vn.dms d ON d.id = tmp.gestdocFk
@@ -51342,21 +51762,21 @@ BEGIN
     */
 
 	DECLARE vClientDebt DOUBLE;
-
+    
     SELECT vn.client_getDebt(vClientFk, util.VN_CURDATE()) INTO vClientDebt;
-
+    
     INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
 		VALUES (vClientFk, 'Saldo pendiente', vClientDebt, util.VN_CURDATE(), 5);
-
+    
     CALL vn.clientGreugeSpray(vClientFk, TRUE, '', TRUE);
-
+    
     INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
 			SELECT vClientFk, 'Liquidación cliente', sum(amount), util.VN_CURDATE(), 5
 				FROM vn.greuge
 				WHERE clientFk = vClientFk;
-
-	UPDATE vn.client
-		SET salesPersonFk = NULL
+                
+	UPDATE vn.client 
+		SET salesPersonFk = NULL 
 		WHERE id = vClientFk;
 
 END ;;
@@ -51447,33 +51867,33 @@ BEGIN
     DECLARE vIssued DATETIME;
     DECLARE vBalance DOUBLE DEFAULT 0.00;
     DECLARE cur CURSOR FOR
-		SELECT
-				created,
-				issued,
+		SELECT 
+				created, 
+				issued, 
 				ROUND(amount, 2) AS balance
 			FROM invoiceOut
-			WHERE clientFk = vClientFk AND companyFk = vCompanyFk
-		UNION ALL
-		SELECT
-				created,
-				payed,
+			WHERE clientFk = vClientFk AND companyFk = vCompanyFk 
+		UNION ALL 
+		SELECT 
+				created, 
+				payed, 
 				ROUND(-1 * amountPaid, 2) AS balance
-			FROM receipt
+			FROM receipt 
 			WHERE clientFk = vClientFk AND companyFk = vCompanyFk
 		ORDER BY issued, created;
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+            
 	OPEN cur;
-
+    
     proc: LOOP
 		SET vDone = FALSE;
-
+        
         FETCH cur INTO vCreated, vIssued, vBalance;
 
 		IF vDate IS NULL THEN
 			SET vDate=vIssued;
         END IF;
-
+        
         IF vDone THEN
 			LEAVE proc;
 		END IF;
@@ -51485,66 +51905,66 @@ BEGIN
             SET vDone = TRUE;
         END IF;
 	END LOOP;
-
+	
 	CLOSE cur;
-
-	SELECT
-        issued,
-        CAST(debtOut AS DECIMAL(10,2)) debtOut,
+    
+	SELECT 
+        issued, 
+        CAST(debtOut AS DECIMAL(10,2)) debtOut, 
         CAST(debtIn AS DECIMAL(10,2)) debtIn,
-		ref,
-        companyFk,
+		ref, 
+        companyFk, 
         priority
 	FROM
-		(SELECT
-                NULL AS issued,
-                SUM(amountUnpaid) AS debtOut,
-				NULL AS debtIn,
-				'Saldo Anterior' AS ref,
+		(SELECT 
+                NULL AS issued, 
+                SUM(amountUnpaid) AS debtOut, 
+				NULL AS debtIn, 
+				'Saldo Anterior' AS ref, 
                 companyFk,
-                0 as priority
-			FROM
-				(SELECT SUM(amount) AS amountUnpaid, companyFk, 0
+                0 as priority 
+			FROM 
+				(SELECT SUM(amount) AS amountUnpaid, companyFk, 0 
 					FROM invoiceOut
-					WHERE clientFk = vClientFK
-						AND issued < vDate
-					GROUP BY companyFk
-
-				UNION ALL
-
-				SELECT SUM(-1 * amountPaid), companyFk, 0
-					FROM receipt
-					WHERE clientFk = vClientFK
-						AND payed < vDate
-					GROUP BY companyFk) AS transactions
-			GROUP BY companyFk
-
-			UNION ALL
-
-			SELECT
-					issued,
-					amount as debtOut,
-					NULL AS debtIn,
+					WHERE clientFk = vClientFK 
+						AND issued < vDate  
+					GROUP BY companyFk 
+                
+				UNION ALL 
+            
+				SELECT SUM(-1 * amountPaid), companyFk, 0 
+					FROM receipt 
+					WHERE clientFk = vClientFK 
+						AND payed < vDate 
+					GROUP BY companyFk) AS transactions 
+			GROUP BY companyFk 
+            
+			UNION ALL 
+		
+			SELECT 
+					issued, 
+					amount as debtOut, 
+					NULL AS debtIn, 
 					ref,
 					companyFk,
-					1
-				FROM invoiceOut
-				WHERE clientFk = vClientFK
+					1 
+				FROM invoiceOut 
+				WHERE clientFk = vClientFK 
 					AND issued >= vDate
-			UNION ALL
-
-			SELECT
-					r.payed,
-					NULL as debtOut,
-					r.amountPaid,
-					r.invoiceFk,
+			UNION ALL 
+		
+			SELECT 
+					r.payed, 
+					NULL as debtOut, 
+					r.amountPaid, 
+					r.invoiceFk, 
 					r.companyFk,
-					0
+					0 
 				FROM receipt r
-				WHERE r.clientFk = vClientFK
-					AND r.payed >= vDate) t
-			INNER JOIN `client` c ON c.id = vClientFK
-	HAVING debtOut <> 0 OR debtIn <> 0
+				WHERE r.clientFk = vClientFK 
+					AND r.payed >= vDate) t 
+			INNER JOIN `client` c ON c.id = vClientFK 
+	HAVING debtOut <> 0 OR debtIn <> 0 
     ORDER BY issued, priority DESC, debtIn;
 END ;;
 DELIMITER ;
@@ -51602,13 +52022,13 @@ BEGIN
 				WHERE id = vClientFk;
 
 		ELSE
-
+		
 			SELECT id INTO vOwner
 				FROM vn.worker
 				WHERE code = vWorkerCode COLLATE utf8_general_ci;
 
 		END IF;
-
+		
 		DROP TEMPORARY TABLE IF EXISTS tmp.clientList;
 		CREATE TEMPORARY TABLE tmp.clientList
 			SELECT DISTINCT t.clientFk, floor(cr.yearSale / 12) monthSale
@@ -51620,7 +52040,7 @@ BEGIN
 				AND t.shipped >= TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
 				AND c.id != vClientFk
 				HAVING monthSale > 100;
-
+					
 		SELECT SUM(monthSale) INTO vTotalSale
 			FROM tmp.clientList;
 
@@ -51631,7 +52051,7 @@ BEGIN
 			SELECT vClientFk, 'Reparto greuge', -vGreuge, util.VN_CURDATE(), vGreugeTypeFk;
 
 	END IF;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -51826,11 +52246,11 @@ BEGIN
 			LEFT JOIN clientProtected cp ON cp.clientFk = cd.clientFk
 			JOIN client c ON c.id = cd.clientFk
 			JOIN province p ON p.id = c.provinceFk
-			LEFT JOIN autonomy a ON a.id = p.autonomyFk
+			LEFT JOIN autonomy a ON a.id = p.autonomyFk 
 			JOIN country co ON co.id = p.countryFk
 		WHERE cd.warning = 'third'
 			AND cp.clientFk IS NULL
-			AND co.code NOT IN ('PT')
+			AND co.code NOT IN ('PT') 
 			AND a.name <> 'Canarias'
 			AND c.salesPersonFk IS NOT NULL;
 
@@ -51941,7 +52361,7 @@ BEGIN
 									JOIN client c ON c.accountingAccount = lc.account
 								WHERE lc.`date` BETWEEN vDateFrom AND vDateTo
 						)sub
-					GROUP BY companyFk, clientFk
+					GROUP BY companyFk, clientFk	
 				) sub1 ON sub1.clientFk = c.id
 			JOIN supplier s ON s.id = sub1.companyFk
 			JOIN company co ON co.id = sub1.companyFk
@@ -52218,9 +52638,9 @@ BEGIN
 	DECLARE i INT DEFAULT 0;
     DECLARE c INT DEFAULT 0;
     DECLARE maxClientFk INT;
-
+         
     DROP TEMPORARY TABLE IF EXISTS tmp.client;
-
+    
     CREATE TEMPORARY TABLE tmp.`client`
     (id INT AUTO_INCREMENT,
      clientFk INT,
@@ -52228,40 +52648,40 @@ BEGIN
      PRIMARY KEY(id),
      UNIQUE KEY clientFk (clientFk))
      ENGINE = MEMORY;
-
+     
      INSERT INTO tmp.client(clientFk)
 		SELECT DISTINCT clientFk
 			FROM vn.invoiceOut
 			WHERE issued > TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
-
+            
 	SELECT max(id) INTO maxClientFk
 		FROM tmp.client;
-
-
+     
+    
 	WHILE i < vNumber DO
-
+    
 		SET i = i + 1;
-
+   
         WHILE c = 0 DO
-
+        
 			SELECT id INTO c
 				FROM tmp.client
 				WHERE id = floor(RAND() * maxClientFk) + 1
 					AND isSelected = FALSE
                     LIMIT 1;
-
+			
 		END WHILE;
-
+        
        -- SELECT i, maxClientFk, c;
-
-        UPDATE tmp.client
-			SET isSelected = TRUE
+        
+        UPDATE tmp.client 
+			SET isSelected = TRUE 
             WHERE id = c;
-
+        
         SET c = 0;
-
+    
     END WHILE;
-
+    
     SELECT c.id, c.name FROM tmp.client tc
 		JOIN vn.client c ON c.id = tc.clientFk
 		WHERE isSelected
@@ -52303,9 +52723,9 @@ BEGIN
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	CREATE OR REPLACE TEMPORARY TABLE tClientList
-		SELECT c.clientFk
+		SELECT c.id clientFk
 			FROM bs.clientDied cd
-				JOIN client c ON c.id = cd.id
+				JOIN client c ON c.id = cd.clientFk
 				LEFT JOIN clientProtected cp ON cp.clientFk = c.id
 				LEFT JOIN salesPersonProtected sp ON sp.salesPersonFk = c.salesPersonFk
 				JOIN province p ON p.id = c.provinceFk
@@ -52413,9 +52833,7 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 	DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
 
-	DROP TEMPORARY TABLE IF EXISTS tSale;
-
-	CREATE TEMPORARY TABLE tSale
+	CREATE OR REPLACE TEMPORARY TABLE tSale
 		(INDEX(ticketFk), INDEX(saleFk), INDEX(itemFk))
 		ENGINE = MEMORY
 		SELECT s.ticketFk, s.id saleFk, s.itemFk, s.quantity
@@ -52436,8 +52854,7 @@ BEGIN
 
 	CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk);
 
-	DROP TEMPORARY TABLE IF EXISTS tGrouping;
-	CREATE TEMPORARY TABLE tGrouping
+	CREATE OR REPLACE  TEMPORARY TABLE tGrouping
 		(INDEX(itemFk))
 		ENGINE = MEMORY
 		SELECT b.itemFk,
@@ -52451,8 +52868,7 @@ BEGIN
 			WHERE lb.warehouse_id = vWarehouseFk
 			GROUP BY b.itemFk;
 
-	DROP TEMPORARY TABLE IF EXISTS tSalePlacementList;
-	CREATE TEMPORARY TABLE tSalePlacementList
+	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList
 		(INDEX(saleFk), INDEX(`order`))
 		ENGINE = MEMORY
 		SELECT ts.saleFk,
@@ -52473,9 +52889,9 @@ BEGIN
 				ish.created,
 				ish.visible,
 				IFNULL(
-					IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),
+					IF(st.description = 'previousByPacking', ish.packing, g.`grouping`),
 					1) `grouping`,
-				sc.isPreviousPrepared,
+				st.description = 'previousPrepared' isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
@@ -52492,6 +52908,7 @@ BEGIN
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
+				JOIN sectorType st ON st.id = sc.typeFk
 				JOIN warehouse w ON w.id = sc.warehouseFk
 				LEFT JOIN tGrouping g ON g.itemFk = ts.itemFk
 				LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
@@ -52504,8 +52921,7 @@ BEGIN
 				AND NOT sc.isHideForPickers
 			HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL;
 
-	DROP TEMPORARY TABLE IF EXISTS tSalePlacementList2;
-	CREATE TEMPORARY TABLE tSalePlacementList2
+	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))
 		ENGINE = MEMORY
 		SELECT saleFk, priority olderPriority
@@ -52591,15 +53007,15 @@ BEGIN
 			DATE_FORMAT(util.VN_NOW(), '%H:%i' ),
 			' ',
 			i.name
-			) INTO vConcept
+			) INTO vConcept 
 		FROM item i
 		WHERE i.id = vItemFk;
 
 	SELECT name INTO vItemName FROM item WHERE id = vBarccodeFk;
 
-	SELECT CONCAT('Añadido articulo ',
+	SELECT CONCAT('Añadido articulo ', 
 			vItemName,
-			' cantidad:',
+			' cantidad:', 
 			vQuantity
 			) INTO vDescription;
 
@@ -52636,7 +53052,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_assign`(vUserFk INT, OUT vCollectionFk INT)
-proc:BEGIN
+proc:BEGIN   
 /* Comprueba si existen colecciones libres que se ajustan al perfil del usuario
  * y le asigna la más antigua.
  * Añade un registro al semillero de colecciones
@@ -52669,14 +53085,14 @@ proc:BEGIN
 				FROM vn.collection c
 					JOIN vn.ticketCollection tc ON tc.collectionFk = c.id
 					JOIN vn.state s ON s.code = 'PRINTED_AUTO'
-					JOIN vn.productionConfig pc
-			WHERE c.workerFk IS NULL
+					JOIN vn.productionConfig pc 
+			WHERE c.workerFk IS NULL 
 				AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
 
 	DELETE c.*
 		FROM vn.collection c
-			JOIN vn.productionConfig pc
-		WHERE c.workerFk IS NULL
+			JOIN vn.productionConfig pc 
+		WHERE c.workerFk IS NULL 
 			AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
 
 	-- Se a�ade registro al semillero
@@ -52686,8 +53102,8 @@ proc:BEGIN
 	-- Comprueba si hay colecciones disponibles que se ajustan a su configuracion
 	SELECT MIN(c.id)
 		INTO vCollectionFk
-		FROM vn.collection c
-			JOIN vn.operator o
+		FROM vn.collection c 
+			JOIN vn.operator o 
 				ON (o.itemPackingTypeFk = c.itemPackingTypeFk OR c.itemPackingTypeFk IS NULL)
 				AND o.numberOfWagons = c.wagons
 				AND o.trainFk = c.trainFk
@@ -52734,18 +53150,18 @@ BEGIN
 	SELECT 	c.id collectionFk,
 			date(c.created) created,
 			COUNT(DISTINCT tc.ticketFk) ticketTotalCount
-		FROM collection c
-				JOIN ticketCollection tc ON tc.collectionFk = c.id
-				JOIN sale s ON s.ticketFk = tc.ticketFk
+		FROM collection c 
+				JOIN ticketCollection tc ON tc.collectionFk = c.id 
+				JOIN sale s ON s.ticketFk = tc.ticketFk 
 				JOIN ticketState ts ON ts.ticketFk = tc.ticketFk
 				JOIN state s2 ON s2.id = ts.stateFk
 				JOIN productionConfig pc
 				JOIN vn.state ss on ss.code = 'PREPARED'
 				LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id
-		WHERE  c.workerFk = vWorkerFk
+		WHERE  c.workerFk = vWorkerFk 
 				AND TIMESTAMPDIFF(HOUR, c.created , util.VN_NOW()) < pc.pendingCollectionsAge
 				AND s.quantity != 0
-				AND s2.order < pc.pendingCollectionsOrder
+				AND s2.order < pc.pendingCollectionsOrder 
 		GROUP BY c.id
 		HAVING COUNT(*) > COUNT(DISTINCT st.id);
 
@@ -52772,15 +53188,15 @@ BEGIN
  * Selecciona los tickets de una colección/ticket
  * @param vParamFk ticketFk/collectionFk
  * @return Retorna ticketFk, level, agencyName, warehouseFk, salesPersonFk, observaciones
- */
+ */	
 	DECLARE vItemPackingTypeFk VARCHAR(1);
 
 	-- Si los sacadores son los de pruebas, pinta los colores
 	SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-		FROM vn.collection
+		FROM vn.collection 
 		WHERE id = vParamFk;
 
-	SELECT t.id ticketFk,
+	SELECT t.id ticketFk, 
 			IF (!(vItemPackingTypeFk <=> 'V'), cc.code,CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` )) `level`,
 			am.name agencyName,
 			t.warehouseFk,
@@ -52790,20 +53206,20 @@ BEGIN
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	-- PAK 23/12/21
-			LEFT JOIN vn.collectionColors cc
-				ON cc.wagon = tc.wagon
-				AND cc.shelve = tc.`level`
+			LEFT JOIN vn.collectionColors cc 
+				ON cc.wagon = tc.wagon 
+				AND cc.shelve = tc.`level` 
 				AND cc.trainFk = c2.trainFk 						-- PAK 23/12/21
-			LEFT JOIN vn.zone z ON z.id = t.zoneFk
+			LEFT JOIN vn.zone z ON z.id = t.zoneFk 
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
-			LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id
+			LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id 
 				AND tob.observationTypeFk = 1
-		WHERE t.id = vParamFk
+		WHERE t.id = vParamFk 
 			AND t.shipped >= util.yesterday()
 	UNION ALL
-	SELECT t.id ticketFk,
+	SELECT t.id ticketFk, 
 			IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
 			am.name agencyName,
 			t.warehouseFk,
@@ -52813,15 +53229,15 @@ BEGIN
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	-- PAK 23/12/21
-			LEFT JOIN vn.collectionColors cc
-				ON cc.wagon = tc.wagon
-					AND cc.shelve = tc.`level`
+			LEFT JOIN vn.collectionColors cc 
+				ON cc.wagon = tc.wagon 
+					AND cc.shelve = tc.`level` 
 					AND cc.trainFk = c2.trainFk 						-- PAK 23/12/21
-			LEFT JOIN vn.zone z ON z.id = t.zoneFk
+			LEFT JOIN vn.zone z ON z.id = t.zoneFk 
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
-			LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id
+			LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id 
 				AND tob.observationTypeFk = 1
 		WHERE tc.collectionFk = vParamFk;
 
@@ -53184,8 +53600,8 @@ proc:BEGIN
 				-- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo
 				DELETE tt.*
 					FROM tTrain tt
-					LEFT JOIN (SELECT DISTINCT wagon
-									FROM tTrain
+					LEFT JOIN (SELECT DISTINCT wagon 
+									FROM tTrain 
 									WHERE ticketFk IS NOT NULL
 								) nn ON nn.wagon = tt.wagon
 				WHERE nn.wagon IS NULL;
@@ -53353,7 +53769,7 @@ BEGIN
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vCursor CURSOR FOR
 		SELECT DISTINCT ticketFk
-			FROM ticketCollection tc
+			FROM ticketCollection tc 
 			WHERE tc.collectionFk  = vSelf;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@@ -53400,25 +53816,25 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `company_getFiscaldata`(workerFk INT)
 BEGIN
-
+	
 DECLARE vCompanyFk INT;
-
-	SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk)
+	
+	SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk) 
 		INTO vCompanyFk
 	FROM vn.routeConfig rc
 		LEFT JOIN userConfig uc ON uc.userFk = workerFk;
-
-
+	
+	
 	SELECT
 	 s.name  AS  name ,
 	 s.NIF  AS  nif ,
 	 s.street  AS  street ,
 	 s.city  AS  city ,
-	 s.postCode  AS  postCode
-
-	 FROM vn.company  c
+	 s.postCode  AS  postCode 
+	
+	 FROM vn.company  c 
 		JOIN  vn.worker w ON w.id  =  c.workerManagerFk
-		JOIN  vn.supplier  s  ON s.id = c.id
+		JOIN  vn.supplier  s  ON s.id = c.id	
    	 WHERE  c.id = vCompanyFk;
 END ;;
 DELIMITER ;
@@ -53475,7 +53891,7 @@ BEGIN
                         IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
                         p.dueDated < vStartingDate isBeforeStarting,
                         p.currencyFk
-					FROM payment p
+					FROM payment p 
 					WHERE p.received > vStartDate
 						AND p.companyFk = vSelf
 					UNION ALL
@@ -53483,9 +53899,9 @@ BEGIN
                         r.companyFk,
                         - IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
                         rv.dueDated < vStartingDate isBeforeStarting,
-                        r.currencyFk
-					FROM invoiceIn r
-						INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
+                        r.currencyFk 
+					FROM invoiceIn r 
+						INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk 
 					WHERE r.issued > vStartDate
 						AND r.isBooked
 						AND r.companyFk = vSelf
@@ -53537,11 +53953,11 @@ BEGIN
             -IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
             r.currencyFk,
             FALSE isPayment,
-            TRUE
-        FROM invoiceIn r
+            TRUE 
+        FROM invoiceIn r 
             LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
                 AND r.supplierFk = si.supplierFk
-                AND r.currencyFk = si.currencyFk
+                AND r.currencyFk = si.currencyFk 
             JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
         WHERE rv.dueDated >= vStartingDate
             AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
@@ -53596,7 +54012,7 @@ BEGIN
 		FROM tPendingDuedates
 		WHERE balance < vInvalidBalances
 			AND balance > - vInvalidBalances;
-
+			
 	DELETE vp.*
 		FROM tPendingDuedates vp
 			JOIN tRowsToDelete rd ON (
@@ -53624,9 +54040,9 @@ BEGIN
 		FROM tPendingDuedates vp
 		    LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
-			LEFT JOIN clientRisk cr ON cr.clientFk = c.id
+			LEFT JOIN clientRisk cr ON cr.clientFk = c.id 
 				AND cr.companyFk = vp.companyFk;
-
+	
 	DROP TEMPORARY TABLE tOpeningBalances;
 	DROP TEMPORARY TABLE tPendingDuedates;
 	DROP TEMPORARY TABLE tRowsToDelete;
@@ -53638,6 +54054,79 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `comparative_add` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `comparative_add`()
+BEGIN
+/**
+ * Inserts sales records less than one month old in comparative.
+ */
+	DECLARE vMaxPeriod INT;
+	DECLARE vPeriod INT;
+	DECLARE vWeek INT;
+	DECLARE vConfigPeriod INT;
+	DECLARE vConfigWeek INT;
+
+	SELECT period, week INTO vConfigPeriod, vConfigWeek
+		FROM comparativeAddConfig;
+
+	SELECT IFNULL(MAX(timePeriod), 0) INTO vMaxPeriod
+		FROM comparative;
+
+	SELECT period - vConfigPeriod,
+		    week
+		    INTO vPeriod,
+		    vWeek 
+		FROM `time` 
+		WHERE dated = util.VN_CURDATE();
+
+	IF vMaxPeriod < vPeriod AND vWeek > vConfigWeek THEN
+		DELETE FROM comparative	WHERE timePeriod BETWEEN vMaxPeriod AND vPeriod;
+
+		INSERT INTO comparative(
+			timePeriod,
+			itemFk,
+			warehouseFk,
+			quantity,
+			price,
+			countryFk
+		)
+		SELECT tm.period,
+				s.itemFk,
+				t.warehouseFk,
+				sum(s.quantity),
+				sum(v.importe),
+				p.countryFk
+			FROM bs.ventas v
+				JOIN time tm ON tm.dated = v.fecha
+				JOIN sale s ON s.id = v.Id_Movimiento
+				JOIN itemType tp ON tp.id = v.tipo_id
+				JOIN itemCategory ic ON ic.id = tp.categoryFk
+				JOIN ticket t ON t.id = s.ticketFk
+                JOIN client c ON c.id = t.clientFk
+				JOIN clientType ct ON ct.id = c.clientTypeFk
+				JOIN warehouse w ON w.id = t.warehouseFk
+				JOIN address ad ON ad.id = t.addressFk
+				LEFT JOIN province p ON p.id = ad.provinceFk
+			WHERE tm.period BETWEEN vMaxPeriod AND vPeriod
+				AND ct.code <> 'loses'
+				AND NOT w.code = 'inv'
+			GROUP BY p.countryFk, s.itemFk, tm.period, t.warehouseFk;
+	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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `conveyorExpedition_Add` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -53649,7 +54138,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `conveyorExpedition_Add`(vStarted DATETIME, vEnded DATETIME)
 BEGIN
 
-
+	
 	DECLARE startingMinute INT;
 
 	TRUNCATE vn.conveyorExpedition;
@@ -53666,23 +54155,23 @@ BEGIN
                                         conveyorBuildingClassFk)
 		SELECT 	e.id,
 				e.created,
-                10 * p.depth as depth,
+                10 * p.depth as depth, 
                 10 * p.width as width,
                 10 * p.height as height,
                 IFNULL(t.routeFk,am.agencyFk) routeFk,
                 hour(e.created) * 60 + minute(e.created),
                 IFNULL(et.description , a.name),
                 IFNULL(t.routeFk,am.agencyFk) criterion,
-                IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass)
+                IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass)              
 		FROM vn.expedition e
 			JOIN vn.ticket t ON t.id = e.ticketFk
             JOIN vn.packaging p ON p.id = e.packagingFk
             LEFT JOIN vn.zone z ON z.id = t.zoneFk
             LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-            LEFT JOIN vn.agency a ON a.id = am.agencyFk
-            LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-            LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
-            JOIN vn.packagingConfig pc
+            LEFT JOIN vn.agency a ON a.id = am.agencyFk 
+            LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk 
+            LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
+            JOIN vn.packagingConfig pc 
 		WHERE t.warehouseFk IN (60,1,44)
             AND e.created BETWEEN vStarted AND vEnded
             AND p.height < 140
@@ -53691,8 +54180,8 @@ BEGIN
 
         SELECT MIN(productionMinute) INTO startingMinute
         	FROM vn.conveyorExpedition ce ;
-
-        UPDATE vn.conveyorExpedition
+        
+        UPDATE vn.conveyorExpedition 
         	SET productionMinute = productionMinute - startingMinute;
 
 END ;;
@@ -53761,7 +54250,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT)
 BEGIN
 
-
+	
 	UPDATE vn.item SET upToDown = vQuantity WHERE id = vItemFk;
 
 END ;;
@@ -53784,52 +54273,52 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `crypt`(vText VARCHAR(255), vKey VAR
 BEGIN
 
 	DECLARE vEncryptedText VARCHAR(255) DEFAULT '';
-
+    
 	DECLARE vKeyLength INT;
     DECLARE vKeyPosition INT DEFAULT 1;
     DECLARE vKeyChar VARCHAR(1);
-
+    
     DECLARE vTextLength INT;
     DECLARE vTextPosition INT DEFAULT 1;
     DECLARE vTextChar VARCHAR(1);
-
+    
     DECLARE vEncryptedChar VARCHAR(1);
     DECLARE vEncryptedCharPosition INT;
-
+    
     DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz';
     DECLARE vChainTextPosition INT;
     DECLARE vChainKeyPosition INT;
     DECLARE vChainLength INT;
-
+    
     DECLARE vInvalidadChars VARCHAR(255) DEFAULT '';
-
-    SET vTextLength = LENGTH(vText);
+    
+    SET vTextLength = LENGTH(vText);	
     SET vKeyLength = LENGTH(vKey);
     SET vChainLength = LENGTH(vChain);
-
+	
 	WHILE vTextPosition <= vTextLength DO
-
+    
 		SET vTextChar = MID(vText,vTextPosition,1);
         SET vKeyChar =  MID(vKey,vKeyPosition,1);
-
+        
         SET vChainTextPosition = LOCATE(vTextChar, vChain);
         SET vInvalidadChars = IF(vChainTextPosition, vInvalidadChars, CONCAT(vInvalidadChars,vTextChar));
         SET vChainKeyPosition = LOCATE(vKeyChar, vChain);
         SET vEncryptedCharPosition = vChainTextPosition + vChainKeyPosition;
-
+        
         IF vEncryptedCharPosition > vChainLength THEN
-
+        
 			SET vEncryptedCharPosition = vEncryptedCharPosition - vChainLength;
-
+            
 		END IF;
-
+        
         SET vEncryptedChar = MID(vChain, vEncryptedCharPosition,1);
-
+        
         SET vEncryptedText = CONCAT(vEncryptedText, vEncryptedChar);
-
+        
 		SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1);
 		SET vTextPosition = vTextPosition + 1;
-
+    
     END WHILE;
 
 	SET vResult = IF(LENGTH(vInvalidadChars), CONCAT('Caracteres no válidos: ',vInvalidadChars),vEncryptedText);
@@ -53854,49 +54343,49 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `cryptOff`(vText VARCHAR(255), vKey
 BEGIN
 
 	DECLARE vUncryptedText VARCHAR(255) DEFAULT '';
-
+    
 	DECLARE vKeyLength INT;
     DECLARE vKeyPosition INT DEFAULT 1;
     DECLARE vKeyChar VARCHAR(1);
-
+    
     DECLARE vTextLength INT;
     DECLARE vTextPosition INT DEFAULT 1;
     DECLARE vTextChar VARCHAR(1);
-
+    
     DECLARE vUncryptedChar VARCHAR(1);
     DECLARE vUncryptedCharPosition INT;
-
+    
     DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz';
     DECLARE vChainTextPosition INT;
     DECLARE vChainKeyPosition INT;
     DECLARE vChainLength INT;
-
-    SET vTextLength = LENGTH(vText);
+    
+    SET vTextLength = LENGTH(vText);	
     SET vKeyLength = LENGTH(vKey);
     SET vChainLength = LENGTH(vChain);
-
+	
 	WHILE vTextPosition <= vTextLength DO
-
+    
 		SET vTextChar = MID(vText,vTextPosition,1);
         SET vKeyChar =  MID(vKey,vKeyPosition,1);
-
+        
         SET vChainTextPosition = LOCATE(vTextChar, vChain);
         SET vChainKeyPosition = LOCATE(vKeyChar, vChain);
         SET vUncryptedCharPosition = vChainTextPosition - vChainKeyPosition;
-
+        
         IF vUncryptedCharPosition < 1 THEN
-
+        
 			SET vUncryptedCharPosition = vUncryptedCharPosition + vChainLength;
-
+            
 		END IF;
-
+        
         SET vUncryptedChar = MID(vChain, vUncryptedCharPosition,1);
-
+        
         SET vUncryptedText = CONCAT(vUncryptedText, vUncryptedChar);
-
+        
 		SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1);
 		SET vTextPosition = vTextPosition + 1;
-
+    
     END WHILE;
 
 	SET vResult = vUncryptedText;
@@ -53992,7 +54481,7 @@ BEGIN
 				OR (vSelf IS NOT NULL AND parentFk = vSelf);
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+    
     SET vSons = 0;
 
 	OPEN vChildren;
@@ -54003,11 +54492,11 @@ BEGIN
 		IF vDone THEN
 			LEAVE myLoop;
 		END IF;
-
+        
         SET vIndex = vIndex + 1;
         SET vLft = vIndex;
         SET vSons = vSons + 1;
-
+    
 		CALL department_calcTreeRec(
 			vChildFk,
             CONCAT(vPath, vChildFk, '/'),
@@ -54062,7 +54551,7 @@ proc: BEGIN
 
 	SELECT isChanged INTO vIsChanged
 		FROM department_recalc;
-
+        
 	IF vIsChanged THEN
 		UPDATE department_recalc SET isChanged = FALSE;
         CALL vn.department_calcTree;
@@ -54087,17 +54576,17 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `department_getHasMistake`()
 BEGIN
-
+	
 /**
  * Obtiene los sectores a los cuales les ponemos errores
  *
  */
-
+	
 	SELECT id, name
 		FROM department
 	WHERE hasToMistake <> FALSE;
-
-
+	
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54156,19 +54645,19 @@ BEGIN
 					FROM department g
 						JOIN tChilds c ON c.id = g.id
 					WHERE g.parentFk IS NOT NULL;
-
+			
 			INSERT IGNORE INTO tNodes
 				SELECT id FROM tParents;
-
+			
 			IF ROW_COUNT() = 0 THEN
 				LEAVE myLoop;
 			END IF;
-
+			
 			DELETE FROM tChilds;
 			INSERT INTO tChilds
 				SELECT id FROM tParents;
 		END LOOP;
-
+		
 		DROP TEMPORARY TABLE
 			tChilds,
 			tParents;
@@ -54235,12 +54724,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProductionUser_exists`(vUserFk INT)
 BEGIN
-
+	
 /*	SELECT COUNT(*) AS UserExists
-		FROM vn.deviceProductionUser dpu
+		FROM vn.deviceProductionUser dpu 
 			WHERE dpu.userFk = vUserFk;*/
 	SELECT TRUE;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54312,10 +54801,10 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `device_checkLogin`(vUserFk INT, vAndroidID VARCHAR(50))
 BEGIN
-
+	
 /*
  * Comprueba si está registrado el dispositivo mediante su androidId
- *
+ * 
  * @param vUSerFk el id del user
  * @param vAndroidID es el identificador android_id del dispositivo
  */
@@ -54327,20 +54816,20 @@ BEGIN
 	SELECT dpc.isAllUsersallowed INTO vIsAllUsersAllowed
 	FROM vn.deviceProductionConfig dpc;
 
-	IF NOT vIsAllUsersAllowed THEN
-
+	IF NOT vIsAllUsersAllowed THEN	
+	
 		SELECT COUNT(*) INTO vIsDepartment
-			FROM vn.workerDepartment dp
+			FROM vn.workerDepartment dp 
 				JOIN department d ON d.id = dp.departmentFk
 			WHERE dp.workerFk = vUserFk AND d.hasToCheckLogin;
-
+	
 		IF vIsDepartment THEN
 			SELECT COUNT(*) INTO vIsAuthorized
-				FROM vn.deviceProductionUser dpu
+				FROM vn.deviceProductionUser dpu 
 					JOIN vn.deviceProduction dp ON dp.id = dpu.deviceProductionFk
 				WHERE dpu.userFk = vUserFk
 					AND dp.android_id = vAndroidID;
-
+				
 			IF NOT vIsAuthorized THEN
 				SET vMessage = 'Usuario no autorizado';
 			END IF;
@@ -54370,15 +54859,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `duaEntryValueUpdate`(vDuaFk INT)
 BEGIN
 
 	UPDATE duaEntry de
-		JOIN
+		JOIN 
 			( SELECT b.entryFk, sum(b.quantity * b.buyingValue) as total
 					FROM buy b
 						JOIN duaEntry de ON de.entryFk = b.entryFk
                         WHERE duaFk = vDuaFk
 					GROUP BY b.entryFk
         	 ) sub ON sub.entryFk = de.entryFk
-
-        LEFT JOIN
+             
+        LEFT JOIN 
 			(SELECT e.id, sum(iit.taxableBase) as euros
 				FROM entry e
 					JOIN invoiceInTax iit ON iit.invoiceInFk = e.invoiceInFk
@@ -54386,11 +54875,11 @@ BEGIN
                     WHERE de.duaFk = vDuaFk
 				GROUP BY e.id
 			) sub2 ON sub2.id = de.entryFk
-
+            
 		SET de.value = sub.total,
 			de.euroValue = sub2.euros
         WHERE duaFk = vDuaFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54414,7 +54903,7 @@ BEGIN
 	DECLARE vInvoiceFk INT;
     DECLARE vASIEN BIGINT DEFAULT 0;
     DECLARE vCounter INT DEFAULT 0;
-
+    
 	DECLARE rs CURSOR FOR
 		SELECT e.invoiceInFk
 			FROM entry e
@@ -54427,7 +54916,7 @@ BEGIN
 	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
@@ -54439,41 +54928,41 @@ BEGIN
             ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
             e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
-
+    
     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
-
+        
 			UPDATE vn2008.XDiario x
 				JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
                 SET x.ASIEN = vASIEN;
-
+        
         ELSE
-
+        
 			SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig;
-
+            
 		END IF;
-
+			     
         SET vCounter = vCounter + 1;
-
+        
 		FETCH rs INTO vInvoiceFk;
 
 	END WHILE;
-
+    
     CLOSE rs;
-
-    UPDATE dua
+    
+    UPDATE dua 
         SET ASIEN = vASIEN
         WHERE id = vDuaFk;
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54499,9 +54988,9 @@ BEGIN
 		SELECT awbFk,companyFk
 			FROM dua
             WHERE id = vDuaFk;
-
+	
 	SELECT LAST_INSERT_ID() INTO vNewDuaFk;
-
+    
     INSERT INTO duaEntry(duaFk, entryFk, value, customsValue)
 		SELECT vNewDuaFk, entryFk, value, value - customsValue
 			FROM duaEntry
@@ -54530,11 +55019,11 @@ BEGIN
     DECLARE vBookDated DATE;
     DECLARE vDiff DECIMAL(10,2);
     DECLARE vApunte BIGINT;
-
+      
 	SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated
-		FROM dua
+		FROM dua 
 		WHERE id = vDuaFk;
-
+		
 	IF vBookNumber IS NULL OR NOT vBookNumber THEN
 		CALL ledger_next(vBookNumber);
 	END IF;
@@ -54545,14 +55034,14 @@ BEGIN
 		ASIEN,
 		FECHA,
 		SUBCTA,
-		CONCEPTO,
+		CONCEPTO, 
 		EUROHABER,
 		SERIE,
 		empresa_id,
 		CLAVE,
 		FACTURA)
 
-	SELECT
+	SELECT 
 			vBookNumber,
 			d.bookEntried,
 			'4700000999',
@@ -54565,20 +55054,20 @@ BEGIN
 		FROM duaTax dt
 			JOIN dua d ON d.id = dt.duaFk
 			WHERE dt.duaFk = vDuaFk;
-
+			
 		-- Apuntes por tipo de IVA y proveedor
-
+		
 		INSERT INTO XDiario(
 		ASIEN,
 		FECHA,
 		SUBCTA,
-		CONTRA,
+		CONTRA, 
 		EURODEBE,
 		BASEEURO,
-		CONCEPTO,
-		FACTURA,
+		CONCEPTO, 
+		FACTURA, 
 		IVA,
-		AUXILIAR,
+		AUXILIAR, 
 		SERIE,
 		FECHA_EX,
 		FECHA_OP,
@@ -54598,17 +55087,17 @@ BEGIN
 		FECREGCON
 	)
 
-	SELECT
+	SELECT 
 			vBookNumber ASIEN,
 			vBookDated FECHA,
 			tr.account SUBCTA,
 			'4330002067' CONTRA,
 			sum(dt.tax) EURODEBE,
-			sum(dt.base) BASEEURO,
+			sum(dt.base) BASEEURO, 
 			CONCAT('DUA nº',d.code) CONCEPTO,
 			d.id FACTURA,
 			dt.rate IVA,
-			'*' AUXILIAR,
+			'*' AUXILIAR, 
 			'D' SERIE,
 			d.issued FECHA_EX,
 			d.operated FECHA_OP,
@@ -54635,10 +55124,10 @@ BEGIN
 							WHERE ta.effectived <= vBookDated
 							AND taxAreaFk = 'WORLD'
 							ORDER BY ta.effectived DESC
-							LIMIT 10000000000000000000
+							LIMIT 10000000000000000000 
 						) tba
 					GROUP BY rate
-					) tr ON tr.rate = dt.rate
+					) tr ON tr.rate = dt.rate 
 			JOIN supplier s ON s.id = d.companyFk
 			JOIN country c ON c.id = s.countryFk
 		WHERE d.id = vDuaFk
@@ -54647,16 +55136,16 @@ BEGIN
 	SELECT SUM(EURODEBE) -SUM(EUROHABER), MAX(id) INTO vDiff, vApunte
 		FROM XDiario
 		WHERE ASIEN = vBookNumber;
-
+		
 	UPDATE XDiario
 		SET BASEEURO = 100 * (EURODEBE - vDiff) / IVA,
-			EURODEBE = EURODEBE - vDiff
+			EURODEBE = EURODEBE - vDiff			
 		WHERE id = vApunte;
 
 	UPDATE dua
 		SET ASIEN = vBookNumber
 		WHERE id = vDuaFk;
-
+            
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54677,36 +55166,36 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTax_doRecalc`(vDuaFk INT)
 BEGIN
 /**
  * Borra los valores de duaTax y los vuelve a crear en base a la tabla duaEntry
- *
+ *  
  * @param vDuaFk Id del dua a recalcular
  */
     DELETE FROM duaTax
 		WHERE duaFk = vDuaFk;
-
-    INSERT INTO duaTax(duaFk, taxClassFk, base)
+        
+    INSERT INTO duaTax(duaFk, taxClassFk, base)    
 		SELECT vDuaFk, taxClassFk, SUM(sub.totalBase)
 			FROM intrastat ist
 				JOIN
 				(SELECT i.intrastatFk,
-						CAST(SUM(b.quantity *
-							b.buyingValue *
-							de.customsValue /
-							de.value)
-								* di.totalAmount /
+						CAST(SUM(b.quantity * 
+							b.buyingValue *  
+							de.customsValue / 
+							de.value)  
+								* di.totalAmount / 
 								bi.totalAmount AS DECIMAL(10,2)
 						) totalBase
-					FROM buy b
+					FROM buy b 
 						JOIN item i ON i.id = b.itemFk
 						JOIN entry e ON e.id = b.entryFk
 						JOIN duaEntry de ON de.entryFk = e.id
 						JOIN(
 							SELECT i.intrastatFk,
-									CAST(SUM(b.quantity *
-										b.buyingValue *
-										de.customsValue /
+									CAST(SUM(b.quantity * 
+										b.buyingValue * 
+										de.customsValue / 
 										de.value) AS DECIMAL(10,2)
 									) totalAmount
-								FROM buy b
+								FROM buy b 
 									JOIN item i ON i.id = b.itemFk
 									JOIN entry e ON e.id = b.entryFk
 									JOIN duaEntry de ON de.entryFk = e.id
@@ -54721,7 +55210,7 @@ BEGIN
                         ) di ON di.intrastatFk = i.intrastatFk
 					WHERE de.duaFk = vDuaFk
 					GROUP BY i.intrastatFk
-					HAVING totalBase
+					HAVING totalBase 
 				)sub ON ist.id = sub.intrastatFk
 			GROUP BY ist.taxClassFk;
 END ;;
@@ -54742,13 +55231,13 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ediTables_Update`()
 BEGIN
-
-	INSERT IGNORE INTO vn.genus(name)
+	
+	INSERT IGNORE INTO vn.genus(name) 
 		SELECT latin_genus_name
 			FROM edi.genus ;
 
-	INSERT IGNORE INTO vn.specie(name)
-		SELECT LCASE(latin_species_name)
+	INSERT IGNORE INTO vn.specie(name) 
+		SELECT LCASE(latin_species_name) 
 			FROM edi.specie ;
 END ;;
 DELIMITER ;
@@ -54788,71 +55277,71 @@ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 OPEN cur1;
 
  read_loop: LOOP
-
+ 
 	SET done = FALSE;
     SET vEntryFk = 0;
-
+    
     FETCH cur1 INTO vId;
-
+    
     IF done THEN
       LEAVE read_loop;
     END IF;
-
+    
     SELECT IFNULL(e.id,0) INTO vEntryFk
 		FROM vn.entry e
 			JOIN vn.travel tr ON tr.id = e.travelFk
-            JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+            JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk 
 										AND ea.warehouseInFk = tr.warehouseInFk
                                         AND ea.agencyModeFk = tr.agencyModeFk
                                         AND ea.supplierFk = e.supplierFk
 			WHERE ea.id = vId
 				AND tr.landed = vLanded
 			LIMIT 1;
-
+    
     IF NOT vEntryFk THEN
-
+    
 		SELECT IFNULL(e.id,0) INTO vEntryFk
 		FROM vn.entry e
 			JOIN vn.travel tr ON tr.id = e.travelFk
-            JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+            JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk 
 										AND ea.warehouseInFk = tr.warehouseInFk
                                         AND ea.agencyModeFk = tr.agencyModeFk
 			WHERE ea.id = vId
 				AND tr.landed = vLanded
                 AND ea.supplierFk IS NULL
 			LIMIT 1;
-
+    
     END IF;
-
+    
     IF NOT vEntryFk THEN
-
+    
 		SET vTravelFk = 0;
-
-		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
+    
+		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk 
 			FROM vn.travel tr
-				JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+				JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk 
 										AND ea.warehouseInFk = tr.warehouseInFk
                                         AND ea.agencyModeFk = tr.agencyModeFk
 				WHERE ea.id = vId
 					AND tr.landed = vLanded;
-
+                
 		IF NOT vTravelFk THEN
-
+        
 			INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
 				SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk
-					FROM vn.ektEntryAssign
+					FROM vn.ektEntryAssign 
 					WHERE id = vId;
-
-			SELECT MAX(tr.id) INTO vTravelFk
+					
+			SELECT MAX(tr.id) INTO vTravelFk 
 				FROM vn.travel tr
-					JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+					JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk 
 										AND ea.warehouseInFk = tr.warehouseInFk
                                         AND ea.agencyModeFk = tr.agencyFk
 				WHERE ea.id = vId
 					AND tr.landed = vLanded;
-
+                
 		END IF;
-
+        
         INSERT INTO vn.entry(travelFk, supplierFk,  companyFk, currencyFk)
 				SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id
 					FROM vn.supplier s
@@ -54860,13 +55349,13 @@ OPEN cur1;
 						JOIN vn.currency cu ON cu.code = 'EUR'
                         JOIN vn.ektEntryAssign ea ON ea.id = vId
 					WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-
-		SELECT MAX(id) INTO vEntryFk
+				
+		SELECT MAX(id) INTO vEntryFk 
 			FROM vn.entry
 			WHERE travelFk = vTravelFk;
-
+		        
     END IF;
-
+	
 	UPDATE vn.ektEntryAssign
 		SET entryFk = vEntryFk
         WHERE id = vId;
@@ -54874,7 +55363,7 @@ OPEN cur1;
   END LOOP;
 
   CLOSE cur1;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54894,18 +55383,18 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `energyMeter_record`(vInput INT, vActiveTime INT)
 BEGIN
 	DECLARE vConsumption INT;
-
+    
     SELECT consumption INTO vConsumption
 		FROM energyInput
 		WHERE input = vInput;
 
-	INSERT INTO vn.energyMeter
-		SET
-		  `input` = vInput,
-		  `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'),
+	INSERT INTO vn.energyMeter 
+		SET 
+		  `input` = vInput, 
+		  `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'), 
 		  `activeTime` = vActiveTime,
           `consumption` = CAST(IFNULL((vConsumption / 3600) * vActiveTime, 0) AS DECIMAL(10,2))
-		ON DUPLICATE KEY UPDATE
+		ON DUPLICATE KEY UPDATE 
 		  `activeTime` = `activeTime` + vActiveTime,
           `consumption` = `consumption` + CAST(VALUES(`consumption`) AS DECIMAL(10,2));
 END ;;
@@ -54928,28 +55417,28 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entryDelivered`(vDated DATE, vEntry
 BEGIN
 
 	DECLARE vTravelFk INT;
-
+    
     SELECT travelFk INTO vTravelFk
-		FROM vn.entry
+		FROM vn.entry 
 		WHERE id = vEntryFk;
-
+    
     IF (SELECT COUNT(*) FROM vn.entry WHERE travelFk = vTravelFk) = 1 THEN
-
+    
 		UPDATE vn.travel SET shipped = LEAST(shipped, vDated), landed = vDated
 			WHERE id = vTravelFk;
-
+    
     ELSE
-
+    
 		INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, ref, isDelivered, isReceived)
 			SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyModeFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE
 				FROM vn.travel WHERE id = vTravelFk;
-
+                
 		SELECT LAST_INSERT_ID() INTO vTravelFk;
-
-        UPDATE vn.entry
-			SET travelFk = vTravelFk
+        
+        UPDATE vn.entry 
+			SET travelFk = vTravelFk 
 			WHERE id = vEntryFk;
-
+    
     END IF;
 
 END ;;
@@ -54975,29 +55464,29 @@ BEGIN
     DECLARE vEntry INT;
     DECLARE vBucket VARCHAR(10);
     DECLARE vSupplierFk INT;
-
+    
     SET vSupplierFk = IF (vLandingWarehouse = 1, 850, 963);
 	-- seleccionamos travel
 	SELECT t.id, e.id INTO vTravel, vEntry
 		FROM travel t LEFT JOIN entry e ON t.id = e.travelFk
-        WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse
+        WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse 
 			AND t.warehouseInFk = vLandingWarehouse AND t.agencyModeFk IS NULL AND e.supplierFk = vSupplierFk
-	LIMIT 1;
-
+	LIMIT 1; 
+	
     -- creamos el travel si es necesario
     IF IFNULL(vTravel, FALSE) = FALSE THEN
 		INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk)
 			VALUES (vInOutDate, vInOutDate, vLandingWarehouse, vShipmentWarehouse);
 		SELECT LAST_INSERT_ID() INTO vTravel;
     END IF;
-
+    
     -- creamos la Entrada si es necesario
 	IF IFNULL(vEntry, FALSE) = FALSE THEN
 		INSERT INTO entry (supplierFk, travelFk)
 				VALUES (vSupplierFk, vTravel); -- proveedor 'CONFECCION ARTIFICIAL'
 		SELECT LAST_INSERT_ID() INTO vEntry;
 	END IF;
-
+            
 	 -- creamos el cubo si es necesario
 	SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1;
 	IF vBucket IS NULL THEN
@@ -55007,7 +55496,7 @@ BEGIN
         SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1;
 	END IF;
 
-	INSERT INTO buy(itemFk,quantity, entryFk, packageFk, packing, stickers, buyingValue, price2, price3)
+	INSERT INTO buy(itemFk,quantity, entryFk, packagingFk, packing, stickers, buyingValue, price2, price3) 
 		SELECT itemFk,
 			quantity,
 			vEntry,
@@ -55039,7 +55528,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_checkPackaging`(vEntryFk INT)
 BEGIN
 /**
  * Comprueba que los campos package y packaging no sean nulos
- *
+ * 
  * @param vEntryFk Id de entrada
  */
 	DECLARE vpackageOrPackingNull INT;
@@ -55293,7 +55782,7 @@ BEGIN
 			comissionValue,
 			packageValue,
 			location,
-			packageFk,
+			packagingFk,
 			price1,
 			price2,
 			price3,
@@ -55313,7 +55802,7 @@ BEGIN
 				comissionValue,
 				packageValue,
 				location,
-				packageFk,
+				packagingFk,
 				price1,
 				price2,
 				price3,
@@ -55343,7 +55832,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_getRate`(vSelf INT)
 BEGIN
 /**
- * Prepara una tabla con las tarifas aplicables en funcion de la fecha
+ * Prepara una tabla con las tarifas aplicables en funcion de la fecha 
  * y el almacén
  *
  * @param vSelf Id de la tabla entry
@@ -55353,7 +55842,7 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 
 	SELECT t.landed, t.warehouseInFk INTO vDated, vWarehouseFk
-		FROM entry e
+		FROM entry e 
 			JOIN travel t ON t.id = e.travelFk
 		WHERE e.id = vSelf;
 
@@ -55460,7 +55949,7 @@ BEGIN
 			containerFk,
 			comissionValue,
 			packageValue,
-			packageFk,
+			packagingFk,
 			price1,
 			price2,
 			price3,
@@ -55481,7 +55970,7 @@ BEGIN
 				containerFk,
 				comissionValue,
 				packageValue,
-				packageFk,
+				packagingFk,
 				price1,
 				price2,
 				price3,
@@ -55492,7 +55981,7 @@ BEGIN
 			FROM buy b
 			WHERE b.entryFk = vSelf
 				AND b.printedStickers != b.stickers;
-
+			
 	IF vChangeEntry THEN
 		UPDATE buy
 			SET stickers = printedStickers,
@@ -55504,7 +55993,7 @@ BEGIN
 				FROM item i
 				WHERE i.description = 'MISFIT'
 				LIMIT 1;
-
+		
 		INSERT INTO buy(entryFk,
 					itemFk,
 					quantity,
@@ -55519,7 +56008,7 @@ BEGIN
 					comissionValue,
 					packageValue,
 					location,
-					packageFk,
+					packagingFk,
 					price1,
 					price2,
 					price3,
@@ -55538,7 +56027,7 @@ BEGIN
 				comissionValue,
 				packageValue,
 				location,
-				packageFk,
+				packagingFk,
 				price1,
 				price2,
 				price3,
@@ -55571,7 +56060,7 @@ BEGIN
 	UPDATE entry
 		SET gestDocFk = (SELECT gestDocFk FROM entry WHERE id = vSelf LIMIT 1)
 		WHERE id = vNewEntryFk;
-
+	
 	INSERT INTO duaEntry (duaFk, entryFk)
 		SELECT duaFk, vNewEntryFk FROM duaEntry WHERE entryFk = vSelf LIMIT 1;
 END ;;
@@ -55645,12 +56134,12 @@ BEGIN
  */
 	DECLARE v_done BOOL DEFAULT FALSE;
 	DECLARE vEntryFk INTEGER;
-
+    
 	DECLARE vCur CURSOR FOR
 		    SELECT id FROM tmp.recalcEntryCommision;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET v_done = TRUE;
+		SET v_done = TRUE; 
 
 	OPEN vCur;
 
@@ -55661,7 +56150,7 @@ BEGIN
 		IF v_done THEN
 			LEAVE l;
 		END IF;
-
+		
 		CALL vn2008.buy_tarifas_entry(vEntryFk);
 	END LOOP;
 
@@ -55686,7 +56175,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitByShelving`(vShelvingFk
 BEGIN
 /**
  * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr�cula
- *
+ * 
  * @param vShelvingFk Identificador de vn.shelving
  * @param vFromEntryFk Entrada origen
  * @param vToEntryFk Entrada destino
@@ -55696,49 +56185,49 @@ BEGIN
 	DECLARE vBuyStickers INT;
 	DECLARE vDone BOOLEAN DEFAULT FALSE;
 
-	DECLARE cur CURSOR FOR
+	DECLARE cur CURSOR FOR 
 		SELECT 	bb.id buyFk,
 				FLOOR(ish.visible / ish.packing) ishStickers,
 				bb.stickers buyStickers
 				FROM vn.itemShelving ish
-				JOIN (SELECT b.id, b.itemFk, b.stickers
-						FROM vn.buy b
+				JOIN (SELECT b.id, b.itemFk, b.stickers 
+						FROM vn.buy b 
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
-						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
+						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk 
 							AND bb.stickers >= FLOOR(ish.visible / ish.packing)
 			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
 			GROUP BY ish.id;
-
+			
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	-- Cantidades de la matrícula que exceden la de las entradas
-	SELECT 	ish.itemFk,
-			i.longName,
+	
+	-- Cantidades de la matrícula que exceden la de las entradas 
+	SELECT 	ish.itemFk, 
+			i.longName, 
 			FLOOR(ish.visible / ish.packing) AS etiEnMatricula,
 			bb.stickers etiEnEntrada
 				FROM vn.itemShelving ish
-					JOIN vn.item i ON i.id = ish.itemFk
-				LEFT JOIN (SELECT b.id, b.itemFk, b.stickers
-						FROM vn.buy b
+					JOIN vn.item i ON i.id = ish.itemFk 
+				LEFT JOIN (SELECT b.id, b.itemFk, b.stickers 
+						FROM vn.buy b 
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
 			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
 				AND  IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing)
 			GROUP BY ish.id;
-
+		
 	OPEN cur;
 
 	read_loop: LOOP
 		SET vDone = FALSE;
-
+	
 		FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers;
-
+	
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
-
+		
 		IF vIshStickers =  vBuyStickers THEN
 			UPDATE vn.buy
 				SET entryFk = vToEntryFk
@@ -55746,9 +56235,9 @@ BEGIN
 		ELSE
 			UPDATE vn.buy
 				SET stickers = stickers - vIshStickers,
-					quantity = stickers * packing
+					quantity = stickers * packing 
 				WHERE id = vBuyFk;
-
+		
 			INSERT INTO	vn.buy(entryFk,
 								itemFk,
 								quantity,
@@ -55763,7 +56252,7 @@ BEGIN
 								comissionValue,
 								packageValue,
 								location,
-								packageFk,
+								packagingFk,
 								price1,
 								price2,
 								price3,
@@ -55790,7 +56279,7 @@ BEGIN
 							comissionValue,
 							packageValue,
 							location,
-							packageFk,
+							packagingFk,
 							price1,
 							price2,
 							price3,
@@ -55828,16 +56317,16 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitMisfit`(vSelf INT)
 BEGIN
-
+	
 	/* Divide una entrada, pasando los registros que ha insertado vn.entry_fixMisfit de la entrada original
 	 * a la nueva
 	 */
-
+	
 	DECLARE vNewEntryFk INT;
 	DECLARE vBuyFk INT;
 
 	SELECT MAX(b.id) INTO vBuyFk
-		FROM vn.buy b
+		FROM vn.buy b 
 			JOIN vn.item i ON i.id = b.itemFk
 			WHERE b.entryFk = vSelf
 				AND i.description = 'MISFIT';
@@ -55846,17 +56335,17 @@ BEGIN
 		SELECT supplierFk, dated, travelFk, currencyFk, companyFk
 			FROM vn.entry e
 			WHERE e.id = vSelf;
+		
+	SET vNewEntryFk = LAST_INSERT_ID(); 
 
-	SET vNewEntryFk = LAST_INSERT_ID();
-
-	UPDATE vn.buy b
+	UPDATE vn.buy b 
 		SET b.entryFk = vNewEntryFk
 		WHERE b.entryFk = vSelf
 			AND b.id > vBuyFk;
-
+		
 	SELECT vNewEntryFk;
-
-
+	
+		
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -55879,7 +56368,7 @@ BEGIN
  * Unlock the indicated entry
  * @vSelf params entry id
  */
-	UPDATE `entry`
+	UPDATE `entry` 
 		SET lockerUserFk = NULL,
 			locked = NULL
 		WHERE id = vSelf;
@@ -55910,21 +56399,21 @@ BEGIN
 	DECLARE vComission INT;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision
-		SELECT e.id
+		SELECT e.id 
 			FROM vn.entry e
 				JOIN vn.travel t ON t.id = e.travelFk
-				JOIN vn.warehouse w ON w.id = t.warehouseInFk
+				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
 			WHERE t.shipped >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency;
 
 	SET vComission = currency_getCommission(vCurrency);
 
-	UPDATE vn.entry e
+	UPDATE vn.entry e 
 		JOIN tmp.recalcEntryCommision tmp ON tmp.id = e.id
 	SET e.commission = vComission;
 
-	SELECT `name` INTO vCurrencyName
-		FROM currency
+	SELECT `name` INTO vCurrencyName 
+		FROM currency 
 			WHERE id = vCurrency;
 
 	CALL entry_recalc();
@@ -55960,7 +56449,7 @@ BEGIN
 	DECLARE vRouteFk INT DEFAULT 0;
 
 	SELECT t.routeFk INTO vRouteFk
-		FROM vn.expedition exp
+		FROM vn.expedition exp 
 			INNER JOIN ticket t on t.id = exp.ticketFk
 		WHERE exp.id = vExpeditionFk;
 
@@ -56163,14 +56652,14 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_printLabel`(vSelf INT)
 BEGIN
 /**
- * Calls the report_print procedure and passes it
+ * Calls the report_print procedure and passes it 
  * the necessary parameters for printing.
  *
  * @param vSelf expeditioPallet id.
  */
 	DECLARE vPrinterFk INT;
 	DECLARE vUserFk INT DEFAULT account.myUser_getId();
-
+	
 	SELECT o.labelerFk INTO vPrinterFk
 		FROM operator o
 		WHERE o.workerFk = vUserFk;
@@ -56237,22 +56726,22 @@ BEGIN
 	DECLARE vTotal INT DEFAULT 0;
 
 	IF vPalletFk = 0 THEN -- Nuevo pallet
-
-		INSERT INTO vn.expeditionPallet(truckFk)
+    
+		INSERT INTO vn.expeditionPallet(truckFk) 
 			VALUES(vTruckFk);
-
+            
 		SELECT LAST_INSERT_ID() INTO vPalletFk;
-
+    
     END IF;
-
+    
     SELECT COUNT(expeditionFk) INTO vTotal FROM vn.expeditionScan WHERE palletFk = vPalletFk;
-
+    
     IF vTotal <> 0 THEN
-		SELECT 	expeditionFk,
+		SELECT 	expeditionFk, 
 				palletFk
-			FROM vn.expeditionScan
+			FROM vn.expeditionScan 
 			WHERE palletFk = vPalletFk;
-	ELSE
+	ELSE 
 		SELECT 0 expeditionFk,vPalletFk palletFk;
 	END IF;
 END ;;
@@ -56325,12 +56814,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Put`(vPalletFk INT, vExpeditionFk INT)
 BEGIN
-
-		REPLACE vn.expeditionScan(expeditionFk, palletFk)
+    
+		REPLACE vn.expeditionScan(expeditionFk, palletFk) 
 			VALUES(vExpeditionFk, vPalletFk);
-
+            
 		SELECT LAST_INSERT_ID() INTO vPalletFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56349,32 +56838,32 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_add`(vParam INT, vStateCode VARCHAR(100))
 BEGIN
-
+	
 	/**
 	 * Inserta nuevos registros en la tabla vn.expeditionState, segun el parámetro
-	 *
+	 * 
 	 * @param vParam Identificador de vn.expedition o de vn.route
 	 * @param vStateCode Corresponde a vn.expeditionStateType.code
 	 */
-
+	
 	IF (SELECT COUNT(*) FROM vn.route r WHERE r.id = vParam) THEN
-
+	
 		INSERT INTO vn.expeditionState(expeditionFk, typeFk)
 			SELECT e.id, est.id
 				FROM vn.expedition e
 					JOIN vn.ticket t ON t.id = e.ticketFk
 					JOIN vn.expeditionStateType est ON est.code = vStateCode
 				WHERE t.routeFk = vParam;
-
+		
 	ELSE
-
+	
 		INSERT INTO vn.expeditionState(expeditionFk, typeFk)
 			SELECT vParam, est.id
 				FROM vn.expeditionStateType est
 				WHERE est.code = vStateCode;
-
+			
 	END IF;
-
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56406,7 +56895,7 @@ BEGIN
 		SELECT e.id, est.id
 			FROM vn.expedition e
 				JOIN vn.expeditionStateType est ON est.code = vStateCode
-				JOIN vn.ticket t ON t.id = e.ticketFk
+				JOIN vn.ticket t ON t.id = e.ticketFk 
 			WHERE t.addressFk  = vAdressFk AND t.routeFk =  vRouteFk;
 
 END ;;
@@ -56427,14 +56916,14 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByExpedition`(vExpeditionFk INT, vStateCode VARCHAR(100))
 BEGIN
-
+	
 	/**
 	 * Inserta nuevos registros en la tabla vn.expeditionState
-	 *
+	 * 
 	 * @param vExpeditionFk Identificador de vn.expedition
 	 * @param vStateCode Corresponde a vn.expeditionStateType.code
 	 */
-
+	
 	INSERT INTO vn.expeditionState(expeditionFk, typeFk)
 		SELECT vExpeditionFk, est.id
 			FROM vn.expeditionStateType est
@@ -56460,7 +56949,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByPallet`(vPalle
 BEGIN
 /**
  * Inserta nuevos registros en la tabla vn.expeditionState
- *
+ * 
  * @param vPalletFk Identificador de vn.expedition
  * @param vStateCode Corresponde a vn.expeditionStateType.code
  */
@@ -56477,7 +56966,7 @@ BEGIN
 
 	IF NOT hasExpeditions THEN
 		DROP TEMPORARY TABLE tExpeditionScan;
-		CALL util.throw('palletDoesNotExist');
+		CALL util.throw('palletDoesNotExist'); 
 	END IF;
 
 	INSERT INTO vn.expeditionState(expeditionFk, typeFk)
@@ -56502,21 +56991,21 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByRoute`(vRouteFk INT, vStateCode VARCHAR(100))
 BEGIN
-
+	
 	/**
 	 * Inserta nuevos registros en la tabla vn.expeditionState, por rutas
-	 *
+	 * 
 	 * @param vRouteFk Identificador de vn.route
 	 * @param vStateCode Corresponde a vn.expeditionStateType.code
 	 */
-
+	
 	INSERT INTO vn.expeditionState(expeditionFk, typeFk)
 		SELECT e.id, est.id
 			FROM vn.expedition e
 				JOIN vn.ticket t ON t.id = e.ticketFk
 				JOIN vn.expeditionStateType est ON est.code = vStateCode
 			WHERE t.routeFk = vRouteFk;
-
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56558,8 +57047,8 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_List`()
 BEGIN
 
-	SELECT 	id truckFk,
-			eta,
+	SELECT 	id truckFk, 
+			eta, 
             description Destino
 		FROM expeditionTruck
         WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
@@ -56603,7 +57092,7 @@ BEGIN
 			JOIN address a ON t.addressFk = a.id
 			JOIN route r ON r.id = t.routeFk
 			LEFT JOIN warehouse w ON t.warehouseFk = w.id
-			LEFT JOIN (SELECT sub.ticketFk,
+			LEFT JOIN (SELECT sub.ticketFk, 
 					CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeConcat
 						FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
 							FROM ticket t
@@ -56634,7 +57123,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_getState`(vExpeditionFk INT)
 BEGIN
-
+	
 	DECLARE vTicketsPendientes INT;
 	DECLARE vEtiquetasTotales INT;
 	DECLARE vEtiquetasEscaneadas INT;
@@ -56644,24 +57133,24 @@ BEGIN
 		FROM vn.ticket t
 			JOIN vn.expedition e ON e.ticketFk = t.id
 		WHERE e.id = vExpeditionFk;
-
+	
 	SELECT COUNT(*) INTO vTicketsPendientes
 		FROM vn.ticket t
 			LEFT JOIN vn.expedition e ON e.ticketFk = t.id
 		WHERE t.routeFk = vRouteFk
 			AND ISNULL(e.id);
-
+		
 	SELECT COUNT(*) INTO vEtiquetasTotales
-		FROM vn.expedition e
+		FROM vn.expedition e 
 			JOIN vn.ticket t ON t.id = e.ticketFk
 		WHERE t.routeFk = vRouteFk;
-
+	
 	SELECT COUNT(*) INTO vEtiquetasEscaneadas
-		FROM vn.expeditionScan es
+		FROM vn.expeditionScan es 
 			JOIN vn.expedition e ON e.id = es.expeditionFk
-			JOIN vn.ticket t ON t.id = e.ticketFk
+			JOIN vn.ticket t ON t.id = e.ticketFk 
 		WHERE t.routeFk = vRouteFk;
-
+		
 	SELECT 	e.ticketFk ticket,
 			t.nickname cliente,
 			a.city ciudad,
@@ -56675,17 +57164,17 @@ BEGIN
 			vTicketsPendientes AS ticketsPendientes,
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas
-		FROM vn.expedition e
-			JOIN vn.ticket t ON t.id = e.ticketFk
-			JOIN vn.address a ON a.id = t.addressFk
-			JOIN vn.province p ON p.id = a.provinceFk
-			JOIN vn.`zone`z ON z.id = t.zoneFk
-			LEFT JOIN vn.route r ON r.id = t.routeFk
-			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk
-			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
-			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+		FROM vn.expedition e 
+			JOIN vn.ticket t ON t.id = e.ticketFk 
+			JOIN vn.address a ON a.id = t.addressFk 
+			JOIN vn.province p ON p.id = a.provinceFk 
+			JOIN vn.`zone`z ON z.id = t.zoneFk 
+			LEFT JOIN vn.route r ON r.id = t.routeFk 
+			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
+			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
+			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56704,12 +57193,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_StateGet`(vExpeditionFk INT)
 BEGIN
-
+	
 	/* Devuelve una "ficha" con todos los datos relativos a la expedición
-	 *
-	 * param vExpeditionFk
+	 * 
+	 * param vExpeditionFk 
 	 */
-
+	
 	DECLARE vTicketsPendientes INT;
 	DECLARE vEtiquetasTotales INT;
 	DECLARE vEtiquetasEscaneadas INT;
@@ -56720,34 +57209,34 @@ BEGIN
 		FROM vn.ticket t
 			JOIN vn.expedition e ON e.ticketFk = t.id
 		WHERE e.id = vExpeditionFk;
-
+	
 	SELECT COUNT(*) INTO vTicketsPendientes
 		FROM vn.ticket t
 			LEFT JOIN vn.expedition e ON e.ticketFk = t.id
 		WHERE t.routeFk = vRouteFk
 			AND ISNULL(e.id);
-
+		
 	SELECT COUNT(*) INTO vEtiquetasTotales
-		FROM vn.expedition e
+		FROM vn.expedition e 
 			JOIN vn.ticket t ON t.id = e.ticketFk
 		WHERE t.routeFk = vRouteFk;
-
+	
 	SELECT COUNT(*) INTO vEtiquetasEscaneadas
-		FROM vn.expeditionScan es
+		FROM vn.expeditionScan es 
 			JOIN vn.expedition e ON e.id = es.expeditionFk
-			JOIN vn.ticket t ON t.id = e.ticketFk
+			JOIN vn.ticket t ON t.id = e.ticketFk 
 		WHERE t.routeFk = vRouteFk;
-
+	
 	SELECT COUNT(*) INTO vEtiquetasLeidasSorter
-		FROM srt.expedition e
+		FROM srt.expedition e 
 			JOIN vn.expedition ve ON ve.id = e.id
 			LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
-			JOIN vn.ticket t ON t.id = ve.ticketFk
+			JOIN vn.ticket t ON t.id = ve.ticketFk 
 			WHERE t.routeFk = vRouteFk
 				AND e.created != e.updated
-				AND ISNULL(es.expeditionFk);
-
-
+				AND ISNULL(es.expeditionFk); 
+			
+		
 	SELECT 	e.ticketFk ticket,
 			t.nickname cliente,
 			a.city ciudad,
@@ -56762,17 +57251,17 @@ BEGIN
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas,
 			vEtiquetasLeidasSorter AS etiquetasSorter
-		FROM vn.expedition e
-			JOIN vn.ticket t ON t.id = e.ticketFk
-			JOIN vn.address a ON a.id = t.addressFk
-			JOIN vn.province p ON p.id = a.provinceFk
-			JOIN vn.`zone`z ON z.id = t.zoneFk
-			LEFT JOIN vn.route r ON r.id = t.routeFk
-			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk
-			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
-			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+		FROM vn.expedition e 
+			JOIN vn.ticket t ON t.id = e.ticketFk 
+			JOIN vn.address a ON a.id = t.addressFk 
+			JOIN vn.province p ON p.id = a.provinceFk 
+			JOIN vn.`zone`z ON z.id = t.zoneFk 
+			LEFT JOIN vn.route r ON r.id = t.routeFk 
+			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
+			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
+			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56818,7 +57307,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControl`(vFromDated DATE, vToDated DATE)
 BEGIN
-
+	
 	DECLARE vSijsnerClientFk INT DEFAULT 19752;
 
 	DECLARE vDateStart DATETIME;
@@ -56827,68 +57316,68 @@ BEGIN
 	SET vDateStart = vFromDated;
 	SET vDateEnd = util.Dayend(vToDated);
 
-	SELECT p.id FustCode,
-			CAST(sent.stucks AS DECIMAL(10,0)) FH,
-			CAST(tp.stucks AS DECIMAL(10,0)) Tickets,
-			CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner,
+	SELECT p.id FustCode, 
+			CAST(sent.stucks AS DECIMAL(10,0)) FH, 
+			CAST(tp.stucks AS DECIMAL(10,0)) Tickets, 
+			CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner, 
 			CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
 		FROM vn.packaging p
 		LEFT JOIN (
 			SELECT FustCode, sum(fustQuantity) stucks
 				FROM (
 				SELECT IFNULL(pe.equivalentFk ,b.packagingFk) FustCode, s.quantity / b.packing AS fustQuantity
-					FROM vn.sale s
-						JOIN vn.ticket t ON t.id = s.ticketFk
-						JOIN vn.warehouse w ON w.id = t.warehouseFk
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
-						JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk
-						JOIN vn.buy b ON b.id = lb.buy_id
-						JOIN vn.packaging p ON p.id = b.packagingFk
+					FROM vn.sale s 
+						JOIN vn.ticket t ON t.id = s.ticketFk 
+						JOIN vn.warehouse w ON w.id = t.warehouseFk 
+						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
+						JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk 
+						JOIN vn.buy b ON b.id = lb.buy_id 
+						JOIN vn.packaging p ON p.id = b.packagingFk 
 						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk
-						JOIN vn.province p2 ON p2.id = a.provinceFk
-						JOIN vn.country c ON c.id = p2.countryFk
+						JOIN vn.address a ON a.id = t.addressFk 
+						JOIN vn.province p2 ON p2.id = a.provinceFk 
+						JOIN vn.country c ON c.id = p2.countryFk 
 					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
 						AND wa.name = 'VNH'
-						AND p.isPackageReturnable
-						AND c.country = 'FRANCIA') sub
+						AND p.isPackageReturnable 
+						AND c.country = 'FRANCIA') sub 
 					GROUP BY FustCode) sent ON sent.FustCode = p.id
 		LEFT JOIN (
 			SELECT FustCode, sum(quantity) stucks
 				FROM (
 				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp
-						JOIN vn.ticket t ON t.id = tp.ticketFk
-						JOIN vn.warehouse w ON w.id = t.warehouseFk
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
-						JOIN vn.packaging p ON p.id = tp.packagingFk
+					FROM vn.ticketPackaging tp 
+						JOIN vn.ticket t ON t.id = tp.ticketFk 
+						JOIN vn.warehouse w ON w.id = t.warehouseFk 
+						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
+						JOIN vn.packaging p ON p.id = tp.packagingFk 
 						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk
-						JOIN vn.province p2 ON p2.id = a.provinceFk
-						JOIN vn.country c ON c.id = p2.countryFk
+						JOIN vn.address a ON a.id = t.addressFk 
+						JOIN vn.province p2 ON p2.id = a.provinceFk 
+						JOIN vn.country c ON c.id = p2.countryFk 
 					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
 						AND wa.name = 'VNH'
-						AND p.isPackageReturnable
+						AND p.isPackageReturnable 
 						AND c.country = 'FRANCIA'
 						AND t.clientFk != vSijsnerClientFk
-						AND tp.quantity > 0) sub
+						AND tp.quantity > 0) sub 
 					GROUP BY FustCode) tp ON tp.FustCode = p.id
 		LEFT JOIN (
 			SELECT FustCode, sum(quantity) stucks
 				FROM (
 				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp
-						JOIN vn.ticket t ON t.id = tp.ticketFk
-						JOIN vn.warehouse w ON w.id = t.warehouseFk
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
-						JOIN vn.packaging p ON p.id = tp.packagingFk
+					FROM vn.ticketPackaging tp 
+						JOIN vn.ticket t ON t.id = tp.ticketFk 
+						JOIN vn.warehouse w ON w.id = t.warehouseFk 
+						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
+						JOIN vn.packaging p ON p.id = tp.packagingFk 
 						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
 					WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
 						AND wa.name = 'VNH'
-						AND p.isPackageReturnable
-						AND t.clientFk = vSijsnerClientFk) sub
+						AND p.isPackageReturnable 
+						AND t.clientFk = vSijsnerClientFk) sub 
 					GROUP BY FustCode) sj ON sj.FustCode = p.id
-		WHERE sent.stucks
+		WHERE sent.stucks 
 			OR tp.stucks
 			OR sj.stucks;
 
@@ -56910,7 +57399,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControlDetail`(vFromDated DATE, vToDated DATE)
 BEGIN
-
+	
 	DECLARE vSijsnerClientFk INT DEFAULT 19752;
 
 	DECLARE vDateStart DATETIME;
@@ -56918,29 +57407,29 @@ BEGIN
 
 	SET vDateStart = vFromDated;
 	SET vDateEnd = util.Dayend(vToDated);
-
+	
 	SELECT a.nickname shopName,
-			a.city ,
-			IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode,
+			a.city , 
+			IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, 
 			tp.quantity,
 			tp.ticketFk,
 			CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
-				FROM vn.ticketPackaging tp
-					JOIN vn.ticket t ON t.id = tp.ticketFk
-					JOIN vn.warehouse w ON w.id = t.warehouseFk
-					JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
-					JOIN vn.packaging p ON p.id = tp.packagingFk
+				FROM vn.ticketPackaging tp 
+					JOIN vn.ticket t ON t.id = tp.ticketFk 
+					JOIN vn.warehouse w ON w.id = t.warehouseFk 
+					JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
+					JOIN vn.packaging p ON p.id = tp.packagingFk 
 					LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-					JOIN vn.address a ON a.id = t.addressFk
-					JOIN vn.province p2 ON p2.id = a.provinceFk
-					JOIN vn.country c ON c.id = p2.countryFk
+					JOIN vn.address a ON a.id = t.addressFk 
+					JOIN vn.province p2 ON p2.id = a.provinceFk 
+					JOIN vn.country c ON c.id = p2.countryFk 
 				WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
 					AND wa.name = 'VNH'
-					AND p.isPackageReturnable
+					AND p.isPackageReturnable 
 					AND c.country = 'FRANCIA'
 					AND t.clientFk != vSijsnerClientFk
 					AND tp.quantity > 0;
-
+				
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56966,8 +57455,8 @@ DECLARE vTicketFk INT;
 DECLARE vSaleFk INT;
 DECLARE vClonTicket INT DEFAULT 0;
 
-DECLARE cur1 CURSOR FOR
-SELECT s.ticketFk, s.id
+DECLARE cur1 CURSOR FOR 
+SELECT s.ticketFk, s.id 
 	FROM vn.sale s
 		JOIN vn.ticket t ON t.id = s.ticketFk
 		JOIN vn.item i ON i.id = s.itemFk
@@ -56983,17 +57472,17 @@ OPEN cur1;
 FETCH cur1 INTO vTicketFk, vSaleFk;
 
  WHILE done = 0 DO
-
+    
     SELECT t.id INTO vClonTicket
 		FROM vn.ticket t
         JOIN (SELECT addressFk, shipped FROM vn.ticket WHERE id = vTicketFk) sub USING(addressFk, shipped)
         WHERE t.warehouseFk = 44
         LIMIT 1;
-
+	
 																								SELECT vTicketFk, vClonTicket;
-
+   
 	IF vClonTicket = 0 THEN
-
+    
 		INSERT INTO ticket (
 				clientFk,
 				shipped,
@@ -57021,12 +57510,12 @@ FETCH cur1 INTO vTicketFk, vSaleFk;
                 zonePrice,
                 zoneBonus,
                 routeFk
-
+			
 		FROM ticket
 		WHERE id = vTicketFk;
 
 		SET vClonTicket = LAST_INSERT_ID();
-
+    
 																										SELECT 'lstID', vClonTicket;
         /*
 		INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
@@ -57036,20 +57525,20 @@ FETCH cur1 INTO vTicketFk, vSaleFk;
 			WHERE t.id = vClonTicket;
 */
 		INSERT INTO ticketLog
-		SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert',
+		SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert', 
 			description = CONCAT('Ha creado el ticket:', ' ', vClonTicket, ' clonando el ', vTicketFk);
-
+      
     END IF;
-
+      
 	UPDATE vn.sale
 		SET ticketFk = vClonTicket
 		WHERE id = vSaleFk;
 
 	SET vClonTicket = 0;
-
+    
     SET done = 0;
     FETCH cur1 INTO vTicketFk, vSaleFk;
-
+    
   END WHILE;
 
   CLOSE cur1;
@@ -57074,8 +57563,8 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `getDayExpeditions`()
 BEGIN
 
-	SELECT
-		e.expeditions_id as expeditionFk,
+	SELECT 
+		e.expeditions_id as expeditionFk, 
         date_format(e.odbc_date,'%Y-%m-%d') as expeditionDate,
         e.ticket_id as ticketFk,
         t.routeFk as routeFk
@@ -57127,6 +57616,51 @@ BEGIN
 
 	SELECT id,name as description,upToDown as  quantity FROM vn.item WHERE upToDown;
 
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getTaxBases` */;
+/*!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_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `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 ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -57152,7 +57686,7 @@ BEGIN
 
 	SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL yearsToDelete YEAR) INTO vDated
 		FROM vn.greugeConfig;
-
+		
 	INSERT INTO vn.greuge(clientFk, description, amount, shipped, created, greugeTypeFk)
 		SELECT clientFk, 'Suma agrupada', SUM(amount), MAX(shipped), MAX(created), greugeTypeFk
 			FROM vn.greuge
@@ -57270,8 +57804,8 @@ DECLARE done BOOL DEFAULT FALSE;
 DECLARE vTicketFk INT;
 
 DECLARE rs CURSOR FOR
-		SELECT id FROM vn.ticket
-			WHERE shipped = util.yesterday()
+		SELECT id FROM vn.ticket 
+			WHERE shipped = util.yesterday() 
 				AND clientFk = 400
                 AND warehouseFk IN (1,44);
 
@@ -57282,13 +57816,13 @@ OPEN rs;
 FETCH rs INTO vTicketFk;
 
 WHILE NOT done DO
-
+   
     INSERT INTO vn.inventoryFailure(dated, itemFk, quantity, value, warehouseFk, throwerFk)
-		SELECT 	t.shipped,
-				s.itemFk,
-				s.quantity,
+		SELECT 	t.shipped, 
+				s.itemFk, 
+				s.quantity, 
 				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue,
-				t.warehouseFk,
+				t.warehouseFk, 
 				w.id
 			FROM vn.ticket t
 				JOIN vn.sale s ON s.ticketFk = t.id
@@ -57299,7 +57833,7 @@ WHILE NOT done DO
 			AND s.quantity > 0;
 
 	FETCH rs INTO vTicketFk;
-
+    
 END WHILE;
 
 
@@ -57442,7 +57976,7 @@ proc: BEGIN
 		CREATE OR REPLACE TEMPORARY TABLE tmp.inventory (
 				itemFk INT(11) NOT NULL PRIMARY KEY,
 				quantity int(11) DEFAULT '0',
-				buyingValue decimal(10,3) DEFAULT '0.000',
+				buyingValue decimal(10,4) DEFAULT '0.0000',
 				freightValue decimal(10,3) DEFAULT '0.000',
 				packing int(11) DEFAULT '0',
 				`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
@@ -57640,7 +58174,7 @@ BEGIN
 			b.id AS buyFk,
 			b.entryFk,
 			b.isIgnored,
-			b.price2,
+			b.price2, 
 			b.price3,
 			b.stickers,
 			b.packing,
@@ -57654,20 +58188,20 @@ BEGIN
 			s.id AS supplierFk,
 			s.name AS supplier
 		FROM itemType it
-		RIGHT JOIN (entry e
+		RIGHT JOIN (entry e 
 				LEFT JOIN supplier s ON s.id = e.supplierFk
 				RIGHT JOIN buy b ON b.entryFk = e.id
 				LEFT JOIN item i ON i.id = b.itemFk
-				LEFT JOIN ink ON ink.id = i.inkFk
+				LEFT JOIN ink ON ink.id = i.inkFk 
 				LEFT JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN warehouse w ON w.id = tr.warehouseInFk
 				LEFT JOIN origin o ON o.id = i.originFk
 				) ON it.id = i.typeFk
 		LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
 		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
-
+	  
 	DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
-	CREATE TEMPORARY TABLE tmp.lastEntryOk
+	CREATE TEMPORARY TABLE tmp.lastEntryOk  
 	(PRIMARY KEY (buyFk))
 	  SELECT
 			i.id AS itemFk,
@@ -57677,7 +58211,7 @@ BEGIN
 			b.id AS buyFk,
 			b.entryFk,
 			b.isIgnored,
-			b.price2,
+			b.price2, 
 			b.price3,
 			b.stickers,
 			b.packing,
@@ -57691,11 +58225,11 @@ BEGIN
 			s.id AS supplierFk,
 			s.name AS supplier
 		FROM itemType it
-		RIGHT JOIN (entry e
+		RIGHT JOIN (entry e 
 				LEFT JOIN supplier s ON s.id = e.supplierFk
 				RIGHT JOIN buy b ON b.entryFk = e.id
 				LEFT JOIN item i ON i.id = b.itemFk
-				LEFT JOIN ink ON ink.id = i.inkFk
+				LEFT JOIN ink ON ink.id = i.inkFk 
 				LEFT JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN warehouse w ON w.id = tr.warehouseInFk
 				LEFT JOIN origin o ON o.id = i.originFk
@@ -57703,34 +58237,34 @@ BEGIN
 		LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
 		WHERE b.packagingFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE()))
 		ORDER BY tr.landed DESC;
-
+		
 	DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOkGroup;
-	CREATE TEMPORARY TABLE tmp.lastEntryOkGroup
+	CREATE TEMPORARY TABLE tmp.lastEntryOkGroup  
 	(INDEX (warehouseFk,itemFk))
 	  SELECT *
 		FROM tmp.lastEntryOk tmp
 		GROUP BY tmp.itemFk,tmp.warehouseFk;
-
+		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		SET b.packagingFk = eo.packagingFk WHERE b.packagingFk = "--";
-
+		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		 SET b.price2 = eo.price2 WHERE  b.price2 = 0 ;
-
+		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		SET b.packing = eo.packing WHERE b.packing = 0;
-
+		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		SET b.buyingValue = eo.buyingValue WHERE  b.buyingValue = 0;
-
+    
 		DROP TEMPORARY TABLE tmp.lastEntry;
         DROP TEMPORARY TABLE tmp.lastEntryOk;
     	DROP TEMPORARY TABLE tmp.lastEntryOkGroup;
@@ -57798,7 +58332,7 @@ BEGIN
 
 	DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, util.VN_CURDATE());
 
-	SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate);
+	SET vMaxTicketDate = util.dayEnd(vMaxTicketDate);
 
 	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;
 
@@ -57890,7 +58424,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInDueDay_calculate`(vInvoiceInFk INT)
 BEGIN
 /**
- * Calcula los vctos. de una factura recibida
+ * Calcula los vctos. de una factura recibida 
  * En caso de haberlos informado previamente o que el proveedor sea español, no los recalculará
  *
  * @param vInvoiceInFk Factura recibida
@@ -57911,46 +58445,46 @@ BEGIN
 		WHERE ii.id = vInvoiceInFk;
 
 	SELECT COUNT(*) INTO vHasDueDay
-		FROM invoiceInDueDay iid
+		FROM invoiceInDueDay iid 
 		WHERE iid.invoiceInFk = vInvoiceInFk;
 
 	IF NOT vHasDueDay AND vCompanyCountryCode = 'ES' THEN
 
 		SET @cont := 0;
 		INSERT INTO invoiceInDueDay (
-				invoiceInFk,
-				dueDated,
-				amount,
+				invoiceInFk, 
+				dueDated, 
+				amount, 
 				foreignValue
 			)
 			SELECT vInvoiceInFk,
-					IF(payDay,
+					IF(payDay, 
 						IF(getNextDueDate(issued, pdd.detail, payDay) < created,
 							created,
-							getNextDueDate(issued, pdd.detail, payDay)),
+							getNextDueDate(issued, pdd.detail, payDay)), 
 						GREATEST(created, issued + INTERVAL pdd.detail DAY)),
-					IF((@cont := @cont + 1) < cont,
-						TRUNCATE(venc / cont, 2),
-						venc - (TRUNCATE(venc / cont, 2) * (cont - 1))),
-					IF(@cont < cont,
-						TRUNCATE(foreignValue / cont, 2),
-						foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1)))
-				FROM (
-					SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100) * vHasDueDayTax)
-								* iit.taxableBase) / COUNT(DISTINCT(pdd.detail)) venc,
+					IF((@cont := @cont + 1) < cont, 
+						TRUNCATE(venc / cont, 2), 
+						venc - (TRUNCATE(venc / cont, 2) * (cont - 1))),  
+					IF(@cont < cont, 
+						TRUNCATE(foreignValue / cont, 2), 
+						foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1)))  
+				FROM ( 
+					SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100) * vHasDueDayTax) 
+								* iit.taxableBase) / COUNT(DISTINCT(pdd.detail)) venc,  
 							SUM(iit.foreignValue) / COUNT(DISTINCT(pdd.detail)) foreignValue,
-							s.payDemFk,
+							s.payDemFk,  
 							ii.companyFk,
 							COUNT(DISTINCT(pdd.detail)) cont,
 							s.payDay,
 							ii.issued,
 							DATE(ii.created) + INTERVAL 2 DAY created
-						FROM invoiceIn ii
-							JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
-							LEFT JOIN sage.TiposIva ti ON ti.CodigoIva= iit.taxTypeSageFk
-							JOIN supplier s ON s.id = ii.supplierFk
-							JOIN payDemDetail pdd ON pdd.id = s.payDemFk
-						WHERE ii.id = vInvoiceInFk
+						FROM invoiceIn ii 
+							JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id 
+							LEFT JOIN sage.TiposIva ti ON ti.CodigoIva= iit.taxTypeSageFk 
+							JOIN supplier s ON s.id = ii.supplierFk  
+							JOIN payDemDetail pdd ON pdd.id = s.payDemFk 
+						WHERE ii.id = vInvoiceInFk   
 						GROUP BY ii.id
 					)sub
 					JOIN payDemDetail pdd ON pdd.id = sub.payDemFk
@@ -57978,9 +58512,9 @@ BEGIN
 
 	DELETE FROM invoiceInDueDay
 		WHERE invoiceInFk = vInvoiceInFk;
-
+		
 	CALL invoiceInDueDay_calculate(vInvoiceInFk);
-
+         
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -58053,14 +58587,15 @@ BEGIN
 	DECLARE vLines INT;
 
 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
-
+	
 	SELECT COUNT(*) INTO vLines
 		FROM invoiceInTax
-		WHERE invoiceInFk = vInvoiceInFk;
-
-	IF vLines >= vTaxRowLimit THEN
+		WHERE invoiceInFk = vInvoiceInFk
+			AND (taxTypeSageFk OR transactionTypeSageFk);
+	
+	IF vLines >= vTaxRowLimit THEN 
 		CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit));
-	END IF;
+	END IF;	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -58099,7 +58634,7 @@ BEGIN
 
 		CALL invoiceInTax_getFromEntries(vInvoiceInFk);
 		CALL invoiceInDueDay_calculate(vInvoiceInFk);
-
+        
 		FETCH rs INTO vInvoiceInFk;
 
 	END WHILE;
@@ -58131,7 +58666,7 @@ BEGIN
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vId
-		WHERE rr.dated <= ii.issued
+		WHERE rr.dated <= ii.issued 
 			AND rr.currencyFk = ii.currencyFk ;
 
 	IF vDated THEN
@@ -58140,13 +58675,13 @@ BEGIN
 			WHERE dated = vDated;
 	END IF;
 
-	SELECT id INTO vExpenseFk
-		FROM vn.expense
-		WHERE `name` = 'Adquisición mercancia Extracomunitaria'
-		GROUP BY id
+	SELECT id INTO vExpenseFk 
+		FROM vn.expense 
+		WHERE `name` = 'Adquisición mercancia Extracomunitaria' 
+		GROUP BY id 
 		LIMIT 1;
-
-	DELETE FROM invoiceInTax
+		
+	DELETE FROM invoiceInTax 
 		WHERE invoiceInFk = vId;
 
 	INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk)
@@ -58160,9 +58695,9 @@ BEGIN
 				JOIN entry e ON e.invoiceInFk = ii.id
 				JOIN supplier s ON s.id = e.supplierFk
 				JOIN buy b ON b.entryFk = e.id
-				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk
+				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk 
 					AND rr.dated = ii.issued
-			WHERE ii.id = vId
+			WHERE ii.id = vId 
 			HAVING taxableBase IS NOT NULL;
 END ;;
 DELIMITER ;
@@ -58189,7 +58724,7 @@ BEGIN
 		SELECT ii.bookEntried,
 				iit.foreignValue,
 				ii.companyFk,
-				ii.expenseFkDeductible,
+				ii.expenseFkDeductible, 
 				iit.taxableBase,
 				iit.transactionTypeSageFk,
 				ii.serial,
@@ -58228,7 +58763,7 @@ BEGIN
 				JOIN country c ON c.id = s.countryFk
 				JOIN supplier sc ON sc.id = ii.companyFk
 				JOIN country cc ON cc.id = sc.countryFk
-				JOIN invoiceInSerial iis ON iis.code = ii.serial
+				JOIN invoiceInSerial iis ON iis.code = ii.serial 
 				JOIN siiTypeInvoiceIn cit ON cit.id = ii.siiTypeInvoiceInFk
 				LEFT JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
 				LEFT JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = iit.transactionTypeSageFk
@@ -58251,18 +58786,18 @@ BEGIN
 			NFACTICK,
 			CLAVE,
 			empresa_id)
-		SELECT
+		SELECT 
 			vBookNumber ASIEN,
 			tii.bookEntried FECHA,
 			tii.supplierAccount SUBCTA,
-			SUM(tii.taxableBase *
-				IF(tii.serial= 'R' AND ((tii.taxCode IS NULL OR tii.taxCode <> 'ISP21')
-						AND tii.taxTypeSageFk IS NOT NULL),
-					1 + (tii.PorcentajeIva / 100),
-					1)) EUROHABER,
-			CONCAT('s/fra',
-				RIGHT(tii.supplierRef, 8),
-				':',
+			SUM(tii.taxableBase * 
+				IF(tii.serial= 'R' AND ((tii.taxCode IS NULL OR tii.taxCode <> 'ISP21') 
+						AND tii.taxTypeSageFk IS NOT NULL), 
+					1 + (tii.PorcentajeIva / 100), 
+					1)) EUROHABER,	
+			CONCAT('s/fra', 
+				RIGHT(tii.supplierRef, 8), 
+				':', 
 				LEFT(tii.supplierName, 10)) CONCEPTO,
 			CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10,4)) CAMBIO,
 			SUM(tii.foreignValue * IF(tii.serial = 'R', 1 + (tii.PorcentajeIva / 100), 1)) HABERME,
@@ -58279,7 +58814,7 @@ BEGIN
 			CONTRA,
 			EURODEBE,
 			EUROHABER,
-			CONCEPTO,
+			CONCEPTO, 
 			CAMBIO,
 			DEBEME,
 			HABERME,
@@ -58291,9 +58826,9 @@ BEGIN
 				tii.supplierAccount CONTRA,
 				IF(tii.isWithheld AND tii.taxableBase < 0, NULL, ROUND(SUM(tii.taxableBase),2)) EURODEBE,
 				IF(tii.isWithheld AND tii.taxableBase < 0, ROUND(SUM(-tii.taxableBase), 2), NULL) EUROHABER,
-				CONCAT('s/fra',
-					RIGHT(tii.supplierRef, 8),
-					':',
+				CONCAT('s/fra', 
+					RIGHT(tii.supplierRef, 8), 
+					':', 
 					LEFT(tii.supplierName, 10)) CONCEPTO,
 				CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10, 4)) CAMBIO,
 				IF(tii.isWithheld, NULL,ABS(ROUND(SUM(tii.foreignValue), 2))) DEBEME,
@@ -58305,17 +58840,17 @@ BEGIN
 			GROUP BY tii.expenseFk;
 
 	-- Líneas de IVA
-	INSERT INTO XDiario(
+	INSERT INTO XDiario( 
 			ASIEN,
 			FECHA,
 			SUBCTA,
-			CONTRA,
+			CONTRA, 
 			EURODEBE,
 			BASEEURO,
 			CONCEPTO,
-			FACTURA,
+			FACTURA, 
 			IVA,
-			AUXILIAR,
+			AUXILIAR, 
 			SERIE,
 			TIPOOPE,
 			FECHA_EX,
@@ -58364,28 +58899,28 @@ BEGIN
 				tii.companyFk
 			FROM tInvoiceIn tii
 				LEFT JOIN (
-					SELECT e.id
+					SELECT e.id 
 						FROM tInvoiceIn tii
-							JOIN expense e ON e.id = tii.expenseFk
+							JOIN expense e ON e.id = tii.expenseFk  
 						WHERE e.isWithheld
 						LIMIT 1
-						) eWithheld ON TRUE
-			WHERE tii.taxTypeSageFk IS NOT NULL
-				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21'))
+						) eWithheld ON TRUE 
+			WHERE tii.taxTypeSageFk IS NOT NULL 
+				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) 
 			GROUP BY tii.PorcentajeIva, tii.expenseFk;
 
 	-- Línea iva inversor sujeto pasivo
- 	INSERT INTO XDiario(
+ 	INSERT INTO XDiario( 
 			ASIEN,
 			FECHA,
 			SUBCTA,
-			CONTRA,
+			CONTRA, 
 			EUROHABER,
 			BASEEURO,
 			CONCEPTO,
-			FACTURA,
+			FACTURA, 
 			IVA,
-			AUXILIAR,
+			AUXILIAR, 
 			SERIE,
 			TIPOOPE,
 			FECHA_EX,
@@ -58434,31 +58969,31 @@ BEGIN
 				JOIN sage.config c
 			WHERE tii.taxCode = 'ISP21' OR MID(tii.supplierAccount, 4, 1) = '1'
 				AND tii.taxTypeSageFk IS NOT NULL
-				AND NOT(tii.isVies
-					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk
+				AND NOT(tii.isVies 
+					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
 			GROUP BY tii.PorcentajeIva, tii.expenseFk;
-
-	-- Actualización del registro original
+		
+	-- Actualización del registro original		
 	UPDATE invoiceIn ii
 		SET ii.isBooked = TRUE
 		WHERE ii.id = vSelf;
-
+	
 	-- Problemas derivados de la precisión en los decimales al calcular los impuestos
-	UPDATE XDiario
-		SET EURODEBE = EURODEBE -
+	UPDATE XDiario 
+		SET EURODEBE = EURODEBE - 
 			(SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0)
 				FROM(
-					SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference
+					SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference 
 						FROM XDiario
 						WHERE ASIEN = vBookNumber
 					)sub
 			)
-		WHERE ASIEN = vBookNumber
+		WHERE ASIEN = vBookNumber 
 			AND EURODEBE <> 0
 		ORDER BY id DESC
 		LIMIT 1;
-
+	
 	DROP TEMPORARY TABLE tInvoiceIn;
 END ;;
 DELIMITER ;
@@ -58573,7 +59108,7 @@ BEGIN
 
 	DROP TEMPORARY TABLE IF EXISTS rs;
 	CREATE TEMPORARY TABLE rs
-		SELECT
+		SELECT 
 				c.accountingAccount AS clientBookingAccount,
 				io.amount as totalAmount,
 				CONCAT('n/fra ', io.ref) as simpleConcept,
@@ -58607,19 +59142,19 @@ BEGIN
 			WHERE io.id = vInvoice;
 
 	CALL vn.ledger_next(vBookNumber);
-
+    
 	-- Linea del cliente
 	INSERT INTO XDiario(
 								ASIEN,
 								FECHA,
-								SUBCTA,
+								SUBCTA,              
 								EURODEBE,
-								CONCEPTO,
+								CONCEPTO, 
 								FECHA_EX,
 								FECHA_OP,
 								empresa_id
 								)
-		SELECT
+		SELECT 
 				vBookNumber AS ASIEN,
 				rs.FECHA,
 				rs.clientBookingAccount AS SUBCTA,
@@ -58635,14 +59170,14 @@ BEGIN
 									ASIEN,
 									FECHA,
 									SUBCTA,
-									CONTRA,
+									CONTRA,              
 									EUROHABER,
-									CONCEPTO,
+									CONCEPTO, 
 									FECHA_EX,
 									FECHA_OP,
 									empresa_id
 									)
-		SELECT
+		SELECT 
 				vBookNumber AS ASIEN,
 				rs.FECHA,
 				ioe.expenseFk AS SUBCTA,
@@ -58656,8 +59191,8 @@ BEGIN
 				JOIN invoiceOutExpense ioe
 			WHERE ioe.invoiceOutFk = vInvoice;
 
-    SELECT GROUP_CONCAT(`name` SEPARATOR ',')
-            INTO vExpenseConcept
+    SELECT GROUP_CONCAT(`name` SEPARATOR ',') 
+            INTO vExpenseConcept 
         FROM expense e
             JOIN invoiceOutExpense ioe ON ioe.expenseFk = e.id
         WHERE ioe.invoiceOutFk = vInvoice;
@@ -58667,7 +59202,7 @@ BEGIN
 								ASIEN,
 								FECHA,
 								SUBCTA,
-								CONTRA,
+								CONTRA,              
 								EUROHABER,
 								BASEEURO,
 								CONCEPTO,
@@ -58695,7 +59230,7 @@ BEGIN
 								TIPORECTIF,
 								empresa_id
 								)
-		SELECT
+		SELECT 
 				vBookNumber AS ASIEN,
 				rs.FECHA,
 				iot.pgcFk AS SUBCTA,
@@ -58715,11 +59250,11 @@ BEGIN
 				rs.FECHA_OP,
 				rs.FECHA_EX,
 				rs.TIPOOPE,
-				rs.NFACTICK,
+				rs.NFACTICK,   
 				rs.TERIDNIF,
 				rs.TERNIF,
 				rs.TERNOM,
-				pgc.mod340 AS L340,
+				pgc.mod340 AS L340,   
 				pgc.siiTrascendencyInvoiceOutFk AS TIPOCLAVE,
 				pgc.cplusTaxBreakFk as TIPOEXENCI,
 				rs.TIPONOSUJE,
@@ -58727,13 +59262,13 @@ BEGIN
 				rs.TIPORECTIF,
 				rs.companyFk AS empresa_id
 			FROM rs
-				JOIN invoiceOutTax iot
+				JOIN invoiceOutTax iot 
 				JOIN pgc ON pgc.code = iot.pgcFk
 				LEFT JOIN pgcEqu pe ON pe.vatFk = iot.pgcFk		-- --------------- Comprueba si la linea es de iva con rec.equiv. asociado
-				LEFT JOIN pgc pgce ON pgce.code = pe.equFk
+				LEFT JOIN pgc pgce ON pgce.code = pe.equFk 
 				LEFT JOIN pgcEqu pe2 ON pe2.equFk = iot.pgcFk  	-- --------------- Comprueba si la linea es de rec.equiv.
 			WHERE iot.invoiceOutFk = vInvoice;
-
+            
             UPDATE invoiceOut
 				SET booked = util.VN_CURDATE()
                 WHERE id = vInvoice;
@@ -58765,7 +59300,7 @@ BEGIN
 
 	DECLARE done BOOL DEFAULT FALSE;
 
-	DECLARE rs CURSOR FOR
+	DECLARE rs CURSOR FOR   
    			SELECT io.id
 			FROM invoiceOut io
 			WHERE RIGHT(ref,7) BETWEEN 1724215  AND 1724224
@@ -58780,15 +59315,15 @@ BEGIN
 	WHILE NOT done DO
 
 		CALL invoiceOutBooking(vInvoice);
-
+	  
 		FETCH rs INTO  vInvoice ;
-
+        
         SET vContador = vContador + 1;
-
+        
         IF vContador MOD 50 = 0 THEN
-
+        
 			SELECT CONCAT(vContador, ' de momento') AS FACTURAS_ASENTADAS;
-
+        
 		END IF;
 
 	END WHILE;
@@ -58816,7 +59351,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutListByCompany`(vCompany INT, vStarted DATE, vEnded DATE)
 BEGIN
 
-SELECT
+SELECT 
 		c.socialName as RazonSocial,
 		c.fi as NIF,
         io.ref as Factura,
@@ -58828,7 +59363,7 @@ SELECT
         pgc.rate as Tipo,
         iot.vat as Cuota,
         pgc.name as Concepto
-
+        
 	FROM vn.invoiceOut io
 		JOIN vn.invoiceOutTax iot ON iot.invoiceOutFk = io.id
         JOIN vn.client c ON c.id = io.clientFk
@@ -59132,17 +59667,17 @@ BEGIN
 
 		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
 		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
-			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+			SELECT s.id, ti.id ticket_id, vWorker Id_Trabajador
 				FROM tmp.ticketToInvoice ti
-					LEFT JOIN ticketState ts ON ti.id = ts.ticket
+					LEFT JOIN ticketState ts ON ti.id = ts.ticketFk
 					JOIN state s
-				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+				WHERE IFNULL(ts.alertLevel, 0) < 3 and s.`code` = getAlert3State(ti.id);
 
-		INSERT INTO ticketTracking(stateFk,ticketFk,workerFk)
+		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT * FROM tmp.updateInter;
 
 		CALL invoiceExpenseMake(vNewInvoiceId);
-		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+		CALL invoiceTaxMake(vNewInvoiceId, vTaxArea);
 
 		UPDATE invoiceOut io
 				JOIN (
@@ -59273,17 +59808,17 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_newFromClient`(
-	IN vClientFk INT,
-	IN vSerial CHAR(2),
+	IN vClientFk INT, 
+	IN vSerial CHAR(2), 
 	IN vMaxShipped DATE,
-	IN vCompanyFk INT,
+	IN vCompanyFk INT, 
 	IN vTaxArea VARCHAR(25),
-	IN vRef VARCHAR(25),
+	IN vRef VARCHAR(25), 
 	OUT vInvoiceId INT)
 BEGIN
 /**
  * Factura los tickets de un cliente hasta una fecha dada
- * @param vClientFk Id del cliente a facturar
+ * @param vClientFk Id del cliente a facturar 
  * @param vSerial Serie de factura
  * @param vMaxShipped Fecha hasta la cual cogera tickets para facturar
  * @param vCompanyFk Id de la empresa desde la que se factura
@@ -59302,11 +59837,11 @@ BEGIN
 		IF NOT vIsRefEditable THEN
 			CALL util.throw('serial non editable');
 		END IF;
-	END IF;
+	END IF;    
 
 	SELECT COUNT(*) INTO vIsExportation
 		FROM vn.invoiceOutSerial
-		WHERE taxAreaFk = 'WORLD'
+		WHERE taxAreaFk = 'WORLD'  
 			AND `code` = vSerial;
 
 	IF vIsExportation THEN
@@ -59319,7 +59854,7 @@ BEGIN
 
 	UPDATE invoiceOut
 		SET `ref` = vRef
-		WHERE id = vInvoiceId
+		WHERE id = vInvoiceId 
 			AND vRef IS NOT NULL;
 
 	IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
@@ -59348,7 +59883,7 @@ BEGIN
  * Factura un ticket
  * @param vTicketFk Id del ticket
  * @param vSerial Serie de factura
- * @param vTaxArea Area de la factura en caso de querer forzarlo,
+ * @param vTaxArea Area de la factura en caso de querer forzarlo, 
  *     en la mayoria de los casos poner NULL
  * @return vInvoiceId
  */
@@ -59363,11 +59898,11 @@ BEGIN
 		IF NOT vIsRefEditable THEN
 			CALL util.throw('serial non editable');
 		END IF;
-
-		UPDATE invoiceOut
+	
+		UPDATE invoiceOut 
 			SET `ref` = vRef
 			WHERE id = vInvoiceId;
-	END IF;
+	END IF;	
 
     IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
 		CALL invoiceOutBooking(vInvoiceId);
@@ -59449,7 +59984,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemBarcode_update`(vItemFk INT,vCo
 BEGIN
 IF vDelete THEN
 	DELETE FROM vn.itemBarcode WHERE itemFk = vItemFk AND  code = vCode;
-ELSE
+ELSE 
 	INSERT INTO vn.itemBarcode(itemFk,code) VALUES (vItemFk,vCode);
 END IF;
 
@@ -59473,33 +60008,33 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFuentesBalance`(vDaysInFuture I
 BEGIN
 
 	/*	Se utiliza para calcular la necesidad de mover mercancia entre el almacén de fuentes y el nuestro
-	 *
+	 * 
 	 *  @param vDaysInFuture Rango de dias para calcular entradas y salidas
-	 *
+	 * 
 	 */
-
+	
 	DECLARE vWarehouseFk INT;
 
 	SELECT s.warehouseFk INTO vWarehouseFk
-		FROM vn.sector s
+		FROM vn.sector s 
 		WHERE s.code = 'FUENTES_PICASSE';
-
+	
 	CALL cache.stock_refresh(FALSE);
 
-	SELECT 	i.id itemFk,
+	SELECT 	i.id itemFk, 
 			i.longName,
             i.size,
             i.subName,
-			v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible,
-			fue.Fuentes,
+			v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible, 
+			fue.Fuentes, 
 			alb.Albenfruit,
-			sale.venta,
-			IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra,
-			IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0)
+			sale.venta, 
+			IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra, 
+			IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) 
 				- IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as saldo
-		FROM vn.item i
-			JOIN vn.itemType it ON it.id = i.typeFk
-			JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+		FROM vn.item i 
+			JOIN vn.itemType it ON it.id = i.typeFk 
+			JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
 		LEFT JOIN (
 				SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Fuentes
 					FROM vn.itemShelving ish
@@ -59507,7 +60042,7 @@ BEGIN
                         JOIN vn.parking p ON p.id = sh.parkingFk
                         JOIN vn.sector s ON s.id = p.sectorFk
 					WHERE s.code = 'FUENTES_PICASSE'
-					GROUP BY ish.itemFk
+					GROUP BY ish.itemFk	
 			 ) fue ON fue.itemFk = i.id
 		LEFT JOIN (
 				SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Albenfruit
@@ -59516,7 +60051,7 @@ BEGIN
                         JOIN vn.parking p ON p.id = sh.parkingFk
                         JOIN vn.sector s ON s.id = p.sectorFk
 					WHERE s.code = 'ALBENFRUIT'
-					GROUP BY ish.itemFk
+					GROUP BY ish.itemFk	
 			 ) alb ON alb.itemFk = i.id
 		LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
 		LEFT JOIN (
@@ -59541,9 +60076,9 @@ BEGIN
 						AND warehouse_id  = vWarehouseFk
 					GROUP BY item_id
 			 ) mov ON mov.item_id = i.id
-		WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit)
+		WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit)	 
 			AND i.itemPackingTypeFk = 'H'
-			AND ic.shortLife
+			AND ic.shortLife 
 		;
 
 END ;;
@@ -59565,7 +60100,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementFromTicket`(vTicket INT)
 BEGIN
 /**
- * Llama a itemPlacementUpdateVisible
+ * Llama a itemPlacementUpdateVisible 
  * de los articulos de la tabla temporal tmp.itemPlacement(itemFk)
  * @treturn tmp.itemPlacement
  * @param vTicket Id del Ticket
@@ -59579,9 +60114,9 @@ BEGIN
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = t.id
 			WHERE t.id = vTicket;
-
+            
 	CALL itemPlacementUpdateVisible();
-
+    
 	DROP TEMPORARY TABLE tmp.itemPlacement;
 END ;;
 DELIMITER ;
@@ -59614,7 +60149,7 @@ BEGIN
 					CAST(FLOOR(LEAST(ish.stock,quantity) / ish.packing) AS DECIMAL(10,0)),
                     ' x ',
                     ish.packing,
-                    IF	(
+                    IF	(	
 						LEAST(ish.stock,quantity) MOD ish.packing,
 						CONCAT(' + ',CAST(LEAST(ish.stock,quantity) MOD ish.packing AS DECIMAL(10,0))),
                         ''
@@ -59645,7 +60180,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyCloseOrder`(vId INT, vQuantity INT)
 BEGIN
 
-	UPDATE vn.itemPlacementSupply
+	UPDATE vn.itemPlacementSupply 
     SET priority = 10
     WHERE id = vId;
 
@@ -59671,7 +60206,7 @@ BEGIN
 	DECLARE vId INT;
     DECLARE vLastParkingFk INT;
     DECLARE vNextParkingFk INT;
-
+        
 	SELECT sh.parkingFk INTO vLastParkingFk
 		FROM vn.itemShelvingPlacementSupply isps
 			JOIN vn.itemShelving ish ON ish.id = isps.itemShelvingFk
@@ -59679,9 +60214,9 @@ BEGIN
         WHERE isps.userFk = getUser()
         ORDER BY isps.created DESC
         LIMIT 1;
-
+    
     SET vNextParkingFk = vn.itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
-
+    
 	SELECT ipsl.id INTO vId
 		FROM vn.itemPlacementSupplyList ipsl
 			JOIN vn.itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
@@ -59690,13 +60225,13 @@ BEGIN
             AND ipsl.sectorFk = vSector
          ORDER BY  ipsl.repoUserFk DESC, ipsl.priority DESC, (ispss.parkingFk = vNextParkingFk) DESC, ispss.parking DESC, ipsl.created
         LIMIT 1;
-
+        
     UPDATE vn.itemPlacementSupply
 		SET repoUserFk = getUser()
         WHERE id = vId;
-
-    SELECT * FROM vn.itemPlacementSupplyList
-		WHERE id = vId
+        
+    SELECT * FROM vn.itemPlacementSupplyList 
+		WHERE id = vId 
 		AND sectorFk = vSector;
 
 END ;;
@@ -59870,7 +60405,7 @@ BEGIN
  * @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;
@@ -59879,41 +60414,41 @@ BEGIN
 	DECLARE vBox INT;
 	DECLARE vPacking INT;
     DECLARE vRoundQuantity INT DEFAULT 1;
-
+	
     SELECT s.ticketFk, LEAST(s.quantity, vQuantity), s.itemFk,t.shipped,t.warehouseFk
         INTO vTicketFk, vQuantity, vItemFk,vDate,vWarehouseFk
         FROM vn.sale s
             JOIN vn.ticket t ON t.id = s.ticketFk
         WHERE s.id = vSaleFk;
-
+    
     UPDATE vn.sale
         SET quantity = quantity - vQuantity
         WHERE id = vSaleFk;
-
+        
     CALL vn.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;
-
+    
     INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept)
         SELECT vTicketFk, vMateFk, CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName)
             FROM vn.item i
             WHERE id = vMateFk;
-
+            
 	SELECT LAST_INSERT_ID() INTO vSaleFk;
-
+    
     CALL vn.sale_calculateComponent(vSaleFk, NULL);
-
+    
     INSERT INTO vn.itemProposal(itemFk, mateFk, counter)
 		VALUES(vItemFk, vMateFk, 1)
         ON DUPLICATE KEY UPDATE counter = counter + 1;
@@ -59942,13 +60477,13 @@ BEGIN
     DECLARE vCalcFk INT;
     DECLARE vTypeFk INT;
     DECLARE vResultsMax INT DEFAULT 10;
-
+    
     DECLARE vTag1 VARCHAR(25);
     DECLARE vTag5 VARCHAR(25);
     DECLARE vTag6 VARCHAR(25);
     DECLARE vTag7 VARCHAR(25);
     DECLARE vTag8 VARCHAR(25);
-
+    
     DECLARE vValue1 VARCHAR(50);
     DECLARE vValue5 VARCHAR(50);
     DECLARE vValue6 VARCHAR(50);
@@ -59958,16 +60493,16 @@ BEGIN
 	SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
 		FROM vn.ticket
         WHERE id = vTicketFk;
-
+    
     SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
 		INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-		FROM vn.item i
+		FROM vn.item i 
             LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
 				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
         WHERE i.id = vItemFk;
-
+    
 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-
+	
 	SELECT i.id itemFk,
 			i.longName,
             i.subName,
@@ -59985,7 +60520,7 @@ BEGIN
             (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
             a.available,
             IFNULL(ip.counter,0) counter
-		FROM vn.item i
+		FROM vn.item i 
 			JOIN cache.available a ON a.item_id = i.id
             LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
 			LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
@@ -59999,7 +60534,7 @@ BEGIN
                 (it1.value = vValue1 COLLATE utf8_general_ci) DESC,
 				(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
 				(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
-				(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
+				(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,                
 				(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
                 (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
 				(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
@@ -60035,7 +60570,7 @@ BEGIN
 
 	CREATE TEMPORARY TABLE tmp.item
 		SELECT vItem id;
-
+	
 	CALL item_refreshTags();
 
 	DROP TEMPORARY TABLE tmp.item;
@@ -60058,23 +60593,23 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
 BEGIN
-
+	
 	DECLARE vStarted DATE;
 	DECLARE vEnded DATETIME;
 
 	SELECT MIN(dated), util.dayEnd(MAX(dated)) INTO vStarted, vEnded
-		FROM `time` t
+		FROM `time` t 
 		WHERE CONCAT(vYear, LPAD(vWeek, 2, 0)) = t.period;
 
 	SELECT t.shipped,
 			w.name warehouse,
-			s.ticketFk,
+			s.ticketFk, 
 			t.nickname client,
-			am.name agencyName,
+			am.name agencyName, 
 			wk.code salesPerson,
 			s.itemFk,
-			IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept,
-			s.quantity,
+			IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept, 
+			s.quantity, 
 			s.price,
 			s.priceFixed,
 			s.discount,
@@ -60084,15 +60619,15 @@ BEGIN
 			wk.id salesPersonFk
 		FROM sale s
 			JOIN ticket t ON t.id = s.ticketFk
-			JOIN warehouse w ON w.id = t.warehouseFk
+			JOIN warehouse w ON w.id = t.warehouseFk 
 			JOIN address a ON a.id = t.addressFk
 			LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
 			JOIN `client` c ON c.id = a.clientFk
-			LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+			LEFT JOIN worker wk ON wk.id = c.salesPersonFk 
 			LEFT JOIN ticketLastState tls ON tls.ticketFk = t.id
-			LEFT JOIN saleBuy sb ON sb.saleFk = s.id
-			LEFT JOIN buy b ON b.id = sb.buyFk
-			LEFT JOIN item ig ON ig.id = b.itemOriginalFk
+			LEFT JOIN saleBuy sb ON sb.saleFk = s.id 
+			LEFT JOIN buy b ON b.id = sb.buyFk 
+			LEFT JOIN item ig ON ig.id = b.itemOriginalFk 
 		WHERE s.itemFk = vItemFk
 			AND t.shipped BETWEEN vStarted AND vEnded
 			AND IF(vWarehouseFk = 0, w.hasComission , t.warehouseFk = vWarehouseFk)
@@ -60119,9 +60654,9 @@ BEGIN
 
 	DECLARE vItemFk INT;
     SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
+    
     UPDATE vn.item SET minimum = min WHERE   id = vItemFk;
-
+	
 
 
 END ;;
@@ -60143,8 +60678,8 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSearchShelving`(`vShelvingFk` VARCHAR(3))
 BEGIN
 	SELECT p.`column` AS col , p.`row`
-		FROM vn.shelving s
-			JOIN parking p ON s.parkingFk = p.id
+		FROM vn.shelving s 
+			JOIN parking p ON s.parkingFk = p.id 
 		WHERE s.`code` = vShelvingFk COLLATE utf8_general_ci;
 END ;;
 DELIMITER ;
@@ -60185,36 +60720,36 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
 BEGIN
-
+	
 /**
  * Devuelve el log de los item en cada carro
  *
- * @param vShelvingFk Matrícula del carro
- *
+ * @param vShelvingFk Matrícula del carro 
+ * 
  */
-
-	SELECT isl.itemShelvingFk,
-			isl.created,
-			isl.accion,
-			isl.itemFk,
-			isl.shelvingFk,
-			isl.quantity,
+	
+	SELECT isl.itemShelvingFk, 
+			isl.created, 
+			isl.accion, 
+			isl.itemFk, 
+			isl.shelvingFk, 
+			isl.quantity, 
 			isl.visible,
-			isl.available,
-			isl.grouping,
-			isl.packing,
-			isl.stars,
-			item.longName,
-			item.size,
-			item.subName,
-			worker.code,
+			isl.available, 
+			isl.grouping, 
+			isl.packing, 
+			isl.stars, 
+			item.longName, 
+			item.size, 
+			item.subName, 
+			worker.code, 
 			isl.accion
-	FROM item
-		JOIN itemShelvingLog isl ON item.id = isl.itemFk
+	FROM item 
+		JOIN itemShelvingLog isl ON item.id = isl.itemFk 
 		JOIN worker ON isl.workerFk = worker.id
 	WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk
 		ORDER BY isl.created DESC;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60233,7 +60768,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, `vCreated` VARCHAR(22))
 BEGIN
-
+	
     DECLARE vItemFk INT;
 
     SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
@@ -60252,9 +60787,9 @@ BEGIN
 
     END IF;
 
-    IF (SELECT COUNT(*) FROM vn.itemShelving
-            WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
-                AND itemFk  = vItemFk
+    IF (SELECT COUNT(*) FROM vn.itemShelving 
+            WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
+                AND itemFk  = vItemFk 
                 AND packing  = vPacking) = 1 THEN
 
         UPDATE vn.itemShelving
@@ -60284,8 +60819,8 @@ BEGIN
                 LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
                 LEFT JOIN vn.buy b ON b.id = lb.buy_id
             WHERE i.id = vItemFk;
-    END IF;
-
+    END IF;      
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60306,9 +60841,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMatch`(vEntryFk INT, vA
 BEGIN
 
 	DECLARE vTravelFk INT;
-
-    SELECT travelFk INTO vTravelFk
-		FROM entry
+    
+    SELECT travelFk INTO vTravelFk 
+		FROM entry 
         WHERE id = vEntryFk;
 
 	SELECT i.id, i.longName, i.size, i.subName, b.stickers, ish.etiquetas, b.printed
@@ -60321,7 +60856,7 @@ BEGIN
 						GROUP BY itemFk
 				  ) b ON b.itemFk = i.id
 		LEFT JOIN (
-					SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas
+					SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas 
 						FROM itemShelving ish
 							JOIN shelving sh ON sh.code = ish.shelvingFk
                             LEFT JOIN parking pk ON pk.id = sh.parkingFk
@@ -60361,7 +60896,7 @@ BEGIN
         UPDATE vn.itemShelving
             SET visible = visible - vQuantity
             WHERE id = vItemShelvingFk;
-
+                    
 
 END ;;
 DELIMITER ;
@@ -60384,47 +60919,47 @@ BEGIN
 
 	DECLARE vVisibleCache INT;
     DECLARE vWarehouseFk INT;
-
+    
     SELECT warehouseFk INTO vWarehouseFk
 		FROM vn.sector
         WHERE id = vSectorFk;
 
 	CALL cache.visible_refresh (vVisibleCache, FALSE, vWarehouseFk);
-
-	SELECT 	t.id as ticketFk,
-		CAST(s.quantity AS DECIMAL(10,0)) as Cantidad,
-        s.itemFk,
-        s.concept,
-        v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho,
+		
+	SELECT 	t.id as ticketFk, 
+		CAST(s.quantity AS DECIMAL(10,0)) as Cantidad, 
+        s.itemFk, 
+        s.concept, 
+        v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho, 
         i.subName,
-        GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo,
+        GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo, 
         s.id as saleFk,
         IFNULL(sub3.transit,0)  transit,
         v.visible, s.isPicked, s.reserved, t.shipped, tst.productionOrder, mm.Id_Movimiento
-		FROM vn.ticket t
+		FROM vn.ticket t 
 			JOIN vn.ticketState tst ON tst.ticketFk = t.id
 			JOIN vn.sale s ON s.ticketFk = t.id
 			JOIN vn.item i ON i.id = s.itemFk
 			JOIN cache.visible v ON s.itemFk = v.item_id AND v.calc_id = vVisibleCache
 			LEFT JOIN vn2008.Movimientos_mark mm ON mm.Id_Movimiento = s.id AND mm.stateFk = 26
-			JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id
+			JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id    
             LEFT JOIN
-			(SELECT itemFk, sum(saldo) as transit
-				FROM vn.itemPlacementSupplyList
-                WHERE saldo > 0
+			(SELECT itemFk, sum(saldo) as transit 
+				FROM vn.itemPlacementSupplyList 
+                WHERE saldo > 0 
 					AND sectorFk = vSectorFk
                 GROUP BY itemFk) sub3 ON sub3.itemFk = i.id
-		WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible)  < s.quantity
+		WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible)  < s.quantity 
 			AND IFNULL(sub3.transit,0) < s.quantity
-			AND s.isPicked = FALSE
+			AND s.isPicked = FALSE 
 			AND s.reserved = FALSE
-			AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE())
+			AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) 
 			AND tst.isPreviousPreparable = TRUE
 			AND t.warehouseFk = vWarehouseFk
             AND iss.sectorFk = vSectorFk
 			AND mm.Id_Movimiento IS NULL
 		ORDER BY itemFk;
-
+                    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60443,7 +60978,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar`(vSectorFk INT)
 proc:BEGIN
-
+	
 	DECLARE vCalcVisibleFk INT;
 	DECLARE vCalcAvailableFk INT;
 	DECLARE hasFatherSector BOOLEAN;
@@ -60451,17 +60986,17 @@ proc:BEGIN
 	DECLARE vWarehouseFk INT DEFAULT 0;
 	DECLARE vSonSectorFk INT;
 	DECLARE vWorkerFk INT;
-
-	SELECT s.workerFk
-		INTO vWorkerFk
+	
+	SELECT s.workerFk 
+		INTO vWorkerFk 
 		FROM vn.sector s
 		WHERE s.id = vSectorFk;
 
 	SELECT w.id, s.warehouseFk INTO vBuyerFk, vWarehouseFk
-		FROM vn.worker w
+		FROM vn.worker w 
 			JOIN vn.sector s ON s.code = w.code
 			WHERE s.id = vSectorFk;
-
+	
 	SELECT s.id INTO vSectorFk
 		FROM vn.sector s
 		WHERE s.warehouseFk = vWarehouseFk
@@ -60470,21 +61005,21 @@ proc:BEGIN
 	SELECT COUNT(*) INTO hasFatherSector
 		FROM vn.sector
 		WHERE sonFk = vSectorFk;
-
+		
 	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
 		FROM vn.sector
 		WHERE id = vSectorFk;
-
+		
 	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
 	CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar;
-
+	
 	IF hasFatherSector THEN
 		CREATE TEMPORARY TABLE tmp.itemShelvingRadar
 			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY
-			SELECT *
+			ENGINE = MEMORY 
+			SELECT * 
 				FROM (
 					SELECT iss.itemFk,
 							i.longName,
@@ -60503,9 +61038,9 @@ proc:BEGIN
 							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
 							WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
 							GROUP BY iss.itemFk
-
+							
 					UNION ALL
-
+						
 					SELECT  v.item_id,
 							i.longName,
 							i.size,
@@ -60515,7 +61050,7 @@ proc:BEGIN
 							0 downstairs,
 							IF(it.isPackaging, NULL, v.visible) visible,
 							vSectorFk as sectorFk
-						FROM cache.visible v
+						FROM cache.visible v  
 							JOIN vn.item i on i.id = v.item_id
 							JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
 							LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk
@@ -60524,8 +61059,8 @@ proc:BEGIN
 							AND iss.itemFk IS NULL
 							AND it.isInventory
 				) sub GROUP BY itemFk;
-
-		SELECT ishr.*,
+					
+		SELECT ishr.*, 
 				CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho,
 				CAST(downstairs - IFNULL(notPickedYed,0) AS DECIMAL(10,0)) as pendiente
 				FROM tmp.itemShelvingRadar ishr
@@ -60542,7 +61077,7 @@ proc:BEGIN
 	ELSE
 		CREATE TEMPORARY TABLE tmp.itemShelvingRadar
 			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY
+			ENGINE = MEMORY 
 			SELECT iss.itemFk,
 					0 `hour`,
 					0 `minute`,
@@ -60554,7 +61089,7 @@ proc:BEGIN
 					IFNULL(a.available,0) available,
 					IFNULL(v.visible - iss.visible,0) dayEndVisible,
 					IFNULL(v.visible - iss.visible,0) firstNegative,
-					IFNULL(v.visible - iss.visible,0) itemPlacementVisible,
+					IFNULL(v.visible - iss.visible,0) itemPlacementVisible, 
 					IFNULL(i.minimum * b.packing,0) itemPlacementSize,
 					ips.onTheWay,
 					iss.visible itemShelvingStock,
@@ -60568,20 +61103,20 @@ proc:BEGIN
 					LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
 					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
 					LEFT JOIN (SELECT itemFk, sum(saldo) as  onTheWay
-									FROM vn.itemPlacementSupplyList
-									WHERE saldo > 0
+									FROM vn.itemPlacementSupplyList 
+									WHERE saldo > 0 
 									GROUP BY itemFk
 								) ips ON ips.itemFk = i.id
-					WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk)
-						OR iss.sectorFk = vSectorFk;
+					WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) 
+						OR iss.sectorFk = vSectorFk;            
 
 		DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime;
 		CREATE TEMPORARY TABLE tmp.itemOutTime
 			SELECT *,SUM(amount) quantity
-				FROM
+				FROM 
 					(SELECT item_id itemFk,
-								amount,
-								IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours,
+								amount, 
+								IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours, 
 								IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
 							FROM vn2008.item_out io
 								JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.item_id
@@ -60589,23 +61124,23 @@ proc:BEGIN
 								JOIN vn.ticketState ts on ts.ticketFk = io.ticketFk
 								JOIN vn.state s ON s.id = ts.stateFk
 								LEFT JOIN vn.zone z ON z.id = t.zoneFk
-								LEFT JOIN (SELECT DISTINCT saleFk
-											FROM vn.saleTracking st
-											WHERE st.created > util.VN_CURDATE()
+								LEFT JOIN (SELECT DISTINCT saleFk 
+											FROM vn.saleTracking st 
+											WHERE st.created > util.VN_CURDATE() 
 												AND st.isChecked
 										)  stPrevious  ON `stPrevious`.`saleFk` = io.saleFk
 							WHERE t.warehouseFk = vWarehouseFk
-								AND s.isPicked = 0
-								AND NOT io.Reservado
+								AND s.isPicked = 0 
+								AND NOT io.Reservado 
 								AND stPrevious.saleFk IS NULL
-								AND io.dat >= util.VN_CURDATE()
+								AND io.dat >= util.VN_CURDATE() 
 								AND io.dat < util.VN_CURDATE() + INTERVAL 1 DAY
 					) sub
 				GROUP BY itemFk, hours, minutes;
-
+	
 		INSERT INTO tmp.itemShelvingRadar (itemFk)
 			SELECT itemFk FROM tmp.itemOutTime
-			ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity,
+			ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, 
 									firstNegative = if (firstNegative < 0, firstNegative, firstNegative + quantity),
 									`hour` = ifnull(if (firstNegative > 0 , `hour`, hours),0),
 									`minute` = ifnull(if (firstNegative > 0, `minute`, minutes),0);
@@ -60625,7 +61160,7 @@ proc:BEGIN
 	END IF;
 
 	DROP TEMPORARY TABLE tmp.itemShelvingRadar;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60649,24 +61184,24 @@ BEGIN
     DECLARE vCalcVisibleFk INT;
     DECLARE vCalcAvailableFk INT;
     DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
-
+    
 	CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
     CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+    
     DROP TEMPORARY TABLE IF EXISTS tmp.item;
     CREATE TEMPORARY TABLE tmp.item
     ENGINE = MEMORY
     SELECT DISTINCT itemFk
-		FROM vn.buy
+		FROM vn.buy 
         WHERE entryFk = vEntryFk;
-
+        
 	DROP TEMPORARY TABLE IF EXISTS tmp.item2;
     CREATE TEMPORARY TABLE tmp.item2
     ENGINE = MEMORY
     SELECT *
 		FROM tmp.item;
-
-    SELECT 	i.id as itemFk,
+    
+    SELECT 	i.id as itemFk, 
 			i.minimum,
             CAST(IFNULL(v.visible,0) - IFNULL(iss.visible,0) AS DECIMAL(10,0)) as enNicho,
 			CAST(IFNULL(a.available,0) AS DECIMAL(10,0))  as disponible,
@@ -60686,11 +61221,11 @@ BEGIN
                             AND IFNULL(tst.productionOrder,0) < 5
 						GROUP BY s.itemFK
 				) ts ON ts.itemFk = i.id;
-
-
+    
+  
 	DROP TEMPORARY TABLE tmp.item;
     DROP TEMPORARY TABLE tmp.item2;
-
+ 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60714,34 +61249,34 @@ BEGIN
     DECLARE vCalcVisibleFk INT;
     DECLARE vCalcAvailableFk INT;
     DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
-
+    
 	CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
     CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+    
     DROP TEMPORARY TABLE IF EXISTS tmp.item;
     CREATE TEMPORARY TABLE tmp.item
     ENGINE = MEMORY
     SELECT DISTINCT itemFk
-		FROM vn.buy
+		FROM vn.buy 
         WHERE entryFk = vEntryFk;
-
+        
 	DROP TEMPORARY TABLE IF EXISTS tmp.item2;
     CREATE TEMPORARY TABLE tmp.item2
     ENGINE = MEMORY
     SELECT *
 		FROM tmp.item;
-
-    SELECT 	i.id as itemFk,
+    
+    SELECT 	i.id as itemFk, 
             CAST(IFNULL(iss.visible,0) - IFNULL(v.visible,0)  AS DECIMAL(10,0)) as outShelving
     FROM vn.item i
 		JOIN tmp.item ti ON ti.itemFk = i.id
         LEFT JOIN cache.visible v ON v.calc_id = vCalcVisibleFk AND v.item_id = i.id
         LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id;
-
-
+    
+  
 	DROP TEMPORARY TABLE tmp.item;
     DROP TEMPORARY TABLE tmp.item2;
-
+ 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60762,10 +61297,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_Add`(vItemShelving
 BEGIN
 /**
  * Añade línea a itemShelvingSale y regulariza el carro
- *
+ * 
  * @param vItemShelvingFk Id itemShelving
  * @param vSaleFk Id de sale
- * @param vQuantity cantidad a regularizar
+ * @param vQuantity cantidad a regularizar 
  */
 	INSERT INTO itemShelvingSale(itemShelvingFk,
 								saleFk,
@@ -60948,7 +61483,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_reserveBySale`(
-	vSelf INT ,
+	vSelf INT , 
 	vQuantity INT,
 	vUserFk INT
 )
@@ -60963,7 +61498,7 @@ BEGIN
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 		ENGINE = MEMORY
 		SELECT vSelf saleFk, vUserFk userFk;
-
+			
 	CALL itemShelvingSale_reserve();
 END ;;
 DELIMITER ;
@@ -60989,12 +61524,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_setQuantity`(
 BEGIN
 /**
  * Gestiona la reserva de un itemShelvingFk, actualizando isPicked y quantity
- * en vn.itemShelvingSale y vn.sale.isPicked en caso necesario.
- * Si la reserva de la ubicación es fallida, se regulariza la situación
- *
- * @param vItemShelvingSaleFk Id itemShelvingSaleFK
+ * en vn.itemShelvingSale y vn.sale.isPicked en caso necesario. 
+ * Si la reserva de la ubicación es fallida, se regulariza la situación 
+ * 
+ * @param vItemShelvingSaleFk Id itemShelvingSaleFK 
  * @param vQuantity Cantidad real que se ha cogido de la ubicación
- * @param vIsItemShelvingSaleEmpty determina si ka ubicación itemShelvingSale se ha
+ * @param vIsItemShelvingSaleEmpty determina si ka ubicación itemShelvingSale se ha 
  * quedado vacio tras el movimiento
  */
 	DECLARE vSaleFk INT;
@@ -61005,7 +61540,7 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vUserFk INT;
 	DECLARE vDone BOOLEAN DEFAULT FALSE;
-	DECLARE vSales CURSOR FOR
+	DECLARE vSales CURSOR FOR 
 		SELECT iss.saleFk, iss.userFk
 			FROM itemShelvingSale iss
 				JOIN sale s ON s.id = iss.saleFk
@@ -61019,14 +61554,14 @@ BEGIN
 		CALL util.throw('Booking completed');
 	END IF;
 
-	SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk
+	SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk 
 			INTO vItemFk, vSaleFk, vItemShelvingFk
 		FROM itemShelvingSale iss
 				JOIN sale s ON s.id = iss.saleFk
 			WHERE iss.id = vItemShelvingSaleFk
 				AND NOT iss.isPicked;
-
-	UPDATE itemShelvingSale
+	
+	UPDATE itemShelvingSale 
 		SET isPicked = TRUE,
 			quantity = vQuantity
 		WHERE id = vItemShelvingSaleFk;
@@ -61051,10 +61586,10 @@ l:		LOOP
 
 			CALL itemShelvingSale_reserveWhitUser();
 			DROP TEMPORARY TABLE tmp.sale;
-
+	
 		END LOOP;
 		CLOSE vSales;
-
+	
 		DELETE iss
 			FROM itemShelvingSale iss
 				JOIN sale s ON s.id = iss.saleFk
@@ -61068,32 +61603,32 @@ l:		LOOP
 			WHERE saleFk = vSaleFk
 				AND NOT isPicked;
 
-	IF vRemainingQuantity THEN
+	IF vRemainingQuantity THEN 
 		CALL itemShelvingSale_reserveBySale (vSaleFk, vRemainingQuantity, NULL);
-
+	
 		SELECT SUM(quantity) INTO vRemainingQuantity
 			FROM itemShelvingSale
 				WHERE saleFk = vSaleFk
 					AND NOT isPicked;
 
 		IF NOT vRemainingQuantity <=> 0 THEN
-			SELECT SUM(iss.quantity)
+			SELECT SUM(iss.quantity) 
 				INTO vReservedQuantity
-				FROM itemShelvingSale iss
+				FROM itemShelvingSale iss 
 					WHERE iss.saleFk = vSaleFk;
-
+	
 			CALL saleTracking_new(
 				vSaleFk,
-				TRUE,
-				vReservedQuantity,
-				`account`.`myUser_getId`(),
+				TRUE, 
+				vReservedQuantity, 
+				`account`.`myUser_getId`(), 
 				NULL,
 				'PREPARED',
 				TRUE);
-
+	
 			UPDATE sale s
 				SET s.quantity = vReservedQuantity
-				WHERE s.id = vSaleFk ;
+				WHERE s.id = vSaleFk ;	
 		END IF;
 	END IF;
 END ;;
@@ -61172,7 +61707,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-
+	
 
 /**
  * Añade registro o lo actualiza si ya existe.
@@ -61184,7 +61719,7 @@ BEGIN
  * @param vGrouping el grouping del producto en itemShelving, NULL para coger el de la ultima compra
  * @param vPacking el packing del producto, NULL para coger el de la ultima compra
  * @param vWarehouseFk indica el sector
- *
+ * 
  **/
 
 	DECLARE vItemFk INT;
@@ -61194,21 +61729,21 @@ BEGIN
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
 
 		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
-		INSERT INTO shelving(code, parkingFk)
+		INSERT INTO shelving(code, parkingFk) 
 			SELECT vShelvingFk, id
-				FROM parking
+				FROM parking 
 				WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
 
 	END IF;
 
-	IF (SELECT COUNT(*) FROM itemShelving
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
-				AND itemFk  = vItemFk
+	IF (SELECT COUNT(*) FROM itemShelving 
+			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
+				AND itemFk  = vItemFk 
 				AND packing  = vPacking) = 1 THEN
 
 		UPDATE itemShelving
 			SET visible = visible+vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; 
 
 	ELSE
 		CALL cache.last_buy_refresh(FALSE);
@@ -61359,10 +61894,10 @@ proc:BEGIN
  * @return Lista de articulos
  */
 	DECLARE vCalcVisibleFk INT;
-
+	
 	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
 
-	SELECT * FROM
+	SELECT * FROM 
 		(SELECT sub.itemFk,
 				sub.longName,
 				CONCAT('Hoy saldrán ', CAST(sub2.pendiente AS DECIMAL(10,0)), ' unidades.') `size`,
@@ -61379,28 +61914,28 @@ proc:BEGIN
 						0 upstairs,
 						SUM(IFNULL(iss.visible,0)) downstairs,
 						IF(it.isPackaging, null, IFNULL(v.visible, 0)) visible,
-						ik.name
+						ik.name 
 					FROM itemShelvingStock iss
 						JOIN sector s ON s.id = iss.sectorFk
 						JOIN item i on i.id = iss.itemFk
-						LEFT JOIN ink ik ON ik.id = i.inkFk
+						LEFT JOIN ink ik ON ik.id = i.inkFk 
 						JOIN itemType it ON it.id = i.typeFk
 						LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
 					WHERE s.warehouseFk = vWarehouseFk
 						AND it.workerFk = vBuyerFk
-					GROUP BY itemFk
+					GROUP BY itemFk	
 				) sub LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente
 									FROM sale s
 										LEFT JOIN saleTracking st ON st.saleFk = s.id
-										JOIN ticket t ON t.id = s.ticketFk
+										JOIN ticket t ON t.id = s.ticketFk 
 										JOIN client c on c.id = t.clientFk
 										JOIN clientType ct ON ct.id = c.clientTypeFk
 									WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 										AND st.saleFk IS NULL
 										AND ct.code IN ('normal', 'trust')
 									GROUP BY s.itemFk
-								) sub2 ON sub2.itemFk = sub.itemFk
-			UNION ALL
+								) sub2 ON sub2.itemFk = sub.itemFk 
+			UNION ALL 
 			SELECT v.item_id ,
 					i.longName,
 					CONCAT('Hoy saldrán ', CAST(sub5.pendiente AS DECIMAL(10,0)), ' unidades.') `size`,
@@ -61418,7 +61953,7 @@ proc:BEGIN
 					LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente
 									FROM sale s
 										LEFT JOIN saleTracking st ON st.saleFk = s.id
-										JOIN ticket t ON t.id = s.ticketFk
+										JOIN ticket t ON t.id = s.ticketFk 
 										JOIN client c on c.id = t.clientFk
 										JOIN clientType ct ON ct.id = c.clientTypeFk
 									WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
@@ -61451,12 +61986,12 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_get`(IN vSelf VARCHAR(8))
 BEGIN
 /**
-* Lista artículos de itemshelving
+* Lista artículos de itemshelving 
 *
 * @param vSelf matrícula del carro
 **/
-	SELECT ish.itemFk item,
-			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description,
+	SELECT ish.itemFk item, 
+			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, 
 			ish.visible,
 			CEIL(ish.visible/ish.packing) stickers,
 			ish.packing,
@@ -61494,7 +62029,7 @@ BEGIN
  *
  * @param vShelvingFk matricula del carro
  */
-	SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder
+	SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder 
 		FROM itemShelving is2
 			JOIN shelving sh ON sh.code = is2.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
@@ -61559,167 +62094,167 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
-BEGIN
-
-	/* Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.
-	 *
-	 *  @param vShelvingFk Matrícula del carro o pallet
-	 */
-
-	DECLARE vWarehouseFk INT;
-	DECLARE vStockScopeDays INT;
-
-	SELECT s.warehouseFk, stockScopeDays
-			INTO vWarehouseFk, vStockScopeDays
-		FROM sector s
-			JOIN operator o ON s.id = o.sectorFk
-			JOIN productionConfig pc
-		WHERE o.workerFk = account.myUser_getId();
-
-	IF vWarehouseFk IS NULL
-		THEN CALL util.throw('WarehouseFk not setted');
-	END IF;
-
-	IF vStockScopeDays IS NULL
-		THEN CALL util.throw('StockScopeDays not setted');
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.tItems
-			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY
-			SELECT itemFk, SUM(visible) visible
-				FROM itemShelving
-				WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
-				GROUP BY itemFk;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
-		(INDEX (itemFk, dated))
-		ENGINE = MEMORY
-			SELECT dated,
-					SUM(t3.amount) OVER (PARTITION BY t3.itemFk ORDER BY dated) stock,
-					t3.itemFk
-				FROM (
-					SELECT t.itemFk, dated, SUM(amount) amount
-						FROM (
-							SELECT t2.itemFk, t2.amount, t2.dated
-								FROM (
-									SELECT item_id itemFk, amount, util.VN_CURDATE() dated
-										FROM cache.stock s
-											JOIN tmp.tItems i ON i.itemFk = s.item_id
-										WHERE s.warehouse_id = vWarehouseFk
-									UNION ALL
-									SELECT ish.itemFk, - SUM(ish.visible), util.VN_CURDATE()
-										FROM itemShelving ish
-											JOIN tmp.tItems i ON i.itemFk = ish.itemFk
-											JOIN shelving sh ON sh.code = ish.shelvingFk
-											JOIN parking p ON sh.parkingFk = p.id
-											JOIN sector s ON s.id = p.sectorFk
-										WHERE s.isReserve
-										GROUP BY ish.itemFk
-									UNION ALL
-									SELECT iei.itemFk, SUM(quantity), landed
-										FROM itemEntryIn iei
-											JOIN tmp.tItems i ON i.itemFk = iei.itemFk
-										WHERE iei.landed BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
-											AND iei.warehouseInFk = vWarehouseFk
-											AND NOT isVirtualStock
-										GROUP BY iei.itemFk, iei.landed
-									UNION ALL
-									SELECT ieo.itemFk, SUM(quantity), shipped
-										FROM itemEntryOut ieo
-											JOIN tmp.tItems i ON i.itemFk = ieo.itemFk
-										WHERE ieo.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
-											AND ieo.warehouseOutFk = vWarehouseFk
-										GROUP BY ieo.itemFk, ieo.shipped
-									UNION ALL
-									SELECT i.itemFk, SUM(ito.quantity), DATE(ito.shipped)
-										FROM itemTicketOut ito
-											JOIN tmp.tItems i ON i.itemFk = ito.itemFk
-										WHERE ito.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
-											AND ito.warehouseFk = vWarehouseFk
-										GROUP BY ito.itemFk, ito.shipped
-									) t2
-							JOIN tmp.tItems i ON i.itemFk = t2.itemFk)t
-							GROUP BY t.itemFk, dated
-					) t3;
-
-	-- Se restan las entradas de hoy
-		UPDATE tmp.tStockByDay sbd
-			JOIN (SELECT iei.itemFk, SUM(quantity) todayEntry
-						FROM itemEntryIn iei
-							JOIN tmp.tItems i ON i.itemFk = iei.itemFk
-						WHERE iei.landed = util.VN_CURDATE()
-							AND iei.warehouseInFk = vWarehouseFk
-							AND NOT iei.isVirtualStock) sub ON sub.itemFk = sbd.itemFk
-			SET sbd.stock = sbd.stock - sub.todayEntry
-			WHERE sbd.dated = util.VN_CURDATE();
-
-	-- Se añaden las lineas de venta servidas
-		UPDATE tmp.tStockByDay sbd
-			JOIN (SELECT s.itemFK, SUM(quantity) amount
-						FROM sale s
-							JOIN ticket t ON t.id = s.ticketFk
-							WHERE t.warehouseFk = vWarehouseFk
-								AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
-								AND s.isPicked
-							GROUP BY s.itemFk) sub ON sub.itemFk = sbd.itemFk
-			SET sbd.stock = sbd.stock + sub.amount;
-
-	-- Se añaden los items ubicados hoy
-		UPDATE tmp.tStockByDay sbd
-			JOIN (SELECT ish.itemFK, SUM(ish.visible) amount
-						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
-							JOIN parking p ON p.id = sh.parkingFk
-							JOIN sector s ON s.id = p.sectorFk
-						WHERE s.warehouseFk = vWarehouseFk
-							AND NOT s.isReserve
-							AND ish.created BETWEEN util.VN_CURDATE() AND util.midnight()
-						GROUP BY ish.itemFk) sub ON sub.itemFk = sbd.itemFk
-			SET sbd.stock = sbd.stock + sub.amount;
-
-			SELECT ts.itemFk,
-				i.longName,
-				IF(ts.stock<=0, ts.dated, NULL) dated,
-				ts.stock,
-				sub4.visible,
-				sub4.shelvingFk
-				FROM(
-					SELECT IFNULL(sub2.minDated, sub.minDated) dated,
-							IFNULL(sub2.itemFk, sub.itemFk) itemFk
-						FROM(SELECT sbd.itemFk,
-									MIN(dated) minDated,
-									sbd.stock
-								FROM tmp.tItems ti
-									LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk
-								GROUP BY itemFk)sub
-							LEFT JOIN (
-									SELECT sbd.itemFk,
-										MIN(dated) minDated,
-										sbd.stock
-									FROM tmp.tItems ti
-										LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk
-									WHERE sbd.stock <= 0
-									GROUP BY itemFk)sub2 ON sub2.itemFk =sub.itemFk
-						WHERE sub2.itemFk IS NOT NULL
-							OR (sub2.itemFk IS NULL AND sub.itemFk IS NOT NULL)) sub3
-					LEFT JOIN tmp.tStockByDay ts ON ts.itemFk = sub3.itemFk  AND ts.dated = sub3.dated
-					JOIN (SELECT ish.itemFk,
-								ish.visible,
-								p.sectorFk,
-								ish.shelvingFk
-							FROM itemShelving ish
-								JOIN vn.shelving sh ON sh.code = ish.shelvingFk
-								LEFT JOIN parking p ON p.id = parkingFk
-								LEFT JOIN vn.sector s ON s.id = p.sectorFk
-							WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
-					) sub4 ON sub4.itemFk = ts.itemFk
-					LEFT JOIN sector s ON s.id = sub4.sectorFk
-					LEFT JOIN item i ON i.id = ts.itemFk
-				WHERE NOT s.isReserve;
-
-		DROP TEMPORARY TABLE tmp.tStockByDay, tmp.tItems;
-
+BEGIN
+	
+	/* Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.	
+	 * 
+	 *  @param vShelvingFk Matrícula del carro o pallet
+	 */
+
+	DECLARE vWarehouseFk INT;
+	DECLARE vStockScopeDays INT;
+
+	SELECT s.warehouseFk, stockScopeDays
+			INTO vWarehouseFk, vStockScopeDays
+		FROM sector s
+			JOIN operator o ON s.id = o.sectorFk
+			JOIN productionConfig pc
+		WHERE o.workerFk = account.myUser_getId();
+
+	IF vWarehouseFk IS NULL
+		THEN CALL util.throw('WarehouseFk not setted');
+	END IF;	
+
+	IF vStockScopeDays IS NULL
+		THEN CALL util.throw('StockScopeDays not setted');
+	END IF;	
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.tItems
+			(PRIMARY KEY (itemFk))
+			ENGINE = MEMORY
+			SELECT itemFk, SUM(visible) visible
+				FROM itemShelving
+				WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+				GROUP BY itemFk;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
+		(INDEX (itemFk, dated))
+		ENGINE = MEMORY
+			SELECT dated,
+					SUM(t3.amount) OVER (PARTITION BY t3.itemFk ORDER BY dated) stock,
+					t3.itemFk
+				FROM (
+					SELECT t.itemFk, dated, SUM(amount) amount 	
+						FROM (
+							SELECT t2.itemFk, t2.amount, t2.dated
+								FROM (
+									SELECT item_id itemFk, amount, util.VN_CURDATE() dated
+										FROM cache.stock s
+											JOIN tmp.tItems i ON i.itemFk = s.item_id
+										WHERE s.warehouse_id = vWarehouseFk
+									UNION ALL
+									SELECT ish.itemFk, - SUM(ish.visible), util.VN_CURDATE()
+										FROM itemShelving ish 
+											JOIN tmp.tItems i ON i.itemFk = ish.itemFk
+											JOIN shelving sh ON sh.code = ish.shelvingFk 
+											JOIN parking p ON sh.parkingFk = p.id 
+											JOIN sector s ON s.id = p.sectorFk
+										WHERE s.isReserve 
+										GROUP BY ish.itemFk
+									UNION ALL
+									SELECT iei.itemFk, SUM(quantity), landed
+										FROM itemEntryIn iei
+											JOIN tmp.tItems i ON i.itemFk = iei.itemFk
+										WHERE iei.landed BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+											AND iei.warehouseInFk = vWarehouseFk
+											AND NOT isVirtualStock
+										GROUP BY iei.itemFk, iei.landed
+									UNION ALL
+									SELECT ieo.itemFk, SUM(quantity), shipped
+										FROM itemEntryOut ieo
+											JOIN tmp.tItems i ON i.itemFk = ieo.itemFk
+										WHERE ieo.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+											AND ieo.warehouseOutFk = vWarehouseFk
+										GROUP BY ieo.itemFk, ieo.shipped
+									UNION ALL
+									SELECT i.itemFk, SUM(ito.quantity), DATE(ito.shipped)
+										FROM itemTicketOut ito
+											JOIN tmp.tItems i ON i.itemFk = ito.itemFk
+										WHERE ito.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+											AND ito.warehouseFk = vWarehouseFk
+										GROUP BY ito.itemFk, ito.shipped
+									) t2
+							JOIN tmp.tItems i ON i.itemFk = t2.itemFk)t
+							GROUP BY t.itemFk, dated
+					) t3;
+					
+	-- Se restan las entradas de hoy
+		UPDATE tmp.tStockByDay sbd
+			JOIN (SELECT iei.itemFk, SUM(quantity) todayEntry
+						FROM itemEntryIn iei
+							JOIN tmp.tItems i ON i.itemFk = iei.itemFk
+						WHERE iei.landed = util.VN_CURDATE()
+							AND iei.warehouseInFk = vWarehouseFk
+							AND NOT iei.isVirtualStock) sub ON sub.itemFk = sbd.itemFk
+			SET sbd.stock = sbd.stock - sub.todayEntry
+			WHERE sbd.dated = util.VN_CURDATE();
+
+	-- Se añaden las lineas de venta servidas
+		UPDATE tmp.tStockByDay sbd
+			JOIN (SELECT s.itemFK, SUM(quantity) amount 
+						FROM sale s
+							JOIN ticket t ON t.id = s.ticketFk
+							WHERE t.warehouseFk = vWarehouseFk
+								AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
+								AND s.isPicked
+							GROUP BY s.itemFk) sub ON sub.itemFk = sbd.itemFk
+			SET sbd.stock = sbd.stock + sub.amount;
+
+	-- Se añaden los items ubicados hoy
+		UPDATE tmp.tStockByDay sbd
+			JOIN (SELECT ish.itemFK, SUM(ish.visible) amount 
+						FROM itemShelving ish
+							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN parking p ON p.id = sh.parkingFk
+							JOIN sector s ON s.id = p.sectorFk
+						WHERE s.warehouseFk = vWarehouseFk
+							AND NOT s.isReserve
+							AND ish.created BETWEEN util.VN_CURDATE() AND util.midnight()
+						GROUP BY ish.itemFk) sub ON sub.itemFk = sbd.itemFk
+			SET sbd.stock = sbd.stock + sub.amount;
+
+			SELECT ts.itemFk, 
+				i.longName,
+				IF(ts.stock<=0, ts.dated, NULL) dated,
+				ts.stock, 
+				sub4.visible,
+				sub4.shelvingFk
+				FROM(
+					SELECT IFNULL(sub2.minDated, sub.minDated) dated,
+							IFNULL(sub2.itemFk, sub.itemFk) itemFk
+						FROM(SELECT sbd.itemFk,
+									MIN(dated) minDated,
+									sbd.stock
+								FROM tmp.tItems ti
+									LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk 
+								GROUP BY itemFk)sub
+							LEFT JOIN (
+									SELECT sbd.itemFk,
+										MIN(dated) minDated,
+										sbd.stock
+									FROM tmp.tItems ti
+										LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk 
+									WHERE sbd.stock <= 0
+									GROUP BY itemFk)sub2 ON sub2.itemFk =sub.itemFk
+						WHERE sub2.itemFk IS NOT NULL 
+							OR (sub2.itemFk IS NULL AND sub.itemFk IS NOT NULL)) sub3
+					LEFT JOIN tmp.tStockByDay ts ON ts.itemFk = sub3.itemFk  AND ts.dated = sub3.dated
+					JOIN (SELECT ish.itemFk,
+								ish.visible,
+								p.sectorFk,
+								ish.shelvingFk
+							FROM itemShelving ish
+								JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+								LEFT JOIN parking p ON p.id = parkingFk
+								LEFT JOIN vn.sector s ON s.id = p.sectorFk
+							WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+					) sub4 ON sub4.itemFk = ts.itemFk
+					LEFT JOIN sector s ON s.id = sub4.sectorFk
+					LEFT JOIN item i ON i.id = ts.itemFk
+				WHERE NOT s.isReserve;
+
+		DROP TEMPORARY TABLE tmp.tStockByDay, tmp.tItems;
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -61812,15 +62347,15 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_selfConsumption`(
-	vShelvingFk VARCHAR(10) COLLATE utf8_general_ci,
-	vItemFk INT,
+	vShelvingFk VARCHAR(10) COLLATE utf8_general_ci, 
+	vItemFk INT, 
 	vQuantity INT
 )
-BEGIN
+BEGIN 
 /**
- * Leave the indicated amount on the shelf
+ * Leave the indicated amount on the shelf 
  * and create a ticket with the difference.
- *
+ * 
  * @param vShelvingFk id of the shelf where the item is located.
  * @param vItemFk article of which the self-consumption ticket is to be created.
  * @param vQuantity amount that will stay on the shelf
@@ -61834,7 +62369,7 @@ BEGIN
 	DECLARE vItemShelvingFk INT;
 
 	SELECT c.id,
-			c.clientFk,
+			pc.clientSelfConsumptionFk,
 			s.warehouseFk
 			INTO vCompanyFk,
 			vClientFk,
@@ -61845,6 +62380,7 @@ BEGIN
 			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
 		WHERE s2.code = vShelvingFk;
 
 	IF vClientFk IS NULL THEN
@@ -61864,10 +62400,10 @@ BEGIN
 	END IF;
 
 	SELECT SUM(visible), id INTO vVisible, vItemShelvingFk
-		FROM itemShelving
+		FROM itemShelving 
 		WHERE shelvingFk = vShelvingFk
 			AND itemFk = vItemFk;
-
+		
 	IF vVisible IS NULL THEN
 		CALL util.throw('The item is not on the shelf.');
 	END IF;
@@ -61920,9 +62456,9 @@ BEGIN
  * @param vGrouping el grouping del producto en itemShelving
  */
 	UPDATE itemShelving
-		SET visible = vVisible,
-			packing = vPacking,
-			grouping = vGrouping
+		SET visible = vVisible, 
+			packing = vPacking, 
+			grouping = vGrouping 
         WHERE id = vShelf;
 
 END ;;
@@ -61944,7 +62480,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagMake`(vItemFk INT)
 BEGIN
 
-/* 	* Crea los tags usando la tabla plantilla itemTag
+/* 	* Crea los tags usando la tabla plantilla itemTag 
 	* y si no existe a partir de la ficha del artículo.
 	* @param vItemFk El item al que se le añaden los tags
 */
@@ -61954,33 +62490,33 @@ BEGIN
     DECLARE vProducer VARCHAR(50);
     DECLARE vOrigin VARCHAR(20);
     DECLARE vTypeFk INTEGER;
-
-	DELETE FROM itemTag
+    
+	DELETE FROM itemTag 
 		WHERE itemFk = vItemFk;
-
-	SELECT typeFk INTO vTypeFk
+  
+	SELECT typeFk INTO vTypeFk 
 		FROM item
         WHERE id = vItemFk;
-
+        
 	INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT vItemFk, itt.tagFk, NULL, itt.priority
 			FROM itemTag it
 				LEFT JOIN itemTypeTag itt ON itt.itemTypeFk = vTypeFk
 			WHERE it.itemFk = vItemFk;
-
+	
     IF (SELECT COUNT(*) FROM itemTag WHERE itemFk = vItemFk LIMIT 1) = 0 THEN
 
-		SELECT ik.name, i.size, i.category, p.name, o.name
+		SELECT ik.name, i.size, i.category, p.name, o.name 
 				INTO vInk, vSize, vCategory, vProducer, vOrigin
 			FROM item i
 				LEFT JOIN ink ik ON ik.id = i.inkFk
                 LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
                 LEFT JOIN origin o ON o.id = i.originFk
 			WHERE i.id = vItemFk;
-
+            
 		INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
 			VALUES(vItemFk, 1, vInk, 1);
-
+                      
 		INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
 			VALUES (vItemFk, 8, vSize, 2);
 
@@ -61989,11 +62525,11 @@ BEGIN
 
 		INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
 			VALUES(vItemFk, 37, vProducer, 4);
-
+	   
 		INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
 			VALUES(vItemFk, 35, vOrigin, 5);
 	END IF;
-
+	     
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -62014,12 +62550,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorder`(itemTypeFk INT)
 BEGIN
 
 	SET @isTriggerDisabled = TRUE;
-
+    
     -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i
 	DROP TABLE IF EXISTS tmp.item;
 	CREATE TABLE tmp.item
 		SELECT DISTINCT i.id
-			FROM vn.item i
+			FROM vn.item i 
 				WHERE i.typeFk = itemTypeFk;
 
 	UPDATE itemTag it
@@ -62028,8 +62564,8 @@ BEGIN
             JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk
 		SET it.priority = itt.priority
 		WHERE itt.itemTypeFk = itemTypeFk;
-
-	CALL item_refreshTags();
+        
+	CALL item_refreshTags(); 
 
 	SET @isTriggerDisabled = FALSE;
 
@@ -62054,12 +62590,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorderByName`(vName VARCHAR
 BEGIN
 
 	SET @isTriggerDisabled = TRUE;
-
+    
     -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i
 	DROP TABLE IF EXISTS tmp.item;
 	CREATE TABLE tmp.item
 		SELECT DISTINCT i.id
-			FROM vn.item i
+			FROM vn.item i 
 				WHERE i.`name` LIKE CONCAT(vName,'%');
 
 	UPDATE itemTag it
@@ -62068,8 +62604,8 @@ BEGIN
             JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk
 		SET it.priority = itt.priority
 		WHERE itt.itemTypeFk = itemTypeFk;
-
-	CALL item_refreshTags();
+        
+	CALL item_refreshTags(); 
 
 	SET @isTriggerDisabled = FALSE;
 
@@ -62092,36 +62628,36 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTag_replace`(vItemFromFk INT, vItemToFk INT, vPicture VARCHAR(100))
 BEGIN
-
+	
 	/* Reemplaza los tags de un artículo por los de otro, así como su imagen
-	 *
+	 * 
 	 * @param vItemFromFk id de vn.item con el artículo del que se toman los tags
 	 * @param vItemToFk id de vn.item con el artículo del que se toman los tags
 	 * @param vPicture imagen del artículo. Opcional. Si no se especifica, hereada la del vItemFromFk
 	 */
 
-	DELETE FROM vn.itemTag
+	DELETE FROM vn.itemTag 
 		WHERE itemFk = vItemToFk;
-
+	
 	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
 		SELECT vItemToFk, tagFk, value, priority
-			FROM vn.itemTag
+			FROM vn.itemTag 
 		WHERE itemFk = vItemFromFk;
-
+	
 	IF ISNULL(vPicture) THEN
-
-		SELECT image INTO vPicture
-			FROM vn.item
+	
+		SELECT image INTO vPicture 
+			FROM vn.item 
 			WHERE id = vItemFromFk;
-
+		
 	END IF;
 
-	UPDATE vn.item i
+	UPDATE vn.item i 
 		SET i.image = vPicture
 		WHERE i.id = vItemToFk;
-
+	
 	CALL vn.itemRefreshTags(vItemToFk);
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -62146,9 +62682,9 @@ BEGIN
 		 SELECT DISTINCT id
 		  FROM  vn.itemCategory
 		  WHERE merchandise <> FALSE;
-
+          
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN  
 	RESIGNAL;
 	END;
 
@@ -62159,45 +62695,45 @@ BEGIN
 				INNER JOIN bs.ventas v ON v.Id_Movimiento = s.id
 			WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, util.VN_CURDATE()) AND util.VN_CURDATE()
 			GROUP BY s.itemFk;
-
+        
 	DROP TABLE IF EXISTS tmp.topSeller;
-	CREATE TEMPORARY TABLE tmp.topSeller
-		(
+	CREATE TEMPORARY TABLE tmp.topSeller   
+		(   
 			`id` int(11) NOT NULL DEFAULT '0',
 			`typeFk` smallint(5) unsigned NOT NULL,
 			`itemCategoryFk` int(10) unsigned NOT NULL,
 			`total` bigint(21) NOT NULL DEFAULT '0'
 		) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
+		
 	OPEN rs;
 	 read_loop: LOOP
 		FETCH rs INTO vCategoryFk;
-
+		
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
-
+		
 		INSERT INTO tmp.topSeller
 			SELECT  tsm.itemFk, tsm.typeFk, it.categoryFk, tsm.total
 			FROM tmp.topSellerMin tsm
 				INNER JOIN vn.itemType it ON  it.id = tsm.typeFk
 			WHERE it.categoryFk = vCategoryFk
 			ORDER BY  tsm.itemFk ,tsm.total DESC
-			LIMIT 5;
+			LIMIT 5; 
 
 	END LOOP;
 	CLOSE rs;
-
+    
     SELECT i.name ,i.id, i.image, i.typeFk, it.categoryFk AS itemCategoryFk,
 		ic.name AS itemCategoryName, it.name AS itemTypeName, ts.total
 		FROM tmp.topSeller ts
 			INNER JOIN vn.item i ON i.id = ts.id
 			INNER JOIN vn.itemType it ON  it.id = ts.typeFk
 			INNER JOIN vn.itemCategory ic ON ic.id = it.categoryFk;
-
+    
     DROP TABLE IF EXISTS topSellerMin;
     DROP TABLE IF EXISTS tmp.topSeller;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -62307,7 +62843,7 @@ SET tag6 = t.name, value6 = it.value
 WHERE it.priority = 2
 AND (vItem IS NULL OR vItem = it.itemFk);
 
-UPDATE item i
+UPDATE item i 
 JOIN itemTag it ON it.itemFk = i.id
 JOIN tag t ON t.id = it.tagFk
 SET tag7 = t.name, value7 = it.value
@@ -62340,7 +62876,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_cleanFloramondo`()
 BEGIN
 /**
-* Elimina todos los items repetidos de floramondo
+* Elimina todos los items repetidos de floramondo 
 * y los sustituye por el que tiene menor id
 */
 	DECLARE vItemFrom INT;
@@ -62406,7 +62942,7 @@ BEGIN
 					AND i2.EmbalageCode <=> i.EmbalageCode
 					AND i2.quality <=> i.quality
 				JOIN (
-					SELECT DISTINCT b.itemFk
+					SELECT DISTINCT b.itemFk 
 						FROM buy b
 							JOIN item i ON i.id = b.itemFk
 						WHERE i.isFloramondo
@@ -62414,7 +62950,7 @@ BEGIN
 				)sub2 ON sub2.itemFk = GREATEST(i.id, i2.id)
 			WHERE i.isFloramondo
 				AND i.id <> i2.id;
-
+				
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION SET vDone = TRUE;
 		BEGIN
 			SET vDone = TRUE;
@@ -62545,6 +63081,316 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_comparative` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_comparative`(
+	vDate DATETIME,
+	vDayRange TINYINT,
+	vWarehouseFk TINYINT,
+	vAvailableSince DATE,
+	vBuyerFk INT,
+	vIsFloramondo BOOL,
+    vCountryFk INT
+)
+proc: BEGIN
+/**
+ * Genera una tabla de comparativa de artículos por itemType/comprador/fecha.
+ * Los datos se calculan en función de los parámetros proporcionados.
+ *
+ * @param vDate La fecha para la cual se generará la comparativa.
+ * @param vDayRange El rango de días a considerar para la comparativa.
+ * @param vWarehouseFk El identificador del almacén para filtrar los artículos.
+ * @param vAvailableSince La fecha de disponibilidad desde la cual se consideran los artículos disponibles.
+ * @param vBuyerFk El identificador del comprador para filtrar los artículos.
+ * @param vIsFloramondo Indica si se deben incluir solo los artículos de Floramondo (opcional).
+ * @param vCountryFk El identificador del país.
+ * @param tmp.comparativeFilterType(filterFk INT ,itemTypeFk INT)
+ * @return tmp.comparative
+ */
+
+	DECLARE vDayRangeStart DATE;
+	DECLARE vDayRangeEnd DATE;
+	DECLARE w1, w2, w3, w4, w5, w6, w7 INT;
+	DECLARE y1, y2, y3, y4, y5, y6, y7 INT;
+	DECLARE z1, z2, z3, z4, z5, z6, z7 INT;
+	DECLARE vPeriod INT;
+	DECLARE i INT DEFAULT 0;
+	DECLARE vHasTypeFilter BOOL;
+	DECLARE vWeekRange INT;
+	DECLARE vWeekCount TINYINT;
+	DECLARE vMaxDayRange INT;
+	DECLARE vMinDayRange INT;
+	DECLARE vDefaultDayRange INT;
+
+	IF NOT(SELECT COUNT(*) FROM comparativeConfig)THEN
+		LEAVE proc;
+	END IF;
+
+	SELECT weekRange,
+			weekRange * 2 + 1,
+			maxDayRange,
+			minDayRange,
+			defaultDayRange
+		INTO vWeekRange,
+			vWeekCount,
+			vMaxDayRange,
+			vMinDayRange,
+			vDefaultDayRange
+		FROM comparativeConfig;
+
+	IF vDayRange < vMinDayRange OR vDayRange > vMaxDayRange THEN
+		SET vDayRange = vDefaultDayRange;
+	END IF;
+
+	SELECT MIN(dated) INTO vDayRangeStart
+		FROM vn.time
+		WHERE dated <= vDate
+			GROUP BY period
+			ORDER BY dated desc 
+		LIMIT 1 OFFSET vWeekRange;
+
+	SELECT MAX(dated) INTO vDayRangeEnd
+		FROM vn.time
+		WHERE dated >= vDate
+			GROUP BY period
+			ORDER BY dated ASC 
+		LIMIT 1 OFFSET vWeekRange;
+
+	SELECT COUNT(itemTypeFk) > 0 INTO vHasTypeFilter 
+		FROM tmp.comparativeFilterType;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemInventory
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
+		SELECT i.id
+			FROM item i
+				JOIN itemType t ON t.id = i.typeFk
+				JOIN itemCategory c ON c.id = t.categoryFk
+				LEFT JOIN worker w ON w.id = t.workerFk
+			WHERE (NOT vHasTypeFilter
+					OR t.id IN (SELECT itemTypeFk FROM tmp.comparativeFilterType))
+				AND (vBuyerFk IS NULL
+					OR t.workerFk = vBuyerFk) 
+				AND (vIsFloramondo IS NULL
+					OR i.isFloramondo = vIsFloramondo); 
+
+	IF vDate < util.VN_CURDATE() THEN
+		ALTER TABLE tmp.itemInventory
+			ADD `buy_id` INT NOT NULL DEFAULT 0,
+			ADD `buy_date` DATE DEFAULT '2000-01-01',
+			ADD `life` INT DEFAULT 0,
+			ADD `sd` INT DEFAULT 0,
+			ADD `avalaible` INT DEFAULT 0,
+			ADD `visible` INT DEFAULT 0;
+	ELSE
+		CALL multipleInventory(vAvailableSince, vWarehouseFk, vDayRange);
+		CALL item_multipleBuy(vDate, vWarehouseFk);
+		CALL item_multipleBuyByDate(vDate, vWarehouseFk);
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tTable (
+		cy INT(6) PRIMARY KEY,
+		ly INT(6),
+		zy INT(6),
+		INDEX (ly)
+	);
+
+	REPEAT
+		SET i = i + 1;
+
+		SELECT t.period INTO vPeriod
+			FROM vn.`time` t
+			WHERE t.dated = vDayRangeStart + INTERVAL (vWeekCount * (i - 1)) DAY;
+
+		INSERT IGNORE INTO tTable(cy, ly, zy) VALUES(vPeriod, vPeriod - 100, vPeriod - 200);
+	UNTIL i = vWeekCount END REPEAT;
+
+	SELECT cy, ly, zy INTO w1, y1, z1 FROM tTable LIMIT 1;
+	SELECT cy, ly, zy INTO w2, y2, z2 FROM tTable WHERE cy > w1 LIMIT 1;
+	SELECT cy, ly, zy INTO w3, y3, z3 FROM tTable WHERE cy > w2 LIMIT 1;
+	SELECT cy, ly, zy INTO w4, y4, z4 FROM tTable WHERE cy > w3 LIMIT 1;
+	SELECT cy, ly, zy INTO w5, y5, z5 FROM tTable WHERE cy > w4 LIMIT 1;
+	SELECT cy, ly, zy INTO w6, y6, z6 FROM tTable WHERE cy > w5 LIMIT 1;
+	SELECT cy, ly, zy INTO w7, y7, z7 FROM tTable WHERE cy > w6 LIMIT 1;
+
+	-- Genera una tabla con los datos del año pasado.
+
+	CREATE OR REPLACE TEMPORARY TABLE tLastYear
+		(KEY (lItemFk))
+		ENGINE = MEMORY
+		SELECT c.itemFk lItemFk,
+				SUM(IF(c.timePeriod = y1, c.quantity, 0)) lweek1,
+				SUM(IF(c.timePeriod = y2, c.quantity, 0)) lweek2,
+				SUM(IF(c.timePeriod = y3, c.quantity, 0)) lweek3,
+				SUM(IF(c.timePeriod = y4, c.quantity, 0)) lweek4,
+				SUM(IF(c.timePeriod = y5, c.quantity, 0)) lweek5,
+				SUM(IF(c.timePeriod = y6, c.quantity, 0)) lweek6,
+				SUM(IF(c.timePeriod = y7, c.quantity, 0)) lweek7,
+				SUM(IF(c.timePeriod = y1, c.price, 0)) lprice1,
+				SUM(IF(c.timePeriod = y2, c.price, 0)) lprice2,
+				SUM(IF(c.timePeriod = y3, c.price, 0)) lprice3,
+				SUM(IF(c.timePeriod = y4, c.price, 0)) lprice4,
+				SUM(IF(c.timePeriod = y5, c.price, 0)) lprice5,
+				SUM(IF(c.timePeriod = y6, c.price, 0)) lprice6,
+				SUM(IF(c.timePeriod = y7, c.price, 0)) lprice7
+			FROM tmp.itemInventory ai
+				JOIN comparative c ON c.itemFk = ai.id
+				JOIN warehouse w on w.id = c.warehouseFk
+				JOIN tTable wt ON c.timePeriod = wt.ly
+			WHERE IFNULL(vWarehouseFk, c.warehouseFk) = c.warehouseFk
+				AND w.isComparative
+				AND (vCountryFk IS NULL OR c.countryFk = vCountryFk)
+			GROUP BY ai.id;
+
+	-- Genera una tabla con los datos de hace DOS años.
+
+	CREATE OR REPLACE TEMPORARY TABLE tTwoYearsAgo
+		(KEY (tItemFk))
+		ENGINE = MEMORY
+		SELECT c.itemFk tItemFk,
+				SUM(IF(c.timePeriod = z1, c.quantity, 0)) vlweek1,
+				SUM(IF(c.timePeriod = z2, c.quantity, 0)) vlweek2,
+				SUM(IF(c.timePeriod = z3, c.quantity, 0)) vlweek3,
+				SUM(IF(c.timePeriod = z4, c.quantity, 0)) vlweek4,
+				SUM(IF(c.timePeriod = z5, c.quantity, 0)) vlweek5,
+				SUM(IF(c.timePeriod = z6, c.quantity, 0)) vlweek6,
+				SUM(IF(c.timePeriod = z7, c.quantity, 0)) vlweek7,
+				SUM(IF(c.timePeriod = z1, c.price, 0)) vlprice1,
+				SUM(IF(c.timePeriod = z2, c.price, 0)) vlprice2,
+				SUM(IF(c.timePeriod = z3, c.price, 0)) vlprice3,
+				SUM(IF(c.timePeriod = z4, c.price, 0)) vlprice4,
+				SUM(IF(c.timePeriod = z5, c.price, 0)) vlprice5,
+				SUM(IF(c.timePeriod = z6, c.price, 0)) vlprice6,
+				SUM(IF(c.timePeriod = z7, c.price, 0)) vlprice7
+			FROM tmp.itemInventory ai
+				JOIN comparative c ON c.itemFk = ai.id
+				JOIN warehouse w on w.id = c.warehouseFk
+				JOIN tTable wt ON c.timePeriod = wt.zy
+			WHERE IFNULL(vWarehouseFk, c.warehouseFk) = c.warehouseFk
+				AND w.isComparative
+				AND (vCountryFk IS NULL OR c.countryFk = vCountryFk)
+			GROUP BY ai.id;
+
+	-- Genera una tabla con los datos de este año.ss
+
+	CREATE OR REPLACE TEMPORARY TABLE tCurrentYear
+		(KEY (cItemFk))
+		ENGINE = MEMORY
+		SELECT t.itemFk cItemFk,
+				SUM(IF(week = w1, total, 0)) cweek1,
+				SUM(IF(week = w2, total, 0)) cweek2,
+				SUM(IF(week = w3, total, 0)) cweek3,
+				SUM(IF(week = w4, total, 0)) cweek4,
+				SUM(IF(week = w5, total, 0)) cweek5,
+				SUM(IF(week = w6, total, 0)) cweek6,
+				SUM(IF(week = w7, total, 0)) cweek7,
+				SUM(IF(week = w1, price, 0)) cprice1,
+				SUM(IF(week = w2, price, 0)) cprice2,
+				SUM(IF(week = w3, price, 0)) cprice3,
+				SUM(IF(week = w4, price, 0)) cprice4,
+				SUM(IF(week = w5, price, 0)) cprice5,
+				SUM(IF(week = w6, price, 0)) cprice6,
+				SUM(IF(week = w7, price, 0)) cprice7
+			FROM (
+				SELECT s.itemFk,
+						ti.period `week`,
+						SUM(s.quantity) total,
+						TRUNCATE(SUM(s.quantity * s.priceFixed),0) price
+					FROM ticket t
+						JOIN sale s ON t.id = s.ticketFk
+	        			JOIN tmp.itemInventory it ON it.id = s.itemFk
+						JOIN time ti ON ti.dated = DATE(t.shipped)
+						JOIN item i ON i.id = s.itemFk
+						JOIN itemType tp ON tp.id = i.typeFk
+						JOIN itemCategory ic ON ic.id = tp.categoryFk
+						JOIN warehouse w ON w.id = t.warehouseFk
+						STRAIGHT_JOIN address ad ON ad.id = t.addressFk
+                        JOIN province p ON p.id = ad.provinceFk
+						JOIN `client` c ON c.id = ad.clientFk
+					WHERE t.shipped BETWEEN vDayRangeStart AND util.dayEnd(vDayRangeEnd)
+						AND c.typeFk IN ('Normal','handMaking')
+						AND w.id = COALESCE(vWarehouseFk, w.id)
+						AND w.isComparative
+                        AND (vCountryFk IS NULL OR p.countryFk = vCountryFk)
+					GROUP BY i.id, week
+			) t
+			GROUP BY t.itemFk;
+
+	-- Genera la tabla con la comparativa.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.comparative
+		ENGINE = MEMORY
+		SELECT it.subName productor, 
+				b.packing, 
+				b.buyingValue costefijo,
+				b.groupingMode caja,
+				it.image ArticleImage,
+				IFNULL(it.inkFk,"?") color,
+				tp.code tipo,
+				it.typeFk tipo_id,
+				o.code origen,
+				it.category categoria,
+				it.stems tallos,
+				it.size medida,
+				it.name article,
+				w.code codigoTrabajador,
+				tp.categoryFk reino_id,
+				ly.*,
+				cy.*,
+				zy.*,
+				it.*,
+				it.id Id_Article,
+				i.buy_id, 
+				tp.life, 
+				IFNULL(i.sd,0) sd,
+				i.avalaible,
+				i.visible,
+				i.buy_date,
+				e.id provider_id,
+				it.comment comments,
+				it.description itemDescription,
+				IF(cy.cItemFk IS NULL AND i.visible = 0 AND i.avalaible = 0 
+					AND IFNULL(i.sd, 0) = 0, FALSE, TRUE) filtret,
+				IF(it.hasMinPrice, FORMAT(it.minPrice, 2), "") pvp,
+				s.company_name
+			FROM tmp.itemInventory i
+				JOIN item it ON it.id = i.id
+				LEFT JOIN itemType tp ON tp.id = it.typeFk
+				LEFT JOIN worker w ON w.id = tp.workerFk
+				LEFT JOIN buy b ON b.id = i.buy_id
+				LEFT JOIN entry e ON e.id = b.entryFk
+				LEFT JOIN origin o ON o.id = it.originFk
+				LEFT JOIN tLastYear ly ON ly.lItemFk = it.id
+				LEFT JOIN tCurrentYear cy ON cy.cItemFk = it.id
+				LEFT JOIN tTwoYearsAgo zy ON zy.tItemFk = it.id
+				LEFT JOIN edi.ekt e2 ON e2.id = b.ektFk
+				LEFT JOIN edi.supplier s ON s.supplier_id = e2.pro
+			WHERE i.avalaible
+				OR i.visible
+				OR i.sd
+				OR cy.cweek1 OR cy.cweek2 OR cy.cweek3 OR cy.cweek4 OR cy.cweek5 OR cy.cweek6 OR cy.cweek7 
+				OR ly.lweek1 OR ly.lweek2 OR ly.lweek3 OR ly.lweek4 OR ly.lweek5 OR ly.lweek6 OR ly.lweek7 
+				OR zy.vlweek1 OR zy.vlweek2 OR zy.vlweek3 OR zy.vlweek4 OR zy.vlweek5 OR zy.vlweek6 OR zy.vlweek7;
+
+	-- Elimina las tablas temporales creadas...
+	DROP TEMPORARY TABLE IF EXISTS tmp.itemInventory,
+		tTwoYearsAgo,
+		tLastYear,
+		tCurrentYear,
+		tTable;
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `item_deactivateUnused` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -62598,50 +63444,50 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getAtp`(vDated DATE)
-BEGIN
-/**
- * Calcula el valor mínimo acumulado para cada artículo ordenado por fecha y
- * almacén.
- *
- * @param vDated Si no hay movimientos en la fecha indicada, debe devolver 0
- * @table tmp.itemCalc(itemFk, wareHouseFk, dated, quantity)
- * @return tmp.itemAtp(itemFk, warehouseFk, quantity)
- */
-	CREATE OR REPLACE TEMPORARY TABLE tItemOrdered
-		(UNIQUE(itemFk, warehouseFk, dated))
-		ENGINE = MEMORY
-		SELECT itemFk, warehouseFk, dated, SUM(quantity) quantity
-			FROM (
-				SELECT itemFk, warehouseFk, dated, quantity
-					FROM tmp.itemCalc
-				UNION ALL
-				SELECT itemFk, warehouseFk, vDated, 0
-					FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
-			) t1
-			GROUP BY itemFk, warehouseFk, dated
-			ORDER BY itemFk, warehouseFk, dated;
-
-	SET @lastItemFk := 0;
-	SET @lastWareHouseFk := 0;
-	SET @lastQuantity := 0;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp
-		(INDEX (itemFk, wareHouseFk))
-		SELECT itemFk, wareHouseFk, MIN(quantityAccumulated) quantity
-			FROM (
-				SELECT
-					itemFk,
-					IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
-						@lastQuantity := quantity,
-						@lastQuantity := @lastQuantity + quantity) quantityAccumulated,
-					wareHouseFk,
-					@lastItemFk := itemFk,
-					@lastWareHouseFk := wareHouseFk
-				FROM tItemOrdered
-			)sub
-			GROUP BY itemFk, wareHouseFk;
-
-	DROP TEMPORARY TABLE tItemOrdered;
+BEGIN
+/**
+ * Calcula el valor mínimo acumulado para cada artículo ordenado por fecha y
+ * almacén.
+ *
+ * @param vDated Si no hay movimientos en la fecha indicada, debe devolver 0
+ * @table tmp.itemCalc(itemFk, wareHouseFk, dated, quantity)
+ * @return tmp.itemAtp(itemFk, warehouseFk, quantity)
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tItemOrdered
+		(UNIQUE(itemFk, warehouseFk, dated))
+		ENGINE = MEMORY
+		SELECT itemFk, warehouseFk, dated, SUM(quantity) quantity
+			FROM (
+				SELECT itemFk, warehouseFk, dated, quantity
+					FROM tmp.itemCalc
+				UNION ALL
+				SELECT itemFk, warehouseFk, vDated, 0
+					FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
+			) t1
+			GROUP BY itemFk, warehouseFk, dated
+			ORDER BY itemFk, warehouseFk, dated;
+
+	SET @lastItemFk := 0;
+	SET @lastWareHouseFk := 0;
+	SET @lastQuantity := 0;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp
+		(INDEX (itemFk, wareHouseFk))
+		SELECT itemFk, wareHouseFk, MIN(quantityAccumulated) quantity
+			FROM (
+				SELECT
+					itemFk,
+					IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
+						@lastQuantity := quantity,
+						@lastQuantity := @lastQuantity + quantity) quantityAccumulated,
+					wareHouseFk,
+					@lastItemFk := itemFk,
+					@lastWareHouseFk := wareHouseFk
+				FROM tItemOrdered
+			)sub
+			GROUP BY itemFk, wareHouseFk;
+
+	DROP TEMPORARY TABLE tItemOrdered;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -62667,13 +63513,13 @@ BEGIN
 /**
  * @vItemFk item a buscar
  * @vWarehouseFk almacen donde buscar
- * @vDate Si la fecha es null, muestra el histórico desde el inventario.
+ * @vDate Si la fecha es null, muestra el histórico desde el inventario. 
  * Si la fecha no es null, muestra histórico desde la fecha pasada.
  */
 	DECLARE vDateInventory DATETIME;
 
 	IF vDate IS NULL THEN
-		SELECT inventoried INTO vDateInventory
+		SELECT inventoried INTO vDateInventory 
 			FROM config;
 	ELSE
 		SELECT mockUtcTime INTO vDateInventory
@@ -62699,7 +63545,7 @@ BEGIN
 		inventorySupplierFk INT(10)
 	);
 
-	INSERT INTO tItemDiary
+	INSERT INTO tItemDiary 
 		SELECT tr.landed shipped,
 				b.quantity `in`,
 				NULL `out`,
@@ -62720,14 +63566,14 @@ BEGIN
 				JOIN entry e ON e.id = b.entryFk
 				JOIN travel tr ON tr.id = e.travelFk
 				JOIN supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE()
+				JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
 					OR (util.VN_CURDATE() AND tr.isReceived),
-						'DELIVERED',
+						'DELIVERED', 
 						'FREE')
 				JOIN entryConfig ec
 			WHERE tr.landed >= vDateInventory
 				AND vWarehouseFk = tr.warehouseInFk
-				AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+				AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 				AND b.itemFk = vItemFk
 				AND e.isExcludedFromAvailable = FALSE
 				AND e.isRaid = FALSE
@@ -62753,14 +63599,14 @@ BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				JOIN warehouse w ON w.id = tr.warehouseOutFk
 				JOIN supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
+				JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE() 
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
-					'DELIVERED',
+					'DELIVERED', 
 					'FREE')
 				JOIN entryConfig ec
 			WHERE tr.shipped >= vDateInventory
 				AND vWarehouseFk = tr.warehouseOutFk
-				AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+				AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 				AND b.itemFk = vItemFk
 				AND e.isExcludedFromAvailable = FALSE
 				AND w.isFeedStock = FALSE
@@ -62784,17 +63630,17 @@ BEGIN
 			NULL
 		FROM sale s
 			JOIN ticket t ON t.id = s.ticketFk
-			LEFT JOIN ticketState ts ON ts.ticket = t.id
+			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
 			LEFT JOIN state st ON st.`code` = ts.`code`
 			JOIN client c ON c.id = t.clientFk
 			JOIN clientType ct ON ct.id = c.clientTypeFk
 			JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-				'DELIVERED',
+				'DELIVERED', 
 				IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
 					'FREE',
 					IFNULL(ts.code, 'FREE')))
 			LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-			LEFT JOIN saleTracking stk ON stk.saleFk = s.id
+			LEFT JOIN saleTracking stk ON stk.saleFk = s.id 
 				AND stk.stateFk = stPrep.id
 			LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
 		WHERE t.shipped >= vDateInventory
@@ -62810,7 +63656,7 @@ BEGIN
 			`out` DESC;
 
 	IF vDate IS NULL THEN
-
+	
 		SET @a := 0;
 		SET @currentLineFk := 0;
 		SET @shipped := '';
@@ -62825,9 +63671,9 @@ BEGIN
 			`in` invalue,
 			`out`,
 			@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0) balance,
-			@currentLineFk := IF (@shipped < util.VN_CURDATE()
+			@currentLineFk := IF (@shipped < util.VN_CURDATE() 
 								OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.`code` >= 'ON_PREPARATION')),
-									lineFk,
+									lineFk, 
 									@currentLineFk) lastPreparedLineFk,
 			isTicket,
 			lineFk,
@@ -62859,25 +63705,25 @@ BEGIN
 			0 clientType,
 			0 claimFk
 		UNION ALL
-		SELECT shipped,
-				alertlevel,
-				stateName,
-				origin,
-				reference,
-				clientFk,
-				name, `in`,
-				`out`,
-				@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0),
-				0,
-				isTicket,
-				lineFk,
-				isPicked,
-				clientType,
+		SELECT shipped, 
+				alertlevel, 
+				stateName, 
+				origin, 
+				reference, 
+				clientFk, 
+				name, `in`, 
+				`out`, 
+				@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0), 
+				0, 
+				isTicket, 
+				lineFk, 
+				isPicked, 
+				clientType, 
 				claimFk
 			FROM tItemDiary
 				WHERE shipped >= vDate;
 	END IF;
-
+	
 	DROP TEMPORARY TABLE tItemDiary;
 END ;;
 DELIMITER ;
@@ -62984,7 +63830,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getLack`(IN vForce BOOLEAN, IN
 BEGIN
 /**
  * Calcula una tabla con el máximo negativo visible para cada producto y almacen
- *
+ * 
  * @param vForce Fuerza el recalculo del stock
  * @param vDays Numero de dias a considerar
 **/
@@ -62994,32 +63840,32 @@ BEGIN
 	CALL item_getMinETD();
 	CALL item_zoneClosure();
 
-	SELECT i.id itemFk,
+	SELECT i.id itemFk, 
 			i.longName,
 			w.id warehouseFk,
-			p.`name` producer,
+			p.`name` producer, 
 			i.`size`,
 			i.category,
-			w.name warehouse,
+			w.name warehouse, 
 			SUM(IFNULL(sub.amount,0)) lack,
 			i.inkFk,
 			IFNULL(im.timed, util.midnight()) timed,
 			IFNULL(izc.timed, util.midnight()) minTimed
-		FROM (SELECT item_id,
-						warehouse_id,
+		FROM (SELECT item_id, 
+						warehouse_id, 
 						amount
 					FROM cache.stock
 					WHERE amount > 0
 				UNION ALL
-				SELECT itemFk,
-						warehouseFk,
+				SELECT itemFk, 
+						warehouseFk, 
 						amount
 					FROM tmp.itemMinacum
 			) sub
 			JOIN warehouse w ON w.id = sub.warehouse_id
 			JOIN item i ON i.id = sub.item_id
-			LEFT JOIN producer p ON p.id = i.producerFk
-			JOIN itemType it ON it.id = i.typeFk
+			LEFT JOIN producer p ON p.id = i.producerFk 
+			JOIN itemType it ON it.id = i.typeFk 
 			JOIN itemCategory ic ON ic.id = it.categoryFk
 			LEFT JOIN tmp.itemMinETD im ON im.itemFk = i.id
 			LEFT JOIN tmp.itemZoneClosure izc ON izc.itemFk = i.id
@@ -63142,12 +63988,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getMinETD`()
 BEGIN
-
+	
 /* Devuelve una tabla temporal con la primera ETD, para todos los artículos con salida hoy.
- *
+ * 
  * @return tmp.itemMinETD(itemFk, timed)
  */
-
+	
 	DECLARE vMidnight DATETIME DEFAULT util.midnight();
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.itemMinETD;
@@ -63158,7 +64004,7 @@ BEGIN
 		SELECT s.itemFk, MIN(TIME(IFNULL(z.`hour`,vMidnight))) timed
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = t.id
-				LEFT JOIN `zone` z ON z.id = t.zoneFk
+				LEFT JOIN `zone` z ON z.id = t.zoneFk 
 			WHERE t.shipped BETWEEN util.VN_CURDATE() AND vMidnight
 			GROUP BY s.itemFk;
 END ;;
@@ -63188,33 +64034,33 @@ BEGIN
  * @param vWarehouseFk warehouse id
  * @param vDate fecha para revisar disponible
  * @param vIsShowedByType para mostrar solo artículos de ese tipo
- */
+ */  
 
     DECLARE vCalcFk INT;
     DECLARE vTypeFk INT;
-
+    
     DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-
+    
     DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
-
+       
     SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
         INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
         FROM vn.item i
             LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
             LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
         WHERE i.id = vItemFk;
-
+    
     CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate);
-
+    
     SELECT i.id itemFk,
             i.longName,
             i.subName,
@@ -63247,7 +64093,7 @@ BEGIN
         ORDER BY counter DESC,
                 (t1.name = vTag1) DESC,
                 (it1.value = vValue1) DESC,
-                (i.tag6 = vTag6) DESC,
+                (i.tag6 = vTag6) DESC,                
                 (i.value6 = vValue6) DESC,
                 (i.tag5 = vTag5) DESC,
                 (i.value5 = vValue5) DESC,
@@ -63256,7 +64102,7 @@ BEGIN
                 (i.tag8 = vTag8) DESC,
                 (i.value8 = vValue8) DESC
          LIMIT 30;
-
+       
 
 END ;;
 DELIMITER ;
@@ -63407,6 +64253,108 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_multipleBuy` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_multipleBuy`(
+    vDate DATETIME,
+    vWarehouseFk INT
+)
+BEGIN
+/**
+ * Updates the tmp.itemInventory table, adding the buy id.
+ *
+ * @param tmp.itemInventory(buy_id)
+ * @param vDate -> Date of the purchase operation.
+ * @param vWarehouseFk -> Identifier of the warehouse (warehouseId).
+ */
+	ALTER TABLE tmp.itemInventory ADD IF NOT EXISTS buy_id INT;
+
+	CALL buyUltimate(vWarehouseFk, vDate);
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp
+		(KEY (itemFk))
+		ENGINE = MEMORY
+		SELECT * 
+            FROM (
+                SELECT itemFk, buyFk
+                    FROM tmp.buyUltimate
+                    ORDER BY (vWarehouseFk = warehouseFk) DESC, landing DESC
+                    LIMIT 10000000000000000000
+            ) t
+		    GROUP BY itemFk;
+
+	UPDATE tmp.itemInventory ai
+		    JOIN tmp t ON ai.id = t.itemFk
+		SET ai.buy_id = t.buyFk;
+
+	DROP TEMPORARY TABLE tmp, tmp.buyUltimate;
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_multipleBuyByDate` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_multipleBuyByDate`(
+	vDated DATETIME,
+	vWarehouseFk TINYINT(3)
+)
+BEGIN
+/**
+ * Updates the tmp.itemInventory table, adding the purchase date.
+ *
+ * @param tmp.itemInventory(buy_date)
+ * @param vDated -> end date
+ * @param vWarehouseFk -> warehouse id
+ */
+	DECLARE vLastBuyScope INT;
+	SELECT comparativeLastBuyScope INTO vLastBuyScope
+		FROM config;
+
+	ALTER TABLE tmp.itemInventory
+		ADD `buy_date` datetime NOT NULL;
+	
+	CREATE OR REPLACE TEMPORARY TABLE lastBuyScope
+		SELECT i.id, MAX(t.landed) lastLanded
+		FROM item i 
+			JOIN buy b ON b.itemFk = i.id 
+			JOIN entry e ON e.id = b.entryFk
+			JOIN travel t ON t.id = e.travelFk 
+			JOIN supplier s ON s.id = e.supplierFk
+			JOIN warehouse w ON w.id = t.warehouseInFk
+		WHERE t.landed BETWEEN (vDated + INTERVAL - vLastBuyScope DAY) AND vDated
+			AND NOT s.name = 'INVENTARIO'
+			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+			AND w.isComparative
+			AND NOT e.isRaid
+		GROUP BY i.id;
+	
+	UPDATE tmp.itemInventory y
+			JOIN lastBuyScope lbs ON lbs.id = y.id
+		SET y.buy_date = lbs.lastLanded;
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `item_refreshFromTags` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -63541,11 +64489,11 @@ BEGIN
  * @param vBarcode del item
  * @param vReference referencia a actualizar
  */
-
+	
 	DECLARE vItemFk INT;
 
     SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
+    
     UPDATE item SET comment = vReference WHERE id = vItemFk;
 
 END ;;
@@ -63568,7 +64516,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setGeneric`(vSelf INT)
 BEGIN
 /**
  * Asigna el código genérico a un item, salvo que sea un código de item genérico.
- *
+ * 
  * @param vSelf identificador de vn.item
  */
 	DECLARE vGenericFk INT;
@@ -63578,7 +64526,7 @@ BEGIN
 			SELECT itemFk, SUM(matches) = maxMatches `match`
 				FROM (
 					SELECT ga.id gaid, ga.itemFk,
-						CASE
+						CASE 
 							WHEN t.code = 'nflowers' THEN
 								it.value <=> ga.numFlores
 							WHEN t.code = 'origin' THEN
@@ -63609,13 +64557,13 @@ BEGIN
 						AND (i.`size` = ga.`size` OR ga.`size` IS NULL)
 						AND i.id != ga.itemFk
 				WHERE i.id = vSelf
-					AND NOT i.isFloramondo) sub
+					AND NOT i.isFloramondo) sub 
 				GROUP BY gaid
 				HAVING `match`) sub2
 				LIMIT 1;
 
-	UPDATE vn.item
-		SET genericFk = vGenericFk
+	UPDATE vn.item 
+		SET genericFk = vGenericFk 
 		WHERE id = vSelf;
 END ;;
 DELIMITER ;
@@ -63657,11 +64605,11 @@ BEGIN
 
 	SELECT DEFAULT(companyFk)  INTO vDefaultCompanyFk
 		FROM vn.ticket LIMIT 1;
-
-	IF vAddressFk IS NULL THEN
+	
+	IF vAddressFk IS NULL THEN 
 		SELECT pc.shortageAddressFk INTO vAddressShortage
 			FROM productionConfig pc ;
-	ELSE
+	ELSE 
 		SET vAddressShortage = vAddressFk;
 	END IF;
 
@@ -63726,18 +64674,18 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_updatePackingShelve`(vSelf INT, vPacking INT)
 BEGIN
-
+	
 	/**
 	 *  Actualiza el valor de item.packingShelve
-	 *
+	 * 
 	 * @param vSelf Identificador de vn.item
 	 * @param vPacking Cantidad de unidades de venta que caben en una bandeja
 	 */
-
-	UPDATE vn.item i
+	
+	UPDATE vn.item i 
 		SET i.packingShelve = vPacking
 		WHERE i.id = vSelf;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -63780,204 +64728,240 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory`(IN vDated DATE, IN vIsDetailed BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory`(vDated DATE, vIsDetailed BOOLEAN)
 BEGIN
+	DECLARE vInventoried DATE;
+	DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE;
+	DECLARE vInventoryClone DATE;
+	DECLARE vDateDayEnd DATETIME;
+	DECLARE vInventorySupplierFk INT;
 
-    DECLARE vInventoried DATE;
-    DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE;
-    DECLARE vInventoried2 DATE;
-    DECLARE vDateDayEnd DATETIME;
-    DECLARE vInventorySupplierFk INT;
+	SELECT inventorySupplierFk INTO vInventorySupplierFk
+		FROM entryConfig;
 
-    SELECT inventorySupplierFk INTO vInventorySupplierFk
-        FROM entryConfig;
+	SET vDateDayEnd = util.dayEnd(vDated);
 
-    SET vDateDayEnd = util.dayEnd(vDated);
+	SELECT tr.landed INTO vInventoried
+		FROM travel tr
+			JOIN `entry` e ON e.travelFk = tr.id
+			JOIN entryConfig ec
+		WHERE landed <= vDateDayEnd
+			AND e.supplierFk = vInventorySupplierFk
+		ORDER BY tr.landed DESC
+		LIMIT 1;
 
-    SELECT landed INTO vInventoried
-    FROM travel tr
-        JOIN entry E ON E.travelFk = tr.id
-    WHERE landed <= vDateDayEnd
-        AND E.supplierFk = vInventorySupplierFk
-    ORDER BY landed DESC
-    LIMIT 1;
+	SET vHasNotInventory = (vInventoried IS NULL);
+	
+	IF vHasNotInventory THEN
+		SELECT landed INTO vInventoryClone
+			FROM travel tr
+				JOIN `entry` e ON e.travelFk = tr.id
+				JOIN entryConfig ec
+			WHERE landed >= vDated
+				AND e.supplierFk = vInventorySupplierFk
+			ORDER BY landed ASC
+			LIMIT 1;
 
-    SET vHasNotInventory = IF (vInventoried is null, TRUE, FALSE);
+		SET vInventoried = vDated + INTERVAL 1 DAY;
+		SET vDateDayEnd = vInventoryClone;
+	END IF;
 
-    IF vHasNotInventory THEN
+	CREATE OR REPLACE TEMPORARY TABLE tInventory(
+		warehouseFk SMALLINT,
+		itemFk BIGINT,
+		quantity INT,
+		cost DOUBLE DEFAULT 0,
+		total DOUBLE DEFAULT 0,
+		warehouseInventory VARCHAR(20),
+		PRIMARY KEY (warehouseInventory, itemFk) USING HASH
+		)
+		ENGINE = MEMORY;
+	
+	-- Inventario inicial
+	IF vHasNotInventory THEN
+		INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+			SELECT tr.warehouseInFk,
+					b.itemFk,
+					SUM(b.quantity),
+					w.name
+				FROM buy b
+					JOIN item i ON i.id = b.itemFk
+					JOIN `entry` e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN itemType t ON t.id = i.typeFk
+					JOIN warehouse w ON w.id = warehouseInFk
+					JOIN entryConfig ec 
+				WHERE landed = vDateDayEnd
+					AND e.supplierFk = vInventorySupplierFk
+					AND w.valuatedInventory
+					AND t.isInventory
+				GROUP BY tr.warehouseInFk, b.itemFk;
+	ELSE
+		INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+			SELECT tr.warehouseInFk,
+					b.itemFk,
+					SUM(b.quantity),
+					w.name
+				FROM buy b
+					JOIN item i ON i.id = b.itemFk
+					JOIN `entry` e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN itemType t ON t.id = i.typeFk
+					JOIN warehouse w ON w.id = warehouseInFk
+					JOIN entryConfig ec 
+				WHERE landed = vInventoried
+					AND e.supplierFk = vInventorySupplierFk
+					AND w.valuatedInventory
+					AND t.isInventory
+				GROUP BY tr.warehouseInFk, b.itemFk;
+	END IF;
 
-        SELECT landed INTO vInventoried2
-        FROM travel tr
-            JOIN entry E ON E.travelFk = tr.id
-        WHERE landed >= vDated
-            AND E.supplierFk = vInventorySupplierFk
-        ORDER BY landed ASC
-        LIMIT 1;
+	-- Añadimos las entradas
+	INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+		SELECT tr.warehouseInFk,
+				b.itemFk,
+				b.quantity * IF(vHasNotInventory, -1, 1),
+				w.name
+			FROM buy b
+				JOIN item i ON i.id = b.itemFk
+				JOIN `entry` e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				JOIN itemType t ON t.id = i.typeFk
+				JOIN warehouse w ON w.id = tr.warehouseInFk
+				JOIN entryConfig ec
+			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
+				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
+				AND NOT e.isRaid
+				AND w.valuatedInventory
+				AND t.isInventory
+				AND e.supplierFk <> vInventorySupplierFk
+			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity * IF(vHasNotInventory, -1, 1));
 
-        SET vInventoried = TIMESTAMPADD(DAY,1,vDated);
-        SET vDateDayEnd = vInventoried2;
+	-- Descontamos las salidas
+	INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+		SELECT tr.warehouseOutFk,
+				b.itemFk,
+				b.quantity * IF(vHasNotInventory, 1, -1),
+				w.name
+			FROM buy b
+				JOIN item i ON i.id = b.itemFk
+				JOIN `entry` e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				JOIN itemType t ON t.id = i.typeFk
+				JOIN warehouse w ON w.id = tr.warehouseOutFk
+			WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
+				AND NOT e.isRaid
+				AND w.valuatedInventory
+				AND t.isInventory
+			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity * IF(vHasNotInventory,1,-1));
 
-    END IF;
+	-- Descontamos las lineas de venta
+	INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+		SELECT w.id,
+				s.itemFk,
+				s.quantity * IF(vHasNotInventory, 1, -1),
+				w.name
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				JOIN `client` c ON c.id = t.clientFk
+				JOIN item i ON i.id = s.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+				JOIN warehouse w ON w.id = t.warehouseFk
+			WHERE t.shipped BETWEEN vInventoried AND vDateDayEnd
+				AND w.valuatedInventory
+				AND it.isInventory
+			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + s.quantity * IF(vHasNotInventory, 1, -1);
 
-    DROP TEMPORARY TABLE IF EXISTS inv;
+	-- Volver a poner lo que esta aun en las estanterias
+	IF vDated = util.VN_CURDATE() THEN 
+		INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+			SELECT w.id,
+					s.itemFk,
+					s.quantity * IF(vHasNotInventory, 0, 1),
+					w.name
+				FROM sale s
+					JOIN ticket t ON t.id = s.ticketFk
+					JOIN `client` c ON c.id = t.clientFk
+					JOIN item i ON i.id = s.itemFk
+					JOIN itemType it ON it.id = i.typeFk
+					JOIN warehouse w ON w.id = t.warehouseFk
+				WHERE t.shipped BETWEEN vDated AND vDateDayEnd
+					AND NOT (s.isPicked OR t.isLabeled)
+					AND w.valuatedInventory
+					AND it.isInventory
+				ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + s.quantity * IF(vHasNotInventory, 0, 1);
+	END IF;
 
-    CREATE TEMPORARY TABLE inv
-        (warehouseFk SMALLINT,
-         Id_Article BIGINT,
-         cantidad INT,
-         coste DOUBLE DEFAULT 0,
-         total DOUBLE DEFAULT 0,
-         Almacen VARCHAR(20),
-         PRIMARY KEY (Almacen, Id_Article) USING HASH)
-     ENGINE = MEMORY;
+	-- Mercancia en transito
+	INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+		SELECT tr.warehouseInFk,
+				b.itemFk,
+				b.quantity,
+				CONCAT(wOut.`name`, ' - ', wIn.`name`)
+			FROM buy b
+				JOIN item i ON i.id = b.itemFk
+				JOIN `entry` e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				JOIN itemType t ON t.id = i.typeFk
+				JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
+				JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
+			WHERE vDated >= tr.shipped AND vDated < tr.landed
+				AND NOT isRaid
+				AND wIn.valuatedInventory
+				AND t.isInventory
+				AND e.isConfirmed
+			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity);
+		
+	CALL vn.buyUltimate(NULL, vDateDayEnd);
 
-    IF vHasNotInventory = TRUE THEN
+	UPDATE tInventory i
+			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
+			JOIN buy b ON b.id = bu.buyFk
+		SET total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
+			cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)
+		WHERE i.quantity;
 
-        INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-            SELECT tr.warehouseInFk, b.itemFk, SUM(b.quantity), w.`name`
-            FROM buy b
-                JOIN item i ON i.id = b.itemFk
-                JOIN entry e ON e.id = b.entryFk
-                JOIN travel tr ON tr.id = e.travelFk
-                JOIN itemType t ON t.id = i.typeFk
-                JOIN warehouse w ON w.id = warehouseInFk
-            WHERE landed = vDateDayEnd
-                AND e.supplierFk = vInventorySupplierFk
-                AND w.valuatedInventory
-                AND t.isInventory
-            GROUP BY tr.warehouseInFk, b.itemFk;
+	DELETE FROM tInventory
+		WHERE quantity IS NULL OR NOT quantity;
 
-    END IF;
-
-    INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-        SELECT tr.warehouseInFk,
-                b.itemFk,
-                b.quantity * IF(vHasNotInventory,-1,1),
-                w.`name`
-            FROM buy b
-                JOIN item i ON i.id = b.itemFk
-                JOIN entry e ON e.id = b.entryFk
-                JOIN travel tr ON tr.id = e.travelFk
-                JOIN itemType t ON t.id = i.typeFk
-                JOIN warehouse w ON w.id = tr.warehouseInFk
-            WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
-                AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, trUE)
-                AND NOT e.isRaid
-                AND w.valuatedInventory
-                AND t.isInventory
-                AND e.supplierFk <> vInventorySupplierFk
-            ON DUPLICATE KEY UPDATE inv.cantidad =
-                inv.cantidad + (b.quantity * IF(vHasNotInventory,-1,1));
-
-    INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-        SELECT tr.warehouseOutFk, b.itemFk, b.quantity * IF(vHasNotInventory,1,-1), w.`name`
-        FROM buy b
-        JOIN item i ON i.id = b.itemFk
-        JOIN entry e ON e.id = b.entryFk
-        JOIN travel tr ON tr.id = e.travelFk
-        JOIN itemType t ON t.id = i.typeFk
-        JOIN warehouse w ON w.id = tr.warehouseOutFk
-        WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
-        AND NOT e.isRaid
-        AND w.valuatedInventory
-        AND t.isInventory
-        ON DUPLICATE KEY UPDATE  inv.cantidad = inv.cantidad + (b.quantity * IF(vHasNotInventory,1,-1));
-
-    INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-        SELECT w.id, s.itemFk, s.quantity  * IF(vHasNotInventory,1,-1), w.`name`
-        FROM sale s
-        JOIN ticket t ON t.id = s.ticketFk
-        JOIN `client` c ON c.id = t.clientFk
-        JOIN item i ON i.id = s.itemFk
-        JOIN itemType it ON  it.id = i.typeFk
-        JOIN warehouse w ON w.id = t.warehouseFk
-        WHERE t.shipped BETWEEN vInventoried AND vDateDayEnd
-        AND w.valuatedInventory
-        AND it.isInventory
-        ON DUPLICATE KEY UPDATE  inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,1,-1);
-
-    IF vDated = util.VN_CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
-
-        INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-            SELECT w.id, s.itemFk, s.quantity  * IF(vHasNotInventory,0,1), w.`name`
-            FROM sale s
-            JOIN ticket t ON t.id = s.ticketFk
-            JOIN `client` c ON c.id = t.clientFk
-            JOIN item i ON i.id = s.itemFk
-            JOIN itemType it ON  it.id = i.typeFk
-            JOIN warehouse w ON w.id = t.warehouseFk
-            WHERE t.shipped BETWEEN  vDated AND vDateDayEnd
-            AND (s.isPicked <> 0 or t.isLabeled <> 0 )
-            AND w.valuatedInventory
-            AND it.isInventory
-            ON DUPLICATE KEY UPDATE  inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,0,1);
-
-    END IF;
-
-    -- Mercancia en transito
-    INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
-        SELECT tr.warehouseInFk, b.itemFk, b.quantity, CONCAT(wOut.`name`,' - ', wIn.`name`)
-        FROM buy b
-            JOIN item i ON i.id = b.itemFk
-            JOIN entry e ON e.id = b.entryFk
-			JOIN travel tr ON tr.id = e.travelFk
-			JOIN itemType t ON t.id = i.typeFk
-            JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
-            JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
-        WHERE vDated >= tr.shipped AND vDated < tr.landed
-            AND NOT isRaid
-            AND wIn.valuatedInventory
-            AND t.isInventory
-            AND e.isConfirmed
-        ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (b.quantity);
-
-    CALL vn.buyUltimate(NULL,vDateDayEnd);
-
-    UPDATE inv i
-    JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.Id_Article = bu.itemFk
-    JOIN buy b ON b.id = bu.buyFk
-    SET total = i.cantidad * (ifnull(b.buyingValue,0) + IFNULL(b.packageValue,0) + IFNULL(b.freightValue,0) + IFNULL(b.comissionValue,0)),
-        coste = ifnull(b.buyingValue,0) + IFNULL(b.packageValue,0) + IFNULL(b.freightValue,0) + IFNULL(b.comissionValue,0)
-    WHERE i.cantidad <> 0;
-
-    DELETE FROM inv WHERE Cantidad IS NULL or Cantidad = 0;
-
-    IF vIsDetailed THEN
-
-        SELECT inv.warehouseFk,
-        		i.id itemFk,
-        		i.longName ,
-        		i.size,
-        		inv.Cantidad,
-        		tp.name Tipo,
-                ic.name Reino,
-                inv.coste,
-                cast(inv.total as decimal(10,2)) total,
-                almacen
-            FROM inv
-                JOIN warehouse w on w.id = warehouseFk
-                JOIN item i ON i.id = inv.Id_Article
-                JOIN itemType tp ON tp.id = i.typeFk
-                JOIN itemCategory ic ON ic.id = tp.categoryFk
-            WHERE w.valuatedInventory
-            and inv.total > 0
-            order by inv.total desc;
-
-    ELSE
-
-		 SELECT i.Almacen, ic.name as Reino, cast(i.total as decimal(10,2)) as Euros, w.code as Comprador,it.id
-            FROM inv i
-				JOIN warehouse wh on wh.id = warehouseFk
-                JOIN item it ON it.id = i.Id_Article
-                JOIN itemType itp ON itp.id = it.typeFk
-                LEFT JOIN worker w ON w.id = itp.workerFk
-                JOIN itemCategory ic ON ic.id = itp.categoryFk
+	IF vIsDetailed THEN
+		SELECT ti.warehouseFk,
+				i.id itemFk,
+				i.longName,
+				i.size,
+				ti.quantity, 
+				tp.name Tipo,
+				ic.name Reino, 
+				ti.cost, 
+				CAST(ti.total AS DECIMAL(10, 2)) total,
+				ti.warehouseInventory almacen
+			FROM tInventory ti
+				JOIN warehouse w ON w.id = warehouseFk
+				JOIN item i ON i.id = ti.itemFk
+				JOIN itemType tp ON tp.id = i.typeFk
+				JOIN itemCategory ic ON ic.id = tp.categoryFk 
+			WHERE w.valuatedInventory
+				AND ti.total > 0
+			ORDER BY ti.total DESC;
+	ELSE
+		SELECT i.warehouseInventory Almacen,
+				ic.name Reino,
+				CAST(i.total AS DECIMAL(10, 2)) Euros,
+				w.code Comprador,
+				it.id
+			FROM tInventory i
+				JOIN warehouse wh ON wh.id = warehouseFk
+				JOIN item it ON it.id = i.itemFk
+				JOIN itemType itp ON itp.id = it.typeFk
+				LEFT JOIN worker w ON w.id = itp.workerFk
+				JOIN itemCategory ic ON ic.id = itp.categoryFk
 			WHERE wh.valuatedInventory
-                AND i.total > 0;
+				AND i.total > 0;
+	END IF;
 
-    END IF;
-    DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE inv;
+	DROP TEMPORARY TABLE
+		tmp.buyUltimate,
+		tInventory;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -63996,10 +64980,10 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `item_zoneClosure`()
 BEGIN
-
-/* Devuelve una tabla temporal con la hora minima de un ticket sino tiene el de la zoneClosure y
+	
+/* Devuelve una tabla temporal con la hora minima de un ticket sino tiene el de la zoneClosure y 
  * si tampoco hay el de la zona , para todos los artículos con salida hoy.
- *
+ * 
  * @return tmp.itemZoneClosure(itemFk, timed)
  */
 
@@ -64010,7 +64994,7 @@ BEGIN
  			MIN(DATE_FORMAT(IF(HOUR(t.shipped),t.shipped,
 					IFNULL(zc.hour, z.HOUR)), '%H:%i')
 				)timed
-			FROM ticket t
+			FROM ticket t 
 				JOIN sale s ON s.ticketFk = t.id
 				LEFT JOIN `zone` z ON z.id = t.zoneFk
 				LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
@@ -64043,37 +65027,37 @@ BEGIN
  * @param vConcept descripcion
  * @param vAmount cantidad que se compensa
  * @param vCompany empresa
- * @param vOriginalAccount cuenta contable desde la cual se compensa
- *
- */
+ * @param vOriginalAccount cuenta contable desde la cual se compensa 
+ * 
+ */   
 	DECLARE vNewBookEntry INT;
     DECLARE vIsClientCompensation INT;
 	DECLARE vClientFk INT;
     DECLARE vSupplierFk INT;
   	DECLARE vIsOriginalAClient BOOL;
     DECLARE vPayMethodCompensation INT;
-
+    
 	CALL ledger_next(vNewBookEntry);
 
 	SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;
 
-	SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation
-		FROM client
+	SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation 
+		FROM client 
 		WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci;
-
+	
 	SET @vAmount1:= 0.0;
 	SET @vAmount2:= 0.0;
 
-    INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id)
-		VALUES ( 	vNewBookEntry,
-					vDated,
-					vOriginalAccount,
-					vCompensationAccount,
-					vConcept,
+    INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) 
+		VALUES ( 	vNewBookEntry, 
+					vDated, 
+					vOriginalAccount, 
+					vCompensationAccount, 
+					vConcept, 
 					@vAmount1:= IF(
-						(vIsOriginalAClient AND vAmount > 0) OR
-						(NOT vIsOriginalAClient AND vAmount < 0),
-						0,
+						(vIsOriginalAClient AND vAmount > 0) OR 
+						(NOT vIsOriginalAClient AND vAmount < 0), 
+						0, 
 						ABS(vAmount)
 					),
 					@vAmount2:= IF(@vAmount1,
@@ -64082,20 +65066,20 @@ BEGIN
 					),
 					vCompanyFk
 				),
-                (	vNewBookEntry,
-               		vDated,
-               		vCompensationAccount,
-               		vOriginalAccount,
-               		vConcept,
+                (	vNewBookEntry, 
+               		vDated, 
+               		vCompensationAccount, 
+               		vOriginalAccount, 
+               		vConcept, 
                		@vAmount2,
 					@vAmount1,
                		vCompanyFk);
-
+   
     IF vIsClientCompensation THEN
     	IF vIsOriginalAClient THEN
     		SET vAmount = -vAmount;
     	END IF;
-		INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate)
+		INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) 
 			VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE);
     ELSE
     	IF NOT vIsOriginalAClient THEN
@@ -64103,7 +65087,7 @@ BEGIN
     	END IF;
 	    SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
 		SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';
-
+	
 		INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
 			VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
     END IF;
@@ -64125,10 +65109,10 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ledger_next`(OUT vNewBookEntry INT)
 BEGIN
-
+   
    UPDATE vn.ledgerConfig  SET lastBookEntry = LAST_INSERT_ID(lastBookEntry + 1);
    SET vNewBookEntry = LAST_INSERT_ID();
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64154,15 +65138,15 @@ BEGIN
  * @param vEntity Nombre que hace referencia a la tabla.
  */
 	DECLARE vTableName VARCHAR(45);
-
+    
     SET vTableName = CONCAT(vEntity, 'Log');
-
+    
     SET @qryLog := CONCAT(
 		'SELECT ot.id, ot.originFk, ot.userFk, u.name, ot.action, ot.creationDate, ot.description FROM ', vTableName, ' AS ot',
 				' INNER JOIN account.user u ON u.id = ot.userFk',
 			' WHERE ot.originFk = ', vOriginFk, ' ORDER BY ot.creationDate DESC'
     );
-
+    
     PREPARE stmt FROM @qryLog;
     EXECUTE stmt;
 END ;;
@@ -64187,9 +65171,9 @@ BEGIN
 SET @buildingOrder := 0;
 SET @route := 0;
 set @cajas := 0;
-
+    
 	UPDATE tmp.sorter
-	SET buildingOrder =  @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1
+	SET buildingOrder =  @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1 
 	where date(created) = vDate
 	order by routeFk, created, weight DESC;
 
@@ -64207,23 +65191,23 @@ set @cajas := 0;
 
 	UPDATE tmp.sorter
 	SET lungGrow = IF(palletOrder = 0, -13, lungGrow);
-
+    
 	DELETE FROM tmp.lungSize WHERE dia = vDate;
-
+	
 	INSERT INTO tmp.lungSize(dia, hora,size)
 	select vDate,hora, @cajas := @cajas + cajas as size
 	from
 	(
 	 select IF(lungGrow BETWEEN -12 AND -1, ETD,time_format(created,"%H:%i")) as hora, sum(if(lungGrow <= 0, lungGrow, 1)) as cajas, @cajas := 0
-	 from tmp.sorter
+	 from tmp.sorter 
 	 where date(created) = vDate
 	 group by hora
 	 ) sub;
-
+	 
 	 SELECT * FROM tmp.lungSize
      WHERE dia = vDate;
-
-
+ 
+ 
 
 
 END ;;
@@ -64244,23 +65228,23 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
 BEGIN
-
+	
 /**
  * Inserta registro si el vWorkerFk no ha registrado nada en las últimas 12 horas
  * @param vPlate número de matrícula
- * @param vWorkerFk id del worker
- *
-*/
-		UPDATE vn.machineWorker mw
-	    		JOIN vn.machine m ON m.id = mw.machineFk
+ * @param vWorkerFk id del worker 
+ * 
+*/    
+		UPDATE vn.machineWorker mw 
+	    		JOIN vn.machine m ON m.id = mw.machineFk 
     		SET mw.outTimed = util.VN_NOW()
 	    	WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
 	    		AND ISNULL(mw.outTimed);
-
+	    	
     	INSERT INTO machineWorker (machineFk, workerFk)
 	        SELECT m.id, vWorkerFk
 	        	FROM machine m
-	            WHERE m.plate= vPlate;
+	            WHERE m.plate= vPlate;	     
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64280,21 +65264,21 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
 BEGIN
 /**
- * Obtiene historial de la matrícula vPlate que el  trabajador vWorkerFk escanea,
+ * Obtiene historial de la matrícula vPlate que el  trabajador vWorkerFk escanea, 
  * si es jefe de producción muestra el historial completo.
- *
+ * 
  * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador
- *
+ * @param vWorkerFk id del trabajador 
+ * 
 */
 	DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vWorkerFk);
 
-	SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed
+	SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed 
 		FROM machineWorker mw
 			JOIN machine m ON m.plate = vPlate
 		WHERE mw.machineFk = m.id
 			AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk)
-			ORDER BY mw.inTimed DESC;
+			ORDER BY mw.inTimed DESC;	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64313,13 +65297,13 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
 BEGIN
-
+	
 /**
- * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate,
- *
+ * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate, 
+ * 
  * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador
- *
+ * @param vWorkerFk id del trabajador 
+ * 
 */
 
 	DECLARE vMachineFk INT(10);
@@ -64328,24 +65312,24 @@ BEGIN
 	SELECT m.id  INTO vMachineFk
 	FROM machine m
 		WHERE m.plate  = vPlate;
-
+	
 	SELECT maxHours INTO vMaxHours
 	FROM machineWorkerConfig;
 
-	IF (SELECT COUNT(*)
+	IF (SELECT COUNT(*) 
 			FROM machineWorker m
 			WHERE  m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN
-
+				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN				
+				
 		UPDATE machineWorker m
 			SET m.outTimed = CURRENT_TIMESTAMP()
-			WHERE m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW())
+			WHERE m.workerFk = vWorkerFk 
+				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) 
 				AND ISNULL(m.outTimed)
 				AND m.machineFk = vMachineFk;
-
+		
     END IF;
-
+       
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64400,12 +65384,12 @@ BEGIN
 /**
  * Inserta en la tabla vn.mail
  *
- * @param vReceiver Receptor del correo
+ * @param vReceiver Receptor del correo 
  * @param vReplyTo A quién contestar el correo
  * @param vSubject Título del correo
  * @param vBody Cuerpo del correo
  */
-
+	
 	DECLARE vIsRepeated BOOLEAN;
 
 	SELECT COUNT(*) INTO vIsRepeated
@@ -64446,12 +65430,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `makeNewItem`()
 BEGIN
 
 	DECLARE newItemFk INT;
-
+    
 	SELECT getNewItemId() INTO newItemFk;
-
+    
 	INSERT INTO item(id,name,typeFk,originFk)
 		SELECT newItemFk, 'Nuevo artículo', 78,39;
-
+        
 	SELECT newItemFk;
 
 
@@ -64479,34 +65463,34 @@ BEGIN
     DECLARE vMinute INT DEFAULT 0;
     DECLARE vBoxes INT;
 
-
+    
     DROP TEMPORARY TABLE IF EXISTS vn.pcsDay;
 	CREATE TEMPORARY TABLE vn.pcsDay
 		SELECT 0 as hh, 0 as mm, 0 as boxes;
-
+   
    -- Creamos una tabla soporte para acumular las cajas a lo largo del dia
 	WHILE vHour < 24 DO
-
+    
 		WHILE vMinute < 59 DO
-
+        
 			SET vMinute = vMinute + 1;
-
+            
 			INSERT INTO vn.pcsDay(hh,mm) VALUES(vHour, vMinute);
-
+        
         END WHILE;
-
+        
         SET vMinute = -1;
         SET vHour = vHour + 1;
-
+    
     END WHILE;
-
+    
     -- Acumulamos
     UPDATE vn.pcsDay pd
 		LEFT JOIN (SELECT * FROM vn.pcs_graf WHERE dia = vDated) pg USING(hh,mm)
         SET pd.boxes = pd.boxes + pg.box;
-
+    
 	SELECT * FROM vn.pcsDay;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64543,7 +65527,7 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.client
 		SELECT id
-			FROM client
+			FROM client 
 			WHERE salesPersonFk = vWorkerFk;
 
 	CALL client_getMana();
@@ -64553,7 +65537,7 @@ BEGIN
 			FROM tmp.clientMana
 			ON DUPLICATE KEY UPDATE amount = VALUES(amount);
 
-	DROP TEMPORARY TABLE
+	DROP TEMPORARY TABLE 
 		tmp.client,
 		tmp.clientMana;
 END ;;
@@ -64572,196 +65556,197 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `multipleInventory`(
-	vDate DATE,
-	vWarehouseFk TINYINT,
-	vMaxDays TINYINT
+CREATE DEFINER=`root`@`localhost` PROCEDURE `multipleInventory`(
+	vDate DATE,
+	vWarehouseFk TINYINT,
+	vMaxDays TINYINT
 )
-proc: BEGIN
-	DECLARE vDateTomorrow DATE DEFAULT vDate + INTERVAL 1 DAY;
-	DECLARE vDateFrom DATE DEFAULT vDate;
-	DECLARE vDateTo DATETIME;
-	DECLARE vDateToTomorrow DATETIME;
-	DECLARE vDefaultDayRange INT;
-
-	IF vDate < util.VN_CURDATE() THEN
-		LEAVE proc;
-	END IF;
-
-	IF vDate = util.VN_CURDATE() THEN
-		SELECT inventoried INTO vDateFrom
-			FROM config;
-	END IF;
-
-	SELECT defaultDayRange INTO vDefaultDayRange
-		FROM comparativeConfig;
-
-	SET vDateTo = vDate + INTERVAL IFNULL(vMaxDays, vDefaultDayRange) DAY;
-	SET vDateToTomorrow = vDateTo + INTERVAL 1 DAY;
-
-	ALTER TABLE vn2008.article_inventory
-		ADD `avalaible` INT NOT NULL,
-		ADD `sd` INT NOT NULL,
-		ADD `rest` INT NOT NULL,
-		ADD `expected` INT NOT NULL,
-		ADD `inventory` INT NOT NULL,
-		ADD `visible` INT NOT NULL,
-		ADD `life` TINYINT NOT NULL DEFAULT '0';
-
-	-- Calculo del inventario
-	UPDATE vn2008.article_inventory ai
-		JOIN (
-		SELECT itemFk Id_Article, SUM(quantity) Subtotal
-			FROM (
-				SELECT s.itemFk, - s.quantity quantity
-					FROM sale s
-						JOIN ticket t ON t.id = s.ticketFk
-						JOIN warehouse w ON w.id = t.warehouseFk
-					WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
-						AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
-						AND w.isComparative
-				UNION ALL
-				SELECT b.itemFk, b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseInFk
-					WHERE t.landed BETWEEN vDateFrom AND util.dayEnd(vDate)
-						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
-						AND w.isComparative
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-				UNION ALL
-				SELECT b.itemFk, - b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseOutFk
-					WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
-						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
-						AND w.isComparative
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-			) sub2
-			GROUP BY itemFk
-	) sub ON ai.article_id = sub.Id_Article
-	SET ai.inventory = sub.Subtotal,
-		ai.visible = sub.Subtotal,
-		ai.avalaible = sub.Subtotal,
-		ai.sd = sub.Subtotal;
-
-	-- Cálculo del visible
-	UPDATE vn2008.article_inventory ai
-		JOIN (
-			SELECT itemFk Id_Article, SUM(quantity) Subtotal
-				FROM (
-					SELECT s.itemFk, s.quantity
-						FROM sale s
-							JOIN ticket t ON t.id = s.ticketFk
-							JOIN warehouse w ON w.id = t.warehouseFk
-						WHERE t.shipped >= vDate
-							AND t.shipped < vDateTomorrow
-							AND (NOT isPicked AND NOT t.isLabeled AND t.refFk IS NULL)
-							AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
-							AND w.isComparative
-					UNION ALL
-					SELECT b.itemFk, - b.quantity
-						FROM buy b
-							JOIN entry e ON e.id = b.entryFk
-							JOIN travel t ON t.id = e.travelFk
-							JOIN warehouse w ON w.id = t.warehouseInFk
-						WHERE t.landed = vDate
-							AND NOT t.isReceived
-							AND NOT e.isExcludedFromAvailable
-							AND NOT e.isRaid
-							AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
-							AND w.isComparative
-					UNION ALL
-					SELECT b.itemFk, b.quantity
-						FROM buy b
-							JOIN entry e ON e.id = b.entryFk
-							JOIN travel t ON t.id = e.travelFk
-							JOIN warehouse w ON w.id = t.warehouseOutFk
-						WHERE t.shipped = vDate
-							AND NOT t.isReceived
-							AND NOT e.isExcludedFromAvailable
-							AND NOT e.isRaid
-							AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
-							AND w.isComparative
-				) sub2
-				GROUP BY itemFk
-		) sub ON ai.article_id = sub.Id_Article
-		SET ai.visible = ai.visible + sub.Subtotal;
-
-	-- Calculo del disponible
-	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
-		(INDEX (itemFk, warehouseFk))
-		ENGINE = MEMORY
-		SELECT sub.itemFk,
-				vWarehouseFk warehouseFk,
-				sub.dated,
-				SUM(sub.quantity) quantity
-			FROM (
-				SELECT s.itemFk,
-						DATE(t.shipped) dated,
-						- s.quantity quantity
-					FROM sale s
-						JOIN ticket t ON t.id = s.ticketFk
-						JOIN warehouse w ON w.id = t.warehouseFk
-					WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
-						AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
-						AND w.isComparative
-				UNION ALL
-				SELECT b.itemFk, t.landed, b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseInFk
-					WHERE t.landed BETWEEN vDateTomorrow AND vDateTo
-						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
-						AND w.isComparative
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-				UNION ALL
-				SELECT b.itemFk, t.shipped, - b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseOutFk
-					WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
-						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
-						AND w.isComparative
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-			) sub
-			GROUP BY sub.itemFk, sub.dated;
-
-	CALL item_getAtp(vDate);
-	CALL vn2008.item_travel(vWarehouseFk, vDate);
-	UPDATE vn2008.article_inventory ai
-			JOIN (
-				SELECT it.itemFk,
-						SUM(it.quantity) quantity,
-						im.quantity minQuantity
-					FROM tmp.itemCalc it
-						JOIN tmp.itemAtp im ON im.itemFk = it.itemFk
-						JOIN item i ON  i.id = it.itemFk
-						LEFT JOIN origin o ON o.id = i.originFk
-						LEFT JOIN vn2008.item_travel t ON t.wh = o.warehouseFk
-					WHERE it.dated < IF(vMaxDays < 0 AND t.landing IS NOT NULL,
-									t.landing,
-									vDateToTomorrow)
-					GROUP BY it.itemFk
-			) sub ON sub.itemFk = ai.article_id
-		SET ai.avalaible = IF(sub.minQuantity > 0,
-				ai.avalaible,
-				ai.avalaible + sub.minQuantity),
-			ai.sd = ai.inventory + sub.quantity;
-
-	DROP TEMPORARY TABLE
-		vn2008.item_travel,
-		tmp.itemCalc,
-		tmp.itemAtp;
+proc: BEGIN
+	DECLARE vDateTomorrow DATE DEFAULT vDate + INTERVAL 1 DAY;
+	DECLARE vDateFrom DATE DEFAULT vDate;
+	DECLARE vDateTo DATETIME;
+	DECLARE vDateToTomorrow DATETIME;
+	DECLARE vDefaultDayRange INT;
+
+	IF vDate < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	IF vDate = util.VN_CURDATE() THEN
+		SELECT inventoried INTO vDateFrom
+			FROM config;
+	END IF;
+
+	SELECT defaultDayRange INTO vDefaultDayRange
+		FROM comparativeConfig;
+
+	SET vDateTo = vDate + INTERVAL IFNULL(vMaxDays, vDefaultDayRange) DAY;
+	SET vDateToTomorrow = vDateTo + INTERVAL 1 DAY;
+
+	ALTER TABLE tmp.itemInventory
+		ADD `avalaible` INT NOT NULL,
+		ADD `sd` INT NOT NULL,
+		ADD `rest` INT NOT NULL,
+		ADD `expected` INT NOT NULL,
+		ADD `inventory` INT NOT NULL,
+		ADD `visible` INT NOT NULL,
+		ADD `life` TINYINT NOT NULL DEFAULT '0';
+
+	-- Calculo del inventario
+	UPDATE tmp.itemInventory ai
+		JOIN (
+		SELECT itemFk Id_Article, SUM(quantity) Subtotal
+			FROM (
+				SELECT s.itemFk, - s.quantity quantity
+					FROM sale s
+						JOIN ticket t ON t.id = s.ticketFk
+						JOIN warehouse w ON w.id = t.warehouseFk
+					WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
+						AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+						AND w.isComparative
+				UNION ALL
+				SELECT b.itemFk, b.quantity
+					FROM buy b
+						JOIN entry e ON e.id = b.entryFk
+						JOIN travel t ON t.id = e.travelFk
+						JOIN warehouse w ON w.id = t.warehouseInFk
+					WHERE t.landed BETWEEN vDateFrom AND util.dayEnd(vDate)
+						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+						AND w.isComparative
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT b.itemFk, - b.quantity
+					FROM buy b
+						JOIN entry e ON e.id = b.entryFk
+						JOIN travel t ON t.id = e.travelFk
+						JOIN warehouse w ON w.id = t.warehouseOutFk
+					WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
+						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+						AND w.isComparative
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+			) sub2
+			GROUP BY itemFk
+	) sub ON ai.id = sub.Id_Article
+	SET ai.inventory = sub.Subtotal,
+		ai.visible = sub.Subtotal,
+		ai.avalaible = sub.Subtotal,
+		ai.sd = sub.Subtotal;
+
+	-- Cálculo del visible
+	UPDATE tmp.itemInventory ai
+		JOIN (
+			SELECT itemFk Id_Article, SUM(quantity) Subtotal
+				FROM (
+					SELECT s.itemFk, s.quantity
+						FROM sale s
+							JOIN ticket t ON t.id = s.ticketFk
+							JOIN warehouse w ON w.id = t.warehouseFk
+						WHERE t.shipped >= vDate
+							AND t.shipped < vDateTomorrow
+							AND (NOT isPicked AND NOT t.isLabeled AND t.refFk IS NULL)
+							AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+							AND w.isComparative
+					UNION ALL
+					SELECT b.itemFk, - b.quantity
+						FROM buy b
+							JOIN entry e ON e.id = b.entryFk
+							JOIN travel t ON t.id = e.travelFk
+							JOIN warehouse w ON w.id = t.warehouseInFk
+						WHERE t.landed = vDate
+							AND NOT t.isReceived
+							AND NOT e.isExcludedFromAvailable
+							AND NOT e.isRaid
+							AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+							AND w.isComparative
+					UNION ALL
+					SELECT b.itemFk, b.quantity
+						FROM buy b
+							JOIN entry e ON e.id = b.entryFk
+							JOIN travel t ON t.id = e.travelFk
+							JOIN warehouse w ON w.id = t.warehouseOutFk
+						WHERE t.shipped = vDate
+							AND NOT t.isReceived
+							AND NOT e.isExcludedFromAvailable
+							AND NOT e.isRaid
+							AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+							AND w.isComparative
+				) sub2
+				GROUP BY itemFk
+		) sub ON ai.id = sub.Id_Article
+		SET ai.visible = ai.visible + sub.Subtotal;
+
+	-- Calculo del disponible
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
+		(INDEX (itemFk, warehouseFk))
+		ENGINE = MEMORY
+		SELECT sub.itemFk,
+				vWarehouseFk warehouseFk,
+				sub.dated,
+				SUM(sub.quantity) quantity
+			FROM (
+				SELECT s.itemFk,
+						DATE(t.shipped) dated,
+						- s.quantity quantity
+					FROM sale s
+						JOIN ticket t ON t.id = s.ticketFk
+						JOIN warehouse w ON w.id = t.warehouseFk
+					WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
+						AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+						AND w.isComparative
+				UNION ALL
+				SELECT b.itemFk, t.landed, b.quantity
+					FROM buy b
+						JOIN entry e ON e.id = b.entryFk
+						JOIN travel t ON t.id = e.travelFk
+						JOIN warehouse w ON w.id = t.warehouseInFk
+					WHERE t.landed BETWEEN vDateTomorrow AND vDateTo
+						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+						AND w.isComparative
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT b.itemFk, t.shipped, - b.quantity
+					FROM buy b
+						JOIN entry e ON e.id = b.entryFk
+						JOIN travel t ON t.id = e.travelFk
+						JOIN warehouse w ON w.id = t.warehouseOutFk
+					WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
+						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+						AND w.isComparative
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+			) sub
+			GROUP BY sub.itemFk, sub.dated;
+
+	CALL item_getAtp(vDate);
+	CALL travel_upcomingArrivals(vWarehouseFk, vDate);
+
+	UPDATE tmp.itemInventory ai
+			JOIN (
+				SELECT it.itemFk,
+						SUM(it.quantity) quantity,
+						im.quantity minQuantity
+					FROM tmp.itemCalc it
+						JOIN tmp.itemAtp im ON im.itemFk = it.itemFk
+						JOIN item i ON  i.id = it.itemFk
+						LEFT JOIN origin o ON o.id = i.originFk
+						LEFT JOIN tmp.itemTravel t ON t.wh = o.warehouseFk
+					WHERE it.dated < IF(vMaxDays < 0 AND t.landing IS NOT NULL,
+									t.landing,
+									vDateToTomorrow)
+					GROUP BY it.itemFk
+			) sub ON sub.itemFk = ai.id
+		SET ai.avalaible = IF(sub.minQuantity > 0,
+				ai.avalaible,
+				ai.avalaible + sub.minQuantity),
+			ai.sd = ai.inventory + sub.quantity;
+
+	DROP TEMPORARY TABLE
+		tmp.itemTravel,
+		tmp.itemCalc,
+		tmp.itemAtp;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -64782,20 +65767,20 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlConnectionsSorter_kill`()
 BEGIN
 
 /**
- * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre
- */
-
+ * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre 
+ */	
+ 
 	DECLARE vDone INT DEFAULT 0;
 	DECLARE vProcesId INT;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT p.id
+		SELECT p.id 
 			FROM information_schema.processlist p
-			WHERE USER = 'sorter'
+			WHERE USER = 'sorter' 
 				AND TIME >= 30;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+	
 	OPEN vCursor;
 
 	l: LOOP
@@ -64832,7 +65817,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlPreparedCount_check`()
 BEGIN
 	DECLARE vPreparedCount INTEGER;
 
-	SELECT VARIABLE_VALUE INTO vPreparedCount
+	SELECT VARIABLE_VALUE INTO vPreparedCount 
 			FROM INFORMATION_SCHEMA.GLOBAL_STATUS
 			WHERE VARIABLE_NAME LIKE '%prepared_stmt_count%';
 
@@ -64840,7 +65825,7 @@ BEGIN
 		CALL `vn`.`mail_insert`('cau@verdnatura.es',
 									NULL,
 									'Problemas BBDD prepared_stmt_count',
-									CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ',
+									CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ', 
 												vPreparedCount,
 												', está próximo a exceder su límite.  \r\n  Hay que reiniciar el servicio LF.VMP.Service del servidor a3.')
 								);
@@ -64867,37 +65852,37 @@ BEGIN
 
 	DECLARE newShelving VARCHAR(3);
     DECLARE vCode VARCHAR(3);
-
+    
     SELECT MAX(code) INTO vCode
 		FROM vn.shelving
         WHERE isPrinted = FALSE;
-
+	
     SET @a1 := ASCII(MID(vCode,1,1));
     SET @a2 := ASCII(MID(vCode,2,1));
     SET @a3 := ASCII(MID(vCode,3,1)) + 1;
-
+    
     IF @a3 > 90 THEN
-
+    
 		SET @a3 = 65;
         SET @a2 = @a2 + 1;
-
+        
         IF @a2 > 90 THEN
-
+        
 			SET @a2 = 65;
             SET @a1 = @a1 + 1;
-
+            
             IF @a1 > 90 THEN
-
+            
 				SET @a1 = 65;
-
+            
             END IF;
-
+        
         END IF;
-
+    
     END IF;
 
 	SET newShelving = CHAR(@a1,@a2,@a3 USING utf8);
-
+    
 	INSERT INTO vn.shelving(code) VALUES(newShelving);
 
 END ;;
@@ -64926,18 +65911,18 @@ BEGIN
  * @param descripcion Texto de la observacion
  */
 	DECLARE vTableName VARCHAR(45);
-
+    
 	SET vTableName = CONCAT(vTableCode,'Observation');
-
+        
 	IF ISNULL(vTableName) THEN
 		CALL util.throw('CODE_NOT_FOUND');
 	END IF;
-
+    
 	SET @qryLog := CONCAT(
 		'INSERT INTO ', vTableName, ' (originFk, userFk,  description)',
 			' VALUES (', vOriginFk, ', ', account.myUser_getId(), ', "', vDescription, '")'
     );
-
+    
     PREPARE stmt FROM @qryLog;
     EXECUTE stmt;
 	DEALLOCATE PREPARE stmt;
@@ -64967,15 +65952,15 @@ BEGIN
 
 	DECLARE vDeliveryMethod INT;
 	DECLARE vClient INT;
-
+    
     SELECT deliveryMethodFk INTO vDeliveryMethod
-		FROM vn.agencyMode
+		FROM vn.agencyMode 
         WHERE id = vAgencyMode;
-
+	
     SELECT clientFk INTO vClient
 		FROM vn.address
         WHERE id = vAddress;
-
+    
 	INSERT INTO hedera.order(date_send,customer_id,delivery_method_id,agency_id,address_id,source_app)
 		VALUES(	vLanded,vClient ,vDeliveryMethod,vAgencyMode ,vAddress ,vSourceApp);
 
@@ -65001,7 +65986,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `orderDelete`(IN vId INT)
 BEGIN
 
 	DELETE FROM hedera.`order` where id = vId;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65028,7 +66013,7 @@ BEGIN
     DECLARE vOrderId INT;
     CALL vn.orderCreate(vLanded,vAgencyMode,vAddress,vSourceApp,vOrderId);
     SELECT vOrderId;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65048,7 +66033,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `orderListVolume`(IN vOrderId INT)
 BEGIN
 
-	SELECT
+	SELECT 
 			o.id,
             o.itemFk,
             i.description,
@@ -65074,7 +66059,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`(	
 														IN vClient INT,
 														IN vDate DATE,
                                                         IN vCompany INT,
@@ -65093,20 +66078,20 @@ BEGIN
 
 	SET vGraceDays = IF(vIsAllInvoiceable ,0, 30);
 	SET vGraceDate = TIMESTAMPADD(DAY, - vGraceDays, vDate);
-
-    /* Clientes especiales:
+    
+    /* Clientes especiales: 
 								3240 MADEFLOR
                                  992 JAVIER FELIU
                                    4 TONI VENDRELL
 	*/
-
+                                 
     IF vClient IN (992, 3240, 4) THEN
-
+    
 		SET vGraceDays = 365;
-
+    
     END IF;
    	/* Fin clientes especiales */
-
+   
 	SET vDateEnd = DATE_ADD(vDate, INTERVAL 1 DAY);
 
     DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoice;
@@ -65130,22 +66115,22 @@ BEGIN
             FROM tmp.packageToInvoice
             GROUP BY itemFk
             HAVING totalQuantity > 0;
-
+    
     SELECT COUNT(*)
         INTO vIsInvoiceable
         FROM tmp.packageToInvoicePositives;
 
     IF vIsInvoiceable THEN
 
-    	CALL ticket_add(vClient,
+    	CALL ticket_add(vClient, 
        		vDateEnd,
-       		vWarehouse,
-	       	vCompany,
-	       	NULL,
-	      	NULL,
-	     	NULL,
-		    vDateEnd,
-	   		account.myUser_getId(),
+       		vWarehouse, 
+	       	vCompany, 
+	       	NULL, 
+	      	NULL, 
+	     	NULL, 
+		    vDateEnd, 
+	   		account.myUser_getId(), 
             TRUE,
 			vNewTicket);
 
@@ -65154,44 +66139,44 @@ BEGIN
                                     packagingFk,
                                     quantity,
                                     pvp)
-            SELECT 	vNewTicket,
-					pti.packagingFk,
-                    - SUM(pti.quantity) AS totalQuantity,
+            SELECT 	vNewTicket, 
+					pti.packagingFk, 
+                    - SUM(pti.quantity) AS totalQuantity, 
                     pti.price
                 FROM tmp.packageToInvoice pti
-					LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
-				WHERE ptip.itemFK IS NOT NULL
+					LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk 
+				WHERE ptip.itemFK IS NOT NULL 
 						OR vIsAllInvoiceable
                 GROUP BY packagingFk
                 HAVING totalQuantity;
 
         INSERT INTO sale(
 						ticketFk,
-						itemFk,
-                        concept,
-                        quantity,
+						itemFk, 
+                        concept, 
+                        quantity, 
                         price
                         )
-            SELECT 		vNewTicket,
-						pti.itemFk,
-                        i.name as concept,
-                        sum(pti.quantity) as totalQuantity,
+            SELECT 		vNewTicket, 
+						pti.itemFk, 
+                        i.name as concept, 
+                        sum(pti.quantity) as totalQuantity, 
                         pti.price
                 FROM tmp.packageToInvoice pti
                     JOIN item i ON i.id = pti.itemFk
 						LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
-                    WHERE ptip.itemFK IS NOT NULL
+                    WHERE ptip.itemFK IS NOT NULL 
 						OR vIsAllInvoiceable
                     GROUP BY pti.itemFk
                     HAVING totalQuantity;
-
+                    
 		INSERT INTO saleComponent(saleFk, componentFk, value)
 			SELECT id, vComponentCost, price
 				FROM sale
 				WHERE ticketFk = vNewTicket;
-
+             
     END IF;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65217,7 +66202,7 @@ BEGIN
         WHERE mm.valor = 1 -- Listo para imprimir
         AND mm.stateFk = 9 -- Encajando
         AND m.Id_Ticket = ticketFk;
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65239,15 +66224,15 @@ BEGIN
 
 	DECLARE valueFk INT;
     DECLARE encajando INT DEFAULT 9;
-
-    SELECT valor INTO valueFk
-		FROM vn2008.Movimientos_mark
-		WHERE Id_Movimiento = saleFk
+    
+    SELECT valor INTO valueFk 
+		FROM vn2008.Movimientos_mark 
+		WHERE Id_Movimiento = saleFk 
 			AND stateFk = encajando;
-
+            
 	SET valueFk = (IFNULL(valueFk,0) + 1) MOD 3;
-
-	REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk)
+	
+	REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk) 
 		VALUES(saleFk,valueFk,account.myUser_getId(),encajando);
 
 
@@ -65339,34 +66324,34 @@ BEGIN
     DECLARE vLetters VARCHAR(26) DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     DECLARE vMaxId INT;
     DECLARE vCode VARCHAR(8);
-
+    
     SET vColumn = vFromColumn;
     SET vRow = vFromRow;
     SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+     
 	SELECT MAX(id) INTO vMaxId
 		FROM vn.parking;
 
 	WHILE vColumn <= vToColumn DO
-
+    
 		WHILE vRow <= vToRow DO
-
+    
 			INSERT IGNORE INTO vn.parking(`column`, `row`, sectorFk, `code`, pickingOrder)
 				VALUES (vColumn, vRow, vSectorFk, vCode, vColumn * 100 + vRow )
                 ON DUPLICATE KEY UPDATE `code` = vCode;
-
+			
 			SET vRow = vRow + 1;
             SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+            
 		END WHILE;
-
+        
         SET vRow = vFromRow;
         SET vColumn = vColumn + 1;
-
+        
 		SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+     
     END WHILE;
-
+    
     SELECT * FROM vn.parking WHERE `column` BETWEEN vFromColumn AND vToColumn;
 
 END ;;
@@ -65391,59 +66376,59 @@ BEGIN
 	DECLARE vRow INT;
     DECLARE vCode VARCHAR(8);
     DECLARE i INT;
-
+    
     IF vToRow < vFromRow THEN
-
+    
 		SET vRow = vFromRow;
-
+    
 		WHILE vRow >= vToRow DO
-
+        
 			SET i = 1;
-
+            
             WHILE i <= vTrolleysByLine DO
-
+            
 				SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i);
-
+            
 				INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder)
 					VALUES (vSectorFk, vCode, vPickingOrder + (i * 10))
 					ON DUPLICATE KEY UPDATE `code` = vCode;
-
+                    
 				SET i = i + 1;
-
+            
             END WHILE;
-
+        
 			SET vRow = vRow - 1;
-
+            
         END WHILE;
 
 	ELSE
-
+    
 		SET vRow = vFromRow;
-
+    
 		WHILE vRow <= vToRow DO
-
+        
 			SET i = 1;
-
+            
             WHILE i <= vTrolleysByLine DO
-
+            
 				SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i);
-
+            
 				INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder)
 					VALUES (vSectorFk, vCode, vPickingOrder + (i * 10) )
 					ON DUPLICATE KEY UPDATE `code` = vCode;
-
+                    
 				SET i = i + 1;
-
+            
             END WHILE;
-
+        
 			SET vRow = vRow + 1;
-
+            
         END WHILE;
-
-
+  	
+		
    END IF;
-
-
+			
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65467,28 +66452,28 @@ BEGIN
     DECLARE vColumn INT;
     DECLARE vLetters VARCHAR(200);
     DECLARE vLettersLength INT;
-
+    
     SET vColumn = vStart;
     SET vRow = 1;
     SET vLetters = 'ABCDEF';
 	SET vLettersLength = LENGTH(vLetters);
-
+    
     WHILE vColumn <= vEnd DO
-
+    
 		REPLACE vn.parking(`column`, `row`, `code`, sectorFk)
 			VALUES(vColumn, vRow, CONCAT(vColumn,MID(vLetters,vRow,1)), vSectorFk);
-
+    
 		SET vRow = vRow + 1;
-
+        
         IF vRow > vLettersLength THEN
-
+        
 			SET vRow = 1;
             SET vColumn = vColumn + 1;
-
+        
         END IF;
-
+    
     END WHILE;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65507,11 +66492,11 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_setOrder`(vWarehouseFk INT)
 BEGIN
-
+	
 	/*
 	 * Ordena el orden de preparacion de los parking de acuerdo con la tabla vn.corridor
 	 */
-
+	
 	UPDATE vn.parking p
 		JOIN (
 			SELECT 	code,
@@ -65520,15 +66505,15 @@ BEGIN
 					SELECT 	c.prepOrder,
 							p.code,
 							@orden := 0,
-							IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor ,
-							CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication
+							IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor , 
+							CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication 
 						FROM vn.parking p
-							JOIN vn.sector s ON s.id = p.sectorFk
+							JOIN vn.sector s ON s.id = p.sectorFk 
 							JOIN vn.corridor c ON c.code = LEFT(p.code,1) COLLATE utf8_general_ci
-						WHERE s.warehouseFk = vWarehouseFk) sub
-				ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code
+						WHERE s.warehouseFk = vWarehouseFk) sub 
+				ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code 
 		SET p.pickingOrder = sub2.po;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65547,17 +66532,17 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `prepareClientList`()
 BEGIN
-
+	
 	/*
 	 * Require la tabla tmp.ticket(id,clientFk)
 	 */
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.client;
 	CREATE TEMPORARY TABLE tmp.client
 		(PRIMARY KEY (id))
 		ENGINE = MEMORY
 		SELECT DISTINCT clientFk id
-			FROM tmp.ticket;
+			FROM tmp.ticket; 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -65582,7 +66567,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, t.clientFk
 			FROM vn.ticket t
-				LEFT JOIN vn.ticketState ts ON ts.ticket = t.id
+				LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
 				JOIN vn.client c ON c.id = t.clientFk
 			WHERE c.typeFk IN ('normal','handMaking','internalUse')
 				AND (
@@ -65685,14 +66670,14 @@ BEGIN
 /**
  * Comprueba si la impresora pertenece al sector
  *
- * @param vLabelerFk id de la impresora
+ * @param vLabelerFk id de la impresora 
  * @param vSector sector a comprobar
  */
 	DECLARE isPrinterInNewSector BOOL;
 
 	IF vLabelerFk IS NOT NULL THEN
 		SELECT COUNT(sectorFK) INTO isPrinterInNewSector
-			FROM vn.printer p
+			FROM vn.printer p  
 				WHERE id = vLabelerFk AND sectorFk = vSector;
 
 		IF !isPrinterInNewSector THEN
@@ -65716,7 +66701,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `productionControl`(
-	vWarehouseFk INT,
+	vWarehouseFk INT, 
 	vScopeDays INT
 )
 proc: BEGIN
@@ -65806,9 +66791,9 @@ proc: BEGIN
 				JOIN agencyMode am ON am.id = t.agencyModeFk
 				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				JOIN agency ag ON ag.id = am.agencyFk
-				LEFT JOIN ticketState tls ON tls.ticket = tt.ticketFk
+				LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
 				LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
-				LEFT JOIN worker w ON w.id = tls.worker
+				LEFT JOIN worker w ON w.id = tls.userFk
 				LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
 				LEFT JOIN `zone` z ON z.id = t.zoneFk
 				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
@@ -65817,7 +66802,7 @@ proc: BEGIN
 				LEFT JOIN parking pk ON pk.id = tp.parkingFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-
+		
 	 UPDATE tmp.productionBuffer pb
 			JOIN (
 				SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking
@@ -65825,12 +66810,12 @@ proc: BEGIN
 						JOIN sale s ON s.ticketFk = pb.ticketFk
 						JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
 						JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
-						JOIN parking p ON p.id = sg.parkingFk
+						JOIN parking p ON p.id = sg.parkingFk 
 					GROUP BY pb.ticketFk
 			) t ON t.ticketFk = pb.ticketFk
 		SET pb.previaParking = t.previaParking;
 
-	-- Problemas por ticket
+	-- Problemas por ticket 
 	ALTER TABLE tmp.productionBuffer
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,
@@ -65923,12 +66908,13 @@ proc: BEGIN
 		ENGINE = MEMORY
 		SELECT ish.itemFk,
 				p.sectorFk,
-				sc.isPreviousPrepared,
+				st.description = 'previousPrepared' isPreviousPrepared,
 				sc.itemPackingTypeFk
 			FROM itemShelving ish
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
+				JOIN sectorType st ON st.id = sc.typeFk
 			WHERE p.sectorFk
 				AND ish.visible
 			GROUP BY ish.itemFk, p.sectorFk;
@@ -66102,8 +67088,8 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores
 		ENGINE = MEMORY
-		SELECT 	COUNT(c.ticketFk) errors,
-				tt.workerFk
+		SELECT COUNT(c.ticketFk) errors,
+				tt.userFk
 			FROM claimDevelopment cd
 				JOIN claim c ON cd.claimFk = c.id
 				JOIN ticket t ON c.ticketFk = t.id
@@ -66113,10 +67099,10 @@ BEGIN
 			WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
 				AND cr.code = 'chk'
 				AND s.code = 'ON_PREPARATION'
-			GROUP BY workerFk;
+			GROUP BY tt.userFk;
 
 	UPDATE productionError ep
-			JOIN itemPickerErrors ipe ON ipe.workerFk = ep.userFk
+			JOIN itemPickerErrors ipe ON ipe.userFk = ep.userFk
 		SET ep.error = ep.error + ipe.errors
 		WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores';
 
@@ -66224,23 +67210,23 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `productionSectorList`(vSectorFk INT)
 BEGIN
 /**
- * Devuelve el listado de vn.sale que se puede preparar en previa para ese sector
+ * Devuelve el listado de sale que se puede preparar en previa para ese sector
  *
- * @param vSectorFk Identificador de vn.sector
+ * @param vSectorFk Identificador de sector
  */
 	DECLARE vWarehouseFk INT;
 
 	SELECT warehouseFk INTO vWarehouseFk
-		FROM vn.sector
+		FROM sector
 		WHERE id = vSectorFk;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.whiteTicket;
 	CREATE TEMPORARY TABLE tmp.whiteTicket
 		(ticketFk INT PRIMARY KEY)
 		SELECT s.ticketFk , count(*) AS saleNum, sum(ISNULL(i.itemPackingTypeFk)) iptNull
-			FROM vn.sale s
-				JOIN vn.item i ON i.id = s.itemFk
-				JOIN vn.ticket t ON t.id = s.ticketFk
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+				JOIN ticket t ON t.id = s.ticketFk
 			WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
 			GROUP BY s.ticketFk
 			HAVING saleNum = iptNull;
@@ -66249,15 +67235,15 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.sectorTypeTicket
 		(ticketFk INT PRIMARY KEY)
 		SELECT s.ticketFk , sum(i.itemPackingTypeFk <=> sc.itemPackingTypeFk) iptSector
-			FROM vn.sale s
-				JOIN vn.item i ON i.id = s.itemFk
-				JOIN vn.ticket t ON t.id = s.ticketFk
-				JOIN vn.sector sc ON sc.id = vSectorFk
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+				JOIN ticket t ON t.id = s.ticketFk
+				JOIN sector sc ON sc.id = vSectorFk
 			WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
 			GROUP BY s.ticketFk
 			HAVING iptSector;
 
-	CALL vn.productionControl(vWarehouseFk, 0);
+	CALL productionControl(vWarehouseFk, 0);
 
 	SELECT 0,999999,0 INTO @sameTicket, @ticket, @litrosTicket;
 
@@ -66296,19 +67282,19 @@ BEGIN
 						IF (MINUTE(isa.shipped),MINUTE(isa.shipped), MINUTE(isa.`hour`)) Minuto,
 						i.subName,
 						CAST(isa.physicalVolume * 1000 AS DECIMAL(10,0)) as Litros
-					FROM vn.itemShelvingAvailable isa
-						JOIN vn.item i ON i.id = isa.itemFk
-						JOIN vn.sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
-						JOIN vn.ticket t ON t.id = isa.ticketFk
+					FROM itemShelvingAvailable isa
+						JOIN item i ON i.id = isa.itemFk
+						JOIN sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
+						JOIN sectorType st ON st.id = s.typeFk
+						JOIN ticket t ON t.id = isa.ticketFk
 						LEFT JOIN tmp.whiteTicket wt ON wt.ticketFk = isa.ticketFk
 						LEFT JOIN tmp.sectorTypeTicket stt ON stt.ticketFk = isa.ticketFk
-						LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = isa.saleFk
-						JOIN vn.client c ON c.id = t.clientFk
+						LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = isa.saleFk
+						JOIN client c ON c.id = t.clientFk
 						JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
-						JOIN vn.packagingConfig pc
-					WHERE IF(s.isPreviousPreparedByPacking,
+						JOIN packagingConfig pc
+					WHERE IF(st.description = 'previousByPacking',
 								i.`size` > pc.previousPreparationMinimumSize
-								AND isa.packing > 1
 								AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
 							TRUE)
 						AND sgd.saleFk IS NULL
@@ -66363,7 +67349,7 @@ BEGIN
         `yearMonth` INT
         )
         ENGINE = MEMORY;
-
+        
 	WHILE vDated <= vEnded DO
 		INSERT INTO tmp.rangeDate
 			SET `dated` = vDated,
@@ -66373,7 +67359,7 @@ BEGIN
             `day` = DAY(vDated),
             `week` = WEEK(vDated, 1),
             `yearMonth` = YEAR(vDated) * 100 + MONTH(vDated);
-
+            
 		SET vDated = DATE_ADD(vDated, INTERVAL 1 DAY);
 	END WHILE;
 END ;;
@@ -66462,7 +67448,7 @@ BEGIN
 	CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook;
-
+    
     CREATE TEMPORARY TABLE tmp.recipeCook
     SELECT *,
             @counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter,
@@ -66480,22 +67466,22 @@ BEGIN
 					IFNULL((i.inkFk = r.inkFk ) ,0)
 						+ IFNULL((i.size = r.size) ,0)
                         + IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0)
-                        + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0)
+                        + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0) 
                         + IFNULL((i.typeFk = r.typeFk),0) as matches,
                     i.typeFk,
                     rl.previousSelected
-				FROM vn.recipe r
+				FROM vn.recipe r 
 					JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0)
 									OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0))
 									OR i.typeFk <=> r.typeFk
 					JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc
                     LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected
 									FROM vn.recipe_log
-                                    GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk
+                                    GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk 
 																						AND rl.log_element = r.element
                                                                                         AND rl.selected_ItemFk = i.id
 				WHERE r.itemFk = vItemFk
-					AND a.available > vBunchesQuantity * r.quantity
+					AND a.available > vBunchesQuantity * r.quantity 
 			 UNION ALL
 				 SELECT 100 itemFk,
 							CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName,
@@ -66512,15 +67498,15 @@ BEGIN
 					WHERE r.itemFk = vItemFk
                     GROUP BY r.element
 			) sub
-
+             
             ORDER BY element, matches DESC, previousSelected DESC;
-
-		SELECT *
+ 
+		SELECT * 
 			FROM tmp.recipeCook
 			WHERE counter < 6
-            OR itemFk = 100
+            OR itemFk = 100 
             ;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -66545,79 +67531,30 @@ BEGIN
     DECLARE vShipped DATE;
     DECLARE vEntryFk INT;
     DECLARE vTravelFk INT;
-
+    
     CALL cache.last_buy_refresh(FALSE);
-
-    SELECT warehouseFk, shipped
+    
+    SELECT warehouseFk, shipped 
 		INTO vWarehouseFk, vShipped
-		FROM vn.ticket
+		FROM vn.ticket 
         WHERE id = vTicketFk;
 
 	UPDATE vn.ticket t
 		JOIN vn.item i ON i.id = vItemFk
         SET t.nickname = CONCAT(vQuantity,' ',i.longName)
 		WHERE t.id = vTicketFk;
-
+        
 	SELECT b.buyingValue INTO vLastCost
 		FROM vn.buy b
 			JOIN cache.last_buy lb ON lb.buy_id = b.id
 		WHERE lb.item_id = vItemFk
         ORDER BY (lb.warehouse_id = vWarehouseFk) DESC
         LIMIT 1;
-
+            
 	INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price)
 		SELECT vTicketFk, 98, - vQuantity, i.longName, vLastCost
 			FROM vn.item i
             WHERE i.id = vItemFk;
-   /*
-	SELECT tr.id INTO vTravelFk
-		FROM vn.travel tr
-			JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
-        WHERE tr.warehouseInFk = vWarehouseFk
-			AND tr.landed = vShipped
-            AND w.name = 'Confeccion';
-
-	IF IFNULL(vTravelFk,0) = 0 THEN
-
-		INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyFk)
-			SELECT vShipped, vShipped, vWarehouseFk, w.id, am.id
-				FROM vn.warehouse w
-					JOIN vn.agencyMode am
-				WHERE w.name = 'Confeccion'
-					AND am.name = 'DIRECTO PROVEEDOR';
-
-        SET vTravelFk = LAST_INSERT_ID();
-
-    END IF;
-
-	SELECT e.id INTO vEntryFk
-		FROM vn.entry e
-			JOIN vn.supplier s ON s.id = supplierFk
-		WHERE e.travelFk = vTravelFk
-			AND s.name = 'Confeccion Natural'
-			AND e.isRaid = FALSE;
-
-	IF IFNULL(vEntryFk,0) = 0 THEN
-
-        INSERT INTO vn.entry(supplierFk, evaNotes, travelFk, companyFk)
-				SELECT s.id, t.nickname, vTravelFk, c.id
-					FROM vn.supplier s
-						JOIN vn.ticket t ON t.id = vTicketFk
-                        JOIN vn.company c ON c.code = 'VNL'
-				WHERE s.name = 'Confeccion Natural';
-
-		SET vEntryFk = LAST_INSERT_ID();
-
-	END IF;
-
-    INSERT INTO vn.buy(entryFk, itemFk, quantity, buyingValue, packageFk, packing, grouping)
-		SELECT vEntryFk, b.itemFk, vQuantity, b.buyingValue, b.packageFk, b.packing, b.grouping
-			FROM cache.last_buy lb
-				JOIN vn.buy b ON b.id = lb.buy_id
-                WHERE lb.item_id = vItemFk
-					ORDER BY (lb.warehouse_id = vWarehouseFk) DESC
-					LIMIT 1;
-*/
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -66711,7 +67648,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `report_print`(
 	)
 BEGIN
 /**
- * Inserts in the print queue the report to be printed and the necessary parameters for this
+ * Inserts in the print queue the report to be printed and the necessary parameters for this 
  * one taking into account the paper size of both the printer and the report.
  *
  * @param vReportName the report to be printed.
@@ -66754,11 +67691,11 @@ BEGIN
 	END IF;
 
 	IF vReportFk IS NULL THEN
-		CALL util.throw('reportNotExists');
+		CALL util.throw('reportNotExists');	
 	END IF;
 
 	IF vReportSize <> vPrinteSize THEN
-		CALL util.throw('incorrectSize');
+		CALL util.throw('incorrectSize');		
 	END IF;
 
 	START TRANSACTION;
@@ -66767,7 +67704,7 @@ BEGIN
 				priorityFk = vPriorityFk,
 				reportFk = vReportFk,
 				workerFk = vUserFk;
-
+				
 		SET vPrintQueueFk = LAST_INSERT_ID();
 
 		WHILE vI < vLength DO
@@ -66800,16 +67737,16 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `riskAllClients`(maxRiskDate DATE)
 BEGIN
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
     CREATE TEMPORARY TABLE tmp.client_list
     (PRIMARY KEY (Id_Cliente))
 		ENGINE = MEMORY
 		SELECT id Id_Cliente, null grade FROM vn.client;
-
+    
     CALL vn2008.risk_vs_client_list(maxRiskDate);
-
-	SELECT
+    
+	SELECT 
 		c.RazonSocial,
         c.Id_Cliente,
         c.Credito,
@@ -66821,7 +67758,7 @@ BEGIN
 			JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente
 			JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
 		GROUP BY c.Id_cliente;
-
+        
 	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
     DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
 END ;;
@@ -66880,25 +67817,25 @@ BEGIN
     DECLARE vM3 INT;
     DECLARE vKg INT;
     DECLARE vMatricula  varchar(50);
-
+    
     SELECT sum(packages) as bultos
 		INTO vPackages
-		FROM vn.ticket t
+		FROM vn.ticket t 
 		WHERE routeFk = vRouteFk;
-
+        
 	SELECT SUM(sv.physicalVolume), SUM(sv.physicalWeight)
 		INTO vM3, vKg
         FROM vn.saleVolume sv
         WHERE sv.routeFk = vRouteFk;
-
+        
 	SELECT v.numberPlate as matricula
 		INTO vMatricula
-		FROM vn.route r
+		FROM vn.route r 
         JOIN vn.vehicle v ON r.vehicleFk = v.id
 		WHERE r.id = vRouteFk;
-
+        
 	SELECT vRouteFk as Ruta,
-		   vPackages as Bultos,
+		   vPackages as Bultos,	
 		   vM3 as m3,
            vKg as Kg,
            vMatricula as Matricula;
@@ -66963,7 +67900,7 @@ BEGIN
 			) sub ON sub.routeFk = rm.routeFk
 		SET rm.ticketFree = sub.ticketFree;
 
-	UPDATE routesMonitor rm
+	UPDATE routesMonitor rm        
 			JOIN(
 				SELECT t.routeFk, COUNT(*) AS ticketPacked
 					FROM vn.ticket t
@@ -67049,11 +67986,11 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `routeSetOk`(
     vRouteFk INT)
 BEGIN
-
+ 
    UPDATE vn.route r
    SET r.isOk = 1
    WHERE r.id = vRouteFk;
-
+   
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67092,15 +68029,18 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(vSelf INT)
-proc: BEGIN
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(
+	vSelf INT
+)
+BEGIN
 /**
- * Calcula las comisión para una ruta y guarda los valores en la tabla routeCommission
+ * Calcula las comisión para una ruta y guarda los valores
+ * en la tabla vn.routeCommission.
  *
- * @param vSelf id de ruta
+ * @param vSelf Id de ruta
  */
-	DECLARE vIsUpdatable BOOL;
-	DECLARE vIsFreelance BOOL;
+	DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
+	DECLARE vAgencyModePricePercentage DOUBLE;
 
 	SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
 		FROM route r
@@ -67116,6 +68056,13 @@ proc: BEGIN
 				JOIN worker w ON w.id = r.workerFk
 			WHERE r.id = vSelf;
 
+		SELECT ampp.percentage INTO vAgencyModePricePercentage
+			FROM route r
+				JOIN agencyMode am ON am.id = r.agencyModeFk
+				JOIN agencyModePricePercentage ampp ON ampp.agencyModeFk = am.id
+			WHERE r.id = vSelf;
+
+		-- Falta calcular el precio, a la espera de saber el/los campo/s exacto/s al que aplicarlo/s
 		IF vIsFreelance THEN
 			INSERT INTO routeCommission (
 					routeFk,
@@ -67125,13 +68072,17 @@ proc: BEGIN
 					cat5m3
 				)
 				SELECT vSelf,
-					r.commissionWorkCenterFk,
-					rc.freelanceM3 * IF(
-						IFNULL(r.m3, 0) >= rc.freelanceMinM3,
+						r.commissionWorkCenterFk,
+						IF(vAgencyModePricePercentage IS NOT NULL,
+							vAgencyModePricePercentage / 100,
+							rc.freelanceM3
+						) *
+						IF(IFNULL(r.m3, 0) >= rc.freelanceMinM3,
 							IFNULL(r.m3, 0),
-							0),
-					rc.distributionCat4M3 * IFNULL(r.m3, 0),
-					rc.distributionCat5M3 * IFNULL(r.m3, 0)
+							0
+						),
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
@@ -67150,15 +68101,15 @@ proc: BEGIN
 					cat5m3
 				)
 				SELECT vSelf,
-					r.commissionWorkCenterFk,
-					(r.kmEnd - r.kmStart) *
-						IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
-					IFNULL(r.m3, 0) *
-						IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
-					(r.kmEnd - r.kmStart) * rc.kmYearly,
-					IFNULL(r.m3, 0) * rc.m3Yearly,
-					rc.distributionCat4M3 * IFNULL(r.m3, 0),
-					rc.distributionCat5M3 * IFNULL(r.m3, 0)
+						r.commissionWorkCenterFk,
+						(r.kmEnd - r.kmStart) *
+							IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
+						IFNULL(r.m3, 0) *
+							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
+						(r.kmEnd - r.kmStart) * rc.kmYearly,
+						IFNULL(r.m3, 0) * rc.m3Yearly,
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
@@ -67177,40 +68128,6 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `route_checkDeliveryMethod` */;
-/*!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 */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `route_checkDeliveryMethod`(vSelf INT)
-BEGIN
-/**
-* Comprueba si el deliveryMethod del agencyMode de la ruta es reparto
-*
-* @param vSelf Id de ruta
-*/
-	DECLARE vDeliveryMethod VARCHAR(45);
-
-	SELECT dm.code INTO vDeliveryMethod
-		FROM route r
-			JOIN agencyMode am ON am.id = r.agencyModeFk
-			JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-		WHERE r.id = vSelf;
-
-	IF vDeliveryMethod <> 'DELIVERY' THEN
-		CALL util.throw('Route tickets via delivery only');
-	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_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `route_doRecalc` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -67224,7 +68141,7 @@ proc: BEGIN
 /**
  * Recalculates modified route.
  */
-
+	
 	DECLARE vDone BOOL;
 	DECLARE vRouteFk INT;
 
@@ -67233,7 +68150,7 @@ proc: BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
 		SET vDone = TRUE;
-
+        
 	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
     BEGIN
 		DO RELEASE_LOCK('vn.route_doRecalc');
@@ -67311,13 +68228,13 @@ SELECT t.id Id,
 			t.cmrFk
 		FROM ticket t
 			JOIN client c ON t.clientFk = c.id
-			JOIN address a ON t.addressFk = a.id
+			JOIN address a ON t.addressFk = a.id 
 			LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
 			LEFT JOIN (
 				SELECT t.addressFk, MAX(d.ticketFk) lastTicketFk
 					FROM ticket t
 						JOIN delivery d ON t.id = d.ticketFk
-						JOIN ticket ti ON ti.routeFk = vRouteFk
+						JOIN ticket ti ON ti.routeFk = vRouteFk 
 							AND ti.id = t.id
 							AND ti.clientFk = t.clientFk
 					GROUP BY addressFk
@@ -67394,27 +68311,27 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `saleBuy_Add`(vSaleFk INT, vBuyFk INT)
 BEGIN
-
+	
 	/* Añade un registro a la tabla saleBuy en el caso de que sea posible mantener la trazabilidad
-	 *
+	 * 
 	 * @param vSaleFk clave primaria de vn.sale
 	 * @param vBuyFk clave primaria de vn.buy
 	 */
-	/*IF (SELECT COUNT(*)
+	/*IF (SELECT COUNT(*) 
 			FROM vn.sale s
 				JOIN vn.item i ON i.id = s.itemFk
-				JOIN vn.itemType it ON it.id = i.typeFk
-				JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+				JOIN vn.itemType it ON it.id = i.typeFk 
+				JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
 			WHERE s.id = vSaleFk
 				AND ic.code = 'fruit') THEN */
-
-	IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN
-
+	
+	IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN 
+	
 		INSERT INTO vn.saleBuy (saleFk, buyFk)
 			VALUES(vSaleFk, vBuyFk);
-
+		
 	END IF;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67438,7 +68355,7 @@ BEGIN
  *
  * @param vSectorFk Identificador de vn.sector
  */
-	INSERT INTO vn.saleGroup(userFk, sectorFk)
+	INSERT INTO vn.saleGroup(userFk, sectorFk) 
 		VALUES (account.myUser_getId(), vSectorFk);
 
 	SELECT LAST_INSERT_ID();
@@ -67572,41 +68489,41 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `saleSplit`(vSaleFk INT, vQuantity INT)
 BEGIN
 
-
+	
     DECLARE vNewSaleFk INT;
-
-    INSERT INTO vn.sale(itemFk,
-						concept,
-                        price,
-                        discount,
-                        quantity,
-                        ticketFk,
+        
+    INSERT INTO vn.sale(itemFk, 
+						concept, 
+                        price, 
+                        discount, 
+                        quantity, 
+                        ticketFk, 
                         isPriceFixed)
-		SELECT 	s.itemFk,
-				i.longName,
-                s.price,
-                s.discount,
+		SELECT 	s.itemFk, 
+				i.longName, 
+                s.price, 
+                s.discount, 
                 vQuantity,
-                s.ticketFk,
-                s.isPriceFixed
+                s.ticketFk, 
+                s.isPriceFixed 
 			FROM vn.sale s
 				JOIN vn.item i ON i.id = s.itemFk
 				WHERE s.id = vSaleFk;
-
+                
 	UPDATE vn.sale s
 		JOIN vn.item i ON i.id = s.itemFk
 		SET s.quantity = s.quantity - vQuantity, s.concept = i.longName
         WHERE s.id = vSaleFk;
-
+ 
 	SELECT LAST_INSERT_ID() INTO vNewSaleFk;
-
-	INSERT INTO vn.saleComponent(	saleFk,
-									componentFk,
+             
+	INSERT INTO vn.saleComponent(	saleFk, 
+									componentFk, 
                                     value)
-	SELECT 	vNewSaleFk,
-			componentFk,
+	SELECT 	vNewSaleFk, 
+			componentFk, 
 			value
-		FROM vn.saleComponent
+		FROM vn.saleComponent 
 		WHERE saleFk = vSaleFk;
 
 END ;;
@@ -67626,41 +68543,41 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sales_merge`(vTicketFk INT)
-BEGIN
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
-		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
-			FROM sale s
-				JOIN item i ON i.id = s.itemFk
-				JOIN itemType it ON it.id = i.typeFk
-			WHERE s.ticketFk = vTicketFk
-				AND it.isMergeable
-			GROUP BY s.itemFk, s.price, s.discount;
-
-	START TRANSACTION;
-
-	UPDATE sale s
-			JOIN tSalesToPreserve stp ON stp.id = s.id
-		SET quantity = newQuantity
-		WHERE s.ticketFk = vTicketFk;
-
-	DELETE s.*
-		FROM sale s
-			LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType it ON it.id = i.typeFk
-		WHERE s.ticketFk = vTicketFk
-			AND stp.id IS NULL
-			AND it.isMergeable;
-
-	COMMIT;
-
-	DROP TEMPORARY TABLE tSalesToPreserve;
+BEGIN
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
+		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+			WHERE s.ticketFk = vTicketFk
+				AND it.isMergeable
+			GROUP BY s.itemFk, s.price, s.discount;          
+
+	START TRANSACTION;
+
+	UPDATE sale s 
+			JOIN tSalesToPreserve stp ON stp.id = s.id
+		SET quantity = newQuantity
+		WHERE s.ticketFk = vTicketFk;
+
+	DELETE s.*
+		FROM sale s
+			LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE s.ticketFk = vTicketFk
+			AND stp.id IS NULL
+			AND it.isMergeable;
+
+	COMMIT;
+
+	DROP TEMPORARY TABLE tSalesToPreserve;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67695,17 +68612,17 @@ BEGIN
 	OPEN cCur;
 
 	myLoop: LOOP
-
+    
 		SET vDone = FALSE;
-
+        
 		FETCH cCur INTO vTicketFk;
 
 		IF vDone THEN
 			LEAVE myLoop;
 		END IF;
-
+		
 		CALL vn.sales_merge(vTicketFk);
-
+        
 	END LOOP;
 
 	CLOSE cCur;
@@ -67836,9 +68753,9 @@ BEGIN
 	DELETE st.*
 		FROM vn.saleTracking st
 			JOIN vn.state s ON s.id = st.stateFk
-		WHERE st.saleFk = vSaleFk
+		WHERE st.saleFk = vSaleFk 
 			AND s.code = vState COLLATE utf8_unicode_ci;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67855,12 +68772,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`(
-										vSaleFK INT,
-										vIsChecked BOOLEAN,
-										vOriginalQuantity INT,
-										vWorkerFk INT,
-										vAction VARCHAR(50),
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`(	
+										vSaleFK INT, 
+										vIsChecked BOOLEAN, 
+										vOriginalQuantity INT, 
+										vWorkerFk INT, 
+										vAction VARCHAR(50), 
 										vState VARCHAR(50),
 										vIsScanned BOOLEAN)
 BEGIN
@@ -67876,12 +68793,12 @@ BEGIN
  * @param vIsScanned Identificador si se ha escaneado automáticamente o manual
  */
 
-	REPLACE vn.saleTracking(saleFk,
-							isChecked,
-							originalQuantity,
-							workerFk,
+	REPLACE vn.saleTracking(saleFk, 
+							isChecked, 
+							originalQuantity, 
+							workerFk,  
 							stateFk,
-							isScanned)
+							isScanned) 
 		SELECT 	vSaleFK,
 				vIsChecked,
 				vOriginalQuantity,
@@ -67908,27 +68825,27 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_updateIsChecked`(vSaleFK INT, vIsChecked BOOL, vIsScanned BOOL)
 BEGIN
-
+	
 	/**
 	 * Actualiza el estado del campo vn.saleTracking.isChecked y elimina las lineas de vn.itemShelving
 	 * si procede, en el caso de las preparaciones previas, por usuario
-	 *
+	 * 
 	 * @param vSaleFk Identificador de vn.sale
 	 * @param vIsChecked Estado del registro
 	 */
-
+	
 	UPDATE vn.saleTracking st
 		JOIN vn.state s ON s.id = st.stateFk  AND s.code = 'PREVIOUS_PREPARATION'
 		SET st.isChecked = vIsChecked,
 			st.isScanned = vIsScanned
 		WHERE st.saleFk = vSaleFK
 			AND st.workerFk = account.myUser_getId();
-
+	
 	IF vIsChecked = FALSE THEN
-
-		DELETE FROM vn.itemShelvingSale
+	
+		DELETE FROM vn.itemShelvingSale 
 			WHERE saleFk = vSaleFK;
-
+	
 	END IF;
 
 END ;;
@@ -67954,14 +68871,14 @@ proc: BEGIN
  *
  * @param vSelf Id de la venta
  * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- */
+ */  
     CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
         SELECT s.id
             FROM sale s
             WHERE s.id = vSelf;
-
+           
     CALL sale_recalcComponent(vOption);
-
+   
     DROP TEMPORARY TABLE tmp.recalculateSales;
 END ;;
 DELIMITER ;
@@ -68008,7 +68925,7 @@ BEGIN
 			GROUP BY s.id;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET v_done = TRUE;
+		SET v_done = TRUE; 
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
 
@@ -68016,7 +68933,7 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.coste
 		(PRIMARY KEY (id)) ENGINE = MEMORY
 		SELECT s.id
-		FROM sale s
+		FROM sale s 
 			JOIN item i ON i.id = s.itemFk
 			JOIN itemType tp ON tp.id = i.typeFk
 			JOIN itemCategory ic ON ic.id = tp.categoryFk
@@ -68035,17 +68952,17 @@ BEGIN
 		IF v_done THEN
 			LEAVE l;
 		END IF;
-
+		
 		SELECT ticketFk, concept
 			INTO vTicketFk, vConcept
 			FROM sale
 			WHERE id = vSaleFk;
-
+			
 		CALL sale_calculateComponent(vSaleFk, 1);
 	END LOOP;
 
 	CLOSE vCur;
-	DROP TEMPORARY TABLE tmp.coste;
+	DROP TEMPORARY TABLE tmp.coste;	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -68054,6 +68971,75 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_getBoxPickingList` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getBoxPickingList`(vSectorFk INT, vDated DATE)
+BEGIN
+/** 
+* Returns a suitable boxPicking sales list
+*
+* @param vSectorFk Identifier for vn.sector table
+* @param vDated Date for vn.tickets.shipping
+*
+* @return tmp.sale
+*/
+	DECLARE vWarehouseFk INT;
+
+	SELECT warehouseFk INTO vWarehouseFk
+		FROM sector 
+		WHERE id = vSectorFk;
+
+	CALL productionControl(vWarehouseFk, 0);
+
+	SELECT
+		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
+		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
+			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 MOD i.packingOut = 0
+			AND 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.name = 'REC_ALGEMESI') 
+			AND pb.shipped = vDated
+		GROUP BY s.id
+		ORDER BY etd;
+
+	DROP TEMPORARY TABLE tmp.productionBuffer;
+	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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `sale_getFromTicketOrCollection` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -68131,7 +69117,7 @@ DECLARE vIsCollection BOOL;
 			TRIM(CONCAT(LPAD(s.concept,30,' '), ' ',
 						RPAD(IFNULL(i.size,''),5,' '))) line1,
 			'' cel1,
-			TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) line2,
+			TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) line2, 
 			IF(s.quantity MOD IFNULL(b.packing,s.quantity + 1),
 				CONCAT(CAST(s.quantity/IFNULL(b.`grouping`,1) AS DECIMAL(10,0)),' x ',IFNULL(b.`grouping`,1)),
 				CONCAT(CAST(s.quantity / IFNULL(b.packing,1) AS DECIMAL(10,0)),' pack de ',IFNULL(b.packing,1))) cel2,
@@ -68148,12 +69134,12 @@ DECLARE vIsCollection BOOL;
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN ticket tt ON tt.id = t.id
 			LEFT JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
-			LEFT JOIN buy b ON b.id = lb.buy_id
+			LEFT JOIN buy b ON b.id = lb.buy_id 
 			JOIN item i ON i.id = s.itemFk
 			LEFT JOIN ticketCollection tc ON tc.ticketFk = t.id
 			LEFT JOIN collection c ON c.id = tc.collectionFk
-			LEFT JOIN (SELECT sub.saleFk, sub.isChecked, sub.stateFk, sub.originalQuantity
-							FROM (SELECT DISTINCT st.id, st.saleFk, st.isChecked, st.stateFk, st.originalQuantity
+			LEFT JOIN (SELECT sub.saleFk, sub.isChecked, sub.stateFk, sub.originalQuantity 
+							FROM (SELECT DISTINCT st.id, st.saleFk, st.isChecked, st.stateFk, st.originalQuantity 
 										FROM tmp.ticket2 t
 											JOIN sale s ON s.ticketFk = t.id
 											JOIN saleTracking st ON st.saleFk = s.id
@@ -68165,7 +69151,7 @@ DECLARE vIsCollection BOOL;
 			LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
 			LEFT JOIN itemProductor ip ON ip.itemFk = s.itemFk
 			LEFT JOIN origin o ON o.id = i.originFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id 
 			LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
 			LEFT JOIN parking p ON p.id = sg.parkingFk
 			LEFT JOIN saleMistake sm ON sm.saleFk = s.id
@@ -68217,8 +69203,8 @@ BEGIN
 	DELETE tt.*
 		FROM tmp.sale_getProblems tt
 			JOIN ticketObservation tto ON tto.ticketFk = tt.ticketFk
-			JOIN observationType ot ON ot.id = tto.observationTypeFk
-		WHERE ot.code = 'administrative'
+			JOIN observationType ot ON ot.id = tto.observationTypeFk 
+		WHERE ot.code = 'administrative' 
 			AND tto.description = 'Miriam';
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
@@ -68250,7 +69236,7 @@ BEGIN
 
 	-- Too Little
 	INSERT INTO tmp.sale_problems(ticketFk, isTooLittle)
-		SELECT tp.ticketFk, TRUE
+		SELECT tp.ticketFk, TRUE 
 			FROM tmp.sale_getProblems tp
 				JOIN ticket t ON t.id = tp.ticketFk
 				JOIN (
@@ -68327,6 +69313,19 @@ BEGIN
 			WHERE tr.isOK IS NULL
 		ON DUPLICATE KEY UPDATE hasTicketRequest = TRUE;
 
+	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
+		(INDEX (itemFk, warehouseFk))
+		ENGINE = MEMORY
+		SELECT ish.itemFk itemFk,
+				SUM(ish.visible) visible,
+				s.warehouseFk warehouseFk
+			FROM itemShelving ish
+				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN parking p ON p.id = sh.parkingFk
+				JOIN sector s ON s.id = p.sectorFk
+			GROUP BY ish.itemFk,
+				s.warehouseFk;
+
 	-- Disponible, Faltas, Inventario y Retrasos
 	OPEN vCursor;
 	l: LOOP
@@ -68339,25 +69338,28 @@ BEGIN
 
 		-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
 		CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
-
-		-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
+	
+		-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida	
 		CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
 
 		INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
 			SELECT ticketFk, problem, saleFk
 				FROM (
-					SELECT 	tl.ticketFk,
-							LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) problem,
+					SELECT tl.ticketFk, 
+							LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) problem, 
 							s.id AS saleFk
 						FROM tmp.ticket_list tl
 							JOIN ticket t ON t.id = tl.ticketFk
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it on it.id = i.typeFk
-							JOIN itemCategory ic ON ic.id = it.categoryFk
-							LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache
-							LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
-							LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+							JOIN itemCategory ic ON ic.id = it.categoryFk 
+							LEFT JOIN cache.visible v ON v.item_id = i.id
+								AND v.calc_id = vVisibleCache
+							LEFT JOIN cache.available av ON av.item_id = i.id
+								AND av.calc_id = vAvailableCache
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible,0) < s.quantity
 							AND IFNULL(av.available ,0) < s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
@@ -68370,20 +69372,24 @@ BEGIN
 							AND t.warehouseFk = vWarehouseFk
 					GROUP BY tl.ticketFk) sub
 					ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
-
+		
 		-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
 		INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk)
 			SELECT ticketFk, problem, saleFk
 				FROM (
-					SELECT tl.ticketFk, LEFT(GROUP_CONCAT('I: ',i.id, ' ', i.longName, ' '),250) problem, s.id AS saleFk
+					SELECT tl.ticketFk,
+							LEFT(GROUP_CONCAT('I: ', i.id, ' ', i.longName, ' '), 250) problem,
+							s.id saleFk
 						FROM tmp.ticket_list tl
 							JOIN ticket t ON t.id = tl.ticketFk
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it on it.id = i.typeFk
 							JOIN itemCategory ic ON ic.id = it.categoryFk
-							LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
-							LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+							LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+								AND v.calc_id = vVisibleCache
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible,0) >= s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
@@ -68397,21 +69403,26 @@ BEGIN
 						GROUP BY tl.ticketFk
 				) sub
 			ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
-
+		
 		-- Retraso: Disponible suficiente, pero no visible ni ubicado
 		INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
 			SELECT ticketFk, problem, saleFk
 				FROM (
-					SELECT tl.ticketFk, LEFT(GROUP_CONCAT('R: ',i.id, ' ', i.longName, ' '),250) problem, s.id AS saleFk
+					SELECT tl.ticketFk,
+							LEFT(GROUP_CONCAT('R: ', i.id, ' ', i.longName, ' '), 250) problem,
+							s.id saleFk
 						FROM tmp.ticket_list tl
 							JOIN ticket t ON t.id = tl.ticketFk
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it on it.id = i.typeFk
 							JOIN itemCategory ic ON ic.id = it.categoryFk
-							LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
-							LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
-							LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+							LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+								AND v.calc_id = vVisibleCache
+							LEFT JOIN cache.available av ON av.item_id = i.id
+								AND av.calc_id = vAvailableCache
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
 							AND IFNULL(av.available, 0) >= s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
@@ -68432,12 +69443,12 @@ BEGIN
 		INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
 			SELECT ticketFk, problem, saleFk
 				FROM (
-					SELECT tl.ticketFk,
+					SELECT tl.ticketFk, 
 							s.id saleFk ,
-							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,''), ' '), 250) problem,
+							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,''), ' '), 250) problem, 
 							MOD(s.quantity, b.`grouping`) hasRounding
 						FROM tmp.ticket_list tl
-							JOIN ticket t ON t.id = tl.ticketFk
+							JOIN ticket t ON t.id = tl.ticketFk 
 								AND t.warehouseFk = vWarehouseFk
 							JOIN sale s ON s.ticketFk = tl.ticketFk
 							JOIN item i ON i.id = s.itemFk
@@ -68445,11 +69456,11 @@ BEGIN
 							JOIN buy b ON b.id = bu.buyFk
 						GROUP BY tl.ticketFk
 						HAVING hasRounding
-				) sub
+				) sub 
 			ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
 	END LOOP;
 	CLOSE vCursor;
-
+	
 	INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked)
 		SELECT DISTINCT tl.ticketFk, FALSE
 			FROM tmp.ticket_list tl
@@ -68459,7 +69470,8 @@ BEGIN
 
 	DROP TEMPORARY TABLE
 		tmp.clientGetDebt,
-		tmp.ticket_list;
+		tmp.ticket_list,
+		tItemShelvingStock_byWarehouse;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -68479,16 +69491,16 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
 BEGIN
 /**
- * Calcula los problemas de cada venta
+ * Calcula los problemas de cada venta 
  * para un conjunto de tickets.
  *
  * @return Problems result
  */
     DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
-    CREATE TEMPORARY TABLE tmp.sale_getProblems
+    CREATE TEMPORARY TABLE tmp.sale_getProblems 
     (INDEX (ticketFk))
     ENGINE = MEMORY
-    SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped
+    SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped 
         FROM ticket t
         WHERE t.id = vTicketFk;
 
@@ -68517,7 +69529,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_PriceFix`(vTicketFk INT)
 BEGIN
-
+	
 	DELETE sc.*
 		FROM vn.saleComponent sc
 			JOIN vn.sale s ON s.id = sc.saleFk
@@ -68553,84 +69565,84 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_recalcComponent`(vOption INT)
 proc: BEGIN
 /**
- * Este procedimiento recalcula los componentes de un conjunto de sales,
+ * Este procedimiento recalcula los componentes de un conjunto de sales, 
  * eliminando los componentes existentes e insertandolos de nuevo
  *
  * @param vOption si no se quiere forzar llamar con NULL
  * @table tmp.recalculateSales (id)
- */
-	DECLARE vShipped DATE;
+ */ 
+	DECLARE vShipped DATE; 
 	DECLARE vWarehouseFk SMALLINT;
     DECLARE vAgencyModeFk INT;
     DECLARE vAddressFk INT;
     DECLARE vTicketFk INT;
-    DECLARE vLanded DATE;
+    DECLARE vLanded DATE; 
     DECLARE vIsEditable BOOLEAN;
     DECLARE vZoneFk INTEGER;
     DECLARE vDone BOOL DEFAULT FALSE;
-
+    
 	DECLARE vCur CURSOR FOR
 		SELECT DISTINCT s.ticketFk
 			FROM tmp.recalculateSales rs
 				JOIN vn.sale s ON s.id = rs.id;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+        
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; 
+   	
 	OPEN vCur;
 
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vCur INTO vTicketFk;
-
+		FETCH vCur INTO vTicketFk; 
+		
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SELECT (hasToRecalcPrice OR ts.alertLevel IS NULL) AND t.refFk IS NULL,
-					t.zoneFk,
-					t.warehouseFk,
-					t.shipped,
-					t.addressFk,
-					t.agencyModeFk,
+		SELECT (hasToRecalcPrice OR ts.alertLevel IS NULL) AND t.refFk IS NULL, 
+					t.zoneFk, 
+					t.warehouseFk, 
+					t.shipped, 
+					t.addressFk, 
+					t.agencyModeFk, 
 					t.landed
-				INTO vIsEditable,
-					vZoneFk,
-					vWarehouseFk,
-					vShipped,
-					vAddressFk,
-					vAgencyModeFk,
+				INTO vIsEditable, 
+					vZoneFk, 
+					vWarehouseFk, 
+					vShipped, 
+					vAddressFk, 
+					vAgencyModeFk, 
 					vLanded
 			FROM ticket t
-				LEFT JOIN ticketState ts ON t.id = ts.ticket
+				LEFT JOIN ticketState ts ON t.id = ts.ticketFk
 				LEFT JOIN alertLevel al ON al.id = ts.alertLevel
 			WHERE t.id = vTicketFk;
 
 		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
+	
 		IF NOT EXISTS (SELECT TRUE FROM tmp.zoneGetLanded LIMIT 1) THEN
 			CALL util.throw(CONCAT('There is no zone for these parameters ', vTicketFk));
 		END IF;
-
+	
 		IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
+	
 			UPDATE ticket t
-				SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
+				SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
 				WHERE t.id = vTicketFk AND t.landed IS NULL;
-
+	
 			IF vZoneFk IS NULL THEN
 				SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
 				UPDATE ticket t
 					SET t.zoneFk = vZoneFk
 					WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
 			END IF;
-
+			
 		END IF;
-
+	
 		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-
-		-- rellena la tabla buyUltimate con la ultima compra
-	    CALL buyUltimate (vWarehouseFk, vShipped);
-
+	        
+		-- rellena la tabla buyUltimate con la ultima compra	
+	    CALL buyUltimate (vWarehouseFk, vShipped);  
+	    
 		CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
 			SELECT s.id saleFk, vWarehouseFk warehouseFk
@@ -68638,7 +69650,7 @@ proc: BEGIN
 						JOIN tmp.recalculateSales rs ON s.id = rs.id
 					WHERE s.ticketFk = vTicketFk;
 
-	    CREATE OR REPLACE TEMPORARY TABLE tmp.ticketLot
+	    CREATE OR REPLACE TEMPORARY TABLE tmp.ticketLot 
 			SELECT vWarehouseFk warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
 				FROM sale s
 					JOIN tmp.recalculateSales rs ON s.id = rs.id
@@ -68652,15 +69664,15 @@ proc: BEGIN
 		IF vOption IS NULL THEN
 			SET vOption = IF(vIsEditable, 1, 6);
     	END IF;
-
-		CALL ticketComponentUpdateSale(vOption);
+	    
+		CALL ticketComponentUpdateSale(vOption); 
 	    CALL catalog_componentPurge();
-
+	    
 		DROP TEMPORARY TABLE tmp.buyUltimate;
 	    DROP TEMPORARY TABLE tmp.sale;
-
+	   
 	END LOOP;
-	CLOSE vCur;
+	CLOSE vCur; 
 
 END ;;
 DELIMITER ;
@@ -68669,6 +69681,155 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_replaceItem` */;
+/*!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_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_replaceItem`(vSaleFk INT, vNewItemFk 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 vNewItemFk 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 vGroupingModeFk INT;
+	DECLARE vPacking INT;
+	DECLARE vRoundQuantity INT DEFAULT 1;
+	DECLARE vLanded DATE;
+	DECLARE vAddressFk INT;
+	DECLARE vAgencyModeFk INT;
+	DECLARE vNewPrice DECIMAL(10,2);
+	DECLARE vOldPrice DECIMAL(10,2);
+	DECLARE vOption INT DEFAULT NULL;
+	DECLARE vNewSaleFk INT;
+	DECLARE vChangePrice INT DEFAULT 1;
+	DECLARE vBuyerDiscount INT DEFAULT 4;
+	DECLARE vManaDiscount INT DEFAULT 3;
+	DECLARE vForceToGrouping INT DEFAULT 1;
+	DECLARE vForceToPacking INT DEFAULT 2;
+	DECLARE vFinalPrice DECIMAL(10,2);
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SELECT s.ticketFk,
+			LEAST(s.quantity, vQuantity),
+			s.itemFk,
+			t.shipped,
+			t.warehouseFk,
+			t.landed,
+			t.addressFk,
+			t.agencyModeFk,
+			s.price
+		INTO vTicketFk,
+			vQuantity,
+			vItemFk,
+			vDate,
+			vWarehouseFk,
+			vLanded,
+			vAddressFk,
+			vAgencyModeFk,
+			vOldPrice
+		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,vGroupingModeFk,vPacking
+		FROM buy b
+			JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
+		WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
+
+	IF vGroupingModeFk = vForceToPacking AND vPacking > 0 THEN
+		SET vRoundQuantity = vPacking;
+	END IF;
+	IF  vGroupingModeFk = vForceToGrouping AND vGrouping > 0 THEN
+		SET vRoundQuantity = vGrouping;
+	END IF;
+
+	CALL catalog_calcFromItem(
+		vLanded,
+		vAddressFk,
+		vAgencyModeFk,
+		vNewItemFk);
+
+	SELECT price INTO vNewPrice
+		FROM tmp.ticketCalculateItem;
+
+	IF vNewPrice IS NULL THEN
+		CALL util.throw('price retrieval failed');
+	END IF;
+	IF vNewPrice > vOldPrice THEN
+		SET vFinalPrice = vOldPrice;
+		IF worker_isInDepartment('vt') THEN
+			SET vOption = vManaDiscount;
+		ELSE
+			SET vOption = vBuyerDiscount;
+		END IF;
+	ELSE
+		SET vFinalPrice = vNewPrice;
+		SET vOption = vChangePrice;
+	END IF;
+
+	START TRANSACTION;
+
+	UPDATE sale
+		SET quantity = quantity - vQuantity
+		WHERE id = vSaleFk;
+
+	INSERT INTO vn.sale(ticketFk,
+			itemFk,
+			quantity,
+			concept,
+			price)
+		SELECT vTicketFk,
+				vNewItemFk,
+				CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName),
+				vFinalPrice
+			FROM vn.item i
+			WHERE id = vNewItemFk;
+
+	SELECT LAST_INSERT_ID() INTO vNewSaleFk;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+		(PRIMARY KEY (saleFk))
+		ENGINE = MEMORY
+		SELECT id saleFk, vWarehouseFk warehouseFk
+			FROM sale s WHERE id = vNewSaleFk;
+
+	CALL ticketComponentUpdateSale(vOption);
+	CALL catalog_componentPurge();
+
+	INSERT INTO itemProposal(itemFk, mateFk, counter)
+		VALUES(vItemFk, vNewItemFk, 1)
+		ON DUPLICATE KEY UPDATE counter = counter + 1;
+
+	COMMIT;
+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_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `sectorCollectionSaleGroup_add` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -68681,22 +69842,22 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollectionSaleGroup_add`(vSaleGroupFk INT, vSectorCollectionFk INT)
 BEGIN
 /**
- * Inserta un nuevo registro en vn.sectorCollectionSaleGroup
+ * Inserta un nuevo registro en vn.sectorCollectionSaleGroup 
  * Actualiza el usuario en vn.saleGroup y reemplaza los registros de vn.saleTracking
- *
+ * 
  * @param vSaleGroupFk Identificador de vn.saleGroup
  * @param vSectorCollectionFk Identificador de vn.sectorCollection
  */
 	REPLACE sectorCollectionSaleGroup
-		SET sectorCollectionFk = vSectorCollectionFk,
+		SET sectorCollectionFk = vSectorCollectionFk, 
 			saleGroupFk = vSaleGroupFk;
-
+	
 	UPDATE saleGroup sg
 		JOIN sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
 		JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
-		SET sg.userFk = sc.userFk
+		SET sg.userFk = sc.userFk 
 		WHERE sg.id = vSaleGroupFk;
-
+	
 	INSERT IGNORE saleTracking(
 			saleFk,
 			isChecked,
@@ -68708,8 +69869,8 @@ BEGIN
 				sc.userFk,
 				s.id
 			FROM saleGroupDetail sgd
-				JOIN sectorCollectionSaleGroup scsg
-					ON scsg.saleGroupFk = sgd.saleGroupFk
+				JOIN sectorCollectionSaleGroup scsg 
+					ON scsg.saleGroupFk = sgd.saleGroupFk 
 				JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
 				JOIN state s ON s.code = 'PREVIOUS_PREPARATION'
 			WHERE sgd.saleGroupFk = vSaleGroupFk;
@@ -68810,30 +69971,30 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_new`(vSectorFk INT)
-BEGIN
-/**
- * Inserta una nueva colección, si el usuario no tiene ninguna vacia.
- * Esto se hace para evitar que por error se generen colecciones sin sentido.
- *
- * @param vSectorFk Identificador de #vn.sector
- */
-	DECLARE hasEmptyCollections BOOL;
-	DECLARE vUserFk INT;
-
-	SET vUserFk = account.myUser_getId();
-
-	SELECT (COUNT(sc.id) > 0) INTO hasEmptyCollections
-		FROM vn.sectorCollection sc
-			LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
-		WHERE ISNULL(scsg.id)
-			AND sc.userFk = vUserFk
-			AND sc.sectorFk = vSectorFk
-			AND sc.created >= util.VN_CURDATE();
-
-	IF NOT hasEmptyCollections THEN
-		INSERT INTO vn.sectorCollection(userFk, sectorFk)
-			VALUES(vUserFk, vSectorFk);
-	END IF;
+BEGIN
+/**
+ * Inserta una nueva colección, si el usuario no tiene ninguna vacia.
+ * Esto se hace para evitar que por error se generen colecciones sin sentido.
+ * 
+ * @param vSectorFk Identificador de #vn.sector
+ */
+	DECLARE hasEmptyCollections BOOL;
+	DECLARE vUserFk INT;
+
+	SET vUserFk = account.myUser_getId();
+
+	SELECT (COUNT(sc.id) > 0) INTO hasEmptyCollections
+		FROM vn.sectorCollection sc 
+			LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id 
+		WHERE ISNULL(scsg.id)
+			AND sc.userFk = vUserFk
+			AND sc.sectorFk = vSectorFk
+			AND sc.created >= util.VN_CURDATE();
+
+	IF NOT hasEmptyCollections THEN
+		INSERT INTO vn.sectorCollection(userFk, sectorFk)
+			VALUES(vUserFk, vSectorFk);
+	END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -68877,7 +70038,7 @@ BEGIN
 
 	CREATE TEMPORARY TABLE tmp.previousErrors -- Errores de previa, derivadores de los revisadores (por reclamación)
 		ENGINE = MEMORY
-		SELECT tt.workerFk, COUNT(c.ticketFk) errorsByClaim
+		SELECT tt.userFk, COUNT(c.ticketFk) errorsByClaim
 			FROM claimDevelopment cd
 				JOIN claim c ON cd.claimFk = c.id
 				JOIN ticket t ON c.ticketFk = t.id
@@ -68885,7 +70046,7 @@ BEGIN
 				JOIN ticketTracking tt ON tt.ticketFk = t.id
 				JOIN `state` s ON s.id = tt.stateFk
 			WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = 'Revisadores' AND s.code = 'OK PREVIOUS'
-			GROUP BY workerFk;
+			GROUP BY tt.userFk;
 
 	DELETE FROM sectorProductivity
 			WHERE dated = vDatedFrom
@@ -68913,7 +70074,7 @@ BEGIN
 		 		LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
 		 		LEFT JOIN `state` s2 ON s2.id = wp.stateFk AND s2.code = 'OK PREVIOUS'
 		 		LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = w.id
-		 		LEFT JOIN tmp.previousErrors pe ON pe.workerFk = w.id
+		 		LEFT JOIN tmp.previousErrors pe ON pe.userFk = w.id
 			WHERE DATE(sc.created) = vDatedFrom
 				AND wp.dated = vDatedFrom
 			GROUP BY w.id;
@@ -68969,7 +70130,7 @@ BEGIN
     SELECT s.warehouseFk
 	FROM vn.sector s
     WHERE s.id = vSectorFk;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -69064,10 +70225,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingChange`(IN `vShelvingO` VAR
 BEGIN
 
      UPDATE vn.itemShelving
-     SET shelvingFk =  vShelvingD COLLATE utf8_unicode_ci
-     WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;
-
-
+     SET shelvingFk =  vShelvingD COLLATE utf8_unicode_ci 
+     WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;  
+     
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -69086,16 +70247,16 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingLog_get`(shelvingFk VARCHAR(10))
 BEGIN
-
+	
 	/* Lista el log de un carro
-	 *
+	 * 
 	 * @param shelvingFk matrícula del carro
-	 *
+	 * 
 	 */
-
+	
 		SELECT 	originFk, name, creationDate, description
 		FROM shelvingLog sl
-			JOIN account.user u ON u.id = sl.userFk
+			JOIN account.user u ON u.id = sl.userFk 
 		WHERE sl.originFk = shelvingFk COLLATE utf8_general_ci
 			ORDER BY creationDate DESC;
 
@@ -69118,22 +70279,22 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
 BEGIN
 
-
-SELECT 	s.itemFk,
+	
+SELECT 	s.itemFk, 
 	s.concept,
-	CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir,
-	CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado
+	CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, 
+	CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado 
 	FROM vn.sale s
 		LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
 		JOIN vn.ticket t ON t.id = s.ticketFk
 		LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
 		JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
-	WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE()))
+	WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE())) 
 		AND iss.saleFk IS NULL
 		AND t.warehouseFk = vWarehouseFk
 	GROUP BY s.itemFk
 	HAVING sinServir > aparcado;
-
+			
 
 END ;;
 DELIMITER ;
@@ -69178,12 +70339,12 @@ BEGIN
 	DELETE FROM shelving
 		WHERE length(code) > 3
 			AND parked < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
+	
 	DELETE FROM itemShelving
 		WHERE visible <= 0
 		AND created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE());
 
-	DELETE ish.*
+	DELETE ish.* 
 		FROM itemShelving ish
 			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 			WHERE sh.parkingFk IS NULL
@@ -69379,20 +70540,20 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `solunionRiskRequest`()
 BEGIN
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
     CREATE TEMPORARY TABLE tmp.client_list
     (PRIMARY KEY (Id_Cliente))
 		ENGINE = MEMORY
-		SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc
+		SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc 
 				JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification
                 WHERE dateEnd IS NULL
                 ORDER BY ci.creationDate DESC
 				LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente;
-
+    
     CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
-
-	SELECT
+    
+	SELECT 
 		c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo,
         cast(c.creditInsurance - r.risk as decimal(10,0)) margen_vivo,
 		f.Consumo consumo_anual, c.Vencimiento, ci.grade
@@ -69402,7 +70563,7 @@ BEGIN
 			JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
 			JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente
 		GROUP BY Id_cliente;
-
+        
 	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
     DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
 END ;;
@@ -69652,10 +70813,10 @@ BEGIN
 	DECLARE vBossId INT;
     DECLARE vDone BOOL;
 	DECLARE workerCur CURSOR FOR
-		SELECT workerFk
-			FROM tmp.subordinate
+		SELECT workerFk 
+			FROM tmp.subordinate 
 			WHERE NOT isChecked;
-
+            
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
     DECLARE EXIT HANDLER FOR 1062 BEGIN
@@ -69663,29 +70824,29 @@ BEGIN
     END;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.subordinate;
-
+    
     CREATE TEMPORARY TABLE tmp.subordinate
         (PRIMARY KEY (workerFk))
         ENGINE = MEMORY
 		SELECT vBossFk AS workerFk, 0 AS isChecked;
-
+        
     WHILE (SELECT COUNT(*) FROM tmp.subordinate WHERE NOT isChecked) > 0 DO
 		OPEN workerCur;
 		workerLoop: LOOP
 			SET vDone = FALSE;
 
 			FETCH workerCur INTO vBossId;
-
+			
 			IF vDone THEN
 				LEAVE workerLoop;
 			END IF;
-
-			INSERT INTO tmp.subordinate
-				SELECT id, 0
-					FROM worker
+		
+			INSERT INTO tmp.subordinate 
+				SELECT id, 0 
+					FROM worker 
 					WHERE bossFk = vBossId;
-
-			UPDATE tmp.subordinate
+					
+			UPDATE tmp.subordinate 
 				SET isChecked = 1
 				WHERE workerFk = vBossId;
 		END LOOP;
@@ -69725,13 +70886,13 @@ BEGIN
 	-- Calcula el balance inicial y final de cada proveedor
 	INSERT INTO openingBalance
 		SELECT MAX(dueDated),
-				supplierFk,
-                companyFk,
+				supplierFk, 
+                companyFk, 
 				sum(amount) eurAmount,
 				sum(divisa) foreignAmount
 		FROM (
 			SELECT p.dueDated,
-				p.supplierFk,
+				p.supplierFk, 
 				p.companyFk,
 				p.amount,
                 p.divisa
@@ -69747,7 +70908,7 @@ BEGIN
 			SELECT iidd.dueDated,
 					ii.supplierFk,
 					ii.companyFk,
-					- iidd.amount,
+					- iidd.amount, 
                     - iidd.foreignValue
 			FROM invoiceIn ii
 				JOIN invoiceInDueDay iidd ON ii.id = iidd.invoiceInFk
@@ -69755,14 +70916,14 @@ BEGIN
                 JOIN company co ON co.id = ii.companyFk
 			WHERE  iidd.dueDated > '2014-12-31'
 				AND iidd.dueDated <= vEnded
-				AND ii.isBooked AND co.`code` = 'VNL'
+				AND ii.isBooked AND co.`code` = 'VNL' 
                 AND c.`code` <> 'EUR'
 		UNION ALL
 
 			SELECT se.dueDated,
 					se.supplierFk,
 					se.companyFk,
-					- se.amount,
+					- se.amount, 
                     0
 			FROM supplierExpense se
 				JOIN currency c ON c.id = se.currencyFk
@@ -69772,7 +70933,7 @@ BEGIN
 				AND co.`code` = 'VNL' AND c.`code` <> 'EUR'
 		) sub
 		GROUP BY companyFk, supplierFk;
-
+  
     SELECT ob.dueDated
 			, ob.supplierFk
 			, ob.companyFk
@@ -69930,7 +71091,7 @@ BEGIN
 										- SUM(iid.amount) mysql,
 										0 sage
 									FROM invoiceInDueDay iid
-										JOIN invoiceIn ii ON ii.id = iid.invoiceInFk
+										JOIN invoiceIn ii ON ii.id = iid.invoiceInFk 
 									WHERE IFNULL(ii.bookEntried, ii.issued) BETWEEN vDateFrom AND vDateTo
 										AND ii.isBooked
 									GROUP BY ii.id
@@ -70025,8 +71186,8 @@ BEGIN
 		JOIN (	SELECT p.supplierFk
 					FROM supplier s
 						JOIN payMethod pm ON pm.id = s.payMethodFk
-						JOIN (SELECT supplierFk,MAX(created) created
-								FROM payment
+						JOIN (SELECT supplierFk,MAX(created) created 
+								FROM payment 
 								GROUP BY supplierFk) p ON p.supplierFk = s.id
 					WHERE p.created < (util.VN_CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
 						AND pm.graceMonthsDisableChecked
@@ -70071,15 +71232,15 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketBoxesView`(IN vTicketFk INT)
 BEGIN
-
-	SELECT  s.id,
-			s.itemFk,
-            s.concept,
-            floor(s.quantity / b.packing) as Cajas,
-            b.packing,
-            s.isPicked,
+  	
+	SELECT  s.id, 
+			s.itemFk, 
+            s.concept, 
+            floor(s.quantity / b.packing) as Cajas, 
+            b.packing, 
+            s.isPicked, 
             i.size
-		FROM ticket t
+		FROM ticket t 
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
 			JOIN cache.last_buy lb on lb.warehouse_id = t.warehouseFk AND lb.item_id = s.itemFk
@@ -70090,7 +71251,7 @@ BEGIN
 			AND p.isBox
 				GROUP BY s.itemFk;
 
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70112,7 +71273,7 @@ BEGIN
 
 	DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
 	DECLARE vDateEnd DATETIME DEFAULT util.dayEnd(vDate);
-
+    
     DROP TEMPORARY TABLE IF EXISTS tmp.ticketBuiltTime;
 
 	CREATE TEMPORARY TABLE tmp.ticketBuiltTime
@@ -70125,7 +71286,7 @@ BEGIN
         SELECT ticketFk, builtTime
 			FROM
 			(
-			SELECT
+			SELECT 
 				ticketFk,
 				created as builtTime
 				FROM
@@ -70133,13 +71294,13 @@ BEGIN
 					WHERE created BETWEEN vDateStart AND vDateEnd
 				ORDER BY ticketFk, created DESC
 				LIMIT 10000000000000000000
-			) sub
+			) sub 
             GROUP BY ticketFk
 		) sub2 ON sub2.ticketFk = t.id
         WHERE t.shipped BETWEEN vDate AND util.dayEnd(vDate)
 			AND t.clientFk NOT IN (50,400,200)
             AND t.companyFk = 442
-
+		
 		;
 
 END ;;
@@ -70168,30 +71329,30 @@ BEGIN
 */
 
 	REPLACE INTO orderTicket(orderFk,ticketFk)
-		SELECT orderFk, vTicketNew
-			FROM orderTicket
+		SELECT orderFk, vTicketNew 
+			FROM orderTicket 
             WHERE ticketFk = vTicketOld;
-
+    
 	-- Bionizamos lineas con Preu = 0
 	CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
 				(PRIMARY KEY (id)) ENGINE = MEMORY
-			SELECT id
+			SELECT id 
 				FROM sale
 				WHERE ticketFk = vTicketNew AND price = 0;
-
+				
 	CALL sale_recalcComponent(1);
 
 	-- Bionizamos lineas con Preu > 0
 	CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
 				(PRIMARY KEY (id)) ENGINE = MEMORY
-			SELECT id
+			SELECT id 
 				FROM sale
 				WHERE ticketFk = vTicketNew AND price > 0;
-
+				
 	CALL sale_recalcComponent(6);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70214,12 +71375,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateFromType`( vLanded D
     vTypeFk INT)
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
-	CREATE TEMPORARY TABLE tmp.item
-		(INDEX (itemFk))
-		ENGINE = MEMORY
+	CREATE TEMPORARY TABLE tmp.item 
+		(INDEX (itemFk)) 
+		ENGINE = MEMORY 
 		SELECT id itemFk FROM vn.item
 			WHERE typeFk = vTypeFk;
-
+            
 	CALL catalog_calculate(vLanded, vAddressFk, vAgencyModeFk);
 	DROP TEMPORARY TABLE tmp.item;
 	DROP TEMPORARY TABLE tmp.ticketLot;
@@ -70241,7 +71402,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculatePurge`()
 BEGIN
-	DROP TEMPORARY TABLE
+	DROP TEMPORARY TABLE 
 		tmp.ticketCalculateItem,
 		tmp.ticketComponentPrice,
 		tmp.ticketComponent,
@@ -70265,56 +71426,56 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClon`(vTicketFk INT, vNewShipped DATE)
 BEGIN
-
+	
     DECLARE done INT DEFAULT FALSE;
-	DECLARE vNewTicketFk INT;
+	DECLARE vNewTicketFk INT;    
 	DECLARE vOldSaleFk INT;
     DECLARE vNewSaleFk INT;
-
+    
     DECLARE cur1 CURSOR FOR
 		SELECT id
 			FROM vn.sale
             WHERE ticketFk = vTicketFk;
-
+            
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
+    
     SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
-
+        
     CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
-    UPDATE vn.ticket
+    
+    UPDATE vn.ticket 
 		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
 			shipped = vNewShipped
         WHERE id = vNewTicketFk;
-
+        
 	OPEN cur1;
-
+    
 	read_loop: LOOP
-
+ 
     FETCH cur1 INTO vOldSaleFk;
-
+    
     IF done THEN
       LEAVE read_loop;
     END IF;
-
+    
 		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
 			SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
 				FROM vn.sale
                 WHERE id = vOldSaleFk;
-
+        
         SELECT max(id) INTO vNewSaleFk
 			FROM vn.sale
             WHERE ticketFk = vNewTicketFk;
-
+        
 		INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge)
 			SELECT vNewSaleFk, componentFk, value, isGreuge
 				FROM vn.saleComponent
                 WHERE saleFk = vOldSaleFk;
-
+    
 	END LOOP;
 
 	CLOSE cur1;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70336,18 +71497,18 @@ BEGIN
 
 	DECLARE vShipped DATE;
     DECLARE vMaxDated DATE;
-
-    SELECT shipped, TIMESTAMPADD(YEAR,1,shipped)
+    
+    SELECT shipped, TIMESTAMPADD(YEAR,1,shipped) 
 		INTO vShipped, vMaxDated
 		FROM vn.ticket
         WHERE id = vTicketFk;
-
+        
 	WHILE vShipped <= vMaxDated DO
-
+    
 		SET vShipped = TIMESTAMPADD(WEEK, 1, vShipped);
-
+        
         CALL vn.ticketClon(vTicketFk, vShipped);
-
+        
 	END WHILE;
 
 END ;;
@@ -70369,10 +71530,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_get`(vTicketFk INT)
 BEGIN
 
-	SELECT tc.collectionFk
+	SELECT tc.collectionFk 
 		FROM vn.ticketCollection tc
 		WHERE ticketFk = vTicketFk;
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70391,18 +71552,18 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_setUsedShelves`(vTicketFk INT, vUsedShelves INT)
 BEGIN
-
+	
 	/*
 	 * Inserta número de baldas que ocupa un ticket
-	 *
+	 * 
 	 * @param vTicketFk Identificador de ticket
 	 * @param vUsedShelves Número de baldas
 	 */
-
+	
 	UPDATE ticketCollection tc
 		SET tc.usedShelves = vUsedShelves
 	WHERE tc.ticketFk = vTicketFk;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70440,18 +71601,18 @@ BEGIN
 	END;
 
 	START TRANSACTION;
-
+    
    IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-
-		UPDATE ticket t
+			
+		UPDATE ticket t 
 				JOIN address a ON a.id = vAddressFk
 			SET t.nickname = a.nickname
 			WHERE t.id = vTicketFk;
-
+            
     END IF;
-
+    
 	UPDATE ticket t
-		SET
+		SET 
 			t.clientFk = vClientFk,
 			t.agencyModeFk = vAgencyModeFk,
 			t.addressFk = vAddressFk,
@@ -70462,12 +71623,12 @@ BEGIN
             t.isDeleted = vIsDeleted
 		WHERE
 			t.id = vTicketFk;
-
+            
 	IF vHasToBeUnrouted THEN
 		UPDATE ticket t SET t.routeFk = NULL
 			WHERE t.id = vTicketFk;
     END IF;
-
+            
 	IF vOption <> 8 THEN
 		DROP TEMPORARY TABLE IF EXISTS tmp.sale;
 		CREATE TEMPORARY TABLE tmp.sale
@@ -70509,104 +71670,104 @@ BEGIN
 	DECLARE vComponentFk INT;
     DECLARE vRenewComponents BOOLEAN;
     DECLARE vKeepPrices BOOLEAN;
-
+    
     CASE vOption
-		WHEN 1 THEN
+		WHEN 1 THEN  
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = FALSE;
 		WHEN 2 THEN
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection';
+			SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection'; 
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = TRUE;
-		WHEN 3 THEN
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana';
+		WHEN 3 THEN 
+			SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana'; 
+			SET vRenewComponents = TRUE;
+            SET vKeepPrices = TRUE;	
+		WHEN 4 THEN 
+			SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount'; 
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = TRUE;
-		WHEN 4 THEN
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount';
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-       /* WHEN 5 THEN
+       /* WHEN 5 THEN 
 			SET vComponentFk = 35;
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = TRUE;*/
-		WHEN 6 THEN
+		WHEN 6 THEN 
     		SELECT id INTO vComponentFk FROM component WHERE `code` = 'imbalance';
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = TRUE;
         WHEN 7 THEN
 		    REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3)
+				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3) 
 				    FROM sale s
                         JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
                             AND sc.componentFk NOT IN (28, 29)
                     GROUP BY s.id;
-
+			
 			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3)
+				SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3) 
 				    FROM sale s
                         JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
                             AND sc.componentFk NOT IN (28, 29)
                 GROUP BY s.id;
-
+                
 			SET vRenewComponents = FALSE;
             SET vKeepPrices = FALSE;
 		WHEN 8 THEN
-            DELETE sc.*
+            DELETE sc.* 
 				FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk;
-
+			
 			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3)
+				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3) 
                     FROM sale s
                         JOIN tmp.sale tmps ON tmps.saleFk = s.id;
-
+				
 			SET vRenewComponents = FALSE;
             SET vKeepPrices = FALSE;
-		WHEN 9 THEN
+		WHEN 9 THEN  
 			SET vRenewComponents = TRUE;
             SET vKeepPrices = TRUE;
     END CASE;
 
     IF vRenewComponents THEN
-        DELETE sc.*
-            FROM tmp.sale tmps
+        DELETE sc.* 
+            FROM tmp.sale tmps 
                 JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
                 JOIN `component` c ON c.id = sc.componentFk
         WHERE c.isRenewable;
-
+				
         REPLACE INTO saleComponent(saleFk, componentFk, value)
             SELECT s.id, tc.componentFk, tc.cost
-                FROM sale s
+                FROM sale s 
                     JOIN tmp.sale tmps ON tmps.saleFk = s.id
                     JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-                        AND sc.componentFk = tc.componentFk
-                    LEFT JOIN `component` c ON c.id = tc.componentFk
+                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
+                        AND sc.componentFk = tc.componentFk 
+                    LEFT JOIN `component` c ON c.id = tc.componentFk 
                 WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE);
-
-		-- Añadir componente venta por paquete
+             
+		-- Añadir componente venta por paquete 
 		DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
 		CREATE TEMPORARY TABLE tmp.sale2
 			(PRIMARY KEY (saleFk))
-			ENGINE = MEMORY
+			ENGINE = MEMORY 
 			SELECT * FROM tmp.sale;
-
+			
 		DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent2;
 		CREATE TEMPORARY TABLE tmp.ticketComponent2
-			SELECT * FROM tmp.ticketComponent;
-
-		REPLACE INTO saleComponent(saleFk, componentFk, value)
+			SELECT * FROM tmp.ticketComponent;   
+		 
+		REPLACE INTO saleComponent(saleFk, componentFk, value)	 
 			SELECT t.id, t.componentFk, t.cost
 				FROM (
 					SELECT s.id, tc.componentFk, tc.cost, MOD(s.quantity, b.packing) as resto
 						FROM vn.sale s
 							JOIN tmp.sale tmps ON tmps.saleFk = s.id
-							JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND  tmps.warehouseFk = lb.warehouse_id
+							JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND  tmps.warehouseFk = lb.warehouse_id 
 							JOIN vn.buy b ON b.id = buy_id
 							JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
-							JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage'
+							JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage' 
 							LEFT JOIN (
 								SELECT s.id
 								FROM vn.sale s
@@ -70617,8 +71778,8 @@ BEGIN
 							) tp ON tp.id = s.id
 						WHERE tp.id IS NULL
 						HAVING resto <> 0) t;
-
-		DROP TEMPORARY TABLE IF EXISTS
+                            
+		DROP TEMPORARY TABLE IF EXISTS 
 			tmp.sale2,
 			tmp.ticketComponent2;
     END IF;
@@ -70636,26 +71797,26 @@ BEGIN
 		UPDATE sale s
 			JOIN item i on i.id = s.itemFk
 			JOIN itemType it on it.id = i.typeFk
-				JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk
+				JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk 
 						FROM saleComponent sc
 							JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
 						GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
 				SET s.price = sumValue / ((100 - s.discount) / 100)
-			WHERE it.code != 'PRT' ;
-
+			WHERE it.code != 'PRT' ; 
+            
 		REPLACE INTO saleComponent(saleFk, componentFk, value)
 			SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue
 				FROM sale s
 					JOIN tmp.sale tmps ON tmps.saleFk = s.id
 					LEFT JOIN saleComponent sc ON sc.saleFk = s.id
 				WHERE sc.componentFk != 21
-				GROUP BY s.id
+				GROUP BY s.id 
 				HAVING ROUND(saleValue, 4) <> 0;
     END IF;
-
+    
     UPDATE sale s
 		JOIN (
-			SELECT SUM(sc.value) sumValue, sc.saleFk
+			SELECT SUM(sc.value) sumValue, sc.saleFk 
 				FROM saleComponent sc
 					JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
 					JOIN `component` c ON c.id = sc.componentFk
@@ -70669,10 +71830,10 @@ BEGIN
 			JOIN sale s on s.id = sc.saleFk
 			JOIN item i ON i.id = s.itemFk
 			JOIN itemType it ON it.id = i.typeFk
-		WHERE it.code = 'PRT';
-
+		WHERE it.code = 'PRT'; 
+		
 	INSERT INTO saleComponent(saleFk, componentFk, value)
-		SELECT s.id, 15, s.price
+		SELECT s.id, 15, s.price   
 			FROM sale s
 				JOIN tmp.sale tmps ON tmps.saleFk = s.id
 				JOIN item i ON i.id = s.itemFK
@@ -70739,24 +71900,24 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticket
 		ENGINE = MEMORY
 		SELECT vTicketFk ticketFk;
-
+        
 	CALL vn.ticket_getTax(NULL);
 
-    SELECT
+    SELECT 
 			tt.ticketFk,
             CAST(tt.taxableBase AS DECIMAL(10, 2)) AS taxableBase,
 			CAST(tt.rate * tt.taxableBase / 100  AS DECIMAL(10, 2)) AS tax,
-            pgc.*,
+            pgc.*, 
             CAST(IF(pe.equFk IS NULL, taxableBase, 0) AS DECIMAL(10, 2)) AS Base,
             pgc.rate / 100 as vatPercent
 		FROM tmp.ticketTax tt
 			JOIN vn.pgc ON pgc.code = tt.pgcFk
 			LEFT JOIN vn.pgcEqu pe ON pe.equFk = pgc.code;
-
+    
 	DROP TEMPORARY TABLE tmp.ticket;
     DROP TEMPORARY TABLE tmp.ticketTax;
 	DROP TEMPORARY TABLE tmp.ticketAmount;
-
+  
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70794,29 +71955,29 @@ BEGIN
 					JOIN ticket t ON t.id = tmpTicket.ticketFk;
 
     CALL addressTaxArea ();
-
+     
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
 	CREATE TEMPORARY TABLE tmp.ticketTax
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
 			SELECT tmpTicket.ticketFk,
 					bp.pgcFk,
-					SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)
+					SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2) 
 						) AS taxableBase,
 					SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)
 						) * pgc.rate / 100 AS tax,
 					tc.code
-
+                        
 				FROM tmp.ticket tmpTicket
 					JOIN sale s ON s.ticketFk = tmpTicket.ticketFk
 					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 AND ata.companyFk = t.companyFk
-					JOIN itemTaxCountry itc
+					JOIN itemTaxCountry itc 
 						ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp
+					JOIN bookingPlanner bp 
 						ON bp.countryFk = su.countryFk
 							AND bp.taxAreaFk = ata.areaFk
 							AND bp.taxClassFk = itc.taxClassFk
@@ -70824,7 +71985,7 @@ BEGIN
                     JOIN taxClass tc ON tc.id = bp.taxClassFk
 				GROUP BY tmpTicket.ticketFk, pgc.code
 				HAVING taxableBase != 0;
-
+                              
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
 	CREATE TEMPORARY TABLE tmp.ticketAmount
 		(INDEX (ticketFk))
@@ -70835,7 +71996,7 @@ BEGIN
 
     DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
     DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea;
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -70856,7 +72017,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTotal`(vTaxArea VARCHAR(25
 BEGIN
 /**
  * Calcula el total con IVA para un conjunto de tickets.
- *
+ * 
  * @param vTaxArea
  * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
  * @return tmp.ticketTotal Total para cada ticket
@@ -70873,7 +72034,7 @@ BEGIN
 			FROM tmp.ticket t
 				LEFT JOIN tmp.ticketAmount ta ON t.ticketFk = ta.ticketFk
 			GROUP BY ticketFk;
-
+			
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
 END ;;
@@ -70945,18 +72106,18 @@ BEGIN
     DECLARE vParked DATETIME;
     DECLARE vLevel INT;
     DECLARE vCollectionFk INT;
-
-    SELECT IFNULL(`level`,0), IFNULL(collectionFk,0)
+    
+    SELECT IFNULL(`level`,0), IFNULL(collectionFk,0) 
 		INTO vLevel, vCollectionFk
 		FROM vn.ticketCollection
         WHERE ticketFk = vTicketFk
         LIMIT 1;
-
-	SELECT created, parkingFk
+        
+	SELECT created, parkingFk 
 		INTO vParked, vParkingFk
 		FROM vn.ticketParking
         WHERE ticketFk = vTicketFk;
-
+        
     SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
 		FROM vn.ticketParking tp
         JOIN vn.parking p ON p.id = tp.parkingFk
@@ -70983,7 +72144,7 @@ BEGIN
                 AND sc.isPackagingArea
                 AND tp.created < vParked
                 AND t.packages <=> 0);
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -71004,7 +72165,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketNotInvoicedByClient`(vClientF
 BEGIN
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-
+    
 	CREATE TEMPORARY TABLE tmp.ticket
 		SELECT id ticketFk
 			FROM ticket
@@ -71014,7 +72175,7 @@ BEGIN
 
 	CALL vn.ticketGetTotal(NULL);
 
-	SELECT 	c.id,
+	SELECT 	c.id, 
 			c.name as Cliente,
             t.shipped as Fecha,
             t.id as Id_Ticket,
@@ -71025,7 +72186,7 @@ BEGIN
 
 	DROP TEMPORARY TABLE
 	tmp.ticket,
-	tmp.ticketTotal;
+	tmp.ticketTotal;   
 
 END ;;
 DELIMITER ;
@@ -71045,21 +72206,21 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketObservation_addNewBorn`(vTicketFk INT)
 BEGIN
-
+	
 	/**
 	 *  Inserta observaciones para los tickets con clientes nuevos o recuperados
-	 *
+	 * 
 	 *  @param vTicketFk Identificador de vn.ticket
 	 */
-
+	
 	DECLARE vDescription VARCHAR(20) DEFAULT '¡Cliente NUEVO! ';
 
 	INSERT INTO vn.ticketObservation(ticketFk, observationTypeFk, description)
 		SELECT vTicketFk, ot.id, vDescription
 			FROM vn.observationType ot
 			WHERE ot.hasNewBornMessage
-		ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description);
-
+		ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description);	
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -71099,7 +72260,7 @@ BEGIN
 	DECLARE vComponentCost INT;
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vClientId INT;
-
+	
 	DECLARE vCursor CURSOR FOR
 		SELECT DISTINCT clientFk
 			FROM (
@@ -71116,31 +72277,31 @@ BEGIN
 		RESIGNAL;
 	END;
 
-	SELECT id INTO vWarehouseInventory
-		FROM warehouse
+	SELECT id INTO vWarehouseInventory 
+		FROM warehouse 
 		WHERE `code`= 'inv';
-
-	SELECT id INTO vComponentCost
-		FROM component
+		
+	SELECT id INTO vComponentCost 
+		FROM component 
 		WHERE `code`= 'purchaseValue';
-
-	SELECT packagingInvoicingDated INTO vDateStart
-		FROM ticketConfig;
-
+		
+	SELECT packagingInvoicingDated INTO vDateStart 
+		FROM ticketConfig;	
+	
 	IF vWarehouseInventory IS NULL THEN
 		CALL util.throw('Warehouse inventory not set');
 	END IF;
 
 	IF vComponentCost IS NULL THEN
 		CALL util.throw('Component cost not set');
-	END IF;
+	END IF;	
 
 	SET vDateEnd = vDated + INTERVAL 1 DAY;
-
+	
 	IF NOT vWithoutPeriodGrace THEN
 		SET vGraceDate = vGraceDate -INTERVAL 1 MONTH;
 	END IF;
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.packagingToInvoice;
 	CREATE TEMPORARY TABLE tmp.packagingToInvoice
 		(INDEX (clientFk))
@@ -71153,7 +72314,7 @@ BEGIN
 				t.clientFk
 			FROM ticketPackaging tp
 				JOIN packaging p ON p.id = tp.packagingFk
-				JOIN ticket t ON t.id = tp.ticketFk
+				JOIN ticket t ON t.id = tp.ticketFk 
 				JOIN client c ON c.id = t.clientFk
 			WHERE c.isActive
 				AND (vClientFk IS NULL OR t.clientFk = vClientFk)
@@ -71161,7 +72322,7 @@ BEGIN
 				AND (tp.quantity < 0 OR (tp.quantity > 0 AND t.shipped < vGraceDate))
 				AND tp.quantity
 				AND p.itemFk;
-
+			
 	OPEN vCursor;
 		l: LOOP
 
@@ -71174,25 +72335,25 @@ BEGIN
 			START TRANSACTION;
 
 			CALL ticket_add(
-					vClientId,
+					vClientId, 
 					vDateEnd,
-					vWarehouseInventory,
-					vCompanyFk,
-					NULL,
-					NULL,
-					NULL,
-					vDateEnd,
-					account.myUser_getId(),
+					vWarehouseInventory, 
+					vCompanyFk, 
+					NULL, 
+					NULL, 
+					NULL, 
+					vDateEnd, 
+					account.myUser_getId(), 
 					TRUE,
 					vNewTicket);
-
+				
 				INSERT INTO ticketPackaging(ticketFk, packagingFk, quantity, pvp)
 					SELECT vNewTicket, packagingFk, - SUM(quantity) totalQuantity, price
-						FROM tmp.packagingToInvoice
+						FROM tmp.packagingToInvoice 
 						WHERE clientFk = vClientId
 						GROUP BY packagingFk
 						HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity < 0);
-
+	
 				INSERT INTO sale(ticketFk, itemFk, concept, quantity, price)
 					SELECT vNewTicket, pti.itemFk, i.name, SUM(pti.quantity) totalQuantity, pti.price
 						FROM tmp.packagingToInvoice pti
@@ -71200,12 +72361,12 @@ BEGIN
 						WHERE pti.clientFk = vClientId
 						GROUP BY pti.itemFk
 						HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity > 0);
-
+		
 				INSERT INTO saleComponent(saleFk, componentFk, value)
 					SELECT id, vComponentCost, price
 						FROM sale
 						WHERE ticketFk = vNewTicket;
-
+			
 			COMMIT;
 		END LOOP;
 	CLOSE vCursor;
@@ -71229,37 +72390,37 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketParking_findSkipped`(vTicketFk INT, vItemPackingTypeFk VARCHAR(1))
 BEGIN
-
+	
 /**
  * Averigua los tickets que se han saltado por un error en el proceso encajado
  * @param vTicketFk Ticket
  * @param vItemPackingTypeFk Modo de encajado
  * @return un select con los tickets afectados
- */
+ */  
 
    	DECLARE vParkingFk INT;
     DECLARE vParked DATETIME;
     DECLARE vLevel INT;
     DECLARE vWagon INT;
     DECLARE vCollectionFk INT;
-
-    SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
+    
+    SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0) 
 		INTO vLevel, vWagon, vCollectionFk
 		FROM vn.ticketCollection tc
 			JOIN vn.collection c ON c.id = tc.collectionFk AND c.itemPackingTypeFk = vItemPackingTypeFk
         WHERE ticketFk = vTicketFk
         ORDER BY c.id DESC
         LIMIT 1;
-
-	SELECT created, parkingFk
+        
+	SELECT created, parkingFk 
 		INTO vParked, vParkingFk
 		FROM vn.ticketParking tp
-			JOIN vn.parking p ON p.id = tp.parkingFk
-			JOIN vn.sector s ON s.id = p.sectorFk
+			JOIN vn.parking p ON p.id = tp.parkingFk 
+			JOIN vn.sector s ON s.id = p.sectorFk 
         WHERE ticketFk = vTicketFk
        		AND s.itemPackingTypeFk = vItemPackingTypeFk
        		AND s.isPackagingArea ;
-
+        
     SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
 		FROM vn.ticketParking tp
         JOIN vn.parking p ON p.id = tp.parkingFk
@@ -71276,9 +72437,9 @@ BEGIN
 	            AND 	(
 						( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
 					OR
-						( tc.collectionFk = vCollectionFk
+						( tc.collectionFk = vCollectionFk 
 							AND (LEFT(tc.wagon,1) < LEFT(vWagon,1)
-							OR  (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
+							OR  (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))	
 						)
 					)
 				) -- Etiquetas que no se han escaneado y ya estamos con una posterior
@@ -71286,7 +72447,7 @@ BEGIN
 	            (s.alertLevel > 1
 					AND tp.parkingFk = vParkingFk
 	                AND sc.isPackagingArea
-	                AND tp.created < vParked
+	                AND tp.created < vParked              
 	                AND t.packages <=> 0);
 END ;;
 DELIMITER ;
@@ -71338,11 +72499,11 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketRequest_Add`(vDescription VARCHAR(255), vQuantity INT, vPrice DOUBLE, vTicketFk INT, vBuyerCode VARCHAR(3))
 BEGIN
 
-	INSERT INTO vn.ticketRequest(description,
-								quantity,
-                                price,
-                                ticketFk,
-                                buyerCode,
+	INSERT INTO vn.ticketRequest(description, 
+								quantity, 
+                                price, 
+                                ticketFk, 
+                                buyerCode, 
                                 requesterFk)
 		VALUES(vDescription,
 				vQuantity,
@@ -71350,7 +72511,7 @@ BEGIN
                 vTicketFk,
                 vBuyerCode,
                 vn.getUser());
-
+                
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -71369,26 +72530,26 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateToday_setState`(vTicketFk INT, vStateCode VARCHAR(45))
 BEGIN
-
+	
 	/* Modifica el estado de un ticket de hoy
-	 *
+	 * 
 	 * @param vTicketFk el id del ticket
 	 * @param vStateCode estado a modificar del ticket
-	 *
+	 * 
 	 */
-
+	
 	DECLARE vAlertLevel INT;
-
-	SELECT s.alertLevel INTO vAlertLevel
-		FROM state s
-			JOIN ticketStateToday tst ON tst.state = s.id
+	
+	SELECT s.alertLevel INTO vAlertLevel 
+		FROM state s 
+			JOIN ticketStateToday tst ON tst.state = s.id 
 		WHERE tst.ticket = vTicketFk
 		LIMIT 1;
-
+	
 	IF vAlertLevel < 2 THEN
-
+	
 		CALL vn.ticket_setState(vTicketFk, vStateCode);
-
+	
 	END IF;
 
 END ;;
@@ -71398,34 +72559,34 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticketStateUpdate` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
 BEGIN
-
+	
 	/*
 	 * @deprecated:utilizar ticket_setState
 	 */
-
+	
 	DECLARE vAlertLevel INT;
 
-	SELECT s.alertLevel INTO vAlertLevel
+	SELECT s.alertLevel INTO vAlertLevel 
 		FROM vn.state s
 			JOIN vn.ticketState ts ON ts.stateFk = s.id
 			WHERE ts.ticketFk = vTicketFk;
-
-	IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
-
-		INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+	
+	IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN 
+	
+		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT id, vTicketFk, account.myUser_getId()
-				FROM vn.state
+				FROM vn.state 
 			WHERE `code` = vStateCode collate utf8_unicode_ci;
 
 	END IF;
@@ -71569,14 +72730,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_add` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
 	vClientId INT
@@ -71693,7 +72854,7 @@ BEGIN
 	END IF;
 
 	IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
-		INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT id, vNewTicket, account.myUser_getId()
 				FROM state
 				WHERE `code` = 'DELIVERED';
@@ -71716,20 +72877,20 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_administrativeCopy`(vOriginalTicket INT, OUT vNewTicket INT)
 BEGIN
-
+	
 	INSERT INTO vn.ticket(clientFk, addressFk, shipped, warehouseFk, companyFk, landed)
-		SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed
+		SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed 
 			FROM vn.ticket t
 				JOIN vn.warehouse w ON w.name = 'INVENTARIO'
 			WHERE t.id = vOriginalTicket;
-
+			
 	SELECT LAST_INSERT_ID() INTO vNewTicket;
 
 	INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity, price, discount)
-		SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount
+		SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount 
 			FROM vn.sale s
 			WHERE s.ticketFk = vOriginalTicket;
-
+		
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -71759,8 +72920,7 @@ BEGIN
 
 	SELECT inventoried INTO vDateInventory FROM config;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
-	CREATE TEMPORARY TABLE tmp.stock
+	CREATE OR REPLACE TEMPORARY TABLE tmp.stock
 		(itemFk INT PRIMARY KEY,
 		amount INT)
 		ENGINE = MEMORY;
@@ -71777,7 +72937,7 @@ BEGIN
 			SELECT itemFk, quantity
 				FROM itemEntryIn
 				WHERE landed >= vDateInventory
-					AND landed < vDateFuture
+					AND landed <= vDateToAdvance
 					AND isVirtualStock = FALSE
 					AND warehouseInFk = vWarehouseFk
 			UNION ALL
@@ -71806,15 +72966,24 @@ BEGIN
 				dest.totalWithVat,
 				origin.totalWithVat futureTotalWithVat,
 				dest.agency,
+				dest.agencyModeFk,
 				origin.futureAgency,
+				origin.agencyModeFk futureAgencyModeFk,
 				dest.lines,
 				dest.liters,
 				origin.futureLines - origin.hasStock AS notMovableLines,
 				(origin.futureLines = origin.hasStock) AS isFullMovable,
+                dest.zoneFk,
                 origin.futureZoneFk,
                 origin.futureZoneName,
 				origin.classColor futureClassColor,
-				dest.classColor
+				dest.classColor,
+				origin.clientFk futureClientFk,
+				origin.addressFk futureAddressFk,
+				origin.warehouseFk futureWarehouseFk,
+				origin.companyFk futureCompanyFk,
+				IFNULL(dest.nickname, origin.nickname) nickname,
+				dest.landed
 			FROM (
 					SELECT
 							s.ticketFk,
@@ -71822,7 +72991,6 @@ BEGIN
 							t.shipped,
 							t.totalWithVat,
 							st.name futureState,
-							t.addressFk,
 							am.name futureAgency,
 							count(s.id) futureLines,
 							GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
@@ -71830,7 +72998,13 @@ BEGIN
 							SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
 							z.id futureZoneFk,
 							z.name futureZoneName,
-							st.classColor
+							st.classColor,
+							t.clientFk,
+							t.nickname,
+							t.addressFk,
+							t.warehouseFk,
+							t.companyFk,
+							t.agencyModeFk
 						FROM ticket t
                             JOIN client c ON c.id = t.clientFk
 							JOIN sale s ON s.ticketFk = t.id
@@ -71846,10 +73020,9 @@ BEGIN
 							AND t.warehouseFk = vWarehouseFk
 						GROUP BY t.id
 				) origin
-				JOIN (
+				LEFT JOIN (
 					SELECT
 							t.id ticketFk,
-							t.addressFk,
 							st.name state,
 							GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
 							t.shipped,
@@ -71857,7 +73030,15 @@ BEGIN
 							am.name agency,
 							CAST(SUM(litros) AS DECIMAL(10,0)) liters,
 							CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
-							st.classColor
+							st.classColor,
+							t.clientFk,
+							t.nickname,
+							t.addressFk,
+							t.zoneFk,
+							t.warehouseFk,
+							t.companyFk,
+							t.landed,
+							t.agencyModeFk
 						FROM ticket t
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN saleVolume sv ON sv.saleFk = s.id
@@ -71871,7 +73052,7 @@ BEGIN
 							AND st.order <= 5
 						GROUP BY t.id
 				) dest ON dest.addressFk = origin.addressFk
-			WHERE origin.hasStock != 0;
+			WHERE origin.hasStock;
 
 	DROP TEMPORARY TABLE tmp.stock;
 END ;;
@@ -71979,7 +73160,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canMerge`(vDated DATE, vScop
 BEGIN
 /**
  * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
- *
+ * 
  * @param vDated Fecha en cuestión
  * @param vScopeDays Dias en el futuro a sondear
  * @param vLitersMax Volumen máximo de los tickets a catapultar
@@ -72060,10 +73241,10 @@ BEGIN
  * Comprueba que los tickets entre un rango de fechas tienen componentes
  * y recalcula sus componentes
  *
- * @param vShippedFrom rango inicial de fecha
+ * @param vShippedFrom rango inicial de fecha 
  * @param vShippedTo rango final de fecha
  */
-
+ 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.coste
 			(primary key (id)) ENGINE = MEMORY
 		SELECT s.id
@@ -72092,9 +73273,9 @@ BEGIN
 				AND ic.merchandise;
 
     CALL vn.sale_recalcComponent(1);
-
+   
     DROP TEMPORARY TABLE tmp.recalculateSales;
-	DROP TEMPORARY TABLE tmp.coste;
+	DROP TEMPORARY TABLE tmp.coste;	
  END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -72102,14 +73283,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_Clone` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT)
 BEGIN
@@ -72164,8 +73345,8 @@ BEGIN
 			FROM ticketObservation
 			WHERE ticketFk = vOriginalTicket;
 
-	INSERT INTO ticketTracking(ticketFk, stateFk, workerFk, created)
-		SELECT vNewTicket, stateFk, workerFk, created
+	INSERT INTO ticketTracking(ticketFk, stateFk, userFk, created)
+		SELECT vNewTicket, stateFk, userFk, created
 			FROM ticketTracking
 			WHERE ticketFk = vOriginalTicket
 			ORDER BY created;
@@ -72185,14 +73366,13 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_cloneWeekly`(vWeek INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_cloneWeekly`(vDateFrom DATE, vDateTo DATE)
 BEGIN
 	DECLARE vIsDone BOOL;
 	DECLARE vLanding DATE;
 	DECLARE vShipment DATE;
 	DECLARE vWarehouseFk INT;
 	DECLARE vTicketFk INT;
-	DECLARE vWeekDay INT;
 	DECLARE vClientFk INT;
 	DECLARE vCompanyFk INT;
 	DECLARE vAddressFk INT;
@@ -72204,19 +73384,21 @@ BEGIN
 
 	DECLARE rsTicket CURSOR FOR
 	SELECT tt.ticketFk,
-		tt.weekDay,
-		t.clientFk,
-		t.warehouseFk,
-		t.companyFk,
-		t.addressFk,
-		tt.agencyModeFk
-		FROM ticketWeekly tt
-			JOIN ticket t ON tt.ticketFk = t.id;
+			t.clientFk,
+			t.warehouseFk,
+			t.companyFk,
+			t.addressFk,
+			tt.agencyModeFk,
+			ti.dated
+		FROM ticketWeekly tt 
+			JOIN ticket t ON tt.ticketFk = t.id
+			JOIN tmp.time ti
+		WHERE WEEKDAY(ti.dated) = tt.weekDay;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
-
-	SET vYear = YEAR(util.VN_CURDATE()) + IF(vWeek < WEEK(util.VN_CURDATE()),1, 0);
-
+	
+	CALL `util`.`time_generate`(vDateFrom,vDateTo);
+	
 	OPEN rsTicket;
 	myLoop: LOOP
 	BEGIN
@@ -72224,36 +73406,31 @@ BEGIN
 		DECLARE vIsDuplicateMail BOOL;
 		DECLARE vSubject VARCHAR(150);
 		DECLARE vMessage TEXT;
-
+		
 		SET vIsDone = FALSE;
-		FETCH rsTicket INTO vTicketFk, vWeekDay, vClientFk, vWarehouseFk, vCompanyFk, vAddressFk, vAgencyModeFk;
+		FETCH rsTicket INTO vTicketFk,vClientFk, vWarehouseFk, vCompanyFk, vAddressFk, vAgencyModeFk,vShipment;
 
 		IF vIsDone THEN
 			LEAVE myLoop;
 		END IF;
 
-		SELECT dated INTO vShipment
-			FROM `time`
-			WHERE `year` = vYear AND `week` = vWeek
-				AND WEEKDAY(dated) = vWeekDay;
-
 		-- busca si el ticket ya ha sido clonado
 		IF EXISTS (SELECT TRUE FROM ticket tOrig
 				JOIN sale saleOrig ON tOrig.id = saleOrig.ticketFk
 				JOIN saleCloned sc ON sc.saleOriginalFk = saleOrig.id
 				JOIN sale saleClon ON saleClon.id = sc.saleClonedFk
 				JOIN ticket tClon ON tClon.id = saleClon.ticketFk
-			WHERE tOrig.id = vTicketFk
-				AND tClon.isDeleted = FALSE
+			WHERE tOrig.id = vTicketFk 
+				AND tClon.isDeleted = FALSE 
 				AND DATE(tClon.shipped) = vShipment)
 		THEN
 			ITERATE myLoop;
 		END IF;
 
 		IF vAgencyModeFk IS NULL THEN
-			SELECT agencyModeFk INTO vAgencyModeFk
+			SELECT agencyModeFk INTO vAgencyModeFk 
 				FROM address
-				WHERE clientFk = vClientFk
+				WHERE clientFk = vClientFk 
 					AND isDefaultAddress;
 		END IF;
 
@@ -72274,8 +73451,8 @@ BEGIN
 			FALSE,
 			vNewTicket);
 
-		UPDATE ticket
-			SET clonedFrom = vTicketFk
+		UPDATE ticket 
+			SET clonedFrom = vTicketFk 
 			WHERE id = vNewTicket;
 
 		INSERT INTO sale (ticketFk, itemFk, concept, quantity, price,
@@ -72294,7 +73471,7 @@ BEGIN
 		INSERT IGNORE INTO saleCloned(saleOriginalFk, saleClonedFk)
 			SELECT saleOriginal.id, saleClon.id
 				FROM sale saleOriginal
-					JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk
+					JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk 
 						AND saleOriginal.quantity = saleClon.quantity
 				WHERE saleOriginal.ticketFk = vTicketFk
 					AND saleClon.ticketFk = vNewTicket;
@@ -72324,7 +73501,7 @@ BEGIN
 				buyed,
 				requesterFk,
 				attenderFk,
-				vNewTicket
+				vNewTicket 
 				FROM ticketRequest
 					WHERE ticketFk =vTicketFk;
 
@@ -72339,26 +73516,26 @@ BEGIN
 		INSERT INTO ticketObservation(
 				ticketFk,
 				observationTypeFk,
-				description)
+				description) 
 			VALUES(
 				vNewTicket,
 				vSalesPersonFK,
 				CONCAT('turno desde ticket: ',vTicketFk))
-			ON DUPLICATE KEY UPDATE description =
+			ON DUPLICATE KEY UPDATE description = 
 				CONCAT(ticketObservation.description,VALUES(description),' ');
 
 		INSERT INTO ticketObservation(ticketFk,
 				observationTypeFk,
-				description)
+				description) 
 			VALUES(
 				vNewTicket,
 				vItemPicker,
 				'ATENCION: Contiene lineas de TURNO')
-			ON DUPLICATE KEY UPDATE description =
+			ON DUPLICATE KEY UPDATE description = 
 				CONCAT(ticketObservation.description,VALUES(description),' ');
 
 		IF (vLanding IS NULL) THEN
-
+				
 			SELECT e.email INTO vSalesPersonEmail
 				FROM client c
 					JOIN account.emailUser e ON e.userFk = c.salesPersonFk
@@ -72366,8 +73543,8 @@ BEGIN
 
 			SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ',
 						 vTicketFk,' para el dia: ', vShipment);
-			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk,
-				' para el dia: ', vShipment,
+			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk, 
+				' para el dia: ', vShipment, 
 				' porque no hay una zona de envío disponible. Se ha creado el ticket: ',
 				vNewTicket, ' pero ha que revisar las fechas y la agencia');
 
@@ -72387,6 +73564,7 @@ BEGIN
 	END;
 	END LOOP;
 	CLOSE rsTicket;
+	DROP TEMPORARY TABLE IF EXISTS tmp.time;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -72406,7 +73584,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_close`()
 BEGIN
 /**
- * Realiza el cierre de todos los
+ * Realiza el cierre de todos los 
  * tickets de la tabla tmp.ticket_close.
  *
  * @table tmp.ticket_close(ticketFk) Identificadores de los tickets a cerrar
@@ -72424,7 +73602,7 @@ BEGIN
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticket_close;
-
+		
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
 		RESIGNAL;
@@ -72434,7 +73612,7 @@ BEGIN
 
 	proc: LOOP
 		SET vDone = FALSE;
-
+		
 		FETCH cur INTO vCurTicketFk;
 
 		IF vDone THEN
@@ -72451,12 +73629,12 @@ BEGIN
                 c.hasToInvoice
 			INTO vClientFk,
 				vIsTaxDataChecked,
-				vCompanyFk,
+				vCompanyFk, 
 				vShipped,
 				vHasDailyInvoice,
 				vWithPackage,
                 vHasToInvoice
-			FROM ticket t
+			FROM ticket t 
 				JOIN `client` c ON c.id = t.clientFk
 				JOIN province p ON p.id = c.provinceFk
 				LEFT JOIN autonomy a ON a.id = p.autonomyFk
@@ -72466,22 +73644,22 @@ BEGIN
 
 		INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
 			(SELECT vCurTicketFk, p.id, COUNT(*)
-				FROM expedition e
+				FROM expedition e 
 					JOIN packaging p ON p.itemFk = e.freightItemFk
 				WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
 					AND vWithPackage
 				GROUP BY p.itemFk);
 
 		-- No retornables o no catalogados
-		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
+		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed) 
 			(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
-				FROM expedition e
+				FROM expedition e 
 					JOIN item i ON i.id = e.freightItemFk
 					LEFT JOIN packaging p ON p.itemFk = i.id
 				WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
 					AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
 				GROUP BY e.freightItemFk);
-
+			
 		IF(vHasDailyInvoice) AND vHasToInvoice THEN
 
 			-- Facturacion rapida
@@ -72489,10 +73667,10 @@ BEGIN
 			-- Facturar si está contabilizado
 			IF vIsTaxDataChecked THEN
 				CALL invoiceOut_newFromClient(
-					vClientFk,
-					(SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')),
-					vShipped,
-					vCompanyFk,
+					vClientFk, 
+					(SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')), 
+					vShipped, 
+					vCompanyFk, 
 					NULL,
 					NULL,
 					vNewInvoiceId);
@@ -72560,25 +73738,25 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentMakeUpdate`(
-		vTicketFk INT,
+		vTicketFk INT, 
 		vClientFk INT,
-		vNickname VARCHAR(50),
+		vNickname VARCHAR(50), 
 		vAgencyModeFk INT,
-        vAddressFk INT,
-		vZoneFk INT,
+        vAddressFk INT, 
+		vZoneFk INT, 
 		vWarehouseFk INT,
-        vCompanyFk INT,
+        vCompanyFk INT, 
 		vShipped DATETIME,
-        vLanded DATE,
+        vLanded DATE, 
 		vIsDeleted BOOLEAN,
-        vHasToBeUnrouted BOOLEAN,
+        vHasToBeUnrouted BOOLEAN, 
 		vOption INT)
 BEGIN
-
+	
 	/**
 	 * Modifica en el ticket los campos que se le pasan por parámetro
 	 * y cambia sus componentes
-	 *
+	 * 
 	 * @param vTicketFk Id del ticket a modificar
 	 * @param vClientFk nuevo cliente
 	 * @param vNickname nuevo alias
@@ -72593,29 +73771,29 @@ BEGIN
 	 * @param vHasToBeUnrouted si se le elimina la ruta  al ticket
 	 * @param vOption opcion para el case del proc ticketComponentUpdateSale
 	 */
-
+	
 	DECLARE vPrice DECIMAL(10,2);
 	DECLARE vBonus DECIMAL(10,2);
 
 	CALL ticket_componentPreview (vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
 
 	IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-
-		UPDATE ticket t
+			
+		UPDATE ticket t 
 				JOIN address a ON a.id = vAddressFk
 			SET t.nickname = a.nickname
 			WHERE t.id = vTicketFk;
-
+			
 	END IF;
 
 	CALL zone_getShipped(vLanded, vAddressFk, vAgencyModeFk, TRUE);
 
-	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
+	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus 
 		FROM tmp.zoneGetShipped
 		WHERE shipped BETWEEN DATE(vShipped) AND util.dayEnd(vShipped)  AND warehouseFk = vWarehouseFk LIMIT 1;
-
+			
 	UPDATE ticket t
-		SET
+		SET 
 			t.clientFk = vClientFk,
 		    t.nickname = vNickname,
 			t.agencyModeFk = vAgencyModeFk,
@@ -72630,12 +73808,12 @@ BEGIN
 			t.isDeleted = vIsDeleted
 		WHERE
 			t.id = vTicketFk;
-
+			
 	IF vHasToBeUnrouted THEN
 		UPDATE ticket t SET t.routeFk = NULL
 			WHERE t.id = vTicketFk;
 	END IF;
-
+			
 	IF vOption <> 8 THEN
 		DROP TEMPORARY TABLE IF EXISTS tmp.sale;
 		CREATE TEMPORARY TABLE tmp.sale
@@ -72673,7 +73851,7 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentPreview`(
 	vTicketFk INT,
-    vLanded DATE,
+    vLanded DATE, 
     vAddressFk INT,
     vZoneFk INT,
     vWarehouseFk SMALLINT)
@@ -72689,7 +73867,7 @@ BEGIN
  *
  * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
  */
-	DECLARE vHasDataChanged BOOL DEFAULT FALSE;
+	DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
 	DECLARE vHasAddressChanged BOOL;
 	DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
 	DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
@@ -72700,8 +73878,8 @@ BEGIN
 
 	DECLARE vHasChangeAll BOOL DEFAULT FALSE;
 
-	SELECT DATE(landed) <> vLanded,
-			addressFk <> vAddressFk,
+	SELECT DATE(landed) <> vLanded, 
+			addressFk <> vAddressFk, 
 			zoneFk <> vZoneFk,
 			warehouseFk <> vWarehouseFk
 		INTO
@@ -72724,15 +73902,15 @@ BEGIN
 		SET vAgencyModeTypeRateFk = 6;
 	END IF;
 
-	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped
+	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped 
 		FROM zone
 		WHERE id = vZoneFk;
-
+		
 	CALL buyUltimate(vWarehouseFk, vShipped);
-
+		
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY (
-	SELECT
+	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
+	SELECT 
 			vWarehouseFk AS warehouseFk,
 			NULL AS available,
 			s.itemFk,
@@ -72752,9 +73930,9 @@ BEGIN
 				JOIN sale s ON s.id = sc.saleFk
 				JOIN ticket t ON t.id = s.ticketFk
 				JOIN `component` c ON c.id = sc.componentFk
-			WHERE s.ticketFk = vTicketFk
-				AND (c.isRenewable = FALSE
-					OR
+			WHERE s.ticketFk = vTicketFk 
+				AND (c.isRenewable = FALSE 
+					OR 
 					(NOT vHasChangeAll
 						AND (NOT (c.typeFk <=> vAddressTypeRateFk
 						OR c.typeFk <=> vAgencyModeTypeRateFk))));
@@ -72833,55 +74011,59 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_DelayTruckSplit`(vTicketFk INT)
-BEGIN
-
-	/*
-	 *  Splita las lineas de ticket que no estan ubicadas
-	 *
-	 */
-
-	DECLARE vNewTicketFk INT;
-	DECLARE vTotalLines INT;
-	DECLARE vLinesToSplit INT;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
-
-	SELECT COUNT(*) INTO vTotalLines
-		FROM vn.sale
-		WHERE ticketFk = vTicketFk;
-
-	CREATE TEMPORARY TABLE tmp.SalesToSplit
-		SELECT s.id saleFk
-			FROM vn.ticket t
-    			JOIN vn.sale s ON t.id = s.ticketFk
-    			LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = s.itemFk AND issw.warehouseFk = t.warehouseFk
-          	WHERE s.quantity > IFNULL(issw.visible, 0)
-	            AND s.quantity > 0
-	            AND s.isPicked = FALSE
-	            AND s.reserved = FALSE
-	            AND t.id = vTicketFk;
-
-	SELECT COUNT(*) INTO vLinesToSplit
-		FROM tmp.SalesToSplit;
-
-	IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
-
-		SET vNewTicketFk = vTicketFk;
-
-	ELSE
-
-		CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
-		UPDATE vn.sale s
-			JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id
-			SET s.ticketFk = vNewTicketFk;
-
-	END IF;
-
-	CALL vn.ticketStateUpdate(vNewTicketFk, 'FIXING');
-
-	DROP TEMPORARY TABLE tmp.SalesToSplit;
-
+BEGIN
+/**
+ * Splita las lineas de ticket que no estan ubicadas
+ *
+ * @param vTicketFk Id ticket
+ */
+	DECLARE vNewTicketFk INT;
+	DECLARE vTotalLines INT;
+	DECLARE vLinesToSplit INT;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
+	
+	SELECT COUNT(*) INTO vTotalLines
+		FROM sale 
+		WHERE ticketFk = vTicketFk;
+			
+	CREATE TEMPORARY TABLE tmp.SalesToSplit
+		SELECT s.id saleFk
+			FROM ticket t
+				JOIN sale s ON t.id = s.ticketFk 
+				LEFT JOIN (
+					SELECT ish.itemFk itemFk,
+							SUM(ish.visible) visible,
+							s.warehouseFk warehouseFk
+						FROM itemShelving ish
+							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN parking p ON p.id = sh.parkingFk
+							JOIN sector s ON s.id = p.sectorFk
+						GROUP BY ish.itemFk,
+							s.warehouseFk
+				) issw ON issw.itemFk = s.itemFk
+					AND issw.warehouseFk = t.warehouseFk 
+			WHERE s.quantity > IFNULL(issw.visible, 0)
+				AND s.quantity > 0
+				AND NOT s.isPicked
+				AND NOT s.reserved
+				AND t.id = vTicketFk;
+
+	SELECT COUNT(*) INTO vLinesToSplit
+		FROM tmp.SalesToSplit;
+
+	IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
+		SET vNewTicketFk = vTicketFk;
+	ELSE
+		CALL ticket_Clone(vTicketFk, vNewTicketFk);
+		UPDATE sale s 
+			JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id 
+			SET s.ticketFk = vNewTicketFk;
+	END IF;
+
+	CALL ticketStateUpdate(vNewTicketFk, 'FIXING');
+
+	DROP TEMPORARY TABLE tmp.SalesToSplit;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -72899,91 +74081,91 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doCmr`(vSelf INT)
-BEGIN
-/**
-* Crea u actualiza la información del CMR asociado con
-* un ticket específico en caso de que sea necesario.
-*
-* @param vSelf El id del ticket
-*/
-	DECLARE vCmrFk, vPreviousCmrFk, vCurrentCmrFk INT;
-	SELECT cmrFk INTO vCmrFk
-		FROM ticket
-		WHERE id = vSelf;
-
-	CREATE OR REPLACE TEMPORARY TABLE tTicket
-		SELECT wo.firstName,
-				v.numberPlate,
-				com.id companyFk,
-				a.id addressFk,
-				c2.defaultAddressFk,
-				su.id supplierFk,
-				t.landed
-			FROM ticket t
-				JOIN ticketState ts ON ts.ticketFk = t.id
-				JOIN `state` s ON s.id = ts.stateFk
-				JOIN alertLevel al ON al.id = s.alertLevel
-				JOIN client c ON c.id = t.clientFk
-				JOIN `address` a ON a.id = t.addressFk
-				JOIN province p ON p.id = a.provinceFk
-				JOIN country co ON co.id = p.countryFk
-				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-				JOIN warehouse w ON w.id = t.warehouseFk
-				JOIN company com ON com.id = t.companyFk
-				JOIN client c2 ON c2.id = com.clientFk
-				JOIN supplierAccount sa ON sa.id  = com.supplierAccountFk
-				JOIN supplier su ON su.id = sa.supplierFk
-				LEFT JOIN route r ON r.id = t.routeFk
-				LEFT JOIN worker wo ON wo.id = r.workerFk
-				LEFT JOIN vehicle v ON v.id = r.vehicleFk
-			WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
-				AND al.code IN ('PACKED', 'DELIVERED')
-				AND co.code <> 'ES'
-				AND am.name <> 'ABONO'
-				AND w.code = 'ALG'
-				AND dm.code = 'DELIVERY'
-				AND t.id = vSelf
-			GROUP BY t.id;
-
-	START TRANSACTION;
-
-	IF vCmrFk THEN
-		UPDATE cmr c
-				JOIN tTicket t
-			SET c.senderInstruccions = t.firstName,
-				c.truckPlate = t.numberPlate,
-				c.companyFk = t.companyFk,
-				c.addressToFk = t.addressFk,
-				c.addressFromFk = t.defaultAddressFk,
-				c.supplierFk = t.supplierFk,
-				c.ead = t.landed
-			WHERE id = vCmrFk;
-	ELSE
-		SELECT MAX(id) INTO vPreviousCmrFk FROM cmr;
-
-		INSERT INTO cmr (
-			senderInstruccions,
-			truckPlate,
-			companyFk,
-			addressToFk,
-			addressFromFk,
-			supplierFk,
-			ead
-		)
-			SELECT * FROM tTicket;
-
-		SELECT MAX(id) INTO vCurrentCmrFk FROM cmr;
-
-		IF vPreviousCmrFk <> vCurrentCmrFk THEN
-			UPDATE ticket
-				SET cmrFk = vCurrentCmrFk
-				WHERE id = vSelf;
-		END IF;
-	END IF;
-
-	COMMIT;
-	DROP TEMPORARY TABLE tTicket;
+BEGIN
+/**
+* Crea u actualiza la información del CMR asociado con
+* un ticket específico en caso de que sea necesario.
+*
+* @param vSelf El id del ticket
+*/
+	DECLARE vCmrFk, vPreviousCmrFk, vCurrentCmrFk INT;
+	SELECT cmrFk INTO vCmrFk
+		FROM ticket
+		WHERE id = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tTicket
+		SELECT wo.firstName,
+				v.numberPlate,
+				com.id companyFk,
+				a.id addressFk,
+				c2.defaultAddressFk,
+				su.id supplierFk,
+				t.landed
+			FROM ticket t
+				JOIN ticketState ts ON ts.ticketFk = t.id
+				JOIN `state` s ON s.id = ts.stateFk
+				JOIN alertLevel al ON al.id = s.alertLevel
+				JOIN client c ON c.id = t.clientFk
+				JOIN `address` a ON a.id = t.addressFk
+				JOIN province p ON p.id = a.provinceFk
+				JOIN country co ON co.id = p.countryFk
+				JOIN agencyMode am ON am.id = t.agencyModeFk
+				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+				JOIN warehouse w ON w.id = t.warehouseFk
+				JOIN company com ON com.id = t.companyFk
+				JOIN client c2 ON c2.id = com.clientFk
+				JOIN supplierAccount sa ON sa.id  = com.supplierAccountFk
+				JOIN supplier su ON su.id = sa.supplierFk
+				LEFT JOIN route r ON r.id = t.routeFk
+				LEFT JOIN worker wo ON wo.id = r.workerFk
+				LEFT JOIN vehicle v ON v.id = r.vehicleFk
+			WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
+				AND al.code IN ('PACKED', 'DELIVERED')
+				AND co.code <> 'ES'
+				AND am.name <> 'ABONO'
+				AND w.code = 'ALG'
+				AND dm.code = 'DELIVERY'
+				AND t.id = vSelf
+			GROUP BY t.id;
+	
+	START TRANSACTION;
+	
+	IF vCmrFk THEN
+		UPDATE cmr c
+				JOIN tTicket t
+			SET c.senderInstruccions = t.firstName,
+				c.truckPlate = t.numberPlate,
+				c.companyFk = t.companyFk,
+				c.addressToFk = t.addressFk,
+				c.addressFromFk = t.defaultAddressFk,
+				c.supplierFk = t.supplierFk,
+				c.ead = t.landed
+			WHERE id = vCmrFk;
+	ELSE
+		SELECT MAX(id) INTO vPreviousCmrFk FROM cmr;
+		
+		INSERT INTO cmr (
+			senderInstruccions,
+			truckPlate,
+			companyFk,
+			addressToFk,
+			addressFromFk,
+			supplierFk,
+			ead
+		)
+			SELECT * FROM tTicket;
+	
+		SELECT MAX(id) INTO vCurrentCmrFk FROM cmr;
+
+		IF vPreviousCmrFk <> vCurrentCmrFk THEN
+			UPDATE ticket
+				SET cmrFk = vCurrentCmrFk
+				WHERE id = vSelf;
+		END IF;
+	END IF;
+
+	COMMIT;
+	DROP TEMPORARY TABLE tTicket;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -73216,37 +74398,37 @@ BEGIN
  * @param vTicketFk -> Ticket
  * @param vDatedNew -> Nueva fecha
  * @return Sales con Movible
-*/
+*/    
     DECLARE vDatedOld DATETIME;
 	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
 
     SELECT t.shipped INTO vDatedOld
-        FROM ticket t
+        FROM ticket t 
         WHERE t.id = vTicketFk;
 
-    CALL item_getStock(vWarehouseFk, vDatedNew, NULL);
+    CALL item_getStock(vWarehouseFk, vDatedNew, NULL); 
     CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
-
-    SELECT s.id,
-			s.itemFk,
-			s.quantity,
-			s.concept,
-			s.price,
+	
+    SELECT s.id, 
+			s.itemFk, 
+			s.quantity, 
+			s.concept, 
+			s.price, 
 			s.reserved,
-			s.discount,
-			i.image,
-			i.subName,
+			s.discount,  
+			i.image, 
+			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.itemList il ON il.itemFk = s.itemFk
         WHERE t.id = vTicketFk;
 
     DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
-
+    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum; 
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -73274,7 +74456,7 @@ BEGIN
  */
 	CALL sale_getProblems(vIsTodayRelative);
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems 
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT ticketFk,
@@ -73346,16 +74528,32 @@ BEGIN
 		problem VARCHAR(1),
 		INDEX(ticketFk)) ENGINE = MEMORY;
 
+	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
+		(INDEX (itemFk, warehouseFk))
+		ENGINE = MEMORY
+		SELECT ish.itemFk itemFk,
+				SUM(ish.visible) visible,
+				s.warehouseFk warehouseFk
+			FROM itemShelving ish
+				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN parking p ON p.id = sh.parkingFk
+				JOIN sector s ON s.id = p.sectorFk
+			GROUP BY ish.itemFk,
+				s.warehouseFk;
+
 	INSERT INTO tmp.salesToSplit(saleFk, ticketFk, problem)
 		SELECT 	s.id, s.ticketFk, 'F'
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = t.id
 				JOIN item i ON i.id = s.itemFk
 				JOIN itemType it on it.id = i.typeFk
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache
-				LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
-				LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+				JOIN itemCategory ic ON ic.id = it.categoryFk 
+				LEFT JOIN cache.visible v ON v.item_id = i.id
+					AND v.calc_id = vVisibleCache
+				LEFT JOIN cache.available av ON av.item_id = i.id
+					AND av.calc_id = vAvailableCache
+				LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+					AND issw.warehouseFk = t.warehouseFk 
 			WHERE IFNULL(v.visible,0) < s.quantity
 				AND IFNULL(av.available ,0) < s.quantity
 				AND IFNULL(issw.visible, 0) < s.quantity
@@ -73365,26 +74563,28 @@ BEGIN
 				AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 				AND NOT i.generic
 				AND t.warehouseFk = vWarehouseFk;
-
+				
 	INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem)
 		SELECT 	s.id, s.ticketFk, 'I'
-			FROM ticket t
+			FROM ticket t 
 				JOIN sale s ON s.ticketFk = t.id
 				JOIN item i ON i.id = s.itemFk
 				JOIN itemType it on it.id = i.typeFk
 				JOIN itemCategory ic ON ic.id = it.categoryFk
-				LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
-				LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+				LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+					AND v.calc_id = vVisibleCache
+				LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+					AND issw.warehouseFk = t.warehouseFk 
 			WHERE IFNULL(v.visible,0) >= s.quantity
 				AND IFNULL(issw.visible, 0) < s.quantity
 				AND s.quantity > 0
-				AND s.isPicked = FALSE
-				AND s.reserved = FALSE
-				AND ic.merchandise = TRUE
+				AND NOT s.isPicked
+				AND NOT s.reserved
+				AND ic.merchandise
 				AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 				AND NOT i.generic
 				AND t.warehouseFk = vWarehouseFk;
-
+				
 	INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem)
 		SELECT 	s.id, s.ticketFk, 'R'
 			FROM ticket t
@@ -73392,20 +74592,23 @@ BEGIN
 				JOIN item i ON i.id = s.itemFk
 				JOIN itemType it on it.id = i.typeFk
 				JOIN itemCategory ic ON ic.id = it.categoryFk
-				LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
-				LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
-				LEFT JOIN itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+				LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+					AND v.calc_id = vVisibleCache
+				LEFT JOIN cache.available av ON av.item_id = i.id
+					AND av.calc_id = vAvailableCache
+				LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+					AND issw.warehouseFk = t.warehouseFk 
 			WHERE IFNULL(v.visible,0) < s.quantity
 				AND IFNULL(av.available ,0) >= s.quantity
 				AND IFNULL(issw.visible, 0) < s.quantity
 				AND s.quantity > 0
-				AND s.isPicked = FALSE
-				AND s.reserved = FALSE
-				AND ic.merchandise = TRUE
+				AND NOT s.isPicked
+				AND NOT s.reserved
+				AND ic.merchandise
 				AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 				AND NOT i.generic
 				AND t.warehouseFk = vWarehouseFk;
-
+		
 	CREATE OR REPLACE TEMPORARY TABLE tTicketsToSplit(
 		ticketFk INT PRIMARY KEY,
 		problems VARCHAR(100),
@@ -73420,18 +74623,18 @@ BEGIN
 			GROUP_CONCAT(DISTINCT ss.problem ORDER BY ss.problem) problems,
 			t.addressFk,
 			GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
-			DATE_FORMAT(IF(HOUR(t.shipped),
-				t.shipped,
+			DATE_FORMAT(IF(HOUR(t.shipped), 
+				t.shipped, 
 				IFNULL(zc.hour, z.HOUR)),'%H:%i') etd
 			FROM tmp.salesToSplit ss
 				JOIN ticket t ON t.id = ss.ticketFk
 				JOIN sale s ON s.id = ss.saleFk
 				JOIN item i ON i.id = s.itemFk
 				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-				LEFT JOIN zone z ON z.id = t.zoneFk
+				LEFT JOIN zone z ON z.id = t.zoneFk 
 			GROUP BY ss.ticketFk;
 
-	SELECT ts.*,
+	SELECT ts.*, 
 			t.id ticketFuture,
 			st.name state,
 			zc.`hour` tfEtd,
@@ -73442,22 +74645,24 @@ BEGIN
 		FROM tTicketsToSplit ts
 			LEFT JOIN ticketState ts2 ON ts2.ticketFk = ts.ticketFk
 			LEFT JOIN `state` st ON st.id = ts2.stateFk
-			LEFT JOIN ticket t ON t.id != ts.ticketFk
+			LEFT JOIN ticket t ON t.id != ts.ticketFk 
 				AND t.addressFk = ts.addressFk
 				AND t.shipped BETWEEN vDated AND util.dayend(vDated)
 			LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk  AND zc.dated = vDated
 			LEFT JOIN sale s ON s.ticketFk = t.id
 			LEFT JOIN item i ON i.id = s.itemFk
-			LEFT JOIN ticketState tst ON tst.ticketFk = t.id
+			LEFT JOIN ticketState tst ON tst.ticketFk = t.id 
 			LEFT JOIN state st2 ON st2.id = tst.stateFk
-		WHERE (t.id IS NULL
+		WHERE (t.id IS NULL 
 				OR (vDated > util.VN_CURDATE())
 				OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`))
 			AND ts.etd <= vHour
 		GROUP BY ts.ticketFk, t.id
 		ORDER BY ts.etd, ts.ticketFk;
-
-	DROP TEMPORARY TABLE tTicketsToSplit;
+		
+	DROP TEMPORARY TABLE
+		tTicketsToSplit,
+		tItemShelvingStock_byWarehouse;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -73493,7 +74698,7 @@ BEGIN
 				JOIN ticket t ON t.id = tmpTicket.ticketFk;
 
 	CALL addressTaxArea ();
-
+ 
 	IF vTaxArea IS NOT NULL THEN
 		UPDATE tmp.addressTaxArea
 			SET areaFk = vTaxArea;
@@ -73565,8 +74770,8 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticketAmount
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
-		SELECT ticketFk,
-				taxableBase,
+		SELECT ticketFk, 
+				taxableBase, 
 				SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax,
 				code
 			FROM tmp.ticketTax
@@ -73646,11 +74851,11 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getWithParameters`(
-	vClientFk INT,
+	vClientFk INT, 
 	vWarehouseFk INT,
-	vShipped DATE,
-	vAddressFk INT,
-	vCompanyFk INT,
+	vShipped DATE, 
+	vAddressFk INT, 
+	vCompanyFk INT, 
 	vAgencyModeFk INT,
 	OUT vTicketFk INT
 	)
@@ -73664,8 +74869,8 @@ BEGIN
  * @param vAddressFk Consignatario
  * @param vCompanyFk Empresa
  * @param vAgencyModeFk agencia
- */
-
+ */  
+ 
 	SELECT t.id INTO vTicketFk
 		FROM vn.ticket t
 		WHERE t.clientFk <=> vClientFk
@@ -73675,7 +74880,7 @@ BEGIN
             AND (t.companyFk <=> vCompanyFk OR vCompanyFk IS NULL)
             AND (t.agencyModeFk <=> vAgencyModeFk OR vAgencyModeFk IS NULL)
 		LIMIT 1;
-
+        
 	IF vTicketFk IS NULL THEN
 		CALL vn.ticket_add(
 				vClientFk,
@@ -73715,24 +74920,24 @@ BEGIN
     DECLARE vAddressFk INT;
     DECLARE vAgencyModeFk INT;
     DECLARE vWarehouseFk INT;
-	DECLARE vCursor CURSOR FOR
+	DECLARE vCursor CURSOR FOR 
 		SELECT id, landed, addressFk, agencyModeFk, warehouseFk
         FROM vn.ticket WHERE shipped > '2020-01-01' AND zoneFk is null;
 	DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET vDone = 1;
-
+    
     OPEN vCursor;
     REPEAT
 		FETCH vCursor INTO vFechedTicket, vLanded, vAddressFk, vAgencyModeFk, vWarehouseFk;
         CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-
+        
         UPDATE vn.ticket t
 			JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = vWarehouseFk
 			SET t.zoneFk = zgs.zoneFk
 		WHERE t.id = vFechedTicket;
-
+        
      UNTIL vDone END REPEAT;
 	DROP TEMPORARY TABLE tmp.zoneGetShipped;
-
+    
     CLOSE vCursor;
 END ;;
 DELIMITER ;
@@ -73752,14 +74957,14 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_priceDifference`(
 	vTicketFk INT,
-    vLanded DATE,
+    vLanded DATE, 
     vAddressFk INT,
     vZoneFk INT,
     vWarehouseFk INT)
 BEGIN
 /**
  * Devuelve las diferencias de precio de los movimientos de un ticket.
- *
+ * 
  * @param vTicketFk Id del ticket
  * @param vLanded Fecha de recepcion
  * @param vAddressFk Id del consignatario
@@ -73768,26 +74973,26 @@ BEGIN
  */
 	CALL vn.ticket_componentPreview(vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
 
-	SELECT 	s.itemFk,
-			i.name,
-			i.size,
-			i.category,
-			IFNULL(s.quantity, 0) AS quantity,
-			IFNULL(s.price, 0) AS price,
+	SELECT 	s.itemFk, 
+			i.name, 
+			i.size, 
+			i.category, 
+			IFNULL(s.quantity, 0) AS quantity, 
+			IFNULL(s.price, 0) AS price, 
 			ROUND(SUM(tc.cost), 2) AS newPrice,
 			s.quantity * (s.price - ROUND(SUM(tc.cost), 2)) difference,
 			s.id AS saleFk
 		FROM sale s
-			JOIN item i ON i.id = s.itemFk
-			JOIN ticket t ON t.id = s.ticketFk
-			LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk
+			JOIN item i ON i.id = s.itemFk 
+			JOIN ticket t ON t.id = s.ticketFk 
+			LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk 
 				AND tc.warehouseFk = vWarehouseFk
-			LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+			LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
 				AND sc.componentFk = tc.componentFk
-			LEFT JOIN `component` c ON c.id = tc.componentFk
-		WHERE t.id = vTicketFk
-			AND IF(sc.componentFk IS NULL
-			AND c.classRate IS NOT NULL, FALSE, TRUE)
+			LEFT JOIN `component` c ON c.id = tc.componentFk 
+		WHERE t.id = vTicketFk 
+			AND IF(sc.componentFk IS NULL 
+			AND c.classRate IS NOT NULL, FALSE, TRUE) 
 		GROUP BY s.id ORDER BY s.id;
 
 	DROP TEMPORARY TABLE tmp.ticketComponentPreview;
@@ -73810,7 +75015,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_printLabelPrevious`(vTicketFk INT)
 BEGIN
 /**
- * Calls the report_print procedure and passes it
+ * Calls the report_print procedure and passes it 
  * the necessary parameters for printing.
  *
  * @param vTicketFk id ticket to print.
@@ -73818,18 +75023,18 @@ BEGIN
 	DECLARE vPrinterFk INT;
 	DECLARE vSaleGroup INT;
 	DECLARE vUserFk INT DEFAULT account.myUser_getId();
-
+	
 	SELECT sg.id, o.labelerFk INTO vSaleGroup, vPrinterFk
 		FROM saleGroup sg
 			JOIN sector sc ON sc.id = sg.sectorFk
-			JOIN saleGroupDetail sgd ON sg.id = sgd.saleGroupFk
+			JOIN saleGroupDetail sgd ON sg.id = sgd.saleGroupFk 
 			JOIN sale s ON sgd.saleFk = s.id
 			JOIN ticket t ON s.ticketFk = t.id
 			JOIN operator o ON o.workerFk = vUserFk
-		WHERE sc.id = o.sectorFk
+		WHERE sc.id = o.sectorFk 
 			AND t.id = vTicketFk
 		LIMIT 1;
-
+	
 	CALL report_print(
 		'LabelPrevia',
 		vPrinterFk,
@@ -73863,12 +75068,12 @@ proc:BEGIN
  */
 	DECLARE hasInvoice BOOL;
 
-	SELECT COUNT(*) INTO hasInvoice
-		FROM ticket
+	SELECT COUNT(*) INTO hasInvoice 
+		FROM ticket 
 		WHERE id = vSelf
 			AND refFk IS NOT NULL;
-
-	IF hasInvoice THEN
+	
+	IF hasInvoice THEN 
 		LEAVE proc;
 	END IF;
 
@@ -73956,14 +75161,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_setNextState` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setNextState`(vSelf INT)
 BEGIN
@@ -73983,7 +75188,7 @@ BEGIN
 		FROM state
 		WHERE id = vStateFk;
 
-	INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+	INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 		VALUES (vNewStateFk, vSelf, account.myUser_getId());
 END ;;
 DELIMITER ;
@@ -74047,14 +75252,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_setPreviousState` */;
 /*!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 character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
 BEGIN
@@ -74079,7 +75284,7 @@ BEGIN
 			ORDER BY id DESC
 			LIMIT 1;
 
-		INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT s.nextStateFk, tt.ticketFk, account.myUser_getId()
 				FROM ticketTracking tt
 					JOIN vn.state s ON tt.stateFk = s.id
@@ -74127,14 +75332,14 @@ BEGIN
 		ORDER BY tt.created DESC
 		LIMIT 1;
 
-	SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
+	SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED'; 
 
 	IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
 		CALL util.throw('ASSIGN_ZONE_FIRST');
 	END IF;
 
 	SET vCanChangeState = (
-			vStateCode <> 'ON_CHECKING' OR
+			vStateCode <> 'ON_CHECKING' OR 
 			vticketAlertLevel < vPackedAlertLevel
 		)AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
@@ -74142,11 +75347,11 @@ BEGIN
 		);
 
 	IF vCanChangeState THEN
-		INSERT INTO ticketTracking (stateFk, ticketFk, workerFk)
+		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
 			SELECT id, vSelf, account.myUser_getId()
 				FROM state
 				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
-
+				
 		IF vStateCode = 'PACKED' THEN
 			CALL ticket_doCmr(vSelf);
 		END IF;
@@ -74186,40 +75391,40 @@ proc:BEGIN
 	SELECT COUNT(*) INTO vProblemLines
 		FROM tmp.salesToSplit
 		WHERE ticketFk = vTicketFk;
-
+	
 	SELECT count(*) INTO vTotalLines
-		FROM vn.sale s
+		FROM vn.sale s 
 		WHERE s.ticketFk = vTicketFk;
-
+	
 	SET vHasFullProblem = (vTotalLines = vProblemLines);
 
 	-- Ticket completo
 	IF vHasFullProblem THEN
-
+	
 		UPDATE vn.ticket
 			SET landed =  vDated + INTERVAL 1 DAY,
 				shipped = vDated,
 				nickname = CONCAT('(',DAY(util.VN_CURDATE()),') ', nickname )
 			WHERE id = vTicketFk;
-
+		
 		SELECT CONCAT("Se ha cambiado el ticket ", vTicketFk, " al dia ", vDated);
 		LEAVE proc;
-
+	
 	END IF;
 
 	-- Ticket a futuro existe
 	IF vTicketFutureFk THEN
-
-		UPDATE vn.sale s
+	
+		UPDATE vn.sale s 
 			JOIN tmp.salesToSplit ss ON s.id = ss.saleFk
 			SET s.ticketFk = vTicketFutureFk,
 				s.concept = CONCAT('(s) ', s.concept)
 			WHERE ss.ticketFk = vTicketFk;
-
-		SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk,
+		
+		SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, 
 						" al ticket existente ", vTicketFutureFk,"(", vDated,")");
 		LEAVE proc;
-
+	
 	END IF;
 
 	-- Ticket nuevo
@@ -74231,18 +75436,18 @@ proc:BEGIN
 			t.landed =  vDated + INTERVAL 1 DAY,
 			t.shipped = vDated,
 			t.agencyModeFk = pc.defautlAgencyMode,
-			t.zoneFk = pc.defaultZone
+			t.zoneFk = pc.defaultZone 
 		WHERE t.id = vTicketFutureFk;
-
-	UPDATE vn.sale s
-		JOIN tmp.salesToSplit sts ON sts.saleFk = s.id
+	
+	UPDATE vn.sale s 
+		JOIN tmp.salesToSplit sts ON sts.saleFk = s.id 
 		SET s.ticketFk = vTicketFutureFk,
 			s.concept = CONCAT('(s) ', s.concept)
 		WHERE sts.ticketFk = vTicketFk;
 
 	CALL vn.ticketStateUpdate(vTicketFutureFk, 'FIXING');
 
-	SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk,
+	SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, 
 						" al nuevo ticket ", vTicketFutureFk,"(", vDated,")");
 END ;;
 DELIMITER ;
@@ -74351,7 +75556,7 @@ proc:BEGIN
 			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
 				FROM tmp.saleGroup sg
 				WHERE NOT ISNULL(sg.itemPackingTypeFk)
-				ORDER BY sg.totalLitros
+				ORDER BY sg.itemPackingTypeFk
 				LIMIT 1;
 
 			UPDATE vn.sale s
@@ -74381,43 +75586,43 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_splitPackingComplete`(vTicketFk INT, vSectorFk INT)
 BEGIN
-
+	
 		DECLARE vNeedToSplit BOOLEAN;
 		DECLARE vNewTicketFk INT;
-
+	
 		DROP TEMPORARY TABLE IF EXISTS tmpSale;
-
+	
 		CREATE TEMPORARY TABLE tmpSale
 			SELECT DISTINCT s.id
-				FROM vn.ticket t
+				FROM vn.ticket t 
 					JOIN vn.sale s ON s.ticketFk = t.id
-					JOIN vn.item i ON i.id = s.itemFk
+					JOIN vn.item i ON i.id = s.itemFk 
 					LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = vSectorFk
-					JOIN vn.packagingConfig pc
+					JOIN vn.packagingConfig pc 
 					WHERE t.id = vTicketFk
 					AND (	s.quantity MOD IFNULL(iss.packing,1) != 0
-						OR
+						OR 
 						 	IFNULL(iss.packing,1) = 1
-						OR
+						OR 
 							i.`size` <= pc.previousPreparationMinimumSize
 						);
-
-		SELECT COUNT(*)
+		
+		SELECT COUNT(*) 
 			INTO vNeedToSplit
-			FROM tmpSale;
-
+			FROM tmpSale; 
+		
 		IF vNeedToSplit THEN
-
+		
 			CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
+		
 			UPDATE vn.sale s
-				JOIN vn.tmpSale ts ON ts.id = s.id
+				JOIN vn.tmpSale ts ON ts.id = s.id 
 				SET s.ticketFk = vNewTicketFk;
-
+		
 		END IF;
-
+	
 		DROP TEMPORARY TABLE tmpSale;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -74448,7 +75653,7 @@ BEGIN
             WHERE ot.description = 'Peso Aduana'
 				AND t.clientFk = vClientFk
                 AND t.shipped BETWEEN vDated AND util.dayend(vDated);
-
+                
 	SELECT sum(IF(sv.physicalWeight = 0, sv.weight, sv.physicalWeight)) INTO vTheorycalWeight
 		FROM vn.ticket t
 			JOIN vn.sale s ON s.ticketFk = t.id
@@ -74457,9 +75662,9 @@ BEGIN
             JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
 		WHERE t.clientFk = vClientFk
                 AND t.shipped BETWEEN vDated AND util.dayend(vDated);
-
+                
 	SET vRatio = vRealWeight / vTheorycalWeight;
-
+                
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketWeight;
 
 	CREATE TEMPORARY TABLE tmp.ticketWeight
@@ -74480,7 +75685,7 @@ BEGIN
                 AND t.shipped BETWEEN vDated AND util.dayend(vDated)
 			GROUP BY ib.ediBotanic, o.code;
 
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -74599,18 +75804,18 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateAll`(vDatedFr
 BEGIN
 
 /**
- * @param vDatedFrom Fecha desde
+ * @param vDatedFrom Fecha desde 
  * @param vDatedTo Fecha hasta
  */
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+	CREATE OR REPLACE TEMPORARY TABLE tmp.`user` 
 		SELECT w.id userFk
 			FROM vn.worker w;
-
+        
 	CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
 
 	DROP TEMPORARY TABLE tmp.`user`;
-
+ 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -74630,21 +75835,21 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
 BEGIN
 /**
- * @param vDepartmentFk
+ * @param vDepartmentFk 
  * @param vDatedFrom workerTimeControl
  * @param vDatedTo workerTimeControl
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+  
 	CREATE TEMPORARY TABLE tmp.`user`
 	SELECT DISTINCT b.workerFk userFk
-		FROM business AS b
-		WHERE (b.started BETWEEN vDatedFrom  AND vDatedTo
+		FROM business AS b 
+		WHERE (b.started BETWEEN vDatedFrom  AND vDatedTo 
 				OR IFNULL(b.ended, vDatedTo)  BETWEEN vDatedFrom  AND vDatedTo
 				OR (b.started <= vDatedFrom AND b.ended >= vDatedTo)
 			) AND b.departmentFk = vDepartmentFk
 		ORDER BY b.ended DESC;
-
+		
 	CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
 
 	DROP TEMPORARY TABLE tmp.`user`;
@@ -74669,19 +75874,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByUser`(vUser
 BEGIN
 
 /**
- * @param vUserFk
+ * @param vUserFk 
  * @param vDatedFrom workerTimeControl
  * @param vDatedTo workerTimeControl
  */
-
+  
   DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+  
   CREATE TEMPORARY TABLE tmp.`user`
 	SELECT id userFk
-		FROM account.user
-        WHERE id = vUserFk;
+		FROM account.user 
+        WHERE id = vUserFk; 
   CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
-
+  
   DROP TEMPORARY TABLE tmp.`user`;
 
 END ;;
@@ -74708,14 +75913,14 @@ BEGIN
  * @param vDatedFrom Fecha desde
  * @param vDatedTo Fecha hasta
  */
-
-    CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+  
+    CREATE OR REPLACE TEMPORARY TABLE tmp.`user` 
         SELECT w.id userFk
           FROM worker w
           WHERE w.id = vWorkerFk;
-
+        
     CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
-
+  
     DROP TEMPORARY TABLE tmp.`user`;
 
 END ;;
@@ -74725,32 +75930,32 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `timeControl_calculate` */;
 /*!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_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculate`(
-	vDatedFrom DATETIME,
+	vDatedFrom DATETIME, 
 	vDatedTo DATETIME)
 BEGIN
 /*
  * Agrupa por trabajador y día, el tiempo de trabajo y descanso retribuido(si tiene).
  * Los registros horarios incorrectos (tmp.timeControlError) no se considerarán.
- * Si un trabajador ha trabajado más de un cierto umbral de tiempo (vTimeToBreakTime)
- * y no ha tenido descansos que superen un parámetro determinado(vMaxTimeToBreak),
+ * Si un trabajador ha trabajado más de un cierto umbral de tiempo (vTimeToBreakTime) 
+ * y no ha tenido descansos que superen un parámetro determinado(vMaxTimeToBreak), 
  * se le añadirá un tiempo de descanso (vBreakTime) a sus horas trabajadas.
  * El tiempo de descanso solo se añade si el trabajador realmente disfrutó del descanso.
  * Si disfrutó de menos tiempo de descanso, solo se añade el tiempo que disfrutó.
- *
+ * 
  * @param vDatedFrom
- * @param vDatedTo
+ * @param vDatedTo 
  *
- * @return tmp.timeControlCalculate
+ * @return tmp.timeControlCalculate 
  * (workerFk, dated, timeWorkSeconds, timeWorkSexagesimal, timeWorkDecimal, timed)
  */
 	DECLARE vHourSeconds INTEGER;
@@ -74882,7 +76087,7 @@ BEGIN
 		), accumulated AS (
 			SELECT 	SUM(IF(isOdd, 0, gapTime))
 						OVER (PARTITION BY userFk,dated ORDER BY userFk,timed) accumulatedWorkTime,
-					SUM(IF(NOT isOdd OR breakPoint, 0, IFNULL(gapTime, 0)))
+					SUM(IF(NOT isOdd OR breakPoint OR gapTime >= vMaxTimeToBreak OR gapTime IS NULL, 0, gapTime))
 						OVER (PARTITION BY realDay ORDER BY realDay,timed) accumulatedBreakTime,
 					IF(realDay <> @oldrealDay OR (isOdd AND gapTime >= vMaxTimeToBreak),
 						@accumulatedForBreakTime := 0,
@@ -74897,7 +76102,7 @@ BEGIN
 			SELECT userFk,
 				dated,
 				MAX(accumulatedWorkTime) +
-					IF(MAX(accumulatedForBreakTime) >= vTimeToBreakTime,
+					IF(MAX(accumulatedForBreakTime) + LEAST(vBreakTime, MAX(accumulatedBreakTime)) >= vTimeToBreakTime,
 						LEAST(vBreakTime, MAX(accumulatedBreakTime)),
 						0) timeWorkSeconds
 			FROM accumulated
@@ -74949,14 +76154,14 @@ BEGIN
  * @param vDatedTo Fecha hasta
  */
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+	CREATE OR REPLACE TEMPORARY TABLE tmp.`user` 
 		SELECT w.id userFk
 			FROM vn.worker w;
-
+        
 	CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
 
 	DROP TEMPORARY TABLE tmp.`user`;
-
+ 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -74976,21 +76181,21 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
 BEGIN
 /**
- * @param vDepartmentFk
+ * @param vDepartmentFk 
  * @param vDatedFrom workerTimeControl
  * @param vDatedTo workerTimeControl
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+  
 	CREATE TEMPORARY TABLE tmp.`user`
 	SELECT DISTINCT b.workerFk userFk
-		FROM business AS b
-		WHERE (b.started BETWEEN vDatedFrom  AND vDatedTo
+		FROM business AS b 
+		WHERE (b.started BETWEEN vDatedFrom  AND vDatedTo 
 				OR IFNULL(b.ended, vDatedTo)  BETWEEN vDatedFrom  AND vDatedTo
 				OR (b.started <= vDatedFrom AND b.ended >= vDatedTo)
 			) AND b.departmentFk = vDepartmentFk
 		ORDER BY b.ended DESC;
-
+		
 	CALL timeControl_calculate(vDatedFrom, vDatedTo);
 
 	DROP TEMPORARY TABLE tmp.`user`;
@@ -75015,19 +76220,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByUser`(vUserF
 BEGIN
 
 /**
- * @param vUserFk
+ * @param vUserFk 
  * @param vDatedFrom workerTimeControl
  * @param vDatedTo workerTimeControl
  */
-
+  
   DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+  
   CREATE TEMPORARY TABLE tmp.`user`
 	SELECT id userFk
-		FROM account.user
-        WHERE id = vUserFk;
+		FROM account.user 
+        WHERE id = vUserFk; 
   CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
-
+  
   DROP TEMPORARY TABLE tmp.`user`;
 
 END ;;
@@ -75085,12 +76290,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_getError`(vDatedFrom DA
 BEGIN
 /*
  * @param vDatedFrom
- * @param vDatedTo
+ * @param vDatedTo 
  * @table tmp.`user`(userFk)
  * Fichadas incorrectas de las cuales no se puede calcular horas trabajadas
  * @return tmp.timeControlError (id)
  */
-	DECLARE vDayMaxTime INTEGER;
+	DECLARE vDayMaxTime INTEGER; 
 
 	SET @journeyCounter := 0;
 	SET @lastUserFk := NULL;
@@ -75098,16 +76303,16 @@ BEGIN
 	SELECT dayMaxTime INTO vDayMaxTime
 		FROM workerTimeControlConfig LIMIT 1;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
-	CREATE TEMPORARY TABLE tmp.timeControl
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; 
+	CREATE TEMPORARY TABLE tmp.timeControl 
 			(INDEX(id), INDEX(journeyCounter))
 			ENGINE = MEMORY
 		SELECT 	sub.id,
-				sub.direction,
+				sub.direction, 
 				sub.timed,
 				IF(sub.direction = 'in' OR @hasOut OR sub.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter,
-				@lastUserFk := sub.userFk workerFk,
-				IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE)
+				@lastUserFk := sub.userFk workerFk,	
+				IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE) 
 			FROM (
 				SELECT  DISTINCT wtc.id,
 						wtc.direction,
@@ -75118,36 +76323,36 @@ BEGIN
 					WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY)
 					ORDER BY wtc.userFk, wtc.timed
 			) sub;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
+		
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; 
 	CREATE TEMPORARY TABLE tmp.timeControlAux
 			(INDEX(id), INDEX(journeyCounter))
 			ENGINE = MEMORY
 		SELECT * FROM tmp.timeControl;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError;
-		CREATE TEMPORARY TABLE tmp.timeControlError
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError; 
+		CREATE TEMPORARY TABLE tmp.timeControlError 
 			(INDEX(id))
 			ENGINE = MEMORY
-			SELECT id
+			SELECT id 
 				FROM tmp.timeControlAux tca
 					JOIN (
-						SELECT journeyCounter,
+						SELECT journeyCounter, 
 								UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork,
-								SUM(direction = 'in') totalIn,
+								SUM(direction = 'in') totalIn, 
 								SUM(direction = 'out') totalOut,
 								timed
 							FROM tmp.timeControl
 							GROUP BY journeyCounter
-							HAVING COUNT(*) MOD 2 = 1
-								OR totalIn <> 1
-								OR totalOut <> 1
+							HAVING COUNT(*) MOD 2 = 1 
+								OR totalIn <> 1 
+								OR totalOut <> 1 
 								OR timeWork >= vDayMaxTime
 					)sub ON sub.journeyCounter = tca.journeyCounter
 				WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; 
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -75170,7 +76375,7 @@ proc: BEGIN
  * deprecated call workerTimeControl_check
  */
 CALL vn.workerTimeControl_check(vUserFk,vDated,vTabletFk);
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -75226,12 +76431,12 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume`(vTravelFk INT)
 BEGIN
-
-	SELECT 	w1.name AS ORI,
-			w2.name AS DES,
+	
+	SELECT 	w1.name AS ORI, 
+			w2.name AS DES, 
 			tr.shipped shipment,
 			tr.landed landing,
-			a.name Agencia,
+			a.name Agencia, 
 			s.name Proveedor,
 			e.id Id_Entrada,
 			e.invoiceNumber Referencia,
@@ -75239,18 +76444,18 @@ BEGIN
 			 vn.item_getVolume(b.itemFk ,b.packagingFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) AS CC,
 			CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
 			 vn.item_getVolume(b.itemFk ,b.packagingFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) AS espais
-	FROM vn.buy b
-		JOIN vn.entry e ON e.id = b.entryFk
-		JOIN vn.supplier s ON s.id = e.supplierFk
-		JOIN vn.travel tr ON tr.id = e.travelFk
+	FROM vn.buy b 
+		JOIN vn.entry e ON e.id = b.entryFk 
+		JOIN vn.supplier s ON s.id = e.supplierFk 
+		JOIN vn.travel tr ON tr.id = e.travelFk 
 		JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
-		JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk
-		JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk
-		JOIN vn.volumeConfig vc
-		JOIN vn.item i ON i.id = b.itemFk
+		JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk 
+		JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk 
+		JOIN vn.volumeConfig vc 
+		JOIN vn.item i ON i.id = b.itemFk 
 		JOIN vn.itemType it ON it.id = i.typeFk
 		WHERE tr.id = vTravelFk;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -75306,11 +76511,11 @@ BEGIN
  * @param vShipped The shipment date
  * @param vLanded The landing date
  */
-
+ 
 	IF vLanded < vShipped THEN
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'Landing cannot be lesser than shipment';
-	END IF;
+	END IF; 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -75374,7 +76579,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_checkWarehouseIsFeedStock`(v
 proc: BEGIN
 /*
  * Check that the warehouse is not Feed Stock
- *
+ * 
  * @vWarehouseFk param warehouse id
  */
 	IF vWarehouseFk IS NULL THEN
@@ -75462,13 +76667,13 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_cloneWithEntries`(
-	IN vTravelFk INT,
-	IN vDateStart DATE,
+	IN vTravelFk INT, 
+	IN vDateStart DATE, 
 	IN vDateEnd DATE,
 	IN vWarehouseOutFk INT,
-	IN vWarehouseInFk INT,
-	IN vRef VARCHAR(255),
-	IN vAgencyModeFk INT,
+	IN vWarehouseInFk INT, 
+	IN vRef VARCHAR(255), 
+	IN vAgencyModeFk INT, 
 	OUT vNewTravelFk INT)
 BEGIN
 /**
@@ -75492,29 +76697,29 @@ BEGIN
 			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;
 		RESIGNAL;
 	END;
-
+	
 	START TRANSACTION;
 
 	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;
@@ -75556,36 +76761,36 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_doRecalc`()
-proc: BEGIN
-/**
-* Recounts the number of entries of changed travels.
-*/
-	DECLARE vTravelFk INT;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('vn.ticket_doRecalc');
-	END;
-
-	IF !GET_LOCK('vn.travel_doRecalc', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tTravel
-		ENGINE = MEMORY
-		SELECT travelFk FROM travelRecalc;
-
-	UPDATE travel t
-		JOIN tTravel tt ON tt.travelFk = t.id
-		SET t.totalEntries = (
-			SELECT COUNT(e.id)
-				FROM entry e
-				WHERE e.travelFk = t.id
-		);
-
-	DELETE tr FROM travelRecalc tr JOIN tTravel t ON tr.travelFk = t.travelFk;
-	DROP TEMPORARY TABLE tTravel;
-	DO RELEASE_LOCK('vn.travel_doRecalc');
+proc: BEGIN
+/**
+* Recounts the number of entries of changed travels.
+*/
+	DECLARE vTravelFk INT;
+	
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('vn.ticket_doRecalc');
+	END;
+
+	IF !GET_LOCK('vn.travel_doRecalc', 0) THEN
+		LEAVE proc;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tTravel
+		ENGINE = MEMORY
+		SELECT travelFk FROM travelRecalc;
+
+	UPDATE travel t
+		JOIN tTravel tt ON tt.travelFk = t.id
+		SET t.totalEntries = (
+			SELECT COUNT(e.id) 
+				FROM entry e 
+				WHERE e.travelFk = t.id
+		);
+
+	DELETE tr FROM travelRecalc tr JOIN tTravel t ON tr.travelFk = t.travelFk;
+	DROP TEMPORARY TABLE tTravel;
+	DO RELEASE_LOCK('vn.travel_doRecalc');
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -75612,10 +76817,10 @@ BEGIN
 		WHERE id = vSelf;
 
 	SELECT e.id entryFk
-		FROM travel t
-			JOIN entry e ON e.travelFk = t.id
-			JOIN buy b ON b.entryFk = e.id
-		WHERE t.id = vTravelFk
+		FROM travel t 
+			JOIN entry e ON e.travelFk = t.id 
+			JOIN buy b ON b.entryFk = e.id 
+		WHERE t.id = vTravelFk 
 			AND (b.packing IS NULL OR b.packagingFk IS NULL);
 END ;;
 DELIMITER ;
@@ -75638,7 +76843,7 @@ BEGIN
 
 /*
  * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
- *
+ * 
  */
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vWorkerName VARCHAR(50);
@@ -75650,7 +76855,7 @@ BEGIN
 		SELECT GROUP_CONCAT( DISTINCT CONCAT('https://salix.verdnatura.es/#!/travel/', ttr.id, '/summary ') ORDER BY ttr.id SEPARATOR '\n\r'),
 			u.name
 			FROM tmp.travel ttr
-				JOIN entry e ON e.travelFk = ttr.id
+				JOIN entry e ON e.travelFk = ttr.id 
 				JOIN buy b ON b.entryFk = e.id
 				JOIN item i ON i.id = b.itemFk
 				JOIN itemType it ON it.id = i.typeFk
@@ -75658,19 +76863,19 @@ BEGIN
 			GROUP BY u.name;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
-	SET vDone = TRUE;
+	SET vDone = TRUE; 
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.travel;
 	CREATE TEMPORARY TABLE tmp.travel
 		SELECT tr.id,tr.landed
 			FROM travel tr
-					JOIN entry e ON e.travelFk = tr.id
+					JOIN entry e ON e.travelFk = tr.id 
 				WHERE tr.landed = util.tomorrow()
 					AND e.isRaid
 				GROUP BY tr.id;
@@ -75728,7 +76933,7 @@ proc: BEGIN
 	IF vSelf IS NULL THEN
 		LEAVE proc;
 	END IF;
-
+    
     INSERT IGNORE INTO travelRecalc SET travelFk = vSelf;
 END ;;
 DELIMITER ;
@@ -75738,6 +76943,100 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_upcomingArrivals` */;
+/*!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 */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_upcomingArrivals`(
+    vWarehouseFk INT,
+    vDate DATETIME
+)
+BEGIN
+/**
+ * Procedure to track and organize the movement of items between warehouses,
+ * where 'warehouseINFk' is @vWarehouseFk.
+ * Uses temporary tables to process and store the travel data of the items.
+ *
+ * @params vWarehouseFk warehouse id
+ * @params vDate selected landed date
+ * @return tmp.itemTravel
+ */
+	DECLARE vTravelFk INT;
+	DECLARE vWarehouseOutFk INT;
+	DECLARE vShipment DATETIME;
+	DECLARE vDateStart DATETIME;
+
+	CREATE OR REPLACE TEMPORARY TABLE tTravelTop
+        (PRIMARY KEY (wh_in,wh_out,landing,shipment))
+            ENGINE = MEMORY
+            SELECT 0 id,
+                vWarehouseFk wh_in,
+                vWarehouseFk wh_out,
+                FALSE ok,
+                vDate landing,
+                vDate shipment;
+
+	REPEAT
+		SET vTravelFk = NULL;
+
+		SELECT id,
+                wh_out,
+                shipment,
+                landing
+			    INTO vTravelFk,
+                vWarehouseOutFk,
+                vShipment,
+                vDateStart
+			FROM tTravelTop 
+            WHERE ok = FALSE LIMIT 1;
+
+		UPDATE tTravelTop 
+            SET ok = TRUE 
+            WHERE id = vTravelFk;
+
+		INSERT IGNORE INTO tTravelTop
+            SELECT id, 
+                    vWarehouseFk,
+                    warehouseOutFk,
+                    FALSE,
+                    IF(vTravelFk, vDateStart, landed),
+                    shipped shipment
+                FROM travel
+                WHERE warehouseOutFk = vWarehouseOutFk
+                    AND IF(vTravelFk, landed <= vShipment, landed >= vShipment)
+                    AND shipped >= util.VN_CURDATE()
+                    AND NOT isDelivered;
+	UNTIL vTravelFk IS NULL END REPEAT;
+
+	DELETE FROM tTravelTop WHERE id = 0;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemTravel
+        (KEY (wh))
+        ENGINE = MEMORY
+        SELECT * 
+            FROM (
+                SELECT wh_out wh,
+                        landing
+                    FROM tTravelTop
+                    WHERE wh_out <> vWarehouseFk
+                    ORDER BY landing
+                    LIMIT 10000000000000000000
+            ) t
+        GROUP BY wh;
+
+	DROP TEMPORARY TABLE tTravelTop;
+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_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `travel_updatePacking` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -75754,10 +77053,10 @@ BEGIN
  * @param vItemFk id del item
  * @param vPacking nuevo packing
  */
-
+	
 	DECLARE vAuctionWarehouseFk INT;
 	DECLARE vMainWarehouseFk INT;
-
+	
 	SELECT warehouseFk INTO vAuctionWarehouseFk
 		FROM auctionConfig;
 
@@ -75817,7 +77116,7 @@ BEGIN
 			FROM travelClonedWeekly
 			WHERE travelFk;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;	
 
 	SET vCounter = vSinceWeek;
 
@@ -75879,12 +77178,12 @@ BEGIN
 /*
  * Plantilla para modificar reemplazar todos los tags
  * por los valores que tienen los articulos
- *
+ * 
  * @param vTypeFk tipo a modificar
- *
+ * 
  */
-	DELETE it.*
-		FROM itemTag it
+	DELETE it.* 
+		FROM itemTag it 
 			JOIN item i ON i.id = it.itemFk
 		WHERE i.typeFk = vTypeFk;
 
@@ -75893,40 +77192,40 @@ BEGIN
 			FROM item i
 				JOIN tag t ON t.name = 'Longitud' COLLATE utf8_general_ci
 			WHERE i.typeFk  =  vTypeFk;
-
+            
 	INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT  i.id, t.id, i.category, 5
 			FROM item i
 				JOIN tag t ON t.name = 'Categoria' COLLATE utf8_general_ci
 			WHERE i.typeFk  =  vTypeFk;
-
+    	
 	INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT  i.id, t.id, ink.name, 2
 			FROM item i
 				JOIN tag t ON t.name = 'Color' COLLATE utf8_general_ci
                 JOIN ink ON ink.id = i.inkFk
 			WHERE i.typeFk  =  vTypeFk;
-
+            
     INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT  i.id, t.id, p.name, 3
 			FROM item i
 				JOIN tag t ON t.name = 'Productor' COLLATE utf8_general_ci
                 JOIN producer p ON p.id = i.producerFk
-			WHERE i.typeFk  =  vTypeFk;
-
+			WHERE i.typeFk  =  vTypeFk;    
+            
 	INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT  i.id, t.id, o.name, 4
 			FROM item i
 				JOIN tag t ON t.name = 'Origen' COLLATE utf8_general_ci
                 JOIN origin o ON o.id = i.originFk
 			WHERE i.typeFk  =  vTypeFk;
-     /*
+     /*      
 	INSERT INTO itemTag(itemFk, tagFk, value, priority)
 		SELECT  i.id, t.id, i.stems, 6
 			FROM item i
 				JOIN tag t ON t.name = 'Tallos' COLLATE utf8_general_ci
-			WHERE i.typeFk  =  vTypeFk;
-     */
+			WHERE i.typeFk  =  vTypeFk;  
+     */   
 -- CALL itemTagArrangedUpdate(NULL);
 
 END ;;
@@ -75949,7 +77248,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `updatePedidosInternos`(vItemFk INT)
 BEGIN
 
 	UPDATE vn.item SET upToDown = 0 WHERE item.id = vItemFk;
-
+    
 
 END ;;
 DELIMITER ;
@@ -75977,7 +77276,7 @@ BEGIN
 	SELECT vp.regex INTO vRegex
 		FROM vehiclePlateRegex vp
 		WHERE vp.countryCodeFk = vCountryCodeFk;
-
+	
 	IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
 		CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));
 	END IF;
@@ -76010,7 +77309,7 @@ proc:BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
-
+	
 	SELECT eventEarlyDays INTO vEventEarlyDays
 		FROM vehicleConfig;
 
@@ -76028,7 +77327,7 @@ proc:BEGIN
 	IF NOT vHasEvents THEN
 		LEAVE proc;
 	END IF;
-
+	
 	START TRANSACTION;
 
 	SELECT util.notification_send('vehicle-event-expired',
@@ -76063,21 +77362,21 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_getMisfit`(vSectorFk INT)
 BEGIN
-
+	
 	/* Devuelve una tabla temporal con los descuadres entre el visible teórico y lo ubicado en la práctica
-	 *
+	 * 
 	 * @param vSectorFk Identificador de vn.sector
-	 *
+	 * 
 	 * @return tmp.stockMisfit(itemFk, visible, parked)
 	 */
-
+	
 	DECLARE vCalcVisibleFk INT;
 	DECLARE vWarehouseFk INT;
 
 	SELECT warehouseFk INTO vWarehouseFk
-		FROM vn.sector s
+		FROM vn.sector s 
 		WHERE s.id = vSectorFk;
-
+	
 	CALL cache.visible_refresh(vCalcVisibleFk, FALSE, vWarehouseFk);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.stockMisfit;
@@ -76090,17 +77389,17 @@ BEGIN
 
 	INSERT INTO tmp.stockMisfit(itemFk, parked)
 		SELECT iss.itemFk , sum(iss.visible )
-			FROM vn.itemShelvingStock iss
-				JOIN vn.sector s ON s.id = iss.sectorFk
+			FROM vn.itemShelvingStock iss 
+				JOIN vn.sector s ON s.id = iss.sectorFk 
 			WHERE vSectorFk IN (s.id, s.sonFk)
 			GROUP BY iss.itemFk;
-
+			
 	INSERT INTO tmp.stockMisfit(itemFk, visible)
-		SELECT v.item_id , v.visible
-			FROM cache.visible v
-			WHERE v.calc_id = vCalcVisibleFk
+		SELECT v.item_id , v.visible 
+			FROM cache.visible v 
+			WHERE v.calc_id = vCalcVisibleFk		
 			ON DUPLICATE KEY UPDATE visible = v.visible;
-
+		
 	DELETE FROM tmp.stockMisfit
 		WHERE visible = parked;
 
@@ -76124,17 +77423,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `warehouseFitting`(IN vWhOrigin INT
 BEGIN
 	DECLARE vCacheVisibleOriginFk INT;
     DECLARE vCacheVisibleDestinyFk INT;
-
+    
 	CALL cache.visible_refresh(vCacheVisibleOriginFk, FALSE, vWhOrigin);
     CALL cache.visible_refresh(vCacheVisibleDestinyFk, FALSE, vWhDestiny);
-
+    
     SELECT i.id itemFk,
 		   i.longName,
            i.size,
            i.subName,
            vOrigin.visible AS Origen,
            vDestiny.visible Destino
-
+           
 		FROM vn.item i
 			JOIN vn.itemType it ON it.id = i.typeFk
 			LEFT JOIN cache.visible vOrigin ON vOrigin.calc_id = vCacheVisibleOriginFk AND vOrigin.item_id = i.id
@@ -76163,13 +77462,13 @@ BEGIN
 
 	DECLARE vWhOrigin INT;
     DECLARE vWhDestiny INT;
-
+    
     SELECT warehouseInFk, warehouseOutFk INTO vWhDestiny, vWhOrigin
 		FROM vn.travel
         WHERE id = vTravelFk;
-
+        
 	CALL vn.warehouseFitting(vWhOrigin, vWhDestiny);
-
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -76233,7 +77532,7 @@ BEGIN
  * Calcula los días y horas de vacaciones en función de un contrato y año
  *
  * @param vYear
- * @param vBusinessFk
+ * @param vBusinessFk  
  * @return tmp.workerCalendarCalculateBusiness (days, hours, daysEnjoyed, hoursEnjoyed)
  */
 	DECLARE vStarted DATE;
@@ -76245,17 +77544,17 @@ BEGIN
 	DECLARE vPayedHolidays DECIMAL(5,2);
 	DECLARE vDifDays INT;
 
-	SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started),
-					IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended),
+	SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started), 
+					IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended), 
 					IF(wbt.hasHolidayEntitlement, w.days, 0),
 					c.hoursWeek,
 					IF(YEAR(b.ended) = vYear, b.payedHolidays, 0) payedHolidays
-				INTO vStarted,
-					vEnded,
-					vDaysHoliday,
+				INTO vStarted, 
+					vEnded, 
+					vDaysHoliday, 
 					vHoursWeek,
 					vPayedHolidays
-			FROM business b
+			FROM business b 
 				JOIN workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk
 				JOIN workCenterHoliday w ON w.workcenterFk = b.workcenterFk
 				LEFT JOIN calendarType c ON c.id = b.calendarTypeFk
@@ -76263,23 +77562,23 @@ BEGIN
 				AND w.year = vYear;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateBusiness;
-
+	
 	IF vStarted < vEnded THEN
 		SET vDifDays = DAYOFYEAR(vEnded) - DAYOFYEAR(vStarted) + 1;
 
-		SELECT IFNULL(SUM(a.holidayEntitlementRate), 0),
+		SELECT IFNULL(SUM(a.holidayEntitlementRate), 0), 
 				SUM(-(a.discountRate - 1)) + vPayedHolidays
-				INTO vDaysToSubtract,
-					vDaysHolidayEnjoyed
+				INTO vDaysToSubtract, 
+					vDaysHolidayEnjoyed 
 			FROM calendar c
 				JOIN absenceType a ON a.id = c.dayOffTypeFk
 				JOIN business b ON b.id = c.businessFk
-			WHERE b.id = vBusinessFk
+			WHERE b.id = vBusinessFk 
 				AND YEAR(c.dated) = vYear;
 
 	END IF;
 
-	CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness
+	CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness	
 		ENGINE = MEMORY
 		SELECT @days := IFNULL(ROUND((vDaysHoliday * (vDifDays - vDaysToSubtract) / IF(util.isLeapYear(vYear) , 366, 365)), 1), 0) days,
 			@days * (vHoursWeek / 5) hours,
@@ -76307,32 +77606,32 @@ BEGIN
 /**
  * Calcula los días y horas de vacaciones en función de un trabajador y año
  *
- * @param vYear
- * @param vWorkerFk
+ * @param vYear 
+ * @param vWorkerFk 
  * @return tmp.workerCalendarCalculateYear (days, hours, daysEnjoyed, hoursEnjoyed)
- */
+ */	
 	DECLARE vDone BOOL;
 	DECLARE vBusinessFk INT;
 
 	DECLARE cur CURSOR FOR
-		SELECT b.id
+		SELECT b.id 
 			FROM business b
-			WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear)
+			WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear) 
 				AND b.workerFk = vWorkerFk;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
+		SET vDone = TRUE;	
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateYear;
 
 	CREATE TEMPORARY TABLE tmp.workerCalendarCalculateYear
-			(days DEC(5,2),
+			(days DEC(5,2), 
 			 hours DEC(5,2),
-			 daysEnjoyed DEC(5,2),
-			 hoursEnjoyed DEC(5,2))
+			 daysEnjoyed DEC(5,2), 
+			 hoursEnjoyed DEC(5,2)) 
 		ENGINE = MEMORY;
 	INSERT INTO tmp.workerCalendarCalculateYear VALUES(0, 0, 0, 0);
-
+				
 	OPEN cur;
 
 	l: LOOP
@@ -76345,12 +77644,12 @@ BEGIN
 
 		CALL workerCalendar_calculateBusiness(vYear, vBusinessFk);
 		UPDATE tmp.workerCalendarCalculateYear w
-				JOIN tmp.workerCalendarCalculateBusiness wc
+				JOIN tmp.workerCalendarCalculateBusiness wc 
 			SET w.days = w.days + wc.days,
 				w.hours = w.hours + wc.hours,
 				w.daysEnjoyed = w.daysEnjoyed + wc.daysEnjoyed,
 				w.hoursEnjoyed = w.hoursEnjoyed + wc.hoursEnjoyed;
-
+			
 		DROP TEMPORARY TABLE tmp.workerCalendarCalculateBusiness;
 
 	END LOOP;
@@ -76421,20 +77720,20 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate;
     CREATE TEMPORARY TABLE tmp.workerDepartmentByDate
 		ENGINE = MEMORY
-		SELECT w.id userFk,
-            w.lastName name,
-            w.firstName firstname,
-            d.name department,
+		SELECT w.id userFk, 
+            w.lastName name, 
+            w.firstName firstname, 
+            d.name department, 
             d.id departmentFk,
-            b.started,
-            d.isProduction,
+            b.started, 
+            d.isProduction, 
             CAST(12 * b.amount / ct.hoursWeek / 52 AS DECIMAL(10,2)) costeHora,
             w.fi nif
 		FROM business b
             JOIN calendarType ct ON ct.id = b.calendarTypeFk
 			JOIN department d ON d.id = b.departmentFk
 			JOIN worker w ON w.id = b.workerFk
-		WHERE b.started <= vDate
+		WHERE b.started <= vDate 
 			AND (b.ended > vDate OR b.ended IS NULL);
 END ;;
 DELIMITER ;
@@ -76458,21 +77757,26 @@ mainLabel:BEGIN
 	IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
 		LEAVE mainLabel;
 	END IF;
+
+	DELETE cp FROM clientProtected cp
+		JOIN client c ON c.id = cp.clientFk
+		WHERE c.salesPersonFk = vUserId;
+
 	DELETE FROM account.account
 		WHERE id = vUserId;
 
-	UPDATE account.user
+	UPDATE account.user 
 		SET role = 2
-		WHERE id = vUserId;
+		WHERE id = vUserId;	
 
-	DELETE FROM pbx.sip
-		WHERE user_id = vUserId;
+	DELETE FROM pbx.sip 
+		WHERE user_id = vUserId;   
 
 	UPDATE `client` c
 		JOIN payMethod p ON p.name = 'CONTADO'
 		SET c.credit = 0, c.payMethodFk = p.id, hasCoreVnl = FALSE
 		WHERE c.id = vUserId;
-
+	
 	UPDATE `client` c
 		SET c.salesPersonFk = null
 		WHERE c.salesPersonFk = vUserId;
@@ -76501,12 +77805,12 @@ BEGIN
 		SELECT b.workerFk
 			FROM business b
 				JOIN vn.worker w ON w.id = b.workerFk
-				JOIN account.account a ON a.id = b.workerFk
-				LEFT JOIN (SELECT b.workerFk
+				JOIN account.account a ON a.id = b.workerFk  
+				LEFT JOIN (SELECT b.workerFk 
 							FROM business b
 							WHERE (ended IS NULL OR ended >=util.VN_CURDATE())
 					)sub ON sub.workerFk = a.id
-				LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk
+				LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk	
 			WHERE sub.workerFk IS NULL
 				AND wd.workerFk IS NULL
 			GROUP BY w.id;
@@ -76524,7 +77828,7 @@ BEGIN
 	END WHILE;
 
 	CLOSE rs;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -76588,19 +77892,19 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(
-	vDatedFrom DATE,
-	vDatedTo DATE,
+	vDatedFrom DATE, 
+	vDatedTo DATE, 
 	vWorkerFk INT)
 BEGIN
 /**
- * Actualiza la tabla workerJourney para que actue como caché permanente revisable
+ * Actualiza la tabla workerJourney para que actue como caché permanente revisable 
  * de las jornadas laborales.
  * @param vDatedFrom workerTimeControl
  * @param vDatedTo workerTimeControl
  * @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
- */
+ */	
 	DECLARE vDatedTimeTo DATETIME;
-	DECLARE vMaxTimePerDay INT;
+	DECLARE vMaxTimePerDay INT; 
 	DECLARE vMinHoursToBreak DECIMAL(10,2);
 	DECLARE vBreakHours DECIMAL(10,2);
 	DECLARE vMonthByYear INT;
@@ -76608,57 +77912,57 @@ BEGIN
 	DECLARE vMonthsByYear INT DEFAULT 12;
 	DECLARE vDaysByWeek INT DEFAULT 5;
 	DECLARE vDatedFromYesterday DATETIME;
-	DECLARE vDatedToTomorrow DATETIME;
-
-	SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY)
+	DECLARE vDatedToTomorrow DATETIME; 
+	
+	SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY) 
 		INTO vDatedFromYesterday, vDatedToTomorrow;
 
 	SET vDatedTimeTo = util.dayEnd(vDatedTo);
-
-	SELECT minHoursToBreak, breakHours, maxTimePerDay
+	
+	SELECT minHoursToBreak, breakHours, maxTimePerDay 
 			INTO vMinHoursToBreak, vBreakHours, vMaxTimePerDay
 		FROM workerTimeControlConfig;
 
 	DELETE FROM workerJourney
-		WHERE dated BETWEEN vDatedFrom AND vDatedTo
+		WHERE dated BETWEEN vDatedFrom AND vDatedTo 
 			AND NOT isPaid
 			AND NOT isUpdated
-			AND (vWorkerFk IS NULL OR userFK = vWorkerFk);
+			AND (vWorkerFk IS NULL OR userFK = vWorkerFk); 
 
-	-- Se inserta todos los días del periodo por worker y business en el rango de fechas.
+	-- Se inserta todos los días del periodo por worker y business en el rango de fechas. 
 	INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
 		 SELECT b.workerFk, t.dated, b.id
-				FROM business b
+				FROM business b 
 					JOIN time t ON t.dated BETWEEN b.started AND IFNULL(b.ended,util.VN_CURDATE())
 				WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
 					AND (vWorkerFk IS NULL OR b.workerFk = vWorkerFk)
 				ORDER BY b.workerFk, t.dated, b.id;
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
 
 	IF vWorkerFk THEN
 		CALL timeControl_calculateByUser(vWorkerFk, vDatedFrom , vDatedTimeTo);
-		CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
-			SELECT vWorkerFk userFk;
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` 
+			SELECT vWorkerFk userFk;	
 	ELSE
 		CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
-		CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` 
 			SELECT id userFk
 				FROM worker w;
-	END IF;
+	END IF; 
 
 	UPDATE workerJourney wj
 		JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
-			SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak,
-					t.timeWorkDecimal - vBreakHours,
+			SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak, 
+					t.timeWorkDecimal - vBreakHours, 
 					t.timeWorkDecimal) AS DECIMAL (10,2)),
 				wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
 		WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
 			AND NOT wj.isPaid
 			AND NOT wj.isUpdated
 			AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
-
-	-- NOCTURNIDAD
+	
+	-- NOCTURNIDAD 
 	CALL timeControl_getError(vDatedFrom, vDatedTimeTo);
 
 	SET @vIsOdd := TRUE;
@@ -76668,9 +77972,9 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.workerTimeControl
 			(INDEX (userFk), INDEX (timed))
 			ENGINE = MEMORY
-		SELECT DISTINCT(wtc.id),
-				wtc.userFk,
-				wtc.timed,
+		SELECT DISTINCT(wtc.id), 
+				wtc.userFk, 
+				wtc.timed, 
 				wtc.direction
 			FROM workerTimeControl wtc
 				JOIN tmp.`user` w ON w.userFk = wtc.userFk
@@ -76680,10 +77984,10 @@ BEGIN
 				AND (vWorkerFk IS NULL OR wtc.userFk = vWorkerFk)
 			ORDER BY wtc.userFk, wtc.timed ASC;
 
-	SELECT MAX(id) INTO @vCont
+	SELECT MAX(id) INTO @vCont 
 		FROM tmp.workerTimeControl;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux;
+	DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux; 
 	CREATE TEMPORARY TABLE tmp.workerTimeControlAux (
 		`id` int(11) ,
 		`userFk` int(10) unsigned ,
@@ -76705,9 +78009,9 @@ BEGIN
 						DATE(@lastTimed) dated,
 						@lastUserFk lastUserFk,
 						IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
-						IF(@vIsOdd
-							AND @lastDirection = 'middle'
-							AND (DATE(@lastTimed) <> date(timed)
+						IF(@vIsOdd 
+							AND @lastDirection = 'middle' 
+							AND (DATE(@lastTimed) <> date(timed) 
 								OR @lastUserFk <> userFk), TRUE, FALSE) hasBreak,
 						@lastTimed := wtc.timed,
 						@lastUserFk := userFk,
@@ -76721,16 +78025,16 @@ BEGIN
 	SET @lastDirection := NULL;
 
 	INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
-		SELECT @vCont:= @vCont + 1,
-				lastUserFk,
-				DATE_ADD(sub.dated, INTERVAL 1 DAY),
+		SELECT @vCont:= @vCont + 1, 
+				lastUserFk, 
+				DATE_ADD(sub.dated, INTERVAL 1 DAY), 
 				'middle'
 			FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
 						DATE(@lastTimed) dated,
 						@lastUserFk lastUserFk,
 						IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
-						IF(@vIsOdd
-							AND @lastDirection = 'middle'
+						IF(@vIsOdd 
+							AND @lastDirection = 'middle' 
 							AND (DATE(@lastTimed)<>date(timed)
 								OR @lastUserFk<>userFk), TRUE, FALSE) hasBreak,
 						@lastTimed := wtc.timed,
@@ -76743,7 +78047,7 @@ BEGIN
 	-- Cambio de dia
 	INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
 		SELECT @vCont:= @vCont + 1,
-				wtc.userFk,
+				wtc.userFk, 
 				util.dayEnd(date(wtc.timed)),
 				'out'
 			FROM workerTimeControl wtc
@@ -76754,8 +78058,8 @@ BEGIN
 			GROUP BY wtc.userFk, DATE(wtc.timed);
 
 	INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
-		SELECT @vCont:= @vCont + 1,
-				wtc.userFk,
+		SELECT @vCont:= @vCont + 1, 
+				wtc.userFk, 
 				DATE_ADD(date(wtc.timed), INTERVAL 1 DAY),
 				'in'
 			FROM workerTimeControl wtc
@@ -76781,8 +78085,8 @@ BEGIN
 								IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed),
 								IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated,
 								wtc.userFk,
-								IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
-									workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
+								IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay, 
+									workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed), 
 									0) NigthlyHours,
 								@lastUserFk := userFk
 							FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
@@ -76795,7 +78099,7 @@ BEGIN
 								) wtc
 							ORDER BY wtc.userFk, wtc.timed
 						)sub
-					WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
+					WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo	 
 					GROUP BY userFk, sub.dated
 				)night ON night.userFk = wj.userFk AND night.dated = wj.dated
 		SET wj.nocturn = night.NigthlyHours
@@ -76807,8 +78111,8 @@ BEGIN
 	UPDATE workerJourney wj
 			JOIN business b ON b.id = wj.businessFk
 			JOIN calendarType ct ON ct.id = b.calendarTypeFk
-		SET wj.priceOrdinaryHour =
-				(vMonthsByYear * b.amount) /
+		SET wj.priceOrdinaryHour = 
+				(vMonthsByYear * b.amount) / 
 				(vWeeksByYear * ct.hoursWeek),
 			wj.contractJourney = ct.hoursWeek / vDaysByWeek
 		WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
@@ -76816,7 +78120,7 @@ BEGIN
 			AND NOT wj.isPaid
 			AND NOT isUpdated;
 
-	-- Precio Extras, Vacaciones y Nocturnas
+	-- Precio Extras, Vacaciones y Nocturnas 
 	UPDATE workerJourney wj
 			JOIN(SELECT MAX(w.dated), t.dated, w.holidayInc, w.nightInc, w.extraInc
 					FROM time t
@@ -76840,12 +78144,12 @@ BEGIN
 		WHERE ct.isPartial
 			AND wj.dated BETWEEN vDatedFrom AND vDatedTo
 			AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
-			AND NOT wj.isPaid
+			AND NOT wj.isPaid 
 			AND NOT wj.isUpdated;
 
 	-- Ausencias
 	UPDATE workerJourney wj
-			JOIN businessCalendar bc ON bc.businessFk = wj.businessFk
+			JOIN businessCalendar bc ON bc.businessFk = wj.businessFk 
 				AND bc.dated = wj.dated
 			JOIN absenceType ab ON ab.id = bc.absenceTypeFk
 		SET wj.permission = ab.permissionRate * wj.contractJourney,
@@ -76860,7 +78164,7 @@ BEGIN
 	 UPDATE workerJourney
 		SET holiday = IF(DAYNAME(dated)='sábado', 0, total),
 			contractJourney = 0
-		WHERE DAYNAME(dated) IN ('sábado', 'domingo')
+		WHERE DAYNAME(dated) IN ('sábado', 'domingo') 
 			AND dated BETWEEN vDatedFrom AND vDatedTo
 			AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
 			AND NOT isPaid
@@ -76869,8 +78173,8 @@ BEGIN
 	-- Festivos por centro de trabajo
 	UPDATE workerJourney wj
 			JOIN calendarHolidays ch ON ch.dated = wj.dated
-			JOIN business b ON b.id = wj.businessFk
-				AND b.workcenterFk = ch.workcenterFk
+			JOIN business b ON b.id = wj.businessFk 
+				AND b.workcenterFk = ch.workcenterFk 
 		SET wj.holiday = wj.total,
 			wj.permission = wj.contractJourney,
 			wj.contractJourney = 0
@@ -76880,7 +78184,7 @@ BEGIN
 			AND NOT wj.isUpdated;
 
 	-- Horas extras
-	UPDATE workerJourney
+	UPDATE workerJourney 
 		SET extra = lunch + total - contractJourney
 		WHERE dated BETWEEN vDatedFrom AND vDatedTo
 			AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
@@ -76910,15 +78214,15 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistakeType_get`()
 BEGIN
-
+	
 /**
  * Obtiene los tipos de error para los trabajadores
  */
-
-	SELECT code, description
-		FROM workerMistakeType
+	
+	SELECT code, description 
+		FROM workerMistakeType 
 		ORDER BY description;
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -76945,7 +78249,7 @@ BEGIN
  *
  */
     INSERT INTO vn.workerMistake(userFk, workerMistakeTypeFk)
-        VALUES(vWorkerFk, vWorkerMistakeTypeFk);
+        VALUES(vWorkerFk, vWorkerMistakeTypeFk); 
 
 END ;;
 DELIMITER ;
@@ -76968,11 +78272,11 @@ BEGIN
 
 	/*INSERT INTO workerTimeControl(userFk, timed, manual, warehouseFk)
 		VALUES(vUserFk, vDated, FALSE, vWarehouseFk);
-
+        
 	CALL vn.workerTimeControlSOWP(vUserFk , vDated);*/
-
+    
     CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,util.VN_NOW(),FALSE);
-
+ 
 
 END ;;
 DELIMITER ;
@@ -76998,8 +78302,8 @@ BEGIN
  *
  */
 
-
-
+    
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -77048,13 +78352,13 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSOWP`(IN vUserFk INT, IN vDated DATE)
 BEGIN
 		SET @order := 0;
-
-		UPDATE workerTimeControl
-			SET `order` =  @order := @order + 1
-			WHERE vUserFk =userFk
+	
+		UPDATE workerTimeControl 
+			SET `order` =  @order := @order + 1 
+			WHERE vUserFk =userFk  
             AND vDated = DATE(timed)
 			ORDER BY timed;
-
+            
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -77073,8 +78377,8 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
 BEGIN
-
-
+	
+	
 	SELECT workerTimeControl_add(vUserFk,vWarehouseFk,vTimed,vIsManual);
 END ;;
 DELIMITER ;
@@ -77162,73 +78466,73 @@ proc: BEGIN
 	DECLARE vTo VARCHAR(50) DEFAULT NULL;
 	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
 	DECLARE vBody VARCHAR(255) DEFAULT NULL;
-
-	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax
+		
+	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax 
 		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
 		FROM workerTimeControlParams;
 
 	SELECT MAX(timed) INTO vLastIn
-		FROM workerTimeControl
-		WHERE userFk = vUserFk
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
 			AND direction = 'in';
-
+		
 	SELECT MAX(timed) INTO vLastOut
-		FROM workerTimeControl
-		WHERE userFk = vUserFk
-			AND direction = 'out';
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
+			AND direction = 'out'; 
 
 	SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
 		FROM account.user u
-		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);
-
+		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);   
+		
 	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
 		FROM worker w
 		WHERE w.id = vUserFk;
 
 
 	IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-
-		-- VERIFICAR DESCANSO DIARIO
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
+		
+		-- VERIFICAR DESCANSO DIARIO 
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
 			SELECT "Descansos 12 h" AS problem;
 			-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
 				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
 			LEAVE proc;
-		END IF;
-
+		END IF;   
+		
 		-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
-		IF (SELECT MOD(COUNT(*),2) -- <>0
-				FROM workerTimeControl
+		IF (SELECT MOD(COUNT(*),2) -- <>0 							
+				FROM workerTimeControl 
 				WHERE userFk = vUserFk
 					AND timed >= vLastIn
-			) THEN
+			) THEN				
 			SELECT "Dias con fichadas impares" AS problem;
 			-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
 				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
+			LEAVE proc;	  
 		END IF;
-
+		
 		-- VERIFICAR VACACIONES
 		SELECT at2.name INTO vCalendarStateType
-			FROM calendar c
+			FROM calendar c 
 				JOIN business b ON b.id = c.businessFk
 				JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
 			WHERE c.dated = util.VN_CURDATE()
 				AND at2.isAllowedToWork = FALSE
 				AND b.workerFk = vUserFk
 			LIMIT 1;
-
+		
 			IF(LENGTH(vCalendarStateType)) THEN
 			SELECT vCalendarStateType AS problem;
 			-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
 				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-
+			LEAVE proc;	
+				
 			END IF;
-
+		
 		-- VERIFICAR CONTRATO EN VIGOR
 			IF (SELECT COUNT(*)
 					FROM business b
@@ -77240,44 +78544,44 @@ proc: BEGIN
 				-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
 				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-				LEAVE proc;
-
+				LEAVE proc;	
+					
 			END IF;
 
 		-- VERIFICAR DESCANSO SEMANAL
 		SET @vHasBreakWeek:= FALSE;
-		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND));
-
+		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); 
+		
 		DROP TEMPORARY TABLE IF EXISTS tmp.trash;
 		CREATE TEMPORARY TABLE tmp.trash
 		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
 				@vLastTimed:= UNIX_TIMESTAMP(timed)
-			FROM workerTimeControl
+			FROM workerTimeControl 
 			WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
 				AND userFk= vUserFk
 				AND direction IN ('in','out')
-			ORDER BY timed ASC;
-
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
+			ORDER BY timed ASC;   
+			
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
 			SELECT "Descansos 36 h" AS problem;
 			-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
 				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
 			LEAVE proc;
 		END IF;
+		
+		DROP TEMPORARY TABLE tmp.trash;    
 
-		DROP TEMPORARY TABLE tmp.trash;
-
-	ELSE  -- DIA ACTUAL
-
+	ELSE  -- DIA ACTUAL   
+		
 		-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
-		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked
+		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked 
 			FROM workerTimeControl wtc
-			WHERE userFk = vUserFk
+			WHERE userFk = vUserFk 
 				AND timed >= vLastIn
 			ORDER BY timed;
 
-		IF  vTimedWorked > vDayWorkMax THEN
+		IF  vTimedWorked > vDayWorkMax THEN 
 			SELECT "Jornadas" AS problem;
 			-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
@@ -77300,10 +78604,10 @@ proc: BEGIN
 					-- ENVIAMOS CORREO AL BOSSFK
 					SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
 					CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-					LEAVE proc;
+					LEAVE proc;	
 			END IF;
 		END IF;*/
-
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -77323,7 +78627,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_checkBreak`(vStarted DATE)
 BEGIN
 /**
- * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
+ * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas 
  * El sistema verificará el descanso corto en la siguiente semana
  * o el largo en las 2 siguientes semanas a partir de la fecha dada
  * @param vStarted día inicio de la semana en el que se quiere verificar
@@ -77334,27 +78638,27 @@ BEGIN
 	DECLARE vShortWeekBreak INT;
 	DECLARE vLongWeekBreak INT;
 
-	SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)),
+	SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)), 
 			util.dayEnd(DATE_ADD(vStarted, INTERVAL longWeekDays DAY)),
-			shortWeekBreak,
+			shortWeekBreak, 
 			longWeekBreak
 			INTO vShortEnded, vLongEnded, vShortWeekBreak, vLongWeekBreak
 		FROM workerTimeControlConfig;
-
+	
 	SET @previousTimed:= UNIX_TIMESTAMP(vStarted);
 	SET @lastUserFk := NULL;
-
+	
 	-- Descanso corto en la semana
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 	CREATE TEMPORARY TABLE tmp.worker
 		(PRIMARY KEY(workerFk))
 		ENGINE = MEMORY
 		SELECT DISTINCT userFk workerFk
-			FROM workerTimeControl
+			FROM workerTimeControl 
 			WHERE timed BETWEEN vStarted AND vShortEnded
 				AND	direction IN ('in', 'out');
-
+	
 	DROP TEMPORARY TABLE IF EXISTS tmp.worker2;
 	CREATE TEMPORARY TABLE tmp.worker2
 		(PRIMARY KEY(workerFk))
@@ -77367,28 +78671,28 @@ BEGIN
 		SELECT sub2.userFk workerFk
 			FROM(SELECT sub.userFk,
 						IF(sub.userFk <> @lastUserFk,
-									@previousTimed:= sub.timed,
+									@previousTimed:= sub.timed, 
 									FALSE),
-						IF(sub.timed - @previousTimed >= vShortWeekBreak,
-							TRUE,
+						IF(sub.timed - @previousTimed >= vShortWeekBreak, 
+							TRUE, 
 							FALSE) hasShortWeekBreak,
 						@previousTimed:= sub.timed,
 						@lastUserFk:= sub.userFk
 					FROM (
 						SELECT userFk, UNIX_TIMESTAMP(timed) timed
-							FROM workerTimeControl
+							FROM workerTimeControl 
 							WHERE timed BETWEEN vStarted AND vShortEnded
 								AND	direction IN ('in', 'out')
-						UNION
+						UNION	
 						SELECT w.workerFk,
 								UNIX_TIMESTAMP(IFNULL(
-									MIN(wtc.timed),
+									MIN(wtc.timed), 
 									DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND)))
 							FROM tmp.worker w
-								LEFT JOIN workerTimeControl wtc
-									ON wtc.userFk = w.workerFk
-									AND wtc.timed BETWEEN vShortEnded
-										AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND)
+								LEFT JOIN workerTimeControl wtc 
+									ON wtc.userFk = w.workerFk 
+									AND wtc.timed BETWEEN vShortEnded 
+										AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND) 
 							GROUP BY w.workerFk
 						UNION
 						SELECT w.workerFk,
@@ -77396,10 +78700,10 @@ BEGIN
 									MAX(wtc.timed),
 									DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND)))
 							FROM tmp.worker2 w
-								LEFT JOIN workerTimeControl wtc
-									ON wtc.userFk = w.workerFk
-									AND wtc.timed BETWEEN
-										DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND)
+								LEFT JOIN workerTimeControl wtc 
+									ON wtc.userFk = w.workerFk 
+									AND wtc.timed BETWEEN 
+										DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND) 
 										AND vStarted
 							GROUP BY w.workerFk
 						ORDER BY userFk, timed
@@ -77409,7 +78713,7 @@ BEGIN
 			GROUP BY sub2.userFk
 			HAVING NOT SUM(hasShortWeekBreak);
 
-	-- Descanso largo en las 2 siguientes semanas
+	-- Descanso largo en las 2 siguientes semanas 
 	DROP TEMPORARY TABLE tmp.worker;
 	CREATE TEMPORARY TABLE tmp.worker
 			(PRIMARY KEY(workerFk))
@@ -77429,12 +78733,12 @@ BEGIN
 			(PRIMARY KEY(workerFk))
 			ENGINE = MEMORY
 		SELECT sub2.userFk workerFk
-			FROM(SELECT userFk,
+			FROM(SELECT userFk, 
 						IF(userFk <> @lastUserFk,
-							@previousTimed:= timed,
+							@previousTimed:= timed, 
 							TRUE),
-						IF(timed - @previousTimed >= vLongWeekBreak,
-							TRUE,
+						IF(timed - @previousTimed >= vLongWeekBreak, 
+							TRUE, 
 							FALSE) hasLongWeekBreak,
 						@previousTimed:= timed,
 						@lastUserFk:= userFk
@@ -77443,24 +78747,24 @@ BEGIN
 								JOIN tmp.workerWithoutShortWeekBreak wws ON wws.workerFk = wtc.userFk
 							WHERE timed BETWEEN vStarted AND vLongEnded
 								AND	direction IN ('in', 'out')
-						UNION
+						UNION	
 						SELECT w.workerFk,
-								UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed),
+								UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed), 
 									DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND)))
 							FROM tmp.worker w
-								LEFT JOIN workerTimeControl wtc
-									ON wtc.userFk = w.workerFk
-									AND timed BETWEEN vLongEnded
-										AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND)
+								LEFT JOIN workerTimeControl wtc 
+									ON wtc.userFk = w.workerFk 
+									AND timed BETWEEN vLongEnded 
+										AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND) 
 							GROUP BY w.workerFk
 						UNION
-						SELECT w.workerFk,
-								UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed),
+						SELECT w.workerFk, 
+								UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed), 
 									DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND)))
 							FROM tmp.worker2 w
-								LEFT JOIN workerTimeControl wtc
-									ON wtc.userFk = w.workerFk
-									AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND)
+								LEFT JOIN workerTimeControl wtc 
+									ON wtc.userFk = w.workerFk 
+									AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND) 
 										AND vStarted
 							GROUP BY w.workerFk
 						ORDER BY userFk, timed
@@ -77504,14 +78808,14 @@ BEGIN
  * Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
  * fichada a la tabla vn.workerTimeControl
  */
-
+	
 	DECLARE vLastIn DATETIME;
 	DECLARE vLastOut DATETIME;
 	DECLARE vNextIn DATETIME;
 	DECLARE vNextOut DATETIME;
 	DECLARE vNextDirection ENUM('in', 'out');
 	DECLARE vLastDirection ENUM('in', 'out');
-	DECLARE vDayMaxTime INTEGER;
+	DECLARE vDayMaxTime INTEGER; 
 	DECLARE vDayBreak INT;
 	DECLARE vShortWeekBreak INT;
 	DECLARE vLongWeekBreak INT;
@@ -77538,7 +78842,7 @@ BEGIN
 			WHERE w.id = vWorkerFk;
 
 		SELECT `description` INTO vErrorMessage
-			FROM workerTimeControlError
+			FROM workerTimeControlError 
 			WHERE `code` = vErrorCode;
 
 		IF vErrorMessage IS NULL THEN
@@ -77550,7 +78854,7 @@ BEGIN
 				' no ha podido fichar por el siguiente problema: ',
 				vErrorMessage)
 			INTO vErrorMessage;
-
+			
 		CALL mail_insert( vMailTo, vMailTo, 'Error al fichar', vErrorMessage);
 	END;
 
@@ -77583,19 +78887,19 @@ BEGIN
 			JOIN workerTimeControlConfig wc
 		WHERE b.workerFk = vWorkerFk
 			AND vDated BETWEEN b.started AND IFNULL(b.ended, vDated);
-
+		
 	-- CONTRATO EN VIGOR
 	IF vDayBreak IS NULL THEN
 		SET vErrorCode = 'INACTIVE_BUSINESS';
 		CALL util.throw(vErrorCode);
 	END IF;
-
+	
 	-- FICHADAS A FUTURO
 	IF vTimed > util.VN_NOW() +  INTERVAL 1 MINUTE THEN
 		SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
 		CALL util.throw(vErrorCode);
 	END IF;
-
+	
 	-- VERIFICAR SI ESTÁ PERMITIDO TRABAJAR
 	CALL timeBusiness_calculateByWorker(vWorkerFk, vDated, vDated);
 	SELECT isAllowedToWork INTO vIsAllowedToWork
@@ -77622,7 +78926,7 @@ BEGIN
 		) THEN
 		SET vIsError = TRUE;
 	END IF;
-
+	
 	DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
 	IF vIsError THEN
 		SET vErrorCode = 'WRONG_DIRECTION';
@@ -77637,7 +78941,7 @@ BEGIN
 			AND timed < vTimed
 		ORDER BY timed DESC
 		LIMIT 1;
-
+	
 	IF (SELECT IF(vDirection = 'in',
 				MOD(COUNT(*), 2) ,
 				IF (vDirection = 'out', NOT MOD(COUNT(*), 2), FALSE))
@@ -77648,7 +78952,7 @@ BEGIN
 		SET vErrorCode = 'ODD_WORKERTIMECONTROL';
 		CALL util.throw(vErrorCode);
 	END IF;
-
+	
 	-- DESCANSO DIARIO
 	SELECT timed INTO vLastOut
 		FROM workerTimeControl
@@ -77657,7 +78961,7 @@ BEGIN
 			AND timed < vTimed
 		ORDER BY timed DESC
 		LIMIT 1;
-
+	
 	SELECT timed INTO vNextIn
 		FROM workerTimeControl
 		WHERE userFk = vWorkerFk
@@ -77665,7 +78969,7 @@ BEGIN
 			AND timed > vTimed
 		ORDER BY timed ASC
 		LIMIT 1;
-
+	
 	CASE vDirection
 		WHEN 'in' THEN
 			IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) <= vDayBreak THEN
@@ -77687,7 +78991,7 @@ BEGIN
 
 	IF (vDirection IN('in', 'out')) THEN
 		-- VERIFICA MAXIMO TIEMPO DESDE ENTRADA HASTA LA SALIDA
-
+		
 		SELECT timed INTO vNextOut
 			FROM workerTimeControl
 			WHERE userFk = vWorkerFk
@@ -77695,7 +78999,7 @@ BEGIN
 				AND timed > vTimed
 			ORDER BY timed ASC
 			LIMIT 1;
-
+	
 		SELECT direction INTO vNextDirection
 			FROM workerTimeControl
 			WHERE userFk = vWorkerFk
@@ -77703,7 +79007,7 @@ BEGIN
 				AND timed > vTimed
 			ORDER BY timed ASC
 			LIMIT 1;
-
+		
 		SELECT direction INTO vLastDirection
 			FROM workerTimeControl
 			WHERE userFk = vWorkerFk
@@ -77711,34 +79015,34 @@ BEGIN
 				AND timed < vTimed
 			ORDER BY timed ASC
 			LIMIT 1;
-
-		IF (vDirection ='in'
-				AND vNextDirection = 'out'
+	
+		IF (vDirection ='in' 
+				AND vNextDirection = 'out' 
 				AND UNIX_TIMESTAMP(vNextOut) - UNIX_TIMESTAMP(vTimed) > vDayMaxTime) OR
-			(vDirection ='out'
+			(vDirection ='out' 
 				AND vLastDirection = 'in'
 				AND UNIX_TIMESTAMP(vTimed) -UNIX_TIMESTAMP(vLastIn) > vDayMaxTime) THEN
 			SET vErrorCode = 'DAY_MAX_TIME';
 			CALL util.throw(vErrorCode);
 		END IF;
-
+		
 		-- VERIFICA DESCANSO SEMANAL
-
+	
 		WITH wtc AS(
-		(SELECT timed
-			FROM vn.workerTimeControl
+		(SELECT timed 
+			FROM vn.workerTimeControl 
 			WHERE userFk = vWorkerFk
 				AND direction IN ('in', 'out')
-				AND timed BETWEEN vTimed - INTERVAL (vWeekScope * 2) SECOND
+				AND timed BETWEEN vTimed - INTERVAL (vWeekScope * 2) SECOND 
 					AND vTimed + INTERVAL (vWeekScope * 2) SECOND )
-		UNION
+		UNION 
 		(SELECT vTimed)
 		), wtcGap AS(
 			SELECT timed,
-				TIMESTAMPDIFF(SECOND, LAG(timed) OVER (ORDER BY timed), timed) gap
+				TIMESTAMPDIFF(SECOND, LAG(timed) OVER (ORDER BY timed), timed) gap 
 			FROM wtc
 			ORDER BY timed
-		), wtcBreak AS(
+		), wtcBreak AS( 
 			SELECT timed,
 					IF(IFNULL(gap, 0) > vShortWeekBreak, TRUE, FALSE) hasShortBreak,
 					IF(IFNULL(gap, 0) > vLongWeekBreak, TRUE, FALSE) hasLongBreak
@@ -77749,21 +79053,21 @@ BEGIN
 					SUM(hasShortBreak) OVER (ORDER BY timed) breakCounter ,
 					LEAD(hasLongBreak) OVER (ORDER BY timed) nextHasLongBreak
 				FROM wtcBreak
-		)SELECT TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed)) > vMaxWorkLongCycle OR
-				(TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed))> vMaxWorkShortCycle
+		)SELECT TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed)) > vMaxWorkLongCycle OR 
+				(TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed))> vMaxWorkShortCycle 
 					AND NOT SUM(IFNULL(nextHasLongBreak, 1)))
 				hasError INTO vIsError
 			FROM wtcBreakCounter
 			GROUP BY breakCounter
 			HAVING hasError
 			LIMIT 1;
-
+	
 		IF vIsError THEN
 			SET vErrorCode = 'BREAK_WEEK';
 			CALL util.throw(vErrorCode);
 		END IF;
 	END IF;
-
+	
 	-- SE PERMITE FICHAR
 	INSERT INTO workerTimeControl(userFk, timed, direction, `manual`)
 		VALUES(vWorkerFk, vTimed, vDirection, vIsManual);
@@ -77792,27 +79096,27 @@ BEGIN
  * Devuelve que direcciones de fichadas son lógicas a partir de la anterior fichada
  * @param vWorkerFk Identificador del trabajador
  * @return (option1, option2)
- * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out')
+ * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out') 		
  */
 	DECLARE vLastIn DATETIME ;
 	DECLARE vIsMiddleOdd BOOLEAN ;
 
-	IF (vTimed IS NULL) THEN
+	IF (vTimed IS NULL) THEN 
 		SET vTimed = util.VN_NOW();
 	END IF;
-
+	
 	SELECT timed INTO vLastIn
-		FROM workerTimeControl
+		FROM workerTimeControl 
 		WHERE userFk = vWorkerFk
-			AND direction = 'in'
+			AND direction = 'in' 
 			AND timed < vTimed
 		ORDER BY timed DESC
 		LIMIT 1;
-
+	
 	SELECT (COUNT(*)mod 2 = 1) INTO vIsMiddleOdd
-		FROM workerTimeControl
+		FROM workerTimeControl 
 		WHERE userFk = vWorkerFk
-			AND direction = 'middle'
+			AND direction = 'middle' 
 			AND timed BETWEEN vLastIn AND util.VN_NOW();
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
@@ -77861,7 +79165,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_getClockIn`(
-	vUserFk INT,
+	vUserFk INT, 
 	vDated DATE)
 BEGIN
 /**
@@ -77871,9 +79175,9 @@ BEGIN
  * @param vDated Fecha proporcionada
  */
 	CALL timeControl_calculateByWorker(
-		vUserFk,
+		vUserFk, 
 		DATE_SUB(vDated, INTERVAL 6 DAY), util.dayEnd(vDated));
-
+		
 	SET @position := 0;
 	SET @lastDated := NULL;
 
@@ -77890,7 +79194,7 @@ BEGIN
 					MAX(2daysAgoDirection) 2daysAgoDirection,
 					MAX(1daysAgo) 1daysAgo,
 					MAX(1daysAgoDirection) 1daysAgoDirection,
-					MAX(0daysAgo) 0daysAgo,
+					MAX(0daysAgo) 0daysAgo, 
 					MAX(0daysAgoDirection) 0daysAgoDirection
 				FROM(SELECT IF(daysAgo = 6, timed, '') 6daysAgo,
 							IF(daysAgo = 5, timed, '') 5daysAgo,
@@ -77910,7 +79214,7 @@ BEGIN
 							direction,
 							position
 						FROM(SELECT DATEDIFF(vDated, timed) daysAgo,
-									TIME_FORMAT(timed,'%H:%i') timed,
+									TIME_FORMAT(timed,'%H:%i') timed, 
 									IF(DATE(timed) <> @lastDated, @position := 0, NULL),
 									@position := @position+1 position,
 									@lastDated := DATE(timed),
@@ -77922,18 +79226,18 @@ BEGIN
 								LIMIT 10000000000000000000
 							)sub
 					)sub2
-				GROUP BY position) sub3
+				GROUP BY position) sub3 
 					JOIN (SELECT MAX(IF(daysAgo = 6, timeWorkSeconds, 0)) 6daysAgoTotal,
 								MAX(IF(daysAgo = 5, timeWorkSeconds, 0)) 5daysAgoTotal,
 								MAX(IF(daysAgo = 4, timeWorkSeconds, 0)) 4daysAgoTotal,
 								MAX(IF(daysAgo = 3, timeWorkSeconds, 0)) 3daysAgoTotal,
 								MAX(IF(daysAgo = 2, timeWorkSeconds, 0)) 2daysAgoTotal,
 								MAX(IF(daysAgo = 1, timeWorkSeconds, 0)) 1daysAgoTotal,
-								MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal
+								MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal 
 							FROM (SELECT DATEDIFF(vDated, dated) daysAgo,
 										timeWorkSeconds
 									FROM tmp.timeControlCalculate) sub4)sub5 ON TRUE;
-
+	
 		DROP TEMPORARY TABLE tmp.timeControlCalculate;
 END ;;
 DELIMITER ;
@@ -77997,45 +79301,45 @@ BEGIN
 	DECLARE vDirectionPrevious VARCHAR(6);
     DECLARE vTimedPrevious DATETIME;
 
-	SELECT direction INTO vDirectionRemove
-		FROM vn.workerTimeControl
-		WHERE userFk = vUserFk
+	SELECT direction INTO vDirectionRemove 
+		FROM vn.workerTimeControl 
+		WHERE userFk = vUserFk 
 			AND timed = vTimed ;
 
 	IF vDirectionRemove = 'out' THEN
-
+	
 		 SELECT timed, direction INTO vTimedPrevious, vDirectionPrevious
-			FROM vn.workerTimeControl
-			WHERE userFk =  vUserFk
+			FROM vn.workerTimeControl 
+			WHERE userFk =  vUserFk 
 				AND timed < vTimed
 			ORDER BY timed DESC
-			LIMIT 1;
-
+			LIMIT 1;       
+                
          IF  vDirectionPrevious = "middle" THEN
-			UPDATE vn.workerTimeControl
+			UPDATE vn.workerTimeControl 
 				SET direction = "out"
                 WHERE userFk = vUserFk
 					AND timed = vTimedPrevious;
          END IF;
-
+   
 	ELSE IF vDirectionRemove = 'in' THEN
 
-			UPDATE vn.workerTimeControl
+			UPDATE vn.workerTimeControl 
 				SET direction = "in"
 				WHERE userFk = vUserFk
 					AND timed > vTimed
 				ORDER BY timed ASC
-				LIMIT 1;
+				LIMIT 1; 
           END IF;
-
+			
 	END IF;
-
+	
 	DELETE FROM vn.workerTimeControl
-		WHERE userFk =  vUserFk
+		WHERE userFk =  vUserFk 
 			AND timed = vTimed;
-
+            
     CALL vn.workerTimeControlSOWP(vUserFk, vTimed);
-
+ 
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -78063,31 +79367,31 @@ proc: BEGIN
 UPDATE vn.workerTimeControl SET direction = 'middle';
 
 /*2- poner los out*/
-UPDATE vn.workerTimeControl wtc
-	JOIN
+UPDATE vn.workerTimeControl wtc 
+	JOIN 
 		(SELECT userFk,MAX(timed) maxTimed FROM
 				(SELECT id, userFk, timed, date(timed) dated
-					FROM vn.workerTimeControl
-				) sub
+					FROM vn.workerTimeControl 
+				) sub 
 		GROUP BY userFk,dated
 		)sub
 	SET direction = "out"
-	WHERE   wtc.userFk = sub.userFk
+	WHERE   wtc.userFk = sub.userFk 
 		AND wtc.timed =  sub.maxTimed;
-
- /*3- poner los in*/
-UPDATE vn.workerTimeControl wtc
-	JOIN
+        
+ /*3- poner los in*/       
+UPDATE vn.workerTimeControl wtc 
+	JOIN 
 		(SELECT userFk,MIN(timed) maxTimed FROM
 				(SELECT id, userFk, timed, date(timed) dated
-					FROM vn.workerTimeControl
-				) sub
+					FROM vn.workerTimeControl 
+				) sub 
 		GROUP BY userFk,dated
 		)sub
 	SET direction = "in"
-	WHERE   wtc.userFk = sub.userFk
-		AND wtc.timed =  sub.maxTimed ;
-
+	WHERE   wtc.userFk = sub.userFk 
+		AND wtc.timed =  sub.maxTimed ;   
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -78160,7 +79464,7 @@ BEGIN
 					AND w.businessFk
 				GROUP BY tm.userFk,t.dated
 				ORDER BY tm.userFk,t.dated;
-
+	
 	INSERT INTO vn.mail (receiver, replyTo, subject, body)
 		SELECT eu.email, 'laboral@verdnatura.es', CONCAT('Registro de horas semana ', WEEK(vDatedFrom), ' año ', YEAR(vDatedFrom)) ,
 				CONCAT('
@@ -78252,7 +79556,7 @@ BEGIN
 
 	IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN
 		SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
-
+	
 		CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL);
 	END IF;
 END ;;
@@ -78302,9 +79606,9 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_weekCheckBreak`(vStarted DATE, vEnded DATE)
 BEGIN
 /**
- * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
- * El sistema verificará el descanso corto en la siguiente semana
- * o el largo en las 2 siguientes semanas a partir de las fechas dadas
+ * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas 
+ * El sistema verificará el descanso corto en la siguiente semana 
+ * o el largo en las 2 siguientes semanas a partir de las fechas dadas 
  * @param vStarted día inicio para verificar
  * @param vEnded día final para verificar
  * @return tmp.workerWithoutWeekBreak (workerFk)
@@ -78326,10 +79630,10 @@ BEGIN
 
 		CALL workerTimeControl_checkBreak(vStarted);
 		 INSERT IGNORE INTO tmp.workerWithoutWeekBreakInWeek
-			SELECT workerFk
+			SELECT workerFk 
 				FROM tmp.workerWithoutWeekBreak;
 		DROP TEMPORARY TABLE IF EXISTS tmp.workerWithoutWeekBreak;
-		SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY);
+		SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY); 
 
 	END WHILE;
 END ;;
@@ -78367,7 +79671,7 @@ BEGIN
     DECLARE vDepartmentFk INT;
     DECLARE isEnabled BOOLEAN DEFAULT TRUE;
 
-    SELECT COUNT(*) INTO vHasSignedToday
+    SELECT COUNT(*) INTO vHasSignedToday 
         FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
 
     SET @day := 0;
@@ -78380,16 +79684,16 @@ BEGIN
         SELECT fichada_anterior, fichada_actual, interval_in_minutes, jornadas
             FROM
                 (
-                SELECT  @lastTimed fichada_anterior,
+                SELECT  @lastTimed fichada_anterior, 
                         timed,
                         CAST(time_to_sec(timediff(timed,@lastTimed )) / 60 AS UNSIGNED) as interval_in_minutes,
                         IF(day(timed) != @day, 1, 0) as  jornadas,
                         @day := day(timed) dia_del_mes,
-                        @lastTimed := timed fichada_actual
+                        @lastTimed := timed fichada_actual                    
                     FROM
                     (
                         SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed
-                        FROM
+                        FROM 
                             (SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
                                 UNION ALL
                             SELECT timed, userFk
@@ -78397,18 +79701,18 @@ BEGIN
                                 WHERE userFk = vUserFk
                                     AND timed >= TIMESTAMPADD(DAY, -10,vDated)
                                 UNION ALL
-                            SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
+                            SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk         
                             ) sub4
                         ORDER BY timed
                     ) sub
-
+                
                 ) sub2
             WHERE fichada_actual >= TIMESTAMPADD(WEEK, -1, vDated)
         ) sub3		;
 
     SELECT IFNULL(SUM(impar),0) into vImpares
     FROM (
-        SELECT 	day(timed) as dayNumber,
+        SELECT 	day(timed) as dayNumber, 
                 count(*) mod 2 as impar
             FROM vn.workerTimeControl wtc
             WHERE userFk = vUserFk
@@ -78425,29 +79729,29 @@ BEGIN
 			AND at2.isAllowedToWork = FALSE
 			AND b.workerFk = vUserFk
 		LIMIT 1;
-
+        
     -- Contrato en vigor
     SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork
         FROM business b
         WHERE b.workerFk = vUserFk
             AND b.started <= vDated
             AND IFNULL(b.ended, vDated) >= vDated;
-
+            
     -- Departamento si vTabletFk es 0 no hacemos comprobacion (Madrid y Vilassar)
     IF vTabletFk <> '0'  THEN
     -- 1 Obtener el departamento del usuario
             SELECT wtcu.departmentFk INTO vDepartmentFk
                 FROM workerTimeControlUserInfo wtcu
                 WHERE wtcu.userFk = vUserFk;
-    -- 2 Comprobar si la tablet pertenece al departamento
+    -- 2 Comprobar si la tablet pertenece al departamento		
             SELECT COUNT(td.tabletFk) INTO isEnabled
                 FROM tabletDepartment td
                 WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk;
-
+        
     END IF;
-
+        
     IF vJornadas IS NOT NULL THEN
-
+        
             SELECT 'Jornadas' as Item, vJornadas as Cantidad, 'Correcto' AS Análisis
             UNION ALL
             SELECT 'Descansos 12 h' as Item, vDescansos12h as Cantidad, IF(vDescansos12h >= vJornadas, 'Correcto','Error: 1 por jornada') as Análisis
@@ -78456,9 +79760,9 @@ BEGIN
             UNION ALL
             SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, IF(vImpares = 0, 'Correcto','Error') as Análisis
             UNION ALL
-            SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
-                    '' as Cantidad,
-                    IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
+            SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, 
+                    '' as Cantidad, 
+                    IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis    
             UNION ALL
             SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
 
@@ -78472,7 +79776,7 @@ BEGIN
             UNION ALL
             SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, 'Correcto'  as Análisis
             UNION ALL
-            SELECT 	IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
+            SELECT 	IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, 
                     '' as Cantidad, IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
             UNION ALL
             SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
@@ -78502,11 +79806,11 @@ BEGIN
  * @param vDepartmentFk id del departamento
  *
  */
-
-	SELECT w.id,w.firstName, w.lastName,d.name
-		FROM worker w
-			JOIN workerDepartment wd ON wd.workerFk = w.id
-			JOIN department d ON d.id = wd.departmentFk
+	
+	SELECT w.id,w.firstName, w.lastName,d.name 
+		FROM worker w 
+			JOIN workerDepartment wd ON wd.workerFk = w.id 
+			JOIN department d ON d.id = wd.departmentFk 
 		WHERE d.id = vDepartmentFk
 		ORDER BY firstName;
 
@@ -78526,46 +79830,30 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getHierarchy`(vBoss INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getHierarchy`(vUserFk INT)
 BEGIN
-    DECLARE EXIT HANDLER FOR 1062 BEGIN
-		CALL util.throw('INFINITE_LOOP');
-    END;
-
-	DROP TEMPORARY TABLE IF EXISTS workerHierarchy;
-	CREATE TEMPORARY TABLE workerHierarchy
+/**
+ * Retorna una tabla temporal con los trabajadores que tiene
+ * el usuario por debajo en la jerarquía de la empresa.
+ *
+ * @param vUserFk Id de usuario.
+ * @return tmp.workerHierarchyList
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.workerHierarchyList
 		(PRIMARY KEY (workerFk))
 		ENGINE = MEMORY
-		SELECT vBoss AS workerFk;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.workerHierarchyList;
-	CREATE TEMPORARY TABLE tmp.workerHierarchyList
-		(PRIMARY KEY (workerFk))
-		ENGINE = MEMORY
-		SELECT vBoss AS workerFk, 0 AS isChecked;
-
-
-    WHILE (SELECT COUNT(*) FROM tmp.workerHierarchyList WHERE NOT isChecked) > 0 DO
-
-	INSERT INTO tmp.workerHierarchyList
-		SELECT w.id, 0
-			FROM worker w
-				JOIN workerHierarchy wh ON wh.workerFk = w.bossFk;
-
-	UPDATE tmp.workerHierarchyList whl
-			JOIN workerHierarchy wh ON  wh.workerFk = whl.workerFk
-		SET whl.isChecked = 1;
-
-	TRUNCATE workerHierarchy;
-
-	INSERT INTO workerHierarchy
-		SELECT workerFk
-			FROM tmp.workerHierarchyList
-			WHERE NOT isChecked;
-
-    END WHILE;
-
-    DROP TEMPORARY TABLE IF EXISTS workerHierarchy;
+		WITH RECURSIVE workerHierarchy AS (
+			SELECT id workerFk, bossFk, 0 depth
+				FROM vn.worker
+				WHERE id = vUserFk
+			UNION ALL
+			SELECT w.id, w.bossFk, wh.depth + 1
+				FROM vn.worker w
+					JOIN workerHierarchy wh ON w.bossFk = wh.workerFk
+		)
+		SELECT * 
+			FROM workerHierarchy
+			ORDER BY depth, workerFk;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -78591,7 +79879,7 @@ BEGIN
 
 	SELECT s.id,s.description,s.warehouseFk
 	FROM sector s
-		JOIN operator o ON o.sectorFk  = s.id
+		JOIN operator o ON o.sectorFk  = s.id 
 	WHERE o.workerFk = account.myUser_getId();
 
 END ;;
@@ -78689,8 +79977,8 @@ BEGIN
 	DECLARE vDone BOOL;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT DISTINCT b.workerFk
-			FROM business b
+		SELECT DISTINCT b.workerFk 
+			FROM business b 
 				WHERE b.started > vBusinessUpdated AND b.started <= vCurdate
 					OR b.ended >= vBusinessUpdated AND b.ended < vCurdate;
 
@@ -78733,10 +80021,10 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHours`(username varchar(255), logon boolean)
 BEGIN
 	DECLARE userid int(11);
-
+        
   	SELECT vn.getUserId(username) INTO userid;
     SELECT username, userid;
-		IF userid IS NOT NULL THEN
+		IF userid IS NOT NULL THEN     
 			IF (logon) THEN
 				CALL vn.workingHoursTimeIn(userid);
 			ELSE
@@ -78805,17 +80093,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `wrongEqualizatedClient`()
 BEGIN
 	SELECT clientFk, c.name, c.isActive, c.isTaxDataChecked, count(ie) as num
 	FROM vn.client c
-		JOIN
+		JOIN 
 		(
-		SELECT DISTINCT
+		SELECT DISTINCT 
 				`a`.`clientFk` ,
 				 a.isEqualizated = 0 as ie
-
+				
 			FROM
 				`vn`.`address` `a`
 		) sub ON sub.clientFk = c.id
 		WHERE c.hasToInvoiceByAddress = FALSE
-
+        
 		GROUP BY clientFk
 		HAVING num > 1
 	UNION ALL
@@ -78899,27 +80187,27 @@ proc: BEGIN
 
 	SELECT scope INTO vScope
 		FROM zoneConfig;
-
+        
 	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
     CREATE TEMPORARY TABLE tmp.zone
 		(INDEX (id))
 		ENGINE = MEMORY
         SELECT id FROM zone;
-
+              
 	TRUNCATE TABLE zoneClosure;
-
+    
     WHILE vCounter <= vScope DO
-
+    
 		CALL zone_getOptionsForShipment(vShipped, TRUE);
-
+        
 		REPLACE zoneClosure(zoneFk, dated, `hour`)
-			SELECT zoneFk, vShipped, `hour`
+			SELECT zoneFk, vShipped, `hour` 
 				FROM tmp.zoneOption;
-
+		
         SET vCounter = vCounter + 1;
         SET vShipped = TIMESTAMPADD(DAY, 1, vShipped);
     END WHILE;
-
+    
     -- DROP TEMPORARY TABLE tmp.zone;
 	DO RELEASE_LOCK('vn.zoneClosure_recalc');
 END ;;
@@ -79013,7 +80301,7 @@ BEGIN
 				OR (vSelf IS NOT NULL AND parentFk = vSelf);
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+    
     SET vSons = 0;
 
 	OPEN vChildren;
@@ -79024,11 +80312,11 @@ BEGIN
 		IF vDone THEN
 			LEAVE myLoop;
 		END IF;
-
+        
         SET vIndex = vIndex + 1;
         SET vLft = vIndex;
         SET vSons = vSons + 1;
-
+    
 		CALL zoneGeo_calcTreeRec(
 			vChildFk,
             CONCAT(vPath, vChildFk, '/'),
@@ -79131,7 +80419,7 @@ proc: BEGIN
 
 	SELECT isChanged INTO vIsChanged
 		FROM zoneGeoRecalc;
-
+        
 	IF vIsChanged THEN
 		UPDATE zoneGeoRecalc SET isChanged = FALSE;
         CALL vn.zoneGeo_calcTree;
@@ -79387,7 +80675,7 @@ proc:BEGIN
  * @table tmp.closedZones(zoneFk, warehouseFk);
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.closedZones;
-
+	
 	CREATE TEMPORARY TABLE tmp.closedZones (
 		`zoneFk` int(11) NOT NULL,
 		`warehouseFk` smallint(6) unsigned NOT NULL,
@@ -79429,7 +80717,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getCollisions`()
 BEGIN
 /**
- * Calcula si para un mismo codigo postal y dia
+ * Calcula si para un mismo codigo postal y dia 
  * hay mas de una zona configurada y manda correo
  *
  */
@@ -79438,16 +80726,16 @@ BEGIN
 	DECLARE vIsDone INT DEFAULT FALSE;
 	DECLARE vTableCollisions TEXT;
 	DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption;
-
+		
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
 	CREATE TEMPORARY TABLE tmp.zone
-		SELECT z.id
+		SELECT z.id 
 			FROM zone z
 				JOIN agencyMode am ON am.id = z.agencyModeFk
 				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-			WHERE dm.code IN ('AGENCY','DELIVERY');
+			WHERE dm.code IN ('AGENCY','DELIVERY'); 
 
 	CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
 
@@ -79462,7 +80750,7 @@ BEGIN
 			PRIMARY KEY zoneFkk (zoneFk, geoFk),
 			INDEX(geoFk))
 			ENGINE = MyISAM;
-
+		
 	OPEN cur1;
 	cur1Loop: LOOP
 		SET vIsDone = FALSE;
@@ -79470,40 +80758,40 @@ BEGIN
 		IF vIsDone THEN
 			LEAVE cur1Loop;
 	    END IF;
-
+	   
 		CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);
 
-		myLoop: LOOP
+		myLoop: LOOP	
 			SET vGeoFk = NULL;
-			SELECT geoFk INTO vGeoFk
+			SELECT geoFk INTO vGeoFk 
 				FROM tmp.zoneNodes zn
 				WHERE NOT isChecked
 				LIMIT 1;
-
+			
 			IF vGeoFk IS NULL THEN
 				LEAVE myLoop;
 			END IF;
-
+		
 			CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
 			UPDATE tmp.zoneNodes
-				SET isChecked = TRUE
+				SET isChecked = TRUE 
 				WHERE geoFk = vGeoFk;
 		END LOOP;
 
 	END LOOP;
 	CLOSE cur1;
-	DELETE FROM tmp.zoneNodes
+	DELETE FROM tmp.zoneNodes 
 		WHERE sons > 0;
-
+	
 	DROP TEMPORARY TABLE IF EXISTS geoCollision;
 	CREATE TEMPORARY TABLE geoCollision
 		SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk
 			FROM tmp.zoneNodes zn
 				JOIN zone z ON z.id = zn.zoneFk
-				JOIN zoneWarehouse zw ON z.id = zw.zoneFk
+				JOIN zoneWarehouse zw ON z.id = zw.zoneFk 
 	        GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
 	        HAVING count(*) > 1;
-
+	
 	SELECT '<table  cellspacing="10">
 				<tr>
 					<th>C.Postal</th>
@@ -79513,39 +80801,39 @@ BEGIN
 					<th>Almacén</th>
 					<th>Salix</th>
                  </tr>' INTO vTableCollisions;
-
-    INSERT INTO mail (receiver,replyTo,subject,body)
+                
+    INSERT INTO mail (receiver,replyTo,subject,body)                
 		SELECT 'pepe@verdnatura.es' receiver,
 	           'noreply@verdnatura.es' replyTo,
 	            CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
 	            CONCAT(vTableCollisions,
 	            	GROUP_CONCAT(sub.td SEPARATOR ''),
 	            	'</table>') body
-			FROM(SELECT
+			FROM(SELECT 
 					CONCAT('<tr>
 						<td>', zn.name, '</td>
 						<td>', zoneFk,'</td>
 						<td>', z.price,'</td>
 						<td>', z.name,'</td>
 						<td>', w.name, '</td>
-						<td>', CONCAT('<a href="https://salix.verdnatura.es/#!/zone/',
+						<td>', CONCAT('<a href="https://salix.verdnatura.es/#!/zone/', 
 								zoneFk,
 								'/location?q=%7B%22search%22:%22',
-								zn.name,
+								zn.name, 
 								'%22%7D">'
-								'https://salix.verdnatura.es/#!/zone/',
+								'https://salix.verdnatura.es/#!/zone/', 
 								zoneFk,
 								'/location?q=%7B%22search%22:%22',
-								zn.name,
+								zn.name, 
 								'%22%7D</a>'),'</td>
 						</tr>') td
 				FROM tmp.zoneNodes zn
 					JOIN zone z ON z.id = zn.zoneFk
 					JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
 					JOIN warehouse w ON w.id = gc.warehouseFk) sub;
-
-	DROP TEMPORARY TABLE
-		geoCollision,
+			
+	DROP TEMPORARY TABLE 
+		geoCollision, 
 		tmp.zone,
 		tmp.zoneNodes;
 END ;;
@@ -79652,18 +80940,18 @@ BEGIN
  	DECLARE vChildFk INT DEFAULT vGeoFk;
  	DECLARE vParentFk INT;
     DECLARE vLevel INT DEFAULT 1;
-
+	
     DROP TEMPORARY TABLE IF EXISTS tNodes;
 	CREATE TEMPORARY TABLE tNodes
 		(PRIMARY KEY (id))
         ENGINE = MEMORY
 		SELECT vGeoFk id, vLevel `level`;
-
+ 
 	myLoop: LOOP
 		SELECT parentFk INTO vParentFk
 			FROM zoneGeo
 			WHERE id = vChildFk;
-
+		
         SET vChildFk = vParentFk;
         SET vLevel = vLevel + 1;
 
@@ -79671,7 +80959,7 @@ BEGIN
 			SELECT vChildFk, vLevel
 				FROM DUAL
 				WHERE vChildFk IS NOT NULL;
-
+        
         IF ROW_COUNT() = 0 THEN
 			LEAVE myLoop;
 		END IF;
@@ -79770,126 +81058,126 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getLeaves`(
-	vSelf INT,
-	vParentFk INT,
-	vSearch VARCHAR(255),
-	vHasInsert BOOL
+CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getLeaves`(
+	vSelf INT,
+	vParentFk INT,
+	vSearch VARCHAR(255),
+	vHasInsert BOOL
 )
-BEGIN
-/**
- * Devuelve las ubicaciones incluidas en la ruta y que sean hijos de parentFk.
- * @param vSelf Id de la zona
- * @param vParentFk Id del geo a calcular
- * @param vSearch Cadena a buscar
- * @param vHasInsert Indica si inserta en tmp.zoneNodes
- * Optional @table tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
- */
-	DECLARE vIsNumber BOOL;
-	DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch <> '';
-
-	CREATE OR REPLACE TEMPORARY TABLE tNodes
-		(UNIQUE (id))
-		ENGINE = MEMORY
-		SELECT id
-			FROM zoneGeo
-			LIMIT 0;
-
-	IF vIsSearch THEN
-		SET vIsNumber = vSearch REGEXP '^[0-9]+$';
-
-		INSERT INTO tNodes
-			SELECT id
-				FROM zoneGeo
-				WHERE (vIsNumber AND `name` = vSearch)
-					OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%'))
-				LIMIT 1000;
-
-	ELSEIF vParentFk IS NULL THEN
-		INSERT INTO tNodes
-			SELECT geoFk
-				FROM zoneIncluded
-				WHERE zoneFk = vSelf;
-	END IF;
-
-	IF vParentFk IS NULL THEN
-		CREATE OR REPLACE TEMPORARY TABLE tChilds
-			(INDEX(id))
-			ENGINE = MEMORY
-			SELECT id FROM tNodes;
-
-		CREATE OR REPLACE TEMPORARY TABLE tParents
-			(INDEX(id))
-			ENGINE = MEMORY
-			SELECT id FROM zoneGeo LIMIT 0;
-
-		myLoop: LOOP
-			DELETE FROM tParents;
-			INSERT INTO tParents
-				SELECT parentFk id
-					FROM zoneGeo g
-						JOIN tChilds c ON c.id = g.id
-					WHERE  g.parentFk IS NOT NULL;
-
-			INSERT IGNORE INTO tNodes
-				SELECT id FROM tParents;
-
-			IF NOT ROW_COUNT() THEN
-				LEAVE myLoop;
-			END IF;
-
-			DELETE FROM tChilds;
-			INSERT INTO tChilds
-				SELECT id FROM tParents;
-		END LOOP;
-
-		DROP TEMPORARY TABLE tChilds, tParents;
-	END IF;
-
-	IF NOT vIsSearch THEN
-		INSERT IGNORE INTO tNodes
-			SELECT id
-				FROM zoneGeo
-				WHERE parentFk <=> vParentFk;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tZones
-		SELECT g.id,
-				g.name,
-				g.parentFk,
-				g.sons,
-				NOT g.sons OR `type` = 'country' isChecked,
-				i.isIncluded selected,
-				g.`depth`,
-				vSelf
-			FROM zoneGeo g
-				JOIN tNodes n ON n.id = g.id
-				LEFT JOIN zoneIncluded i ON i.geoFk = g.id
-					AND i.zoneFk = vSelf
-			ORDER BY g.`depth`, selected DESC, g.name;
-
-	IF vHasInsert THEN
-		INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
-			SELECT id,
-					name,
-					parentFk,
-					sons,
-					isChecked,
-					vSelf
-				FROM tZones
-				WHERE selected
-					OR (selected IS NULL AND vParentFk IS NOT NULL);
-	ELSE
-		SELECT id,
-				name,
-				parentFk,
-				sons,
-				selected
-			FROM tZones
-			ORDER BY `depth`, selected DESC, name;
-	END IF;
-
-	DROP TEMPORARY TABLE tNodes, tZones;
+BEGIN 
+/**
+ * Devuelve las ubicaciones incluidas en la ruta y que sean hijos de parentFk.
+ * @param vSelf Id de la zona
+ * @param vParentFk Id del geo a calcular
+ * @param vSearch Cadena a buscar
+ * @param vHasInsert Indica si inserta en tmp.zoneNodes
+ * Optional @table tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
+ */
+	DECLARE vIsNumber BOOL;
+	DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch <> '';
+
+	CREATE OR REPLACE TEMPORARY TABLE tNodes
+		(UNIQUE (id))
+		ENGINE = MEMORY
+		SELECT id 
+			FROM zoneGeo 
+			LIMIT 0;
+
+	IF vIsSearch THEN
+		SET vIsNumber = vSearch REGEXP '^[0-9]+$';
+	
+		INSERT INTO tNodes
+			SELECT id 
+				FROM zoneGeo
+				WHERE (vIsNumber AND `name` = vSearch)
+					OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%'))
+				LIMIT 1000;
+			
+	ELSEIF vParentFk IS NULL THEN
+		INSERT INTO tNodes
+			SELECT geoFk 
+				FROM zoneIncluded
+				WHERE zoneFk = vSelf;
+	END IF;
+
+	IF vParentFk IS NULL THEN
+		CREATE OR REPLACE TEMPORARY TABLE tChilds
+			(INDEX(id))
+			ENGINE = MEMORY
+			SELECT id FROM tNodes;
+
+		CREATE OR REPLACE TEMPORARY TABLE tParents
+			(INDEX(id))
+			ENGINE = MEMORY
+			SELECT id FROM zoneGeo LIMIT 0;
+
+		myLoop: LOOP
+			DELETE FROM tParents;
+			INSERT INTO tParents
+				SELECT parentFk id
+					FROM zoneGeo g
+						JOIN tChilds c ON c.id = g.id
+					WHERE  g.parentFk IS NOT NULL;
+			
+			INSERT IGNORE INTO tNodes
+				SELECT id FROM tParents;
+			
+			IF NOT ROW_COUNT() THEN
+				LEAVE myLoop;
+			END IF;
+			
+			DELETE FROM tChilds;
+			INSERT INTO tChilds
+				SELECT id FROM tParents;
+		END LOOP;
+		
+		DROP TEMPORARY TABLE tChilds, tParents;
+	END IF;
+
+	IF NOT vIsSearch THEN
+		INSERT IGNORE INTO tNodes
+			SELECT id 
+				FROM zoneGeo
+				WHERE parentFk <=> vParentFk;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tZones
+		SELECT g.id,
+				g.name,
+				g.parentFk,
+				g.sons,
+				NOT g.sons OR `type` = 'country' isChecked,
+				i.isIncluded selected,
+				g.`depth`,
+				vSelf
+			FROM zoneGeo g
+				JOIN tNodes n ON n.id = g.id
+				LEFT JOIN zoneIncluded i ON i.geoFk = g.id
+					AND i.zoneFk = vSelf
+			ORDER BY g.`depth`, selected DESC, g.name;
+
+	IF vHasInsert THEN
+		INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
+			SELECT id,
+					name,
+					parentFk,
+					sons,
+					isChecked,
+					vSelf
+				FROM tZones
+				WHERE selected
+					OR (selected IS NULL AND vParentFk IS NOT NULL);
+	ELSE
+		SELECT id,
+				name,
+				parentFk,
+				sons,
+				selected
+			FROM tZones
+			ORDER BY `depth`, selected DESC, name;
+	END IF;
+
+	DROP TEMPORARY TABLE tNodes, tZones;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -79914,7 +81202,7 @@ BEGIN
  * @table tmp.zone(id) The zones ids
  * @param vLanded The delivery date
  * @return tmp.zoneOption The computed options
- */
+ */	
 	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
 	CREATE TEMPORARY TABLE tmp.zoneOption
 		ENGINE = MEMORY
@@ -79955,13 +81243,13 @@ BEGIN
 						END
 					LIMIT 10000000000000000000
 			) t
-			GROUP BY zoneFk;
-
+			GROUP BY zoneFk;	
+	
 	DELETE t FROM tmp.zoneOption t
 		JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
 		LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
 	WHERE eg.zoneExclusionFk IS NULL;
-
+			
 	IF NOT vShowExpiredZones THEN
 		DELETE FROM tmp.zoneOption
 			WHERE shipped < util.VN_CURDATE()
@@ -79993,7 +81281,7 @@ BEGIN
  * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
  */
 	DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
-
+		
 	DROP TEMPORARY TABLE IF EXISTS tLandings;
 	CREATE TEMPORARY TABLE tLandings
 		(INDEX (eventFk))
@@ -80072,48 +81360,48 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getPostalCode`(vSelf INT)
-BEGIN
-/**
- * Devuelve los códigos postales incluidos en una zona
- */
-	DECLARE vGeoFk INT DEFAULT NULL;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.zoneNodes (
-		geoFk INT,
-		name VARCHAR(100),
-		parentFk INT,
-		sons INT,
-		isChecked BOOL DEFAULT 0,
-		zoneFk INT,
-		PRIMARY KEY zoneNodesPk (zoneFk, geoFk),
-		INDEX(geoFk))
-		ENGINE = MEMORY;
-
-	CALL zone_getLeaves(vSelf, NULL , NULL, TRUE);
-
-	UPDATE tmp.zoneNodes
-		SET isChecked = 0
-		WHERE parentFk IS NULL;
-
-	myLoop: LOOP
-		SET vGeoFk = NULL;
-		SELECT geoFk INTO vGeoFk
-			FROM tmp.zoneNodes
-			WHERE NOT isChecked
-			LIMIT 1;
-
-		CALL zone_getLeaves(vSelf, vGeoFk, NULL, TRUE);
-		UPDATE tmp.zoneNodes
-			SET isChecked = TRUE
-			WHERE geoFk = vGeoFk;
-
-		IF vGeoFk IS NULL THEN
-			LEAVE myLoop;
-		END IF;
-	END LOOP;
-
-	DELETE FROM tmp.zoneNodes
-		WHERE sons > 0;
+BEGIN
+/**
+ * Devuelve los códigos postales incluidos en una zona
+ */
+	DECLARE vGeoFk INT DEFAULT NULL;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.zoneNodes (
+		geoFk INT,
+		name VARCHAR(100),
+		parentFk INT,
+		sons INT,
+		isChecked BOOL DEFAULT 0,
+		zoneFk INT,
+		PRIMARY KEY zoneNodesPk (zoneFk, geoFk),
+		INDEX(geoFk))
+		ENGINE = MEMORY;
+
+	CALL zone_getLeaves(vSelf, NULL , NULL, TRUE);
+
+	UPDATE tmp.zoneNodes
+		SET isChecked = 0
+		WHERE parentFk IS NULL;
+
+	myLoop: LOOP
+		SET vGeoFk = NULL;
+		SELECT geoFk INTO vGeoFk
+			FROM tmp.zoneNodes
+			WHERE NOT isChecked
+			LIMIT 1;
+
+		CALL zone_getLeaves(vSelf, vGeoFk, NULL, TRUE);
+		UPDATE tmp.zoneNodes
+			SET isChecked = TRUE
+			WHERE geoFk = vGeoFk;
+
+		IF vGeoFk IS NULL THEN
+			LEAVE myLoop;
+		END IF;
+	END LOOP;
+
+	DELETE FROM tmp.zoneNodes
+		WHERE sons > 0;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -80144,7 +81432,7 @@ BEGIN
 	DECLARE vZoneGeo INT;
 
 	SELECT address_getGeo(vAddressFk) INTO vZoneGeo;
-
+	
 	CALL vn.zone_getFromGeo(vZoneGeo);
 	CALL vn.zone_getOptionsForLanding(vLanded, vShowExpiredZones);
 	CALL vn.zone_excludeFromGeo(vZoneGeo);
@@ -80164,7 +81452,7 @@ BEGIN
 					FROM tmp.zoneOption zo
 						JOIN vn.zoneWarehouse zw ON zw.zoneFk = zo.zoneFk
 						JOIN vn.`zone` z ON z.id = zo.zoneFk
-						LEFT JOIN tmp.closedZones cz
+						LEFT JOIN tmp.closedZones cz 
 							ON cz.warehouseFk = zw.warehouseFk
 								AND cz.zoneFk = zw.zoneFk
 								AND zo.shipped = util.VN_CURDATE()
@@ -80198,9 +81486,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getState`(vDated DATE)
 BEGIN
 /**
  * Devuelve las zonas y el estado para la fecha solicitada
- *
+ * 
  * @param vDated Fecha en cuestión
- */
+ */	
 	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
 
 	CREATE TEMPORARY TABLE tmp.zone (
@@ -80214,7 +81502,7 @@ BEGIN
 	CALL vn.zone_getOptionsForShipment(vDated, TRUE);
 
 	CALL vn.zone_getClosed();
-
+	
 	SELECT zo.zoneFk,
 			zo.`hour`etd,
 			(zo.`hour` <= TIME(util.VN_NOW())) isLate,
@@ -80224,11 +81512,11 @@ BEGIN
 		FROM tmp.zoneOption zo
 			JOIN vn.zone z ON z.id = zo.zoneFk
 			JOIN vn.zoneWarehouse zw ON zw.zoneFk = z.id
-			LEFT JOIN tmp.closedZones cz
-				ON cz.warehouseFk = zw.warehouseFk
+			LEFT JOIN tmp.closedZones cz 
+				ON cz.warehouseFk = zw.warehouseFk 
 					AND cz.zoneFk = zo.zoneFk;
-
-	DROP TEMPORARY TABLE
+	
+	DROP TEMPORARY TABLE 
 		tmp.closedZones,
 		tmp.zoneOption,
 		tmp.zone;
@@ -80254,21 +81542,21 @@ BEGIN
 /**
  * Devuelve el listado de agencias disponibles para la fecha,
  * dirección y almacén pasados.
- *
+ * 
  * @param vAddress
  * @param vWarehouse warehouse
  * @param vLanded Fecha de recogida
  * @select Listado de agencias disponibles
  */
-
+ 
 	CALL zone_getFromGeo(address_getGeo(vAddress));
     CALL zone_getOptionsForLanding(vLanded, FALSE);
-
-	SELECT am.id agencyModeFk,
-			am.name agencyMode,
-			am.description,
+    
+	SELECT am.id agencyModeFk, 
+			am.name agencyMode, 
+			am.description, 
 			am.deliveryMethodFk,
-			TIMESTAMPADD(DAY, -zo.travelingDays, vLanded) shipped,
+			TIMESTAMPADD(DAY, -zo.travelingDays, vLanded) shipped, 
 			zw.warehouseFk,
 			z.id zoneFk
 		FROM tmp.zoneOption zo
@@ -80278,11 +81566,11 @@ BEGIN
 		WHERE zw.warehouseFk = vWarehouse
 		GROUP BY z.agencyModeFk
 		ORDER BY agencyMode;
-
+        
 	DROP TEMPORARY TABLE
 		tmp.zone,
         tmp.zoneOption;
-
+        
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -80303,9 +81591,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_upcomingDeliveries`()
 BEGIN
 
 	DECLARE vForwardDays INT;
-
+    
     SELECT forwardDays INTO vForwardDays FROM zoneConfig;
-	CALL util.time_createTable(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY));
+	CALL util.time_generate(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY));
 
 	DROP TEMPORARY TABLE IF EXISTS tLandings;
 	CREATE TEMPORARY TABLE tLandings
@@ -80319,7 +81607,7 @@ BEGIN
 				JOIN zoneEvent e ON e.zoneFk = z.id
 				JOIN tmp.time ti ON ti.dated BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vForwardDays, util.VN_CURDATE());
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;			
 	CREATE TEMPORARY TABLE tmp.zoneOption
 		ENGINE = MEMORY
 		SELECT *
@@ -80360,7 +81648,7 @@ BEGIN
 		JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
 		LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
 	WHERE eg.zoneExclusionFk IS NULL;
-
+			
 	SELECT MAX(zo.`hour`) `hour`, zg.`name`, zo.shipped, zo.zoneFk
 		FROM tmp.zoneOption zo
 			JOIN `zone` z ON z.id = zo.zoneFk
@@ -80371,7 +81659,7 @@ BEGIN
 		WHERE dm.code = 'DELIVERY'
         GROUP BY shipped, zg.`name`
 		ORDER BY shipped, zg.`name`;
-
+	
     DROP TEMPORARY TABLE tmp.time, tLandings;
 END ;;
 DELIMITER ;
@@ -81735,7 +83023,7 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticket` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated`,`p`.`code` AS `parkingCode` from (((((`ticketState` `tss` join `ticket` `t` on(`t`.`id` = `tss`.`ticket`)) join `warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) join `state` `s` on(`s`.`id` = `tss`.`state`)) left join `ticketParking` `tp` on(`tp`.`ticketFk` = `t`.`id`)) left join `parking` `p` on(`p`.`id` = `tp`.`parkingFk`)) where ifnull(`t`.`packages`,0) = 0 */;
+/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticketFk` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated`,`p`.`code` AS `parkingCode` from (((((`ticketState` `tss` join `ticket` `t` on(`t`.`id` = `tss`.`ticketFk`)) join `warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) join `state` `s` on(`s`.`id` = `tss`.`state`)) left join `ticketParking` `tp` on(`tp`.`ticketFk` = `t`.`id`)) left join `parking` `p` on(`p`.`id` = `tp`.`parkingFk`)) where ifnull(`t`.`packages`,0) = 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -82185,7 +83473,7 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingStock` AS select `ish`.`itemFk` AS `itemFk`,sum(`ish`.`visible`) AS `visible`,min(`ish`.`packing`) AS `packing`,min(`ish`.`grouping`) AS `grouping`,`s`.`description` AS `sector`,sum(`ish`.`visible`) AS `visibleOriginal`,0 AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created`,`s`.`isPreviousPrepared` AS `isPreviousPrepared` from (((`itemShelving` `ish` left join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) left join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) left join `sector` `s` on(`s`.`id` = `p`.`sectorFk`)) where `ish`.`visible` <> 0 and `p`.`sectorFk` <> 0 group by `ish`.`itemFk`,`p`.`sectorFk` */;
+/*!50001 VIEW `itemShelvingStock` AS select `ish`.`itemFk` AS `itemFk`,sum(`ish`.`visible`) AS `visible`,min(`ish`.`packing`) AS `packing`,min(`ish`.`grouping`) AS `grouping`,`s`.`description` AS `sector`,sum(`ish`.`visible`) AS `visibleOriginal`,0 AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created`,`st`.`description` = 'previousPrepared' AS `isPreviousPrepared` from ((((`itemShelving` `ish` left join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) left join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) left join `sector` `s` on(`s`.`id` = `p`.`sectorFk`)) left join `sectorType` `st` on(`st`.`id` = `s`.`typeFk`)) where `ish`.`visible` <> 0 and `p`.`sectorFk` <> 0 group by `ish`.`itemFk`,`p`.`sectorFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -82226,24 +83514,6 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
---
--- Final view structure for view `itemShelvingStock_byWarehouse`
---
-
-/*!50001 DROP VIEW IF EXISTS `itemShelvingStock_byWarehouse`*/;
-/*!50001 SET @saved_cs_client          = @@character_set_client */;
-/*!50001 SET @saved_cs_results         = @@character_set_results */;
-/*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8mb4 */;
-/*!50001 SET character_set_results     = utf8mb4 */;
-/*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingStock_byWarehouse` AS select `ish`.`itemFk` AS `itemFk`,sum(`ish`.`visible`) AS `visible`,`s`.`warehouseFk` AS `warehouseFk` from (((`itemShelving` `ish` join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) join `sector` `s` on(`s`.`id` = `p`.`sectorFk`)) group by `ish`.`itemFk`,`s`.`warehouseFk` */;
-/*!50001 SET character_set_client      = @saved_cs_client */;
-/*!50001 SET character_set_results     = @saved_cs_results */;
-/*!50001 SET collation_connection      = @saved_col_connection */;
-
 --
 -- Final view structure for view `itemTagged`
 --
@@ -82959,7 +84229,7 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketState` AS select `tt`.`created` AS `updated`,`tt`.`stateFk` AS `stateFk`,`tt`.`workerFk` AS `workerFk`,`tls`.`ticketFk` AS `ticketFk`,`s`.`id` AS `state`,`s`.`order` AS `productionOrder`,`s`.`alertLevel` AS `alertLevel`,`s`.`code` AS `code`,`tls`.`ticketFk` AS `ticket`,`tt`.`workerFk` AS `worker`,`s`.`isPreviousPreparable` AS `isPreviousPreparable`,`s`.`isPicked` AS `isPicked` from ((`ticketLastState` `tls` join `ticketTracking` `tt` on(`tt`.`id` = `tls`.`ticketTrackingFk`)) join `state` `s` on(`s`.`id` = `tt`.`stateFk`)) */;
+/*!50001 VIEW `ticketState` AS select `tt`.`created` AS `updated`,`tt`.`stateFk` AS `stateFk`,`tt`.`userFk` AS `userFk`,`tls`.`ticketFk` AS `ticketFk`,`s`.`id` AS `state`,`s`.`order` AS `productionOrder`,`s`.`alertLevel` AS `alertLevel`,`s`.`code` AS `code`,`s`.`isPreviousPreparable` AS `isPreviousPreparable`,`s`.`isPicked` AS `isPicked` from ((`ticketLastState` `tls` join `ticketTracking` `tt` on(`tt`.`id` = `tls`.`ticketTrackingFk`)) join `state` `s` on(`s`.`id` = `tt`.`stateFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -82977,7 +84247,7 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`ticketState` `ts` join `ticket` `t` on(`t`.`id` = `ts`.`ticket`)) where `t`.`shipped` between `util`.`VN_CURDATE`() and `MIDNIGHT`(`util`.`VN_CURDATE`()) */;
+/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticketFk` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`userFk` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`ticketState` `ts` join `ticket` `t` on(`t`.`id` = `ts`.`ticketFk`)) where `t`.`shipped` between `util`.`VN_CURDATE`() and `MIDNIGHT`(`util`.`VN_CURDATE`()) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -83229,7 +84499,7 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `zoneEstimatedDelivery` AS SELECT `t`.`zoneFk` AS `zoneFk`, `zc`.`hour` AS `zoneClosureHour`, `z`.`hour` AS `zoneHour`, `sv`.`volume` AS `volume`, `al`.`hasToRecalcPrice` AS `hasToRecalcPrice`, `lhp`.`m3` AS `m3`, `dl`.`minSpeed` AS `minSpeed` FROM ((((((((((`vn`.`ticket` `t` JOIN `vn`.`ticketStateToday` `tst` ON (`tst`.`ticket` = `t`.`id`)) JOIN `vn`.`state` `s` ON (`s`.`id` = `tst`.`state`)) 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`)) JOIN `vn`.`warehouseAlias` `wa` ON (`wa`.`id` = `w`.`aliasFk`)) 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`() */;
+/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,`zc`.`hour` AS `zoneClosureHour`,`z`.`hour` AS `zoneHour`,`sv`.`volume` AS `volume`,`al`.`hasToRecalcPrice` AS `hasToRecalcPrice`,`lhp`.`m3` AS `m3`,`dl`.`minSpeed` AS `minSpeed` from ((((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on(`tst`.`ticket` = `t`.`id`)) join `vn`.`state` `s` on(`s`.`id` = `tst`.`state`)) 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`)) join `vn`.`warehouseAlias` `wa` on(`wa`.`id` = `w`.`aliasFk`)) 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`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -83243,4 +84513,4 @@ WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-20 10:10:52
+-- Dump completed on 2024-01-24  8:21:19
diff --git a/e2e/helpers/tests.js b/e2e/helpers/tests.js
index 992ec051f..adb2f8f72 100644
--- a/e2e/helpers/tests.js
+++ b/e2e/helpers/tests.js
@@ -49,6 +49,20 @@ async function test() {
         random: false,
     });
 
+    const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+    jasmine.addReporter(new SpecReporter({
+        spec: {
+            displaySuccessful: false,
+            displayPending: false,
+            displayDuration: false,
+            displayFailed: true,
+            displayErrorMessages: true,
+        },
+        summary: {
+            displayPending: false,
+        }
+    }));
+
     await backendStatus();
 
     jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
index 8be307269..4f54ad860 100644
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@@ -225,7 +225,8 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should show error trying to delete a ticket with a refund', async() => {
-        await page.accessToSearchResult('7');
+        await page.loginAndModule('production', 'ticket');
+        await page.accessToSearchResult('8');
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
         await page.waitToClick(selectors.globalItems.acceptButton);
diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
index e6c601d7d..701e6b1b4 100644
--- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js
+++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
@@ -22,17 +22,6 @@ describe('Travel basic data path', () => {
         await page.waitForState('travel.card.basicData');
     });
 
-    it('should throw error if try move a travel with entries', async() => {
-        const lastMonth = Date.vnNew();
-        lastMonth.setMonth(lastMonth.getMonth() - 1);
-
-        await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
-        await page.waitToClick(selectors.travelBasicData.save);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Cannot past travels with entries');
-    });
-
     it('should set a wrong delivery date then receive an error on submit', async() => {
         await page.loginAndModule('buyer', 'travel');
         await page.write(selectors.travelIndex.generalSearchFilter, '4');
diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index c9a13b4cc..8abb1a4a1 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -74,7 +74,6 @@ describe('ticket componentUpdate()', () => {
                     }
                 }
             };
-
             await models.Ticket.componentUpdate(ctx, options);
 
             [componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven, null, options);
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 43bc2c2d9..7931935b7 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -117,7 +117,7 @@ describe('ticket setDeleted()', () => {
                 return value;
             };
 
-            const ticketId = 7;
+            const ticketId = 8;
             await models.Ticket.setDeleted(ctx, ticketId, options);
 
             await tx.rollback();
diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
index 92c01792f..97f100501 100644
--- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
@@ -247,6 +247,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
 
                     const start = new Date(dated - 1);
                     start.setHours(0, 0, 0);
+
                     await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
                         hankPymId,
                         start,
@@ -255,7 +256,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
 
                     let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
 
-                    expect(timeControlCalculateTable.timeWorkSeconds).toEqual(26400);
+                    expect(timeControlCalculateTable.timeWorkSeconds).toEqual(25200);
                     await tx.rollback();
                 } catch (e) {
                     await tx.rollback();