Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

2024-05-15 16:41:15 +02:00 · 2024-05-15 16:41:15 +02:00 · c6242cc2e9
parent 411933a608 7e3861a02f
commit c6242cc2e9
225 changed files with 4687 additions and 4768 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - (Worker -> time-control) Corrección de errores
 - (InvoiceOut -> Crear factura) Cuando falla al crear una factura, se devuelve un error
 - (Worker -> Ver albarán) Ya no aparece la página en blanco
 ### Changed
 - (InvoiceOut) Las facturas ahora muestran el ticket del cual proviene el abono
 ## [24.18.01] - 2024-05-07
--- a/1
+++ b/1
@ -24,7 +24,6 @@ node {
        FROM_GIT = env.JOB_NAME.startsWith('gitea/')
        RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
        RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
        // env.DEBUG = 'strong-remoting:shared-method'
        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
        echo "NODE_NAME: ${env.NODE_NAME}"
        echo "WORKSPACE: ${env.WORKSPACE}"
--- a/back/methods/postcode/filter.js
+++ b/back/methods/postcode/filter.js
@ -45,7 +45,7 @@ module.exports = Self => {
                        {'pc.code': {like: `%${value}%`}},
                        {'t.name': {like: `%${value}%`}},
                        {'p.name': {like: `%${value}%`}},
-                        {'c.country': {like: `%${value}%`}}
+                        {'c.name': {like: `%${value}%`}}
                    ]
                };
            }
@ -62,7 +62,7 @@ module.exports = Self => {
            pc.code,
            t.name as town,
            p.name as province,
-            c.country
+            c.name country
        FROM
            postCode pc
            JOIN town t on t.id = pc.townFk
--- a/back/models/country.json
+++ b/back/models/country.json
@ -13,7 +13,7 @@
            "id": true,
            "description": "Identifier"
        },
-        "country": {
+        "name": {
            "type": "string",
            "required": true
        },
--- a/db/dbWatcher.js
+++ b/db/dbWatcher.js
@ -0,0 +1,24 @@
 const fs = require('fs');
 const {spawn} = require('child_process');
 function watchDatabaseChanges() {
    console.log('Watching for changes in db/routines and db/versions');
    fs.watch('db', {recursive: true}, (eventType, filename) => {
        if (filename.endsWith('.sql')) {
            let command;
            if (filename.startsWith('routines')) command = 'push';
            else if (filename.startsWith('versions')) command = 'run';
            if (command) {
                const process = spawn('myt', [command]);
                process.stdout.on('data', data => console.log(data.toString()));
                process.stderr.on('data', data => console.error(`stderr: ${data}`));
                process.on('error', error => console.error(`error: ${error.message}`));
                process.on('close', () => console.log('Watching for changes in db/routines and db/versions'));
            }
        }
    });
 }
 if (require.main === module) watchDatabaseChanges();
 module.exports = watchDatabaseChanges;
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-INSERT INTO `version` VALUES ('vn-database','10977','7a021c9ac6f804cc120542b65d7461283d516569','2024-04-18 09:13:43','11000');
+INSERT INTO `version` VALUES ('vn-database','11031','12f36dc825b6660062e2c86fde9c6b451cb58f0d','2024-05-14 08:25:58','11048');
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@ -651,6 +651,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10855','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10856','00-cloneAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10857','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10858','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10859','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10861','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterAgencyTermConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterGastosResumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
@ -688,6 +689,9 @@ INSERT INTO `versionLog` VALUES ('vn-database','10890','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10891','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10892','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10893','00-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10895','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10895','01-secondScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10895','02-thirdScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','01-financialProductType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','02-flight.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','03-gastos_resumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:00',NULL,NULL);
@ -737,11 +741,13 @@ INSERT INTO `versionLog` VALUES ('vn-database','10940','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10941','00-restoreVn2008Jerarquia.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 09:36:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10942','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 10:24:45',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10943','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 10:29:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10944','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10946','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-08 07:56:17',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10948','00-addReconciliationConfig.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10948','02-grantPrivileges.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10948','03-modifyColumn.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10949','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10950','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','00-account.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','01-bs.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','02-edi.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
@ -768,7 +774,36 @@ INSERT INTO `versionLog` VALUES ('vn-database','10975','00-action.sql','jenkins@
 INSERT INTO `versionLog` VALUES ('vn-database','10975','01-expeditionFk.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-03 12:04:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10976','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10977','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10984','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10988','00-pbx_prefix.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-04-11 17:00:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10990','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10991','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10992','00-acl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10992','00-referenceRate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10994','00-modifyAcls.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10995','01-agencyLogCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10995','02-agencyWorkCenterCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10995','03-tableAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','00-dropOrderRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','01-dropTicketRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','02-dropTravelRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10997','00-groupingMode.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11001','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11002','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11003','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11007','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11008','00-alter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11012','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11014','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11016','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-27 13:16:09',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11018','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11021','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-30 09:07:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11026','00-entryAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11026','01-entryUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11026','02-entryInternal.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11031','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11033','00-rollbackAcls.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-07 12:45:45',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11045','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-10 14:53:29',NULL,NULL);
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@ -1311,7 +1346,6 @@ INSERT INTO `ACL` VALUES (211,'TravelLog','*','READ','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (212,'Thermograph','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (214,'Entry','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (216,'TravelThermograph','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (218,'Intrastat','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account');
@ -1842,6 +1876,17 @@ INSERT INTO `ACL` VALUES (822,'SupplierDms','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (823,'MailAlias','*','*','ALLOW','ROLE','developerBoss');
 INSERT INTO `ACL` VALUES (824,'ItemShelving','hasItemOlder','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (825,'Application','getEnumValues','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (826,'Ticket','editZone','WRITE','ALLOW','ROLE','salesAssistant');
 INSERT INTO `ACL` VALUES (827,'TicketWeekly','deleteById','WRITE','ALLOW','ROLE','buyerBoss');
 INSERT INTO `ACL` VALUES (828,'TicketWeekly','upsert','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (830,'InvoiceIn','*','READ','ALLOW','ROLE','deliveryBoss');
 INSERT INTO `ACL` VALUES (831,'InvoiceIn','exchangeRateUpdate','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (832,'AgencyLog','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (833,'AgencyWorkCenter','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (834,'AgencyMode','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (835,'Agency','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (836,'Agency','*','WRITE','ALLOW','ROLE','deliveryAssistant');
 INSERT INTO `ACL` VALUES (837,'AgencyWorkCenter','*','WRITE','ALLOW','ROLE','deliveryAssistant');
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@ -1987,6 +2032,7 @@ INSERT INTO `businessType` VALUES ('others','Otros');
 INSERT INTO `businessType` VALUES ('otherSector','Profesional de otro sector');
 INSERT INTO `businessType` VALUES ('restoration','Restauración');
 INSERT INTO `businessType` VALUES ('trainingCentre','Centro de formación');
 INSERT INTO `businessType` VALUES ('VIP','Very important person');
 INSERT INTO `businessType` VALUES ('wholesaler','Mayorista');
 INSERT INTO `businessType` VALUES ('worker','Trabajador');
@ -2189,19 +2235,19 @@ INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NUL
 INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (80,'vallesTeam','EQUIPO J VALLES',43,44,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (80,'vallesTeam','EQUIPO ESPAÑA 5',43,44,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
 INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',45,46,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (94,'brocalTeam','EQUIPO J BROCAL',47,48,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',0,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',47,48,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',0,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (95,'zambranoTeam','EQUIPO C ZAMBRANO',49,50,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',0,'equipoczambrano@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',49,50,24065,0,0,0,2,0,43,'/1/43/','es1_equipo',0,'es1@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
 INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',51,52,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',53,54,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',55,56,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (125,'miriamMarTeam','EQUIPO MIRIAM MAR',57,58,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (125,'miriamMarTeam','EQUIPO ESPAÑA 3',57,58,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
@ -2212,8 +2258,8 @@ INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',63,64,6264
 INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (139,'soriaTeam','EQUIPO J SORIA ',65,66,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'equipojsoria@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (139,'soriaTeam','EQUIPO ESPAÑA 4',65,66,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'equipojsoria@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',67,68,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',67,68,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
@ -2517,7 +2563,7 @@ INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,1
 INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
 INSERT INTO `workCenter` VALUES (2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (3,'Marjales',26,20008,NULL,NULL,NULL,NULL);
-INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,7,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (5,'Madrid',28,2869,5,'Av constitución 3',554145,2.00);
 INSERT INTO `workCenter` VALUES (6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL);
 INSERT INTO `workCenter` VALUES (7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL);
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
@ -92,7 +92,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','tagL10n','root@pc-jua
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','config','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','','Select');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','originL10n','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','origin','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','entryEditor','entry','guillermo@10.5.1.4','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','entryEditor','entry','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','social','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','image','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','tblContadores','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','','Select');
@ -327,20 +327,16 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','price_fixed','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','itemType','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','travel','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Bancos_poliza','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','duaDismissed','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','edi_article','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket_type','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','time','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','operator','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','payment','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
@ -553,7 +549,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','client','alexm@%',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleVolume','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','Cubos','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','routesMonitor','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','sale','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','sale','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Delete','Update');
@ -1248,7 +1244,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Recib
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Rutas','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Movimientos','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','state','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','route','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','routeComplement','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','deliveryMethod','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Tickets','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
@ -1379,15 +1375,31 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneIncluded','guil
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneGeo','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','quality','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','category','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket_type','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','edi_bucket','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ektEntryAssign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','edi_bucket_type','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','calendarType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','timeSlots','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierFreight','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollWorker','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollWorkCenter','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollComponent','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','professionalCategory','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','ticketObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deliveryNoteState','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceOutExpense','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','delivery','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','entry','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@ -1623,6 +1635,36 @@ INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','cmrFk','
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','editorFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','config','truckLength','0000-00-00 00:00:00','Select');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','production','item','isBoxPickingMode','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','id','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','supplierFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','dated','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceNumber','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isExcludedFromAvailable','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isConfirmed','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isOrdered','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isRaid','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','commission','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','created','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','evaNotes','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','travelFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','currencyFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','companyFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','gestDocFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceInFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','loadPriority','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','kop','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','sub','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','pro','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','auction','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceAmount','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','buyerFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','typeFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','reference','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','observationEditorFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','clonedFrom','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','editorFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','lockerUserFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','locked','0000-00-00 00:00:00','Update');
 /*!40000 ALTER TABLE `columns_priv` ENABLE KEYS */;
 /*!40000 ALTER TABLE `procs_priv` DISABLE KEYS */;
@ -1682,18 +1724,13 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROC
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','dayend','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','buffer_settypebyname','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financialBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','barcodeToItem','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticket_splititempackingtype','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','deliveryAssistant','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','entryEditor','buy_tarifas','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','claimManager','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_fixMisfit','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','employee','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@ -1729,7 +1766,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','P
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','client_getDebt','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','client_getDebt','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@ -1741,9 +1777,8 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hasanynegativ
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hassomenegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','administrative','accountshorttostandard','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','raidupdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','lastdayofweek','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','artificialBoss','raidupdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','creditInsurance_GetRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','invoicefromclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoicefromclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoicefromticket','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@ -1843,7 +1878,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','packinglistswitch',
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','previoussticker_get','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','productioncontrol','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','productionsectorlist','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','riskallclients','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','routemonitor_calculate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','account','developer','user_haspriv','FUNCTION','jgallego@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','salegroup_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@ -1878,7 +1912,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myuser_hasroutine
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionAssi','timebusiness_calculateall','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','timecontrol_geterror','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','travel_weeklyclone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','handmadeBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','productionAssi','rutasanalyze','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionPlus','workerCreateExternal','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
@ -2009,7 +2043,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_rollback','PROCED
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_start','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPrices','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByAwb','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','hr','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','financial','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2022,6 +2056,16 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','entry_getTransfer','PR
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','intrastat_estimateNet','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','artificialBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','remittance_calc','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','developer','connection_kill','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','client_getRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','item_ValuateInventory','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hrBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@ -2056,7 +2100,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"ver
 INSERT  IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','developerBoss','{\"access\":33554432,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','employee','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
@ -995,27 +995,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 `hedera`.`order_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterUpdate`
-	AFTER UPDATE ON `order`
+	AFTER UPDATE ON `order`
-	FOR EACH ROW
+	FOR EACH ROW
-BEGIN
+BEGIN
-	CALL stock.log_add('order', NEW.id, OLD.id);
+	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
-    IF !(OLD.address_id <=> NEW.address_id)
+		CALL vn.mail_insert(
-    OR !(OLD.company_id <=> NEW.company_id)
+			'jgallego@verdnatura.es',
-    OR !(OLD.customer_id <=> NEW.customer_id) THEN
+			'noreply@verdnatura.es',
-		CALL order_requestRecalc(NEW.id);
+			'Actualizada order al address 2850',
-	END IF;
+			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
-
+		);
-	IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
+	END IF;
 		-- 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 */ ;
@ -1071,70 +1063,6 @@ DELIMITER ;
 /*!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 `hedera`.`orderRow_afterInsert`
 	AFTER INSERT ON `orderRow`
 	FOR EACH ROW
 BEGIN
 	CALL stock.log_add('orderRow', NEW.id, NULL);
    CALL order_requestRecalc(NEW.orderFk);
 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 `hedera`.`orderRow_afterUpdate`
 	AFTER UPDATE ON `orderRow`
 	FOR EACH ROW
 BEGIN
 	CALL stock.log_add('orderRow', NEW.id, OLD.id);
    CALL order_requestRecalc(OLD.orderFk);
    CALL order_requestRecalc(NEW.orderFk);
 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 `hedera`.`orderRow_afterDelete`
 	AFTER DELETE ON `orderRow`
 	FOR EACH ROW
 BEGIN
 	CALL stock.log_add('orderRow', NULL, OLD.id);
    CALL order_requestRecalc(OLD.orderFk);
 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 */ ;
 --
 -- Current Database: `pbx`
@ -1398,12 +1326,6 @@ DELIMITER ;
 USE `psico`;
 --
 -- Current Database: `rfid`
 --
 USE `rfid`;
 --
 -- Current Database: `sage`
 --
@ -1519,12 +1441,12 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-    
+
-    CALL visible_log(
+	CALL visible_log(
 		NEW.isPicked,
-        NEW.warehouseFk,
+		NEW.warehouseFk,
-        NEW.itemFk,
+		NEW.itemFk,
-        NEW.quantity
+		NEW.quantity
 	);
 END */;;
 DELIMITER ;
@ -1554,11 +1476,11 @@ BEGIN
 	DELETE FROM inboundPick
 		WHERE inboundFk = OLD.id;
-    CALL visible_log(
+	CALL visible_log(
 		OLD.isPicked,
-        OLD.warehouseFk,
+		OLD.warehouseFk,
-        OLD.itemFk,
+		OLD.itemFk,
-        -OLD.quantity
+		-OLD.quantity
 	);
 END */;;
 DELIMITER ;
@ -1581,12 +1503,12 @@ DELIMITER ;;
 BEGIN
 	SET NEW.lack = NEW.quantity;
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-    
+
-    CALL visible_log(
+	CALL visible_log(
 		NEW.isPicked,
-        NEW.warehouseFk,
+		NEW.warehouseFk,
-        NEW.itemFk,
+		NEW.itemFk,
-        -NEW.quantity
+		-NEW.quantity
 	);
 END */;;
 DELIMITER ;
@ -1616,11 +1538,11 @@ BEGIN
 	DELETE FROM inboundPick
 		WHERE outboundFk = OLD.id;
-    CALL visible_log(
+	CALL visible_log(
 		OLD.isPicked,
-        OLD.warehouseFk,
+		OLD.warehouseFk,
-        OLD.itemFk,
+		OLD.itemFk,
-        OLD.quantity
+		OLD.quantity
 	);
 END */;;
 DELIMITER ;
@ -1745,15 +1667,15 @@ DELIMITER ;;
 	BEFORE INSERT ON `accountReconciliation`
 	FOR EACH ROW
-	SET NEW.calculatedCode = REPLACE(
+	SET NEW.calculatedCode = REGEXP_REPLACE(
-							REPLACE(
+		CONCAT(NEW.supplierAccountFk, 
-								REPLACE(
+			NEW.operationDated, 
-									REPLACE(
+			NEW.amount, 
-											CONCAT(NEW.supplierAccountFk,NEW.operationDated,NEW.amount,NEW.concept,NEW.debitCredit)
+			NEW.concept, 
-											,' ','')
+			CAST(NEW.debitCredit AS UNSIGNED)
-										,":",'')
+		),
-									,'-','')
+		'[ :\\-.]', ''
-								,'.','') */;;
+	) */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@ -1867,37 +1789,33 @@ 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 
+		THEN
-			UPDATE client 
+			UPDATE client
 				SET hasToInvoiceByAddress = TRUE
 				WHERE id = NEW.clientFk;
 		END IF;
 	END IF;
 	IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
 		CALL util.throw ('Cannot desactivate the default address');
 	END IF;
-	IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN
+	IF (NEW.clientFk <> OLD.clientFk
-		INSERT IGNORE INTO ticketRecalc (ticketFk)
+		OR NEW.isActive <> OLD.isActive
-			SELECT id FROM ticket t 
+		OR NOT (NEW.provinceFk <=> OLD.provinceFk))
-				WHERE t.addressFk = NEW.id
+	AND (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
-					AND t.refFk IS NULL;
+		UPDATE client
 	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 IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -1937,6 +1855,26 @@ 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`.`agency_beforeInsert`
 	BEFORE INSERT ON `agency`
 	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`.`agency_afterInsert`
 	AFTER INSERT ON `agency`
 	FOR EACH ROW
@ -2292,7 +2230,7 @@ trig: BEGIN
 	DECLARE vWarehouse INT;
 	DECLARE vLanding DATE;
 	DECLARE vGrouping INT;
-	DECLARE vGroupingMode TINYINT;
+	DECLARE vGroupingMode VARCHAR(255);
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
 	DECLARE vBuyerFk INT;
@ -2398,8 +2336,6 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 	CALL stock.log_add('buy', NEW.id, NULL);
 	CALL buy_afterUpsert(NEW.id);
 END */;;
 DELIMITER ;
@ -2508,11 +2444,11 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_afterUpdate`
 	AFTER UPDATE ON `buy`
@ -2527,14 +2463,6 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 	IF !(NEW.id <=> OLD.id)
 	OR !(NEW.entryFk <=> OLD.entryFk)
 	OR !(NEW.itemFk <=> OLD.itemFk)
 	OR !(NEW.quantity <=> OLD.quantity)
 	OR !(NEW.created <=> OLD.created) THEN
 		CALL stock.log_add('buy', NEW.id, OLD.id);
 	END IF;
 	CALL buy_afterUpsert(NEW.id);
 	SELECT w.isBuyerToBeEmailed, t.landed
@ -2610,20 +2538,15 @@ DELIMITER ;;
 	AFTER DELETE ON `buy`
 	FOR EACH ROW
 trig: BEGIN
 	DECLARE vValues VARCHAR(255);
 	IF @isModeInventory OR @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
 	CALL stock.log_add('buy', NULL, OLD.id);
 	INSERT INTO entryLog
 		SET `action` = 'delete',
 			`changedModel` = 'Buy',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -3302,24 +3225,11 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
-		UPDATE `address` SET isDefaultAddress = 0
+		UPDATE `address` SET isDefaultAddress = FALSE
 			WHERE clientFk = NEW.id;
 		UPDATE `address` SET isDefaultAddress = 1
 			WHERE id = NEW.defaultAddressFk;      
 	END IF;
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
+		UPDATE `address` SET isDefaultAddress = TRUE
-		INSERT IGNORE INTO ticketRecalc (ticketFk)
+			WHERE id = NEW.defaultAddressFk;
 			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
 			WHERE id = NEW.id;
 	END IF;
 END */;;
 DELIMITER ;
@ -4674,26 +4584,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterInsert`
 	AFTER INSERT ON `entry`
 	FOR EACH ROW
 BEGIN
 	CALL travel_requestRecalc(NEW.travelFk);
 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`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
@ -4701,9 +4591,19 @@ BEGIN
 	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
 	IF NEW.isBooked = OLD.isBooked THEN
 		CALL entry_checkBooked(OLD.id);
 	ELSE
 		IF NEW.isBooked THEN
 			SELECT COUNT(*) INTO vTotalBuy
 				FROM buy
 				WHERE entryFk = NEW.id;
 			IF NOT vTotalBuy THEN
 				CALL util.throw('Entry must have lines to be marked booked');
 			END IF;
 		END IF;
 	END IF;
 	SET NEW.editorFk = account.myUser_getId();
@ -4711,7 +4611,7 @@ BEGIN
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
 		IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
-			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
 		END IF;
 		SELECT COUNT(*) > 0 INTO vIsVirtual
@ -4769,24 +4669,12 @@ DELIMITER ;;
 	AFTER UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
 	IF NOT(NEW.id <=> OLD.id)
 	OR NOT(NEW.travelFk <=> OLD.travelFk)
 	OR NOT(NEW.isRaid <=> OLD.isRaid) THEN
 		CALL stock.log_add('entry', NEW.id, OLD.id);
 	END IF;
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
 		CALL travel_requestRecalc(OLD.travelFk);
 		CALL travel_requestRecalc(NEW.travelFk);
 	END IF;
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
 			SELECT b.id
 				FROM buy b
 				WHERE b.entryFk = NEW.id;
-		
+
 		CALL buy_checkItem();
 	END IF;
 END */;;
@ -4834,8 +4722,6 @@ BEGIN
 			`changedModel` = 'Entry',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 	CALL travel_requestRecalc(OLD.travelFk);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -5475,7 +5361,6 @@ DELIMITER ;;
 	AFTER UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
 	IF NEW.issued != OLD.issued    
 		OR NEW.currencyFk != OLD.currencyFk THEN
@ -5510,6 +5395,26 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_beforeDelete`
 	BEFORE DELETE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.id);
 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`.`invoiceIn_afterDelete`
 	AFTER DELETE ON `invoiceIn`
 	FOR EACH ROW
@ -7827,11 +7732,7 @@ BEGIN
 		CALL util.throw('Cannot insert a service item into a ticket');
 	END IF;
 	CALL stock.log_add('sale', NEW.id, NULL);
 	CALL ticket_requestRecalc(NEW.ticketFk);
 	IF NEW.quantity > 0 THEN
 		UPDATE vn.collection c
 			JOIN vn.ticketCollection tc ON tc.collectionFk = c.id
 				AND tc.ticketFk = NEW.ticketFk
@ -7907,24 +7808,6 @@ BEGIN
 	DECLARE vIsToSendMail BOOL;
 	DECLARE vUserRole VARCHAR(255);
 	IF !(NEW.id <=> OLD.id)
 	OR !(NEW.ticketFk <=> OLD.ticketFk)
 	OR !(NEW.itemFk <=> OLD.itemFk)
 	OR !(NEW.quantity <=> OLD.quantity)
 	OR !(NEW.created <=> OLD.created)
 	OR !(NEW.isPicked <=> OLD.isPicked) THEN
 		CALL stock.log_add('sale', NEW.id, OLD.id);
 	END IF;
 	IF !(NEW.price <=> OLD.price)
 	OR !(NEW.ticketFk <=> OLD.ticketFk)
 	OR !(NEW.itemFk <=> OLD.itemFk)
 	OR !(NEW.quantity <=> OLD.quantity)
 	OR !(NEW.discount <=> OLD.discount) THEN
 		CALL ticket_requestRecalc(NEW.ticketFk);
 		CALL ticket_requestRecalc(OLD.ticketFk);
 	END IF;
 	IF !(OLD.ticketFk <=> NEW.ticketFk) THEN
 		UPDATE ticketRequest SET ticketFk = NEW.ticketFk
 			WHERE saleFk = NEW.id;
@ -8046,9 +7929,6 @@ BEGIN
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 	CALL stock.log_add('sale', NULL, OLD.id);
 	CALL ticket_requestRecalc(OLD.ticketFk);
 	SELECT account.myUser_getName() INTO vUserRole;
 	SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole;
@ -8434,8 +8314,8 @@ DELIMITER ;;
 	AFTER INSERT ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
+	UPDATE client c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
 END */;;
@ -8458,13 +8338,13 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	IF NEW.dateLeaving IS NOT NULL THEN
-		UPDATE vn2008.Clientes c
+		UPDATE client c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
 	ELSE
-		UPDATE vn2008.Clientes c
+		UPDATE client c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
 	END IF;
@ -8487,8 +8367,8 @@ DELIMITER ;;
 	BEFORE DELETE ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
+	UPDATE client c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit  WHERE ci.id = OLD.creditInsurance;
 END */;;
@ -9077,25 +8957,11 @@ DELIMITER ;;
 	AFTER UPDATE ON `ticket`
 	FOR EACH ROW
 BEGIN
 	IF !(NEW.id <=> OLD.id)
 		OR !(NEW.warehouseFk <=> OLD.warehouseFk)
 		OR !(NEW.shipped <=> OLD.shipped) THEN
 			CALL stock.log_add('ticket', NEW.id, OLD.id);
 	END IF;
 	IF !(NEW.clientFk <=> OLD.clientFk)
 		OR !(NEW.addressFk <=> OLD.addressFk)
 		OR !(NEW.companyFk <=> OLD.companyFk) THEN
 			CALL ticket_requestRecalc(NEW.id);
 	END IF;
 	IF NEW.routeFk <> OLD.routeFk THEN
-		UPDATE expedition 
+		UPDATE expedition
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -9366,8 +9232,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 	SET NEW.workerFk = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -9530,7 +9394,7 @@ BEGIN
 	END IF;
 	IF NEW.attenderFk IS NULL THEN
-		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
+		SET NEW.attenderFk = (SELECT defaultAttenderFk FROM ticketConfig LIMIT 1);
 	END IF;
 END */;;
 DELIMITER ;
@ -9560,10 +9424,6 @@ BEGIN
 	IF NEW.salesPersonCode <> OLD.salesPersonCode THEN
 		SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode);
 	END IF;
 	IF NEW.buyerCode <> OLD.buyerCode THEN
 		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
 	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -9623,28 +9483,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterInsert`
 	AFTER INSERT ON `ticketService`
 	FOR EACH ROW
 BEGIN
 	CALL ticket_requestRecalc(NEW.ticketFk);
 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`.`ticketService_beforeUpdate`
 	BEFORE UPDATE ON `ticketService`
 	FOR EACH ROW
@ -9665,31 +9503,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterUpdate`
 	AFTER UPDATE ON `ticketService`
 	FOR EACH ROW
 BEGIN
    IF !(NEW.price <=> OLD.price)
    OR !(NEW.ticketFk <=> OLD.ticketFk)
    OR !(NEW.quantity <=> OLD.quantity) THEN
 		CALL ticket_requestRecalc(NEW.ticketFk);
 		CALL ticket_requestRecalc(OLD.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  = 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`.`ticketService_afterDelete`
 	AFTER DELETE ON `ticketService`
 	FOR EACH ROW
@ -9699,9 +9512,6 @@ BEGIN
 			`changedModel` = 'TicketService',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 	CALL ticket_requestRecalc(OLD.ticketFk);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10142,10 +9952,8 @@ DELIMITER ;;
 	AFTER UPDATE ON `travel`
 	FOR EACH ROW
 BEGIN
 	CALL stock.log_add('travel', NEW.id, OLD.id);
 	IF NOT(NEW.shipped <=> OLD.shipped) THEN
-		UPDATE entry 
+		UPDATE entry
 			SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
 			WHERE travelFk = NEW.id;
 	END IF;
@ -10154,11 +9962,11 @@ BEGIN
 		IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
 			CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
 				SELECT b.id
-					FROM entry e 
+					FROM entry e
 						JOIN buy b ON b.entryFk = e.id
 						JOIN item i ON i.id = b.itemFk
 					WHERE e.travelFk = NEW.id;
-		
+
 			CALL buy_checkItem();
 		END IF;
 	END IF;
@ -10997,4 +10805,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2024-04-18  7:16:17
+-- Dump completed on 2024-05-14  6:26:46
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -162,7 +162,7 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
        (4, 'JPY', 'Yen Japones',   1),
        (5, 'CNY',  'Yuan Chino',   1.2);
-INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
+INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
    VALUES
        (1, 'España',   1, 'ES', 1, 24, 4, 0, 1),
        (2, 'Italia',   1, 'IT', 1, 27, 4, 0, 1),
@ -2562,7 +2562,7 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1),
        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1);
-INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`, `daysAgo`)
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
    VALUES
        (1, -2, '2% retention', 2, 45);
@ -3789,4 +3789,6 @@ INSERT INTO vn.workerTeam(id, team, workerFk)
        (8, 1, 19);
 INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment) 
-    VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
+    VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
 UPDATE vn.locker SET workerFk = 1110 WHERE id = 147; 
--- a/db/routines/bs/procedures/manaCustomerUpdate.sql
+++ b/db/routines/bs/procedures/manaCustomerUpdate.sql
@ -5,97 +5,90 @@ BEGIN
 	DECLARE vFromDated DATE;
 	DECLARE vForDeleteDated DATE;
 	DECLARE vManaId INT;
-    DECLARE vManaAutoId INT;
+	DECLARE vManaAutoId INT;
-    DECLARE vClaimManaId INT;
+	DECLARE vClaimManaId INT;
-    DECLARE vManaBankId INT;
+	DECLARE vManaBankId INT;
-    DECLARE vManaGreugeTypeId INT;
+	DECLARE vManaGreugeTypeId INT;
-    DECLARE vManaFromDays INT;
+	DECLARE vManaFromDays INT;
-    DECLARE vManaToDays INT;
+	DECLARE vManaToDays INT;
-	SELECT id INTO vManaId 
+	SELECT id INTO vManaId
-			FROM vn.component WHERE code = 'mana';
+		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.accounting WHERE code = 'mana';
-	SELECT id INTO vManaGreugeTypeId 
+	SELECT id INTO vManaGreugeTypeId
 		FROM vn.greugeType WHERE code = 'mana';
-    SELECT manaFromDays, manaToDays
+	SELECT manaFromDays, manaToDays
-        INTO vManaFromDays, vManaToDays
+		INTO vManaFromDays, vManaToDays
-        FROM vn.salespersonConfig;
+		FROM vn.salespersonConfig;
-	SELECT MAX(dated)
+	SELECT MAX(dated) INTO vFromDated
-        INTO vFromDated 
+		FROM vn.clientManaCache;
        FROM vn.clientManaCache;
-	 DELETE
+	DELETE FROM vn.clientManaCache
-        FROM vn.clientManaCache
+		WHERE dated = vFromDated;
-        WHERE dated = vFromDated;
+	
-    
+	SELECT MAX(dated) INTO vFromDated 
-    SELECT MAX(dated)
+		FROM vn.clientManaCache;
-        INTO vFromDated 
+			
-        FROM vn.clientManaCache;
+	IF vFromDated IS NULL THEN
-            
+		SELECT manaDateFrom
-    IF ISNULL(vFromDated) THEN
+			INTO vFromDated
-        SELECT manaDateFrom
+			FROM vn.salespersonConfig;
-            INTO vFromDated
+	END IF;
            FROM vn.salespersonConfig;
    END IF;
-    WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
+	WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
-        SELECT
+		SELECT vFromDated + INTERVAL vManaToDays DAY,
-                vFromDated + INTERVAL vManaToDays DAY,
+				vFromDated - INTERVAL vManaFromDays DAY 
-                vFromDated - INTERVAL vManaFromDays DAY 
+			INTO  vToDated,
-            INTO 
+				vForDeleteDated;
-                vToDated,
+			
-                vForDeleteDated;
+		DELETE FROM vn.clientManaCache
-            
+			WHERE dated <= vForDeleteDated;
        DELETE FROM vn.clientManaCache
            WHERE dated <= vForDeleteDated;
-        INSERT INTO vn.clientManaCache(clientFk, mana, dated)
+		INSERT INTO vn.clientManaCache(clientFk, mana, dated)
-            SELECT 
+			SELECT Id_Cliente,
-                    Id_Cliente,
+					SUM(mana),
-                    SUM(mana),
+					vToDated 
-                    vToDated 
+				FROM (
-                FROM 
+					SELECT a.clientFk Id_Cliente, s.quantity * sc.value mana
-                (
+						FROM vn.ticket t
-                    SELECT a.clientFk Id_Cliente, s.quantity * sc.value as mana
+							JOIN vn.address a ON a.id = t.addressFk
-                        FROM vn.ticket t
+							JOIN vn.sale s ON s.ticketFk = t.id
-                            JOIN vn.address a ON a.id = t.addressFk
+							JOIN vn.saleComponent sc ON sc.saleFk = s.id
-                            JOIN vn.sale s on s.ticketFk = t.id
+						WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
-                            JOIN vn.saleComponent sc on sc.saleFk = s.id
+							AND t.shipped > vFromDated 
-                        WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
+							AND DATE(t.shipped) <= vToDated
-                            AND t.shipped > vFromDated 
+					UNION ALL
-                            AND date(t.shipped) <= vToDated
+					SELECT clientFk, - amountPaid
-                    UNION ALL
+						FROM vn.receipt
-                    SELECT clientFk, - amountPaid
+						WHERE bankFk = vManaBankId
-                        FROM vn.receipt
+							AND payed > vFromDated 
-                        WHERE bankFk = vManaBankId
+							AND payed <= vToDated
-                            AND payed > vFromDated 
+					UNION ALL
-                            AND payed <= vToDated
+					SELECT clientFk, amount
-                    UNION ALL
+						FROM vn.greuge
-                    SELECT clientFk, amount
+						WHERE greugeTypeFk = vManaGreugeTypeId
-                        FROM vn.greuge
+							AND shipped > vFromDated 
-                        WHERE greugeTypeFk = vManaGreugeTypeId
+							AND shipped <= vToDated
-                            AND shipped > vFromDated 
+					UNION ALL
-                            AND shipped <= vToDated
+					SELECT clientFk, mana
-                    UNION ALL
+						FROM vn.clientManaCache
-                    SELECT clientFk, mana
+						WHERE dated = vFromDated
-                        FROM vn.clientManaCache
+				) sub
-                        WHERE dated = vFromDated
+				GROUP BY Id_Cliente
-                ) sub
+				HAVING Id_Cliente;
                GROUP BY Id_Cliente
                HAVING Id_Cliente;
-        SET vFromDated = vToDated;  
+		SET vFromDated = vToDated;
-    END WHILE;
+	END WHILE;
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/sale_add.sql
+++ b/db/routines/bs/procedures/sale_add.sql
@ -0,0 +1,64 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sale_add`(
 	IN vStarted DATE,
 	IN vEnded DATE
 )
 BEGIN
 /**
 * Añade las ventas que se realizaron entre 2 fechas a la tabla bs.sale
 * 
 * @param vStarted Fecha de inicio
 * @param vEnded Fecha de fin
 *
 */
 	IF vStarted < (util.VN_CURDATE() - INTERVAL 5 YEAR) OR vStarted > vEnded THEN
 		CALL util.throw('Wrong date');
 	END IF;
 	DELETE FROM sale 
 		WHERE dated BETWEEN vStarted AND vEnded;
 	REPLACE sale(
 		saleFk,
 		amount,
 		surcharge,
 		dated,
 		typeFk,
 		clientFk,
 		companyFk,
 		margin
 	)WITH calculatedSales AS(
 	SELECT s.id saleFk,
 			CAST(SUM(IF(ct.isBase, s.quantity * sc.value, 0)) AS DECIMAL(10, 3)) amount,
 			CAST(SUM(IF(ct.isBase, 0, s.quantity * sc.value)) AS DECIMAL(10, 3)) surcharge,
 			s.total,
 			DATE(t.shipped) dated,
 			i.typeFk,
 			t.clientFk,
 			t.companyFk,
 			CAST(SUM(IF(ct.isMargin, s.quantity * sc.value, 0 )) AS DECIMAL(10, 3)) marginComponents
 		FROM vn.ticket t
 			STRAIGHT_JOIN vn.sale s ON s.ticketFk = t.id
 			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.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
 		WHERE t.shipped BETWEEN vStarted AND vEnded
 			AND s.quantity <> 0
 			AND ic.merchandise 
 		GROUP BY s.id
 	)SELECT saleFk, 
 			amount, 
 			surcharge, 
 			dated, 
 			typeFk, 
 			clientFk, 
 			companyFk, 
 			IF (marginComponents IS NULL, 
 				0, 
 				CAST(marginComponents + amount + surcharge - total AS DECIMAL(10, 3)))
 		FROM calculatedSales;
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/ventas_add_launcher.sql
+++ b/db/routines/bs/procedures/ventas_add_launcher.sql
@ -1,13 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add_launcher`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sales_addLauncher`()
 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();
-	CALL ventas_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
+	
-
+	CALL sale_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/ventas_add.sql
+++ b/db/routines/bs/procedures/ventas_add.sql
@ -1,78 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add`(
 	IN vStarted DATETIME,
 	IN vEnded DATETIME)
 BEGIN
 /**
 * Añade las ventas que se realizaron entre
 * vStarted y vEnded
 * 
 * @param vStarted Fecha de inicio
 * @param vEnded Fecha de finalizacion
 *
 **/
 	DECLARE vStartingDate DATETIME;
 	DECLARE vEndingDate DATETIME;
 	IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) 
 		OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN
 		CALL util.throw('fechaDemasiadoAntigua');
 	END IF;
 	SET vEnded = util.dayEnd(vEnded);
 	SET vStartingDate = vStarted ;
 	SET vEndingDate = util.dayEnd(vStartingDate);
 	DELETE 
 		FROM sale 
 		WHERE dated BETWEEN vStartingDate AND vEnded;
 	WHILE vEndingDate <= vEnded DO
 		REPLACE ventas(Id_Movimiento, importe, recargo, fecha, tipo_id, Id_Cliente, empresa_id)
 			SELECT saleFk,
 					SUM(IF(ct.isBase, s.quantity * sc.value, 0)) importe,
 					SUM(IF(ct.isBase, 0, s.quantity * sc.value)) recargo,
 					vStartingDate,
 					i.typeFk,
 					a.clientFk,
 					t.companyFk
 				FROM vn.saleComponent sc
 					JOIN vn.component c ON c.id = sc.componentFk
 					JOIN vn.componentType ct ON ct.id = c.typeFk
 					JOIN vn.sale s ON s.id = sc.saleFk
 					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.ticket t ON t.id = s.ticketFk
 					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 
 				GROUP BY sc.saleFk
 				HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0;
 		UPDATE sale s
 				JOIN (
 					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.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 
 						WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
 							AND ct.isMargin = TRUE
 						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);
 		SET vEndingDate = util.dayEnd(vStartingDate);
 	END WHILE;
 END$$
 DELIMITER ;
--- a/db/routines/dipole/procedures/expedition_add.sql
+++ b/db/routines/dipole/procedures/expedition_add.sql
@ -34,7 +34,7 @@ BEGIN
 					vPrinterFk,
 					IFNULL(right(`t`.`routeFk`, 3),0),
 					if (@vVolume := vn.ticketTotalVolume(t.id) > 1.5, @vVolume, IFNULL( rm.beachFk, 0)),
-					LEFT(IFNULL(et.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
+					LEFT(IFNULL(rs.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
 					t.clientFk ,
 					ifnull(c.mobile, ifnull(a.mobile, ifnull(c.phone, a.phone))),
 					LEFT(p.name, 20),
@ -46,7 +46,7 @@ BEGIN
 					JOIN vn.address a ON a.id = t.addressFk
 					JOIN vn.province p ON p.id = a.provinceFk
 					LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-					LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+					LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
 					LEFT JOIN vn.beach b ON b.code = rm.beachFk
 					LEFT JOIN vn.`zone`z ON z.id = t.zoneFk
 					JOIN vn.agencyMode am ON t.agencyModeFk = am.id
--- a/db/routines/pbx/views/sipConf.sql
+++ b/db/routines/pbx/views/sipConf.sql
@ -12,7 +12,7 @@ AS SELECT `s`.`user_id` AS `id`,
 	`c`.`permit` AS `permit`,
 	`c`.`type` AS `type`,
 	`c`.`context` AS `context`,
-	`c`.`incomingLimit` AS `incominglimit`,
+	`c`.`call-limit` AS `call-limit`,
 	`c`.`pickupGroup` AS `pickupgroup`,
 	`c`.`directMedia` AS `directmedia`,
 	`c`.`insecure` AS `insecure`,
--- a/db/routines/sage/procedures/clientSupplier_add.sql
+++ b/db/routines/sage/procedures/clientSupplier_add.sql
@ -53,7 +53,7 @@ BEGIN
 			IFNULL(c.street, ''),
 			c.accountingAccount,
 			@fi := IF(cu.code = LEFT(TRIM(c.fi), 2) AND c.isVies, MID(TRIM(c.fi), 3, LENGTH(TRIM(c.fi))-1), TRIM(c.fi)),
-            IF(c.isVies, CONCAT(cu.code, @fi ), TRIM(c.fi)),
+            IF(c.isVies, CONCAT(IFNULL(cu.viesCode,cu.code), @fi ), TRIM(c.fi)),
 			IFNULL(c.postcode, ''),
 			IFNULL(c.city, ''),
 			IFNULL(pr.CodigoProvincia, ''),
@ -91,7 +91,7 @@ BEGIN
 				IFNULL(s.street, ''),
 				s.account,
 				@nif := IF(co.code = LEFT(TRIM(s.nif), 2), MID(TRIM(s.nif), 3, LENGTH(TRIM(s.nif))-1), TRIM(s.nif)),
-				IF(s.isVies, CONCAT(co.code, @nif), TRIM(s.nif)),
+				IF(s.isVies, CONCAT(IFNULL(co.viesCode,co.code), @nif), TRIM(s.nif)),
 				IFNULL(s.postCode,''),
 				IFNULL(s.city, ''),
 				IFNULL(pr.CodigoProvincia, ''),
--- a/db/routines/srt/functions/expedition_getDayMinute.sql
+++ b/db/routines/srt/functions/expedition_getDayMinute.sql
@ -15,14 +15,14 @@ BEGIN
 	DECLARE vDayMinute INT;
-	SELECT HOUR(IFNULL(et.ETD, z.`hour`)) * 60 + MINUTE(IFNULL(et.ETD, z.`hour`)) INTO vDayMinute 
+	SELECT HOUR(IFNULL(rs.ETD, z.`hour`)) * 60 + MINUTE(IFNULL(rs.ETD, z.`hour`)) INTO vDayMinute 
 		FROM vn.expedition e  
 			JOIN vn.ticket t ON e.ticketFk = t.id
 			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 t.routeFk = rm.routeFk 
-			LEFT JOIN vn.expeditionTruck et ON rm.expeditionTruckFk = et.id 
+			LEFT JOIN vn.roadmapStop rs ON rm.expeditionTruckFk = rs.id 
 		WHERE e.id = vExpeditionFk;
 	RETURN vDayMinute;
--- a/db/routines/srt/procedures/expedition_reset.sql
+++ b/db/routines/srt/procedures/expedition_reset.sql
@ -296,8 +296,8 @@ BEGIN
    SET @dm := (24 * 60) - 10;
-    UPDATE vn.expeditionTruck et 
+    UPDATE vn.roadmapStop rs 
-   		SET et.eta = timestampadd(MINUTE ,@dm := 1 + @dm,util.VN_CURDATE())
+   		SET rs.eta = timestampadd(MINUTE ,@dm := 1 + @dm,util.VN_CURDATE())
   		WHERE description LIKE 'PRU%' ;
   	DELETE FROM srt.movingLog ;
--- a/db/routines/srt/views/bufferDayMinute.sql
+++ b/db/routines/srt/views/bufferDayMinute.sql
@ -3,10 +3,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `srt`.`bufferDayMinute`
 AS SELECT `b`.`id` AS `bufferFk`,
 	`e`.`id` AS `expeditionFk`,
-	`srt`.`dayMinute`(IFNULL(`et`.`eta`, `z`.`hour`)) AS `dayMinute`,
+	`srt`.`dayMinute`(IFNULL(`rs`.`eta`, `z`.`hour`)) AS `dayMinute`,
 	`e`.`position` AS `position`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) MINUTE
 	) AS `ETD`,
 	`e2`.`ticketFk` AS `ticketFk`,
@ -34,7 +34,7 @@ FROM (
 				)
 				LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 			)
-			LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+			LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 		)
 		LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
 	)
--- a/db/routines/srt/views/bufferStock.sql
+++ b/db/routines/srt/views/bufferStock.sql
@ -4,22 +4,22 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `e`.`id` AS `expeditionFk`,
 	`e`.`bufferFk` AS `bufferFk`,
 	`e`.`position` AS `position`,
-	`srt`.`dayMinute`(IFNULL(`et`.`eta`, `z`.`hour`)) AS `dayMinute`,
+	`srt`.`dayMinute`(IFNULL(`rs`.`eta`, `z`.`hour`)) AS `dayMinute`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) + 120 MINUTE
 	) AS `eta`,
 	`ve`.`ticketFk` AS `ticketFk`,
 	IFNULL(`t`.`routeFk`, `t`.`agencyModeFk`) AS `routeFk`,
 	`z`.`name` AS `zonaTicket`,
-	`et`.`description` AS `truck`,
+	`rs`.`description` AS `truck`,
 	`es`.`description` AS `expeditionState`,
 	`b`.`hasWorkerWaiting` AS `hasWorkerWaiting`,
 	`b`.`isActive` AS `isActive`,
 	IF(
-		`et`.`id` IS NULL,
+		`rs`.`id` IS NULL,
 		`c`.`bufferDefault`,
-		`et`.`bufferFk`
+		`rs`.`bufferFk`
 	) AS `bufferTruck`,
 	`bt`.`typeName` AS `typeName`,
 	`rm`.`bufferFk` AS `routeBuffer`
@ -45,7 +45,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 			)
 			JOIN `srt`.`config` `c`
 		)
--- a/db/routines/srt/views/upperStickers.sql
+++ b/db/routines/srt/views/upperStickers.sql
@ -4,13 +4,13 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `e`.`id` AS `expeditionFk`,
 	`e`.`id` MOD 10000 AS `expedition`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) + 120 MINUTE
 	) AS `ETD`,
 	`ve`.`ticketFk` AS `ticketFk`,
 	right(IFNULL(`t`.`routeFk`, `t`.`agencyModeFk`), 3) AS `routeFk`,
 	`z`.`name` AS `zonaTicket`,
-	`et`.`description` AS `truck`,
+	`rs`.`description` AS `truck`,
 	`epo`.`workerCode` AS `worker`,
 	`p`.`name` AS `labeler`,
 	`ve`.`counter` AS `expeditionCounter`,
@ -32,7 +32,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 			)
 			JOIN `dipole`.`expedition_PrintOut` `epo` ON(`epo`.`expeditionFk` = `e`.`id`)
 		)
--- a/db/routines/vn/events/clientsDisable.sql
+++ b/db/routines/vn/events/clientsDisable.sql
@ -7,15 +7,19 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
 			LEFT JOIN account.account a ON a.id = u.id
 		SET u.active = FALSE
 		WHERE c.typeFk = 'normal'
 			AND a.id IS NULL
 			AND u.active
 			AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH 
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					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 t.created > util.VN_CURDATE() - INTERVAL 12 MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH 
 				);
 END$$
 DELIMITER ;
--- a/db/routines/vn/functions/sale_hasComponentLack.sql
+++ b/db/routines/vn/functions/sale_hasComponentLack.sql
@ -0,0 +1,28 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`sale_hasComponentLack`(
 	vSelf INT
 )RETURNS tinyint(1)
 	READS SQL DATA
 BEGIN
 /**
 * Check if a sales line has all the required components.
 * 
 * @param vSelf Id de sale
 * @return BOOL
 */
 	DECLARE vHasComponentLack TINYINT(1);
 	WITH componentRequired AS(
 	SELECT COUNT(*) total 
 		FROM vn.component
 		WHERE isRequired
 	)SELECT SUM(IF(c.isRequired, TRUE, FALSE)) <> cr.total INTO vHasComponentLack
 		FROM vn.sale s
 			JOIN componentRequired cr 
 			LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id 
 			LEFT JOIN vn.component c ON c.id = sc.componentFk
 		WHERE s.id = vSelf;
 	RETURN vHasComponentLack;	
 END$$
 DELIMITER ;
--- a/db/routines/vn/functions/ticket_isTooLittle.sql
+++ b/db/routines/vn/functions/ticket_isTooLittle.sql
@ -0,0 +1,25 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`ticket_isTooLittle`(
 	vSelf INT
 )
 	RETURNS tinyint(1)
 	READS SQL DATA
 BEGIN
 /**
 * Check if the ticket is small based on the volume and amount parameters.
 * 
 * @param vSelf Id ticket
 * @return BOOL
 */
 	DECLARE vIsTooLittle TINYINT(1);
 	SELECT (SUM(IFNULL(sv.litros, 0)) < vc.minTicketVolume 
 			OR IFNULL(t.totalWithoutVat, 0) < vc.minTicketValue) INTO vIsTooLittle
 		FROM ticket t
 			LEFT JOIN saleVolume sv ON sv.ticketFk = t.id
 			JOIN volumeConfig vc
 		WHERE t.id = vSelf;
 	RETURN vIsTooLittle;	
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/agencyVolume.sql
+++ b/db/routines/vn/procedures/agencyVolume.sql
@ -9,7 +9,7 @@ BEGIN
 	DECLARE vEnded DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
 	SELECT ag.id agency_id,
-			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
+			CONCAT(RPAD(c.name, 16,' _') ,' ',ag.name) Agencia,
 			COUNT(*) expediciones,
 			SUM(t.packages) Bultos,
 			SUM(tpe.boxes) Faltan
--- a/db/routines/vn/procedures/balance_create.sql
+++ b/db/routines/vn/procedures/balance_create.sql
@ -1,10 +1,11 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balance_create`(
-	IN vStartingMonth INT,
+	vStartingMonth INT,
-	IN vEndingMonth INT,
+	vEndingMonth INT,
-	IN vCompany INT,
+	vCompany INT,
-	IN vIsConsolidated BOOLEAN,
+	vIsConsolidated BOOLEAN,
-	IN vInterGroupSalesIncluded BOOLEAN)
+	vInterGroupSalesIncluded BOOLEAN
 )
 BEGIN
 /**
 * Crea un balance financiero para una empresa durante 
--- a/db/routines/vn/procedures/buy_recalcPricesByBuy.sql
+++ b/db/routines/vn/procedures/buy_recalcPricesByBuy.sql
@ -1,11 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_recalcPricesByBuy`(IN vBuyFk INT(11))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_recalcPricesByBuy`(
 	vBuyFk INT(11)
 )
 BEGIN
 /**
 * Recalcula los precios de una compra
 *
 * @param vBuyFk
- */  
+ */
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
 	CREATE TEMPORARY TABLE tmp.buyRecalc
--- a/db/routines/vn/procedures/buy_recalcPricesByEntry.sql
+++ b/db/routines/vn/procedures/buy_recalcPricesByEntry.sql
@ -1,11 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_recalcPricesByEntry`(IN vEntryFk INT(11))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_recalcPricesByEntry`(
 	vEntryFk INT(11)
 )
 BEGIN
 /**
 * Recalcula los precios de una entrada
 *
 * @param vEntryFk
- */  
+ */
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
 	CREATE TEMPORARY TABLE tmp.buyRecalc
--- a/db/routines/vn/procedures/catalog_componentCalculate.sql
+++ b/db/routines/vn/procedures/catalog_componentCalculate.sql
@ -259,7 +259,7 @@ BEGIN
 				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
 					AND tcs.warehouseFk = tcc.warehouseFk
 			WHERE IFNULL(tcs.classRate, 1) = 1
-				AND NOT tcc.groupingMode = 'packing'
+				AND (tcc.groupingMode = 'grouping' OR tcc.groupingMode IS NULL)
 				AND (tcc.packing > tcc.`grouping` OR tcc.groupingMode IS NULL)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -86,7 +86,7 @@ BEGIN
 		WHERE cs.description = 'Anulado'
 			AND c.created < v2Months;
-	DELETE FROM expeditionTruck WHERE eta < v3Months;
+	DELETE FROM roadmapStop WHERE eta < v3Months;
 	DELETE FROM XDiario WHERE FECHA < v3Months OR FECHA IS NULL;
 	-- Borrar travels sin entradas
@ -131,7 +131,8 @@ BEGIN
 	DELETE e
 		FROM entry e
-			JOIN tEntryToDelete tmp ON tmp.id = e.id;
+			JOIN tEntryToDelete tmp ON tmp.id = e.id
 		WHERE NOT e.isBooked;
 	-- borrar de route registros menores a 4 años
 	CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
--- a/db/routines/vn/procedures/client_getRisk.sql
+++ b/db/routines/vn/procedures/client_getRisk.sql
@ -22,7 +22,7 @@ BEGIN
 			c.credit,
 			CAST(r.risk AS DECIMAL (10,2)) risk,
 			CAST(c.credit - r.risk AS DECIMAL (10,2)) difference,
-			co.country
+			co.name country
 		FROM client c
 			JOIN tmp.risk r ON r.clientFk = c.id
 			JOIN country co ON co.id = c.countryFk
--- a/db/routines/vn/procedures/collection_addItem.sql
+++ b/db/routines/vn/procedures/collection_addItem.sql
@ -52,6 +52,10 @@ BEGIN
 	SELECT LAST_INSERT_ID() INTO vSaleFk;
 	UPDATE sale
 		SET originalQuantity = 0
 		WHERE id = vSaleFk;
 	CALL sale_calculateComponent(vSaleFk, NULL);
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@ -30,7 +30,10 @@ BEGIN
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 INTO vHasTooMuchCollections
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, 
 			collection_assign_lockname
 		INTO vHasTooMuchCollections,
 			vLockName
 		FROM productionConfig pc
 			LEFT JOIN tCollection ON TRUE;
--- a/db/routines/vn/procedures/company_getSuppliersDebt.sql
+++ b/db/routines/vn/procedures/company_getSuppliersDebt.sql
@ -188,11 +188,12 @@ 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
 			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
 			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
-			LEFT JOIN country co ON co.id = be.countryFk;
+			LEFT JOIN country co ON co.id = be.countryFk
 		GROUP BY vp.id;
 	DROP TEMPORARY TABLE tOpeningBalances;
 	DROP TEMPORARY TABLE tPendingDuedates;
--- a/db/routines/vn/procedures/conveyorExpedition_Add.sql
+++ b/db/routines/vn/procedures/conveyorExpedition_Add.sql
@ -24,7 +24,7 @@ BEGIN
                10 * p.height as height,
                IFNULL(t.routeFk,am.agencyFk) routeFk,
                hour(e.created) * 60 + minute(e.created),
-                IFNULL(et.description , a.name),
+                IFNULL(rs.description , a.name),
                IFNULL(t.routeFk,am.agencyFk) criterion,
                IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass)              
 		FROM vn.expedition e
@ -34,7 +34,7 @@ BEGIN
            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 
+            LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
            JOIN vn.packagingConfig pc 
 		WHERE t.warehouseFk IN (60,1,44)
            AND e.created BETWEEN vStarted AND vEnded
--- a/db/routines/vn/procedures/creditInsurance_getRisk.sql
+++ b/db/routines/vn/procedures/creditInsurance_getRisk.sql
@ -27,7 +27,7 @@ BEGIN
 			cac.invoiced billedAnnually,
 			c.dueDay,
 			cgd.grade,
-			c2.country
+			c2.name country
 		FROM tmp.clientGetDebt cgd
 			LEFT JOIN tmp.risk r ON r.clientFk = cgd.clientFk
 			JOIN client c ON c.id = cgd.clientFk
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/db/routines/vn/procedures/duaInvoiceInBooking.sql
@ -28,11 +28,10 @@ BEGIN
 			JOIN entry e ON e.invoiceInFk = ii.id
 			JOIN duaEntry de ON de.entryFk = e.id
 			JOIN dua d ON d.id = de.duaFk
-		SET ii.isBooked = TRUE,
+		SET ii.booked = IFNULL(ii.booked, d.booked),
-			ii.booked = IFNULL(ii.booked,d.booked),
+			ii.operated = IFNULL(ii.operated, d.operated),
-			ii.operated = IFNULL(ii.operated,d.operated),
+			ii.issued = IFNULL(ii.issued, d.issued),
-			ii.issued = IFNULL(ii.issued,d.issued),
+			ii.bookEntried = IFNULL(ii.bookEntried, d.bookEntried),
 			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
 			e.isBooked = TRUE,
 			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
@ -71,5 +70,9 @@ BEGIN
 		SET ASIEN = vASIEN
 		WHERE id = vDuaFk;
 	UPDATE invoiceIn ii
 			JOIN duaInvoiceIn dii ON dii.invoiceInFk = ii.id
 		SET ii.isBooked = TRUE
 		WHERE dii.duaFk = vDuaFk;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/expeditionTruck_Add.sql
+++ b/db/routines/vn/procedures/expeditionTruck_Add.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionTruck_Add`(vHour VARCHAR(5), vDescription VARCHAR(45))
 BEGIN
-	INSERT INTO vn.expeditionTruck(eta,description)
+	INSERT INTO vn.roadmapStop(eta,description)
 		VALUES(CONCAT(util.VN_CURDATE(), ' ', vHour), vDescription);
 END$$
--- a/db/routines/vn/procedures/expeditionTruck_List.sql
+++ b/db/routines/vn/procedures/expeditionTruck_List.sql
@ -4,9 +4,9 @@ BEGIN
 	SELECT 	id truckFk, 
 			eta, 
-            description Destino
+			description Destino
-		FROM expeditionTruck
+		FROM roadmapStop
-        WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+		WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-        ORDER BY eta;
+		ORDER BY eta;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/expedition_StateGet.sql
+++ b/db/routines/vn/procedures/expedition_StateGet.sql
@ -53,8 +53,8 @@ BEGIN
 			am.name zonaRuta,
 			t.routeFk ruta,
 			rm.beachFk ubicacion,
-			et.eta ,
+			rs.eta ,
-			et.description camion,
+			rs.description camion,
 			vTicketsPendientes AS ticketsPendientes,
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas,
@ -67,7 +67,7 @@ BEGIN
 			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 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
 END$$
--- a/db/routines/vn/procedures/expedition_getState.sql
+++ b/db/routines/vn/procedures/expedition_getState.sql
@ -37,8 +37,8 @@ BEGIN
 			am.name zonaRuta,
 			t.routeFk ruta,
 			rm.beachFk ubicacion,
-			et.eta ,
+			rs.eta ,
-			et.description camion,
+			rs.description camion,
 			vTicketsPendientes AS ticketsPendientes,
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas
@ -50,7 +50,7 @@ BEGIN
 			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 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
 END$$
--- a/db/routines/vn/procedures/fv_pca.sql
+++ b/db/routines/vn/procedures/fv_pca.sql
@ -1,101 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fv_pca`()
 BEGIN
 DECLARE done INT DEFAULT FALSE;
 DECLARE vTicketFk INT;
 DECLARE vSaleFk INT;
 DECLARE vClonTicket INT DEFAULT 0;
 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
 		JOIN vn.itemType it ON it.id = i.typeFk
 		WHERE t.shipped BETWEEN '2020-10-18' AND '2020-10-31'
 		AND it.code IN ('ANT','ANS','ORQ','TRO')
 		and t.warehouseFk = 1;
 DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 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,
 				addressFk,
 				agencyModeFk,
 				nickname,
 				warehouseFk,
 				companyFk,
 				landed,
 				zoneFk,
                zonePrice,
                zoneBonus,
                routeFk
 		)
 		SELECT
 				clientFk,
 				shipped,
 				addressFk,
 				agencyModeFk,
 				nickname,
 				44,
 				companyFk,
 				landed,
 				zoneFk,
                zonePrice,
                zoneBonus,
                routeFk
 		FROM ticket
 		WHERE id = vTicketFk;
 		SET vClonTicket = LAST_INSERT_ID();
 																										SELECT 'lstID', vClonTicket;
        /*
 		INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
 		SELECT vTicketFk, ao.observationTypeFk, ao.description
 			FROM addressObservation ao
 				JOIN ticket t ON t.addressFk = ao.addressFk
 			WHERE t.id = vClonTicket;
 */
 		INSERT INTO ticketLog
 		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;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/db/routines/vn/procedures/inventoryMake.sql
@ -21,7 +21,7 @@ BEGIN
 		SELECT id
 			FROM warehouse
 			WHERE isInventory;
-	
+
 	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
@ -38,18 +38,18 @@ BEGIN
 			INTO vMaxRecentInventories,
 				vWarehouseOutFkInventory,
 				vAgencyModeFkInventory
-		FROM inventoryConfig 
+		FROM inventoryConfig
 		LIMIT 1;
-	IF vDateLastInventory IS NULL 
+	IF vDateLastInventory IS NULL
 		OR vInventorySupplierFk IS NULL
-		OR vMaxRecentInventories IS NULL 
+		OR vMaxRecentInventories IS NULL
-		OR vInventoryDate IS NULL 
+		OR vInventoryDate IS NULL
 		OR vWarehouseOutFkInventory IS NULL
 		OR vAgencyModeFkInventory IS NULL THEN
 		CALL util.throw('Some config parameters are not set');
 	END IF;
-	
+
 	START TRANSACTION;
 	OPEN cWarehouses;
@ -77,7 +77,7 @@ BEGIN
 			LIMIT 1;
 		IF vTravelFk IS NULL THEN
-			INSERT INTO travel 
+			INSERT INTO travel
 				SET warehouseOutFk = vWarehouseOutFkInventory,
 					warehouseInFk = vWarehouseFk,
 					shipped = vInventoryDate,
@ -94,15 +94,16 @@ BEGIN
 		SELECT id INTO vEntryFk
 			FROM entry
 			WHERE supplierFk = vInventorySupplierFk
-			AND travelFk = vTravelFk;
+				AND travelFk = vTravelFk
 				AND typeFk = 'inventory';
 		IF vEntryFk IS NULL THEN
-			INSERT INTO entry 
+			INSERT INTO entry
 				SET supplierFk = vInventorySupplierFk,
 					isConfirmed = TRUE,
 					isOrdered = TRUE,
-					travelFk = vTravelFk;
+					travelFk = vTravelFk,
-
+					typeFk = 'inventory';
 			SELECT LAST_INSERT_ID() INTO vEntryFk;
 		ELSE
 			DELETE FROM buy WHERE entryFk = vEntryFk;
@ -224,15 +225,15 @@ BEGIN
 				JOIN tInventory i2 ON i2.itemFk = i.id
 			SET i.lastUsed = NOW()
 			WHERE i2.quantity;
-	
+
 		DROP TEMPORARY TABLE tInventory;
 	END LOOP;
-	
+
 	CLOSE cWarehouses;
 	UPDATE config SET inventoried = vInventoryDate;
-	
+
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		(INDEX(entryId)) ENGINE = MEMORY
 		SELECT e.id entryId,
@ -252,7 +253,7 @@ BEGIN
 			WHERE e.supplierFk = vInventorySupplierFk
 				AND t.shipped IN (sub.shipped);
-	DELETE e 
+	DELETE e
 		FROM `entry` e
 			JOIN tEntryToDelete tmp ON tmp.entryId = e.id;
--- a/db/routines/vn/procedures/invoiceInTax_afterUpsert.sql
+++ b/db/routines/vn/procedures/invoiceInTax_afterUpsert.sql
@ -10,8 +10,6 @@ BEGIN
 	DECLARE vLines INT;
 	DECLARE vHasDistinctTransactions INT;
 	CALL invoiceIn_checkBooked(vInvoiceInFk);
 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
 	SELECT COUNT(*) INTO vLines
--- a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
@ -5,8 +5,6 @@ BEGIN
 	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);
 	CALL invoiceIn_checkBooked(vInvoiceInFk);
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
--- a/db/routines/vn/procedures/itemShelvingRadar.sql
+++ b/db/routines/vn/procedures/itemShelvingRadar.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
 	vSectorFk INT
 )
-proc:BEGIN
+BEGIN
 /**
 * Calcula la información detallada respecto un sector.
 *
@ -15,37 +15,24 @@ proc:BEGIN
 	DECLARE vWarehouseFk INT DEFAULT 0;
 	DECLARE vSonSectorFk INT;
 	DECLARE vWorkerFk INT;
-	
+
-	SELECT s.workerFk 
+	SELECT s.workerFk INTO vWorkerFk 
-		INTO vWorkerFk 
+		FROM sector s
 		FROM vn.sector s
 		WHERE s.id = vSectorFk;
 	SELECT w.id, s.warehouseFk INTO vBuyerFk, vWarehouseFk
 		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
 			AND s.isMain;
 	SELECT COUNT(*) INTO hasFatherSector
-		FROM vn.sector
+		FROM sector
 		WHERE sonFk = vSectorFk;
-		
+
 	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
-		FROM vn.sector
+		FROM 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
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
 			(PRIMARY KEY (itemFk))
 			ENGINE = MEMORY 
 			SELECT * 
@ -54,57 +41,77 @@ proc:BEGIN
 							i.longName,
 							i.size,
 							i.subName producer,
-							IFNULL(a.available,0) available,
+							IFNULL(a.available, 0) available,
-							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible,0), 0)) upstairs,
+							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible, 0), 0)) upstairs,
-							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible,0), 0)) downstairs,
+							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible, 0), 0)) downstairs,
-							IF(it.isPackaging, NULL, IFNULL(v.visible,0)) as visible,
+							IF(it.isPackaging, NULL, IFNULL(v.visible, 0)) visible,
-							vSectorFk sectorFk
+							vSectorFk sectorFk,
-						FROM vn.itemShelvingStock iss
+							ish.isChecked,
-							JOIN vn.sector s ON s.id = iss.sectorFk
+							sub.isAllChecked
-							JOIN vn.item i on i.id = iss.itemFk
+						FROM itemShelvingStock iss
-							JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
+							JOIN itemShelving ish ON ish.shelvingFk = iss.shelvingFk
-							LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
+							LEFT JOIN (
-							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
+								SELECT itemFk,
 										IF(
 											COUNT(*) = SUM(IF(isChecked >= 0, 1, 0)),
 											TRUE,
 											FALSE
 										) isAllChecked
 									FROM itemShelving is2
 									GROUP BY itemFk
 							) sub ON sub.itemFk = ish.itemFk
 							JOIN sector s ON s.id = iss.sectorFk
 							JOIN item i ON i.id = iss.itemFk
 							JOIN itemType it ON it.id = i.typeFk
 							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
 							WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
 							GROUP BY iss.itemFk
 					UNION ALL
-						
+					SELECT v.item_id,
 					SELECT  v.item_id,
 							i.longName,
 							i.size,
-							i.subName producer,
+							i.subName,
-							IFNULL(a.available,0) as available,
+							IFNULL(a.available, 0),
-							0 upstairs,
+							0,
-							0 downstairs,
+							0,
-							IF(it.isPackaging, NULL, v.visible) visible,
+							IF(it.isPackaging, NULL, v.visible),
-							vSectorFk as sectorFk
+							vSectorFk,
 							NULL,
 							NULL
 						FROM cache.visible v  
-							JOIN vn.item i on i.id = v.item_id
+							JOIN item i ON i.id = v.item_id
-							JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
+							JOIN itemType it ON it.id = i.typeFk
-							LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk
+							LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id
-							LEFT JOIN cache.available a ON a.item_id = v.item_id AND a.calc_id = vCalcAvailableFk
+								AND iss.warehouseFk = vWarehouseFk
 							LEFT JOIN cache.available a ON a.item_id = v.item_id
 								AND a.calc_id = vCalcAvailableFk
 						WHERE v.calc_id = vCalcVisibleFk
 							AND iss.itemFk IS NULL
 							AND it.isInventory
-				) sub GROUP BY itemFk;
+				) sub
 				GROUP BY itemFk;
 		SELECT ishr.*, 
-				CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho,
+				CAST(visible - upstairs - downstairs AS DECIMAL(10, 0)) nicho,
-				CAST(downstairs - IFNULL(notPickedYed,0) AS DECIMAL(10,0)) as pendiente
+				CAST(downstairs - IFNULL(notPickedYed, 0) AS DECIMAL(10, 0)) pendiente
-				FROM tmp.itemShelvingRadar ishr
+			FROM tItemShelvingRadar ishr
-					JOIN vn.item i ON i.id = ishr.itemFk
+				JOIN item i ON i.id = ishr.itemFk
-					LEFT JOIN (SELECT s.itemFk, sum(s.quantity) as notPickedYed
+				LEFT JOIN (
-								FROM vn.ticket t
+					SELECT s.itemFk, SUM(s.quantity) notPickedYed
-									JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
+							FROM ticket t
-									JOIN vn.sale s ON s.ticketFk = t.id
+								JOIN ticketStateToday tst ON tst.ticketFk = t.id
-								WHERE t.warehouseFk = vWarehouseFk
+								JOIN alertLevel al ON al.id = tst.alertLevel
-									AND tst.alertLevel = 0
+								JOIN sale s ON s.ticketFk = t.id
-								GROUP BY s.itemFk
+							WHERE t.warehouseFk = vWarehouseFk
-							) sub ON sub.itemFk = ishr.itemFk
+								AND al.code = 'FREE'
-				ORDER BY i.typeFk, i.longName;
+							GROUP BY s.itemFk
 				) sub ON sub.itemFk = ishr.itemFk
 			ORDER BY i.typeFk, i.longName;
 	ELSE
-		CREATE TEMPORARY TABLE tmp.itemShelvingRadar
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
 			(PRIMARY KEY (itemFk))
 			ENGINE = MEMORY 
 			SELECT iss.itemFk,
@ -115,80 +122,86 @@ proc:BEGIN
 					i.size,
 					i.subName producer,
 					i.upToDown,
-					IFNULL(a.available,0) available,
+					IFNULL(a.available, 0) available,
-					IFNULL(v.visible - iss.visible,0) dayEndVisible,
+					IFNULL(v.visible - iss.visible, 0) dayEndVisible,
-					IFNULL(v.visible - iss.visible,0) firstNegative,
+					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,
+					IFNULL(i.minimum * b.packing, 0) itemPlacementSize,
 					ips.onTheWay,
 					iss.visible itemShelvingStock,
-					IFNULL(v.visible,0) visible,
+					IFNULL(v.visible, 0) visible,
 					b.isPickedOff,
 					iss.sectorFk
-				FROM vn.itemShelvingStock iss
+				FROM itemShelvingStock iss
-					JOIN vn.item i on i.id = iss.itemFk
+					JOIN item i ON i.id = iss.itemFk
-					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk AND lb.warehouse_id = vWarehouseFk
+					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk
-						LEFT JOIN vn.buy b ON b.id = lb.buy_id
+						AND lb.warehouse_id = vWarehouseFk
-					LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
+						LEFT JOIN buy b ON b.id = lb.buy_id
-					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
+					LEFT JOIN cache.available a ON a.item_id = iss.itemFk
-					LEFT JOIN (SELECT itemFk, sum(saldo) as  onTheWay
+						AND a.calc_id = vCalcAvailableFk
-									FROM vn.itemPlacementSupplyList 
+					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
-									WHERE saldo > 0 
+						AND v.calc_id = vCalcVisibleFk
-									GROUP BY itemFk
+					LEFT JOIN (
-								) ips ON ips.itemFk = i.id
+						SELECT itemFk, SUM(saldo) onTheWay
-					WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) 
+							FROM itemPlacementSupplyList 
-						OR iss.sectorFk = vSectorFk;            
+							WHERE saldo > 0 
 							GROUP BY itemFk
 					) ips ON ips.itemFk = i.id
 					WHERE iss.sectorFk = vSectorFk
 						OR iss.sectorFk IS NULL;            
-		DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime;
+		CREATE OR REPLACE TEMPORARY TABLE tmp.itemOutTime
-		CREATE TEMPORARY TABLE tmp.itemOutTime
+			SELECT *, SUM(amount) quantity
-			SELECT *,SUM(amount) quantity
+				FROM (
-				FROM 
+					SELECT io.itemFk,
-					(SELECT io.itemFk,
+							io.quantity amount, 
-								io.quantity amount, 
+							IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) `hours`, 
-								IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours, 
+							IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) `minutes`
-								IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
+						FROM itemTicketOut `io`
-							FROM itemTicketOut io
+							JOIN tItemShelvingRadar isr ON isr.itemFk = io.itemFk
-								JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.itemFk
+							JOIN ticket t ON t.id= io.ticketFk
-								JOIN vn.ticket t on t.id= io.ticketFk
+							JOIN ticketState ts ON ts.ticketFk = io.ticketFk
-								JOIN vn.ticketState ts on ts.ticketFk = io.ticketFk
+							JOIN `state` s ON s.id = ts.stateFk
-								JOIN vn.state s ON s.id = ts.stateFk
+							LEFT JOIN `zone` z ON z.id = t.zoneFk
-								LEFT JOIN vn.zone z ON z.id = t.zoneFk
+							LEFT JOIN (
-								LEFT JOIN (SELECT DISTINCT saleFk 
+								SELECT DISTINCT saleFk 
-											FROM vn.saleTracking st 
+									FROM saleTracking st 
-											WHERE st.created > util.VN_CURDATE() 
+									WHERE st.created > util.VN_CURDATE() 
-												AND st.isChecked
+										AND st.isChecked
-										)  stPrevious  ON `stPrevious`.`saleFk` = io.saleFk
+							) stPrevious ON stPrevious.saleFk = io.saleFk
-							WHERE t.warehouseFk = vWarehouseFk
+						WHERE t.warehouseFk = vWarehouseFk
-								AND s.isPicked = 0 
+							AND NOT s.isPicked
-								AND NOT io.reserved 
+							AND NOT io.reserved 
-								AND stPrevious.saleFk IS NULL
+							AND stPrevious.saleFk IS NULL
-								AND io.shipped >= util.VN_CURDATE() 
+							AND io.shipped >= util.VN_CURDATE() 
-								AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
+							AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
-					) sub
+				) sub
-				GROUP BY itemFk, hours, minutes;
+				GROUP BY itemFk, `hours`, `minutes`;
-		INSERT INTO tmp.itemShelvingRadar (itemFk)
+		INSERT INTO tItemShelvingRadar (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),
+					firstNegative = IF(firstNegative < 0, firstNegative, firstNegative + quantity),
-									`hour` = ifnull(if (firstNegative > 0 , `hour`, hours),0),
+					`hour` = IFNULL(IF(firstNegative > 0 , `hour`, `hours`), 0),
-									`minute` = ifnull(if (firstNegative > 0, `minute`, minutes),0);
+					`minute` = IFNULL(IF(firstNegative > 0, `minute`, `minutes`), 0);
-		UPDATE tmp.itemShelvingRadar isr
+		UPDATE tItemShelvingRadar isr
-			JOIN (SELECT s.itemFk, sum(s.quantity) amount
+				JOIN (
-					FROM sale s
+					SELECT s.itemFk, SUM(s.quantity) amount
-						JOIN ticket t ON t.id = s.ticketFk
+						FROM sale s
-						JOIN ticketLastState tls ON tls.ticketFk = t.id
+							JOIN ticket t ON t.id = s.ticketFk
-					WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+							JOIN ticketState ts ON ts.ticketFk = t.id
-						AND tls.name = 'Prep Camara'
+						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-					GROUP BY s.itemFk) sub ON sub.itemFk = isr.itemFk
+							AND ts.code = 'COOLER_PREPARATION'
 						GROUP BY s.itemFk
 				) sub ON sub.itemFk = isr.itemFk
 			SET isr.dayEndVisible = dayEndVisible + sub.amount,
 				firstNegative = firstNegative + sub.amount;
-		SELECT * FROM tmp.itemShelvingRadar;
+		SELECT * FROM tItemShelvingRadar;
 	END IF;
-	DROP TEMPORARY TABLE tmp.itemShelvingRadar;
+	DROP TEMPORARY TABLE tItemShelvingRadar;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`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.
@ -13,34 +13,27 @@ 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;
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
 	SET vQuantity = vQuantity * vPacking;
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
 		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
 		INSERT INTO shelving(code, parkingFk) 
 			SELECT vShelvingFk, id
 				FROM parking 
 				WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
 	IF vPacking IS NULL
 	THEN
 		SET vPacking = itemPacking(vBarcode, vWarehouseFk);
 		SET vQuantity = vQuantity * vPacking;
 	END IF;
-	IF (SELECT COUNT(*) FROM itemShelving 
+	IF (SELECT COUNT(*) FROM itemShelving
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
+			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
-				AND itemFk  = vItemFk 
+				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);
--- a/db/routines/vn/procedures/itemTrash.sql
+++ b/db/routines/vn/procedures/itemTrash.sql
@ -1,56 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemTrash`(
 	vItemFk INT,
 	vWarehouseFk INT,
 	vQuantity INT,
 	vIsTrash BOOLEAN)
 BEGIN
 	DECLARE vTicketFk INT;
 	DECLARE vClientFk INT;
 	DECLARE vCompanyVnlFk INT DEFAULT 442;
 	DECLARE vCalc INT;
 	SELECT barcodeToItem(vItemFk) INTO vItemFk;
 	SELECT IF(vIsTrash, 200, 400) INTO vClientFk;
 	SELECT t.id INTO vTicketFk
 		FROM ticket t
 			JOIN address a ON a.id=t.addressFk
 		WHERE t.warehouseFk = vWarehouseFk
 			AND t.clientFk = vClientFk
 			AND DATE(t.shipped) = util.VN_CURDATE()
 			AND a.isDefaultAddress
 		LIMIT 1;
 	CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
 	IF vTicketFk IS NULL THEN
 		CALL ticket_add(
 			vClientFk,
 			util.VN_CURDATE(),
 			vWarehouseFk,
 			vCompanyVnlFk,
 			NULL,
 			NULL,
 			NULL,
 			util.VN_CURDATE(),
 			account.myUser_getId(),
 			FALSE,
 			vTicketFk);
 	END IF;
 	INSERT INTO sale(ticketFk, itemFk, concept, quantity)
 		SELECT vTicketFk,
 				vItemFk,
 				CONCAT(longName,' ',worker_getCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
 				vQuantity
 			FROM item
 			WHERE id = vItemFk;
 	UPDATE cache.visible
 		SET visible = visible - vQuantity
 		WHERE calc_id = vCalc
 			AND item_id = vItemFk;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/item_getBalance.sql
+++ b/db/routines/vn/procedures/item_getBalance.sql
@ -9,7 +9,7 @@ BEGIN
 * @vItemFk item a buscar
 * @vWarehouseFk almacen donde buscar
 * @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.
+ * Si la fecha no es null, muestra histórico desde la fecha de vDate.
 */
 	DECLARE vDateInventory DATETIME;
@ -40,117 +40,154 @@ BEGIN
 		inventorySupplierFk INT(10)
 	);
-	INSERT INTO tItemDiary 
+	INSERT INTO tItemDiary
-		SELECT tr.landed shipped,
+		WITH entriesIn AS (
-				b.quantity `in`,
+			SELECT tr.landed shipped,
-				NULL `out`,
+					b.quantity `in`,
-				st.alertLevel ,
+					NULL `out`,
-				st.name stateName,
+					st.alertLevel ,
-				s.name `name`,
+					st.name stateName,
-				e.invoiceNumber reference,
+					s.name `name`,
-				e.id origin,
+					e.invoiceNumber reference,
-				s.id clientFk,
+					e.id origin,
-				IF(st.`code` = 'DELIVERED', TRUE, FALSE) isPicked,
+					s.id clientFk,
-				FALSE isTicket,
+					IF(st.`code` = 'DELIVERED', TRUE, FALSE) isPicked,
-				b.id lineFk,
+					FALSE isTicket,
-				NULL `order`,
+					b.id lineFk,
-				NULL clientType,
+					NULL `order`,
-				NULL claimFk,
+					NULL clientType,
-				ec.inventorySupplierFk
+					NULL claimFk,
-			FROM buy b
+					ec.inventorySupplierFk
-				JOIN entry e ON e.id = b.entryFk
+				FROM vn.buy b
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
+					JOIN vn.supplier s ON s.id = e.supplierFk
-					OR (util.VN_CURDATE() AND tr.isReceived),
+					JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
-						'DELIVERED', 
+						OR (util.VN_CURDATE() AND tr.isReceived),
-						'FREE')
+							'DELIVERED',
-				JOIN entryConfig ec
+							'FREE')
-			WHERE tr.landed >= vDateInventory
+					JOIN vn.entryConfig ec
-				AND vWarehouseFk = tr.warehouseInFk
+				WHERE tr.landed >= vDateInventory
-				AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
+					AND vWarehouseFk = tr.warehouseInFk
-				AND b.itemFk = vItemFk
+					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
-				AND e.isExcludedFromAvailable = FALSE
+					AND b.itemFk = vItemFk
-				AND e.isRaid = FALSE
+					AND NOT e.isExcludedFromAvailable
-		UNION ALL
+					AND NOT e.isRaid
-		SELECT tr.shipped,
+		), entriesOut AS (
-				NULL,
+			SELECT tr.shipped,
-				b.quantity,
+					NULL,
-				st.alertLevel,
+					b.quantity,
-				st.name,
+					st.alertLevel,
-				s.name,
+					st.name stateName,
-				e.invoiceNumber,
+					s.name ,
-				e.id,
+					e.invoiceNumber,
-				s.id,
+					e.id entryFk,
-				IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
+					s.id supplierFk,
-				FALSE,
+					IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
-				b.id,
+					FALSE isTicket,
-				NULL,
+					b.id,
-				NULL,
+					NULL `order`,
-				NULL,
+					NULL clientType,
-				ec.inventorySupplierFk
+					NULL claimFk,
-			FROM buy b
+					ec.inventorySupplierFk
-				JOIN entry e ON e.id = b.entryFk
+				FROM vn.buy b
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
-				JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE() 
+					JOIN vn.supplier s ON s.id = e.supplierFk
 					JOIN vn.state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
-					'DELIVERED', 
+							'DELIVERED',
-					'FREE')
+							'FREE')
-				JOIN entryConfig ec
+					JOIN vn.entryConfig ec
-			WHERE tr.shipped >= vDateInventory
+				WHERE tr.shipped >= vDateInventory
-				AND vWarehouseFk = tr.warehouseOutFk
+					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 b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
+						AND NOT e.isExcludedFromAvailable
-				AND w.isFeedStock = FALSE
+						AND NOT w.isFeedStock
-				AND e.isRaid = FALSE
+						AND NOT e.isRaid
-		UNION ALL
+		), sales AS (
-		SELECT DATE(t.shipped),
+			SELECT DATE(t.shipped) shipped,
-			NULL,
+					s.quantity,
-			s.quantity,
+					st2.alertLevel,
-			st2.alertLevel,
+					st2.name,
-			st2.name,
+					t.nickname,
-			t.nickname,
+					t.refFk,
-			t.refFk,
+					t.id ticketFk,
-			t.id,
+					t.clientFk,
-			t.clientFk,
+					s.id saleFk,
-			stk.id,
+					st.`order`,
-			TRUE,
+					c.typeFk,
-			s.id,
+					cb.claimFk
-			st.`order`,
+				FROM vn.sale s
-			c.typeFk,
+					JOIN vn.ticket t ON t.id = s.ticketFk
-			cb.claimFk,
+					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-			NULL
+					LEFT JOIN vn.state st ON st.`code` = ts.`code`
-		FROM sale s
+					JOIN vn.client c ON c.id = t.clientFk
-			JOIN ticket t ON t.id = s.ticketFk
+					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+						'DELIVERED',
-			LEFT JOIN state st ON st.`code` = ts.`code`
+						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
-			JOIN client c ON c.id = t.clientFk
+							'FREE',
-			JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
+							IFNULL(ts.code, 'FREE')))
-				'DELIVERED', 
+					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
-				IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
+				WHERE t.shipped >= vDateInventory
-					'FREE',
+					AND s.itemFk = vItemFk
-					IFNULL(ts.code, 'FREE')))
+					AND vWarehouseFk = t.warehouseFk
-			LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+		),sale AS (
-			LEFT JOIN saleTracking stk ON stk.saleFk = s.id 
+			SELECT s.shipped,
-				AND stk.stateFk = stPrep.id
+					NULL `in`,
-			LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+					s.quantity,
-		WHERE t.shipped >= vDateInventory
+					s.alertLevel,
-			AND s.itemFk = vItemFk
+					s.name,
-			AND vWarehouseFk =t.warehouseFk
+					s.nickname,
-		ORDER BY shipped,
+					s.refFk,
-			(inventorySupplierFk = clientFk) DESC,
+					s.ticketFk,
-			alertLevel DESC,
+					s.clientFk,
-			isTicket,
+					IF(stk.saleFk, TRUE, NULL),
-			`order` DESC,
+					TRUE,
-			isPicked DESC,
+					s.saleFk,
-			`in` DESC,
+					s.`order`,
-			`out` DESC;
+					s.typeFk,
 					s.claimFk,
 					NULL
 				FROM sales s
 					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
 					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
 						AND stk.stateFk = stPrep.id
 				GROUP BY s.saleFk
 		)	SELECT shipped,
 				`in`,
 				`out`,
 				alertLevel,
 				stateName,
 				`name`,
 				reference,
 				origin,
 				clientFk,
 				isPicked,
 				isTicket,
 				lineFk,
 				`order`,
 				clientType,
 				claimFk,
 				inventorySupplierFk
 				FROM entriesIn
 			UNION ALL
 			SELECT * FROM entriesOut
 			UNION ALL
 			SELECT * FROM sale
 			ORDER BY shipped,
 				(inventorySupplierFk = clientFk) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
 				isPicked DESC,
 				`in` DESC,
 				`out` DESC;
 	IF vDate IS NULL THEN
-	
+
 		SET @a := 0;
 		SET @currentLineFk := 0;
 		SET @shipped := '';
@ -220,7 +257,7 @@ BEGIN
 			FROM tItemDiary
 				WHERE shipped >= vDate;
 	END IF;
-	
+
 	DROP TEMPORARY TABLE tItemDiary;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@ -21,7 +21,7 @@ BEGIN
 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
-	-- Añadido temporalmente para ver si ya no sucede el cuelgue de db
+	-- Añadido temporalmente para que no se cuelgue la db
 	SET vShowType = TRUE;
 	WITH itemTags AS (
@ -82,7 +82,7 @@ BEGIN
 				AND iss.warehouseFk = vWarehouseFk
 			JOIN itemTags its
 		WHERE a.available > 0
-			AND IF(vShowType, i.typeFk = its.typeFk, TRUE)
+			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
 		ORDER BY `counter` DESC,
 			(t.name = its.name) DESC,
--- a/db/routines/vn/procedures/packageInvoicing.sql
+++ b/db/routines/vn/procedures/packageInvoicing.sql
@ -1,121 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packageInvoicing`(	
 														IN vClient INT,
 														IN vDate DATE,
                                                        IN vCompany INT,
                                                        IN vIsAllInvoiceable BOOLEAN,
                                                        OUT vNewTicket INT(11)
 													  )
 BEGIN
 	DECLARE vGraceDays INT;
    DECLARE vDateStart DATE DEFAULT '2017-11-21';
    DECLARE vIsInvoiceable BOOLEAN;
    DECLARE vWarehouse INT DEFAULT 13;
    DECLARE vComponentCost INT DEFAULT 28;
    DECLARE vGraceDate DATE;
 	DECLARE vDateEnd DATE;
 	SET vGraceDays = IF(vIsAllInvoiceable ,0, 30);
 	SET vGraceDate = TIMESTAMPADD(DAY, - vGraceDays, vDate);
    /* 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;
    CREATE TEMPORARY TABLE tmp.packageToInvoice
        SELECT 	p.itemFk,
 				tp.packagingFk,
                IF(tp.quantity < 0 OR t.shipped < vGraceDate, tp.quantity, 0) quantity,
                tp.ticketFk,
                p.price
            FROM ticketPackaging tp
                JOIN packaging p ON p.id = tp.packagingFk
                JOIN ticket t ON t.id = tp.ticketFk
            WHERE t.shipped BETWEEN vDateStart AND vDateEnd
                AND t.clientFk = vClient;
    DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoicePositives;
    CREATE TEMPORARY TABLE tmp.packageToInvoicePositives
        SELECT itemFk, sum(quantity) as totalQuantity
            FROM tmp.packageToInvoice
            GROUP BY itemFk
            HAVING totalQuantity > 0;
    SELECT COUNT(*)
        INTO vIsInvoiceable
        FROM tmp.packageToInvoicePositives;
    IF vIsInvoiceable THEN
    	CALL ticket_add(vClient, 
       		vDateEnd,
       		vWarehouse, 
 	       	vCompany, 
 	       	NULL, 
 	      	NULL, 
 	     	NULL, 
 		    vDateEnd, 
 	   		account.myUser_getId(), 
            TRUE,
 			vNewTicket);
    	INSERT INTO ticketPackaging(
 									ticketFk,
                                    packagingFk,
                                    quantity,
                                    pvp)
            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 
 						OR vIsAllInvoiceable
                GROUP BY packagingFk
                HAVING totalQuantity;
        INSERT INTO sale(
 						ticketFk,
 						itemFk, 
                        concept, 
                        quantity, 
                        price
                        )
            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 
 						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 ;
--- a/db/routines/vn/procedures/reportLabelCollection_get.sql
+++ b/db/routines/vn/procedures/reportLabelCollection_get.sql
@ -20,7 +20,7 @@ BEGIN
 			CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
 			CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.level) levelV,
 			tc.ticketFk,
-			LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
+			LEFT(COALESCE(rs.description, zo.name, am.name),12) agencyDescription,
 			am.name,
 			t.clientFk,
 			CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
@ -47,7 +47,7 @@ BEGIN
 			LEFT JOIN ticketTrolley tt ON tt.ticket = t.id
 			LEFT JOIN zone zo ON t.zoneFk = zo.id
 			LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
-			LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk
+			LEFT JOIN roadmapStop rs ON rs.id = rm.expeditionTruckFk
 		WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam)
 		GROUP BY t.id
 		ORDER BY cc.code;
--- a/db/routines/vn/procedures/routeMonitor_calculate.sql
+++ b/db/routines/vn/procedures/routeMonitor_calculate.sql
@ -106,8 +106,8 @@ BEGIN
 		SET rm.m3boxes = sub.m3boxes;
 	UPDATE routesMonitor rm
-			JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+			JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
-		SET rm.etd = et.eta;
+		SET rm.etd = rs.eta;
 	DROP TEMPORARY TABLE tmp.routesMonitor;
 END$$
--- a/db/routines/vn/procedures/sale_getProblems.sql
+++ b/db/routines/vn/procedures/sale_getProblems.sql
@ -34,7 +34,7 @@ BEGIN
 		ticketFk INT(11),
 		saleFk INT(11),
 		isFreezed INTEGER(1) DEFAULT 0,
-		risk DECIMAL(10,2) DEFAULT 0,
+		risk DECIMAL(10,1) DEFAULT 0,
 		hasHighRisk TINYINT(1) DEFAULT 0,
 		hasTicketRequest INTEGER(1) DEFAULT 0,
 		itemShortage VARCHAR(255),
@ -44,6 +44,7 @@ BEGIN
 		hasComponentLack INTEGER(1),
 		hasRounding VARCHAR(255),
 		isTooLittle BOOL DEFAULT FALSE,
 		isVip BOOL DEFAULT FALSE,
 		PRIMARY KEY (ticketFk, saleFk)
 	) ENGINE = MEMORY;
@ -79,6 +80,14 @@ BEGIN
 				JOIN volumeConfig vc
 			WHERE sub.litros < vc.minTicketVolume
 				AND sub.totalWithoutVat < vc.minTicketValue;
 	-- VIP
 	INSERT INTO tmp.sale_problems(ticketFk, isVip)
 		SELECT DISTINCT tl.ticketFk, TRUE
 			FROM tmp.ticket_list tl
 				JOIN client c ON c.id = tl.clientFk
 			WHERE c.businessTypeFk = 'VIP'
 			ON DUPLICATE KEY UPDATE isVip = TRUE;
 	-- Faltan componentes
 	INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
--- a/db/routines/vn/procedures/sale_setProblem.sql
+++ b/db/routines/vn/procedures/sale_setProblem.sql
@ -0,0 +1,18 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblem`(
 	vProblemCode VARCHAR(25)
 )
 BEGIN
 /**
 * Update column sale.problem with a problem code
 * @param vProblemCode Code to set or unset
 * @table tmp.sale(saleFk, hasProblem)
 */
 	UPDATE sale s
 			JOIN tmp.sale ts ON ts.saleFk = s.id 
 		SET s.problem = CONCAT(
 			IF(ts.hasProblem,
 				CONCAT(s.problem, ',', vProblemCode),
 				REPLACE(s.problem, vProblemCode , '')));
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/sale_setProblemComponentLack.sql
+++ b/db/routines/vn/procedures/sale_setProblemComponentLack.sql
@ -0,0 +1,21 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemComponentLack`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the problems for sales lines that have or no longer have problems with components, 
 * verify whether all mandatory components are present or not
 *
 * @param vSelf Id del sale
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 		(INDEX(saleFk))
 		ENGINE = MEMORY
 		SELECT vSelf saleFk, sale_hasComponentLack(vSelf) hasProblem;
 	CALL sale_setProblem('hasComponentLack');	
 	DROP TEMPORARY TABLE tmp.sale;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/sale_setProblemComponentLackByComponent.sql
+++ b/db/routines/vn/procedures/sale_setProblemComponentLackByComponent.sql
@ -0,0 +1,26 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemComponentLackByComponent`(
 	vComponentFk INT
 )
 BEGIN
 /**
 * Update the issues for sales lines that have or no longer have problems with components, verify 
 * whether all mandatory components are present or not resulting from changes in the table vn.component
 *
 * @param vComponentFk Id component
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 		(INDEX(saleFk))
 		ENGINE = MEMORY
 		SELECT s.id saleFk, sale_hasComponentLack(s.id) hasProblem
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = t.id
 				LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
 			WHERE t.shipped >= util.midnight()
 				AND (vComponentFk IS NULL OR sc.componentFk = vComponentFk);
 	CALL sale_setProblem('hasComponentLack');
 	DROP TEMPORARY TABLE tmp.sale;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/sale_setProblemRounding.sql
+++ b/db/routines/vn/procedures/sale_setProblemRounding.sql
@ -0,0 +1,34 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemRounding`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the rounding problem for a sales line
 * @param vSelf Id sale
 */
 	DECLARE vItemFk INT;
 	DECLARE vWarehouseFk INT;
 	DECLARE vShipped DATE;
 	DECLARE vQuantity INT;
 	SELECT s.itemFk, t.warehouseFk, t.shipped, s.quantity 
 			INTO vItemFk, vWarehouseFk, vShipped, vQuantity
 		FROM sale s 
 			JOIN ticket t ON t.id = s.ticketFk 
 		WHERE s.id = vSelf;
 	CALL buyUltimate(vWarehouseFk, vShipped);	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		SELECT vSelf saleFk, MOD(vQuantity, bu.`grouping`) hasProblem
 			FROM tmp.buyUltimate bu
 				JOIN buy b ON b.id = bu.buyFk
 			WHERE bu.itemFk = vItemFk;
 	CALL sale_setProblem('hasRounding');
 	DROP TEMPORARY TABLE tmp.ticket;
 	DROP TEMPORARY TABLE tmp.buyUltimate;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/stockBuyed_add.sql
+++ b/db/routines/vn/procedures/stockBuyed_add.sql
@ -43,7 +43,7 @@ BEGIN
 	INSERT INTO stockBuyed(buyed, dated, description)
 		SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
 				vDated,
-				IF(c.code = 'ES', p.name, c.country) destiny
+				IF(c.code = 'ES', p.name, c.name) destiny
 			FROM itemTicketOut ito
 				JOIN ticket t ON t.id = ito.ticketFk
 				JOIN `address` a ON a.id = t.addressFk
--- a/db/routines/vn/procedures/ticket_doCmr.sql
+++ b/db/routines/vn/procedures/ticket_doCmr.sql
@ -7,7 +7,7 @@ BEGIN
 *
 * @param vSelf El id del ticket
 */
-	DECLARE vCmrFk, vPreviousCmrFk, vCurrentCmrFk INT;
+	DECLARE vCmrFk INT;
 	SELECT cmrFk INTO vCmrFk
 		FROM ticket
 		WHERE id = vSelf;
@ -44,8 +44,6 @@ BEGIN
 				AND t.id = vSelf
 			GROUP BY t.id;
 	START TRANSACTION;
 	IF vCmrFk THEN
 		UPDATE cmr c
 				JOIN tTicket t
@ -57,9 +55,7 @@ BEGIN
 				c.supplierFk = t.supplierFk,
 				c.ead = t.landed
 			WHERE id = vCmrFk;
-	ELSE
+	ELSE		
 		SELECT MAX(id) INTO vPreviousCmrFk FROM cmr;
 		INSERT INTO cmr (
 			senderInstruccions,
 			truckPlate,
@ -70,17 +66,14 @@ BEGIN
 			ead
 		)
 			SELECT * FROM tTicket;
 		SELECT MAX(id) INTO vCurrentCmrFk FROM cmr;
-		IF vPreviousCmrFk <> vCurrentCmrFk THEN
+		IF (SELECT EXISTS(SELECT * FROM tTicket)) THEN
 			UPDATE ticket
-				SET cmrFk = vCurrentCmrFk
+				SET cmrFk = LAST_INSERT_ID()
 				WHERE id = vSelf;
 		END IF;
 	END IF;
 	COMMIT;
 	DROP TEMPORARY TABLE tTicket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_getProblems.sql
+++ b/db/routines/vn/procedures/ticket_getProblems.sql
@ -25,6 +25,7 @@ BEGIN
 			MAX(itemDelay) itemDelay,
 			MAX(hasRounding) hasRounding,
 			MAX(itemLost) itemLost,
 			MAX(isVip) isVip,
 			0 totalProblems
 		FROM tmp.sale_problems
 			GROUP BY ticketFk;
@ -40,7 +41,8 @@ BEGIN
 			(tp.isTooLittle) +
 			(tp.itemLost) +
 			(tp.hasRounding) +
-			(tp.itemShortage)
+			(tp.itemShortage) +
 			(tp.isVip)
 		);
 	DROP TEMPORARY TABLE tmp.sale_problems;
--- a/db/routines/vn/procedures/ticket_setProblem.sql
+++ b/db/routines/vn/procedures/ticket_setProblem.sql
@ -0,0 +1,19 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblem`(
 	vProblemCode VARCHAR(25)
 )
 BEGIN
 /**
 * Update column ticket.problem with a problem code
 * 
 * @param vProblemCode Code to set or unset
 * @table tmp.ticket(ticketFk, hasProblem)
 */
 	UPDATE ticket t
 			JOIN tmp.ticket tt ON tt.ticketFk = t.id 
 		SET t.problem = CONCAT(
 			IF(tt.hasProblem,
 				CONCAT(problem, ',', vProblemCode),
 				REPLACE(problem, vProblemCode , '')));
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemFreeze.sql
+++ b/db/routines/vn/procedures/ticket_setProblemFreeze.sql
@ -0,0 +1,29 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemFreeze`(
 	vClientFk INT 
 )
 BEGIN
 /**
 * Update the problem of tickets whose client is frozen or unfrozen
 * 
 * @param vClientFk Id Cliente, if NULL all clients
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		(INDEX(ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, FALSE hasProblem
 			FROM ticket t 
 			WHERE t.shipped >= util.midnight()
 				AND (vClientFk IS NULL OR t.clientFk = vClientFk);
 	UPDATE tmp.ticket t
 			JOIN ticket ti ON ti.id = t.ticketFk
 			JOIN client c ON c.id = ti.clientFk
 		SET t.hasProblem = TRUE
 		WHERE c.isFreezed;
 	CALL ticket_setProblem('hasTicketRequest');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemRequest.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRequest.sql
@ -0,0 +1,28 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRequest`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the problems of tickets that have a pending ticketRequest or no longer have it
 * 
 * @param vSelf Id ticket, if NULL ALL tickets
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		(INDEX(ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, FALSE hasProblem 
 			FROM ticket t 
 				WHERE t.shipped >= util.midnight()
 					AND (vSelf IS NULL OR t.id = vSelf);
 	UPDATE tmp.ticket t
 			JOIN ticketRequest tr ON tr.ticketFk = t.ticketFk
 		SET t.hasProblem = TRUE
 		WHERE tr.isOK IS NULL;
 	CALL ticket_setProblem('hasTicketRequest');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemRisk.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRisk.sql
@ -0,0 +1,33 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRisk`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the risk problem for a specific ticket
 *
 * @param vSelf Id ticket
 */
 	DECLARE vHasRisk BOOL;
 	DECLARE vHasHighRisk BOOL;
 	SELECT t.risk > (c.credit + 10), ((t.risk - cc.riskTolerance) > (c.credit + 10)) 
 			INTO vHasRisk, vHasHighRisk
 		FROM client c
 			JOIN ticket t ON t.clientFk = c.id 
 			JOIN clientConfig cc
 		WHERE t.id = vSelf;
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		SELECT vSelf ticketFk, vRisk hasProblem;
 	CALL ticket_setProblem('hasRisk');
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		SELECT vSelf ticketFk, vHasHighRisk hasProblem;
 	CALL ticket_setProblem('hasHighRisk');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemRounding.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRounding.sql
@ -0,0 +1,34 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRounding`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the rounding problem for the sales lines of a ticket
 *
 * @param vSelf Id de ticket
 */
 	DECLARE vWarehouseFk INT;
 	DECLARE vDated DATE;
 	SELECT warehouseFk, shipped 
 			INTO vWarehouseFk, vDated
 		FROM ticket
 		WHERE id = vSelf;
 	CALL buyUltimate(vWarehouseFk, vDated);	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		SELECT s.id saleFk , MOD(s.quantity, b.`grouping`) hasProblem
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = tl.ticketFk
 				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
 				JOIN buy b ON b.id = bu.buyFk
 			WHERE t.id = vSelf;
 	CALL sale_setProblem('hasRounding');
 	DROP TEMPORARY TABLE tmp.ticket;
 	DROP TEMPORARY TABLE tmp.buyUltimate;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemTaxDataChecked.sql
+++ b/db/routines/vn/procedures/ticket_setProblemTaxDataChecked.sql
@ -0,0 +1,24 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` 
 	PROCEDURE `vn`.`ticket_setProblemTaxDataChecked`(vClientFk INT)
 BEGIN
 /**
 * Update the problem of tickets, depending on whether 
 * the client taxDataCheched is verified or not
 * 
 * @param vClientFk Id cliente, if NULL all clients
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		(INDEX(ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, IF(c.isTaxDataChecked, FALSE, TRUE) hasProblem
 			FROM ticket t 
 				JOIN client c ON c.id = t.clientFk 
 			WHERE t.shipped >= util.midnight() 
 				AND (c.id = vClientFk OR vClientFk IS NULL);
 	CALL ticket_setProblem('isTaxDataChecked');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemTooLittle.sql
+++ b/db/routines/vn/procedures/ticket_setProblemTooLittle.sql
@ -0,0 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemTooLittle`(
 	vSelf INT
 )
 BEGIN
 /**
 * Update the problems when the ticket is too small or is no longer so
 *
 * @param vSelf Id del ticket
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		(INDEX(ticketFk))
 		ENGINE = MEMORY
 		SELECT vSelf ticketFk, ticket_isTooLittle(vSelf) hasProblem;
 	CALL ticket_setProblem('isTooLittle');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setProblemTooLittleItemCost.sql
+++ b/db/routines/vn/procedures/ticket_setProblemTooLittleItemCost.sql
@ -0,0 +1,29 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemTooLittleItemCost`(
 	vItemFk INT
 )
 BEGIN
 /**
 * Update the problems when the ticket is too small or is no longer so, 
 * derived from changes in the itemCost table
 * 
 * @param vItemFk Id del item, NULL ALL items
 */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
 		(INDEX(ticketFk))
 		ENGINE = MEMORY
 		WITH tickets AS(
 			SELECT t.id ticketFk
 				FROM vn.ticket t
 					JOIN vn.sale s ON s.ticketFk = t.id
 				WHERE t.shipped >= util.midnight()
 					AND (s.itemFk = vItemFk OR vItemFk IS NULL)
 				GROUP BY t.id
 		)SELECT ticketFk, ticket_isTooLittle(ticketFk) hasProblem
 			FROM tickets;
 	CALL ticket_setProblem('isTooLittle');
 	DROP TEMPORARY TABLE tmp.ticket;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setRisk.sql
+++ b/db/routines/vn/procedures/ticket_setRisk.sql
@ -0,0 +1,87 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setRisk`(
 	vClientFk INT)
 BEGIN
 /**
 * Update the risk for a client with pending tickets
 *
 * @param vClientFk Id cliente
 */
 	DECLARE vHasDebt BOOL;
 	SELECT COUNT(*) INTO vHasDebt
 		FROM `client`
 		WHERE id = vClientFk 
 			AND typeFk = 'normal';
 	IF vHasDebt THEN
 		CREATE OR REPLACE TEMPORARY TABLE tTicketRisk
 			(KEY (ticketFk))
 			ENGINE = MEMORY
 		WITH ticket AS(
 		SELECT id ticketFk, companyFk, DATE(shipped) dated
 			FROM vn.ticket t
 			WHERE clientFk = vClientFk
 				AND refFk IS NULL
 				AND NOT isDeleted 
 				AND totalWithoutVat <> 0
 		), dated AS(
 		SELECT t.companyFk, MIN(DATE(t.dated) - INTERVAL cc.riskScope MONTH) started,
 				MAX(DATE(t.dated)) ended
 			FROM ticket t
 				JOIN vn.clientConfig cc	
 			GROUP BY t.companyFk	
 		), balance AS(
 		SELECT SUM(amount)amount, companyFk
 			FROM (
 				SELECT amount, companyFk
 					FROM vn.clientRisk 
 					WHERE clientFk = vClientFk	
 				UNION ALL
 				SELECT -(SUM(amount) / 100) amount, tm.companyFk
 					FROM hedera.tpvTransaction t
 						JOIN hedera.tpvMerchant tm ON t.id = t.merchantFk
 					WHERE clientFk = vClientFk	
 						AND receiptFk IS NULL
 						AND status = 'ok'
 			) sub
 			WHERE companyFk
 			GROUP BY companyFk
 		), uninvoiced AS(
 		SELECT t.companyFk, DATE(t.shipped) dated, SUM(IFNULL(t.totalWithVat, 0)) amount
 			FROM vn.ticket t
 				JOIN dated d
 			WHERE t.clientFk = vClientFk
 				AND t.refFk IS NULL
 				AND t.shipped BETWEEN d.started AND d.ended
 			GROUP BY t.companyFk, DATE(t.shipped)
 		), receipt AS(
 		SELECT companyFk,DATE(payed) dated, SUM(amountPaid) amount
 		 	FROM vn.receipt 
 			WHERE clientFk = vClientFk
 				AND payed > util.VN_CURDATE() 
 			GROUP BY companyFk, DATE(payed)
 		), risk AS(
 		SELECT b.companyFk,
 				ui.dated, 
 				SUM(ui.amount) OVER (PARTITION BY b.companyFk ORDER BY ui.dated ) + 
 					b.amount + 
 					SUM(IFNULL(r.amount, 0)) amount
 			FROM balance b
 				JOIN uninvoiced ui ON ui.companyFk = b.companyFk
 				LEFT JOIN receipt r ON r.dated > ui.dated AND r.companyFk = ui.companyFk
 			GROUP BY b.companyFk, ui.dated
 		)
 		SELECT ti.ticketFk, r.amount
 			FROM ticket ti 
 				JOIN risk r ON r.dated = ti.dated AND r.companyFk = ti.companyFk;
 		UPDATE ticket t 
 				JOIN tTicketRisk tr ON tr.ticketFk = t.id
 			SET t.risk = tr.amount;
 		DROP TEMPORARY TABLE tTicketRisk;
 	END IF;	
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/workerDisable.sql
+++ b/db/routines/vn/procedures/workerDisable.sql
@ -28,5 +28,9 @@ mainLabel:BEGIN
 	UPDATE `client` c
 		SET c.salesPersonFk = null
 		WHERE c.salesPersonFk = vUserId;
 	UPDATE locker l
 		SET l.workerFk = NULL
 		WHERE l.workerFk = vUserId; 
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/workerTimeControl_direction.sql
+++ b/db/routines/vn/procedures/workerTimeControl_direction.sql
@ -26,7 +26,7 @@ BEGIN
 		FROM workerTimeControl 
 		WHERE userFk = vWorkerFk
 			AND direction = 'middle' 
-			AND timed BETWEEN vLastIn AND util.VN_NOW();
+			AND timed BETWEEN vLastIn AND vTimed;
 	DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
 	CREATE TEMPORARY TABLE tmp.workerTimeControlDirection
--- a/db/routines/vn/procedures/worker_updateBalance.sql
+++ b/db/routines/vn/procedures/worker_updateBalance.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBalance`(vSelfFk INT(11), vCredit DECIMAL(10,2), vDebit DECIMAL(10,2))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBalance`(vSelf INT(11), vCredit DECIMAL(10,2), vDebit DECIMAL(10,2))
 BEGIN
 /**
 * Actualiza la columna balance de worker.
@ -8,6 +8,6 @@ BEGIN
 */
 	UPDATE worker
 		SET balance = IFNULL(balance, 0) + IFNULL(vCredit, 0) - IFNULL(vDebit, 0)
-		WHERE id = vSelfFk;
+		WHERE id = vSelf;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/client_afterUpdate.sql
+++ b/db/routines/vn/triggers/client_afterUpdate.sql
@ -10,11 +10,5 @@ BEGIN
 		UPDATE `address` SET isDefaultAddress = TRUE
 			WHERE id = NEW.defaultAddressFk;
 	END IF;
 	IF NOT NEW.isActive THEN
 		UPDATE account.`user`
 			SET active = FALSE
 			WHERE id = NEW.id;
 	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/country_afterInsert.sql
+++ b/db/routines/vn/triggers/country_afterInsert.sql
@ -5,14 +5,17 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterInsert`
 BEGIN
 	UPDATE sage.Naciones
 		SET countryFk = NEW.id
-		WHERE Nacion = NEW.country;
+		WHERE Nacion = NEW.name;
 	IF ROW_COUNT() = 0 THEN
 		CALL mail_insert(
 			'cau@verdnatura.es',
 			NULL,
 			'Actualizar tabla sage.Naciones',
-			CONCAT('Se ha insertado un nuevo país en la tabla vn.conuntry. Para el correcto funcionamiento del sistema \n\t\t\t\tde contabilidad es necesario actualizar la columna sage.Naciones.countryFk con el valor del nuevo país. \n\t\t\t Hay que buscar el nuevo país: ', NEW.country, ' en la tabla sage.Naciones y actualizar el campo sage.Naciones.countryFk con el valor ', NEW.id)
+			CONCAT('Se ha insertado un nuevo país en la tabla vn.conuntry. 
 				Para el correcto funcionamiento del sistema \n\t\t\t\tde contabilidad es necesario actualizar la columna
 				sage.Naciones.countryFk con el valor del nuevo país. \n\t\t\t Hay que buscar el nuevo país: ', NEW.name, 
 				' en la tabla sage.Naciones y actualizar el campo sage.Naciones.countryFk con el valor ', NEW.id)
 		);
 	END IF;
 END$$
--- a/db/routines/vn/triggers/country_afterUpdate.sql
+++ b/db/routines/vn/triggers/country_afterUpdate.sql
@ -3,8 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterUpdate`
 	AFTER UPDATE ON `country`
 	FOR EACH ROW
 BEGIN
-	IF !(OLD.country <=> NEW.country) THEN
+	IF !(OLD.name <=> NEW.name) THEN
-		UPDATE zoneGeo SET `name` = NEW.country
+		UPDATE zoneGeo SET `name` = NEW.name
 			WHERE id = NEW.geoFk;
 	END IF;
 END$$
--- a/db/routines/vn/triggers/country_beforeInsert.sql
+++ b/db/routines/vn/triggers/country_beforeInsert.sql
@ -3,6 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_beforeInsert`
 	BEFORE INSERT ON `country`
 	FOR EACH ROW
 BEGIN
-    SET NEW.geoFk = zoneGeo_new('country', NEW.country, NULL);
+    SET NEW.geoFk = zoneGeo_new('country', NEW.name, NULL);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/entry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/entry_beforeUpdate.sql
@ -6,9 +6,19 @@ BEGIN
 	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
 	IF NEW.isBooked = OLD.isBooked THEN
 		CALL entry_checkBooked(OLD.id);
 	ELSE
 		IF NEW.isBooked THEN
 			SELECT COUNT(*) INTO vTotalBuy
 				FROM buy
 				WHERE entryFk = NEW.id;
 			IF NOT vTotalBuy THEN
 				CALL util.throw('Entry must have lines to be marked booked');
 			END IF;
 		END IF;
 	END IF;
 	SET NEW.editorFk = account.myUser_getId();
@ -16,7 +26,7 @@ BEGIN
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
 		IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
-			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
 		END IF;
 		SELECT COUNT(*) > 0 INTO vIsVirtual
--- a/db/routines/vn/triggers/invoiceInCorrection_beforeDelete.sql
+++ b/db/routines/vn/triggers/invoiceInCorrection_beforeDelete.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeDelete`
 	BEFORE DELETE ON `invoiceInCorrection`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.correctingFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInCorrection_beforeInsert.sql
+++ b/db/routines/vn/triggers/invoiceInCorrection_beforeInsert.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeInsert`
 	BEFORE INSERT ON `invoiceInCorrection`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(NEW.correctingFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInCorrection_beforeUpdate.sql
+++ b/db/routines/vn/triggers/invoiceInCorrection_beforeUpdate.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeUpdate`
 	BEFORE UPDATE ON `invoiceInCorrection`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.correctingFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInDueDay_beforeDelete.sql
+++ b/db/routines/vn/triggers/invoiceInDueDay_beforeDelete.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_beforeDelete`
 	BEFORE DELETE ON `invoiceInDueDay`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql
+++ b/db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql
@ -5,8 +5,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_befor
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
 	SET NEW.editorFk = account.myUser_getId();
    SELECT isNotified INTO vIsNotified 
--- a/db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql
+++ b/db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql
@ -5,7 +5,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_befor
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 	SET NEW.editorFk = account.myUser_getId();
    SELECT isNotified INTO vIsNotified 
--- a/db/routines/vn/triggers/invoiceInIntrastat_beforeDelete.sql
+++ b/db/routines/vn/triggers/invoiceInIntrastat_beforeDelete.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeDelete`
 	BEFORE DELETE ON `invoiceInIntrastat`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInIntrastat_beforeInsert.sql
+++ b/db/routines/vn/triggers/invoiceInIntrastat_beforeInsert.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeInsert`
 	BEFORE INSERT ON `invoiceInIntrastat`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInIntrastat_beforeUpdate.sql
+++ b/db/routines/vn/triggers/invoiceInIntrastat_beforeUpdate.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeUpdate`
 	BEFORE UPDATE ON `invoiceInIntrastat`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInTax_beforeDelete.sql
+++ b/db/routines/vn/triggers/invoiceInTax_beforeDelete.sql
@ -1,8 +0,0 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeDelete`
 	BEFORE DELETE ON `invoiceInTax`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql
+++ b/db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql
@ -3,8 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeUp
 	BEFORE UPDATE ON `invoiceInTax`
 	FOR EACH ROW
 BEGIN
 	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 	IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN 
 		CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
 	END IF;
--- a/db/routines/vn/triggers/invoiceIn_beforeUpdate.sql
+++ b/db/routines/vn/triggers/invoiceIn_beforeUpdate.sql
@ -5,10 +5,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_beforeUpdat
 BEGIN
 	DECLARE vWithholdingSageFk INT;
 	IF NEW.isBooked = OLD.isBooked THEN
 		CALL invoiceIn_checkBooked(OLD.id);
 	END IF;
 	IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
 		CALL util.throw('The invoiceIn reference contains invalid characters');
 	END IF;
--- a/db/routines/vn/triggers/ticket_afterUpdate.sql
+++ b/db/routines/vn/triggers/ticket_afterUpdate.sql
@ -7,6 +7,8 @@ BEGIN
 		UPDATE expedition
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 		CALL ticket_doCmr(NEW.id);
 	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/views/exchangeReportSource.sql
+++ b/db/routines/vn/views/exchangeReportSource.sql
@ -1,22 +0,0 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`exchangeReportSource`
 AS SELECT `e`.`dated` AS `dated`,
 	cast(sum(`e`.`amountIn`) AS decimal(10, 2)) AS `amountIn`,
 	cast(sum(`e`.`rateIn`) AS decimal(10, 4)) AS `rateIn`,
 	cast(sum(`e`.`amountOut`) AS decimal(10, 2)) AS `amountOut`,
 	cast(sum(`e`.`rateOut`) AS decimal(10, 4)) AS `rateOut`,
 	cast(sum(`e`.`amountEntry`) AS decimal(10, 2)) AS `amountEntry`,
 	cast(sum(`e`.`rateEntry`) AS decimal(10, 4)) AS `rateEntry`,
 	cast(
 		IFNULL(`rr`.`value`, `rrc`.`simulatedValue`) AS decimal(10, 4)
 	) AS `rateECB`
 FROM (
 		(
 			`vn`.`exchangeReportSourcePrevious` `e`
 			LEFT JOIN `vn`.`referenceRate` `rr` ON(`rr`.`dated` = `e`.`dated`)
 		)
 		JOIN `vn`.`referenceRateConfig` `rrc` ON(1)
 	)
 GROUP BY `e`.`dated`
 ORDER BY `e`.`dated`
--- a/db/routines/vn/views/exchangeReportSourcePrevious.sql
+++ b/db/routines/vn/views/exchangeReportSourcePrevious.sql
@ -1,29 +0,0 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`exchangeReportSourcePrevious`
 AS SELECT `exchangeInsuranceIn`.`dated` AS `dated`,
 	`exchangeInsuranceIn`.`amount` AS `amountIn`,
 	`exchangeInsuranceIn`.`rate` AS `rateIn`,
 	0.00 AS `amountOut`,
 	0.00 AS `rateOut`,
 	0.00 AS `amountEntry`,
 	0.00 AS `rateEntry`
 FROM `vn`.`exchangeInsuranceIn`
 UNION ALL
 SELECT `exchangeInsuranceOut`.`received` AS `received`,
 	0.00 AS `amountIn`,
 	0.00 AS `ratedIn`,
 	`exchangeInsuranceOut`.`divisa` AS `amountOut`,
 	`exchangeInsuranceOut`.`rate` AS `ratedOut`,
 	0.00 AS `amountEntry`,
 	0.00 AS `rateEntry`
 FROM `vn`.`exchangeInsuranceOut`
 UNION ALL
 SELECT `exchangeInsuranceEntry`.`dated` AS `dated`,
 	0.00 AS `amountIn`,
 	0.00 AS `ratedIn`,
 	0.00 AS `amountOut`,
 	0.00 AS `ratedOut`,
 	`exchangeInsuranceEntry`.`Dolares` AS `amountEntry`,
 	`exchangeInsuranceEntry`.`rate` AS `rateEntry`
 FROM `vn`.`exchangeInsuranceEntry`
--- a/db/routines/vn/views/expeditionCommon.sql
+++ b/db/routines/vn/views/expeditionCommon.sql
@ -1,9 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionCommon`
-AS SELECT `et`.`id` AS `truckFk`,
+AS SELECT `rs`.`id` AS `truckFk`,
-	`et`.`eta` AS `eta`,
+	`rs`.`eta` AS `eta`,
-	IFNULL(ucase(`et`.`description`), 'SIN ESCANEAR') AS `description`,
+	IFNULL(ucase(`rs`.`description`), 'SIN ESCANEAR') AS `description`,
 	`es`.`palletFk` AS `palletFk`,
 	`t`.`routeFk` AS `routeFk`,
 	`es`.`id` AS `scanFk`,
@ -17,8 +17,8 @@ FROM (
 			(
 				(
 					(
-						`vn`.`expeditionTruck` `et`
+						`vn`.`roadmapStop` `rs`
-						LEFT JOIN `vn`.`routesMonitor` `r` ON(`et`.`id` = `r`.`expeditionTruckFk`)
+						LEFT JOIN `vn`.`routesMonitor` `r` ON(`rs`.`id` = `r`.`expeditionTruckFk`)
 					)
 					LEFT JOIN `vn`.`ticket` `t` ON(`r`.`routeFk` = `t`.`routeFk`)
 				)
@ -28,4 +28,4 @@ FROM (
 		)
 		LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`es`.`palletFk` = `ep`.`id`)
 	)
-WHERE `et`.`eta` >= `util`.`VN_CURDATE`()
+WHERE `rs`.`eta` >= `util`.`VN_CURDATE`()
--- a/db/routines/vn/views/expeditionPallet_Print.sql
+++ b/db/routines/vn/views/expeditionPallet_Print.sql
@ -1,12 +1,12 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionPallet_Print`
-AS SELECT `et2`.`description` AS `truck`,
+AS SELECT `rs2`.`description` AS `truck`,
 	`t`.`routeFk` AS `routeFk`,
 	`r`.`description` AS `zone`,
 	COUNT(`es`.`id`) AS `eti`,
 	`ep`.`id` AS `palletFk`,
-	`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
+	`rs`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
 		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
@ -20,8 +20,8 @@ FROM (
 					(
 						(
 							(
-								`vn`.`expeditionTruck` `et`
+								`vn`.`roadmapStop` `rs`
-								JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`)
+								JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `rs`.`id`)
 							)
 							JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`)
 						)
@ -33,7 +33,7 @@ FROM (
 			)
 			LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`)
 		)
-		LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs2` ON(`rs2`.`id` = `rm`.`expeditionTruckFk`)
 	)
 GROUP BY `ep`.`id`,
 	`t`.`routeFk`
--- a/db/routines/vn/views/expeditionRoute_Monitor.sql
+++ b/db/routines/vn/views/expeditionRoute_Monitor.sql
@ -15,7 +15,7 @@ FROM (
 						`vn`.`route` `r`
 						LEFT JOIN `vn`.`routesMonitor` `rm` ON(`r`.`id` = `rm`.`routeFk`)
 					)
-					LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+					LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 				)
 				JOIN `vn`.`ticket` `t` ON(`t`.`routeFk` = `r`.`id`)
 			)
--- a/db/routines/vn/views/expeditionScan_Monitor.sql
+++ b/db/routines/vn/views/expeditionScan_Monitor.sql
@ -1,9 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionScan_Monitor`
-AS SELECT `et`.`id` AS `truckFk`,
+AS SELECT `rs`.`id` AS `truckFk`,
-	`et`.`eta` AS `ETD`,
+	`rs`.`eta` AS `ETD`,
-	`et`.`description` AS `description`,
+	`rs`.`description` AS `description`,
 	`ep`.`id` AS `palletFk`,
 	`ep`.`position` AS `position`,
 	`ep`.`built` AS `built`,
@ -12,8 +12,8 @@ AS SELECT `et`.`id` AS `truckFk`,
 	`es`.`scanned` AS `scanned`
 FROM (
 		(
-			`vn`.`expeditionTruck` `et`
+			`vn`.`roadmapStop` `rs`
-			LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`)
+			LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `rs`.`id`)
 		)
 		LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`)
 	)
--- a/db/routines/vn/views/expeditionSticker.sql
+++ b/db/routines/vn/views/expeditionSticker.sql
@ -14,7 +14,7 @@ AS SELECT `e`.`id` AS `expeditionFk`,
 	IF(
 		`t`.`routeFk`,
 		IFNULL(
-			`et`.`description`,
+			`rs`.`description`,
 			REPLACE(`am`.`name`, 'ZONA ', 'Z')
 		),
 		`z`.`name`
@ -45,7 +45,7 @@ FROM (
 									)
 									LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 								)
-								LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+								LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 							)
 							LEFT JOIN `vn`.`beach` `b` ON(`b`.`code` = `rm`.`beachFk`)
 						)
--- a/db/routines/vn/views/expeditionTicket_NoBoxes.sql
+++ b/db/routines/vn/views/expeditionTicket_NoBoxes.sql
@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `t`.`id` AS `ticketFk`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	`t`.`routeFk` AS `routeFk`,
-	`et`.`description` AS `description`
+	`rs`.`description` AS `description`
 FROM (
 		(
 			(
@ -13,7 +13,7 @@ FROM (
 			)
 			JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 		)
-		JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+		JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 	)
 WHERE `e`.`id` IS NULL
-	AND `et`.`eta` > `util`.`VN_CURDATE`()
+	AND `rs`.`eta` > `util`.`VN_CURDATE`()
--- a/Show More
+++ b/Show More