Merge branch 'test' into dev

Reviewed-on: #3427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

CHANGELOG.md

@@ -1,3 +1,77 @@
+# Version 25.04 - 2025-01-28
+
+### Added 🆕
+
+- feat: refs #7202 added new field  by:Jon
+- feat: refs #7343 delete sending to user  by:ivanm
+- feat: refs #7569 refs#7569 sendEmailNotification  by:sergiodt
+- feat: refs #7569 refs#7569 sendMail  by:sergiodt
+- feat: refs #7584 changes request  by:robert
+- feat: refs #7584 workerTimeControl_afterDelete  by:robert
+- feat: refs #7832 implement refund ticket restrictions and add unit tests for ticket service updates  by:jgallego
+- feat: refs #7882 Added coords to create a address  by:guillermo
+- feat: refs #8073 change names and primary key  by:ivanm
+- feat: refs #8073 new comment message  by:ivanm
+- feat: refs #8073 #refs 8073 create vn.productionCountryVolume  by:ivanm
+- feat: refs #8117 add worker first and last name to item type query  by:jtubau
+- feat: refs #8247 added new acl for VnUser model  by:Jon
+- feat: refs #8258 added uppercase validation on supplier create  (origin/8258-uppercaseInputs) by:provira
+- feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables  by:jgallego
+- feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data  by:jgallego
+- feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table  by:jgallego
+- feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana  by:guillermo
+- feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic  by:jgallego
+- feat: refs #8381 add initial and final temperature fields to entry model and queries  by:jgallego
+
+### Changed 📦
+
+- refactor: order by id  by:alexm
+- refactor: refs #7202 modified new invoice procedure and incoterms sql  by:Jon
+- refactor: refs #7202 modified procedure to include customsAgent field when creating an invoice  by:Jon
+- refactor: refs #8378 deprecate bi.f_tvc  by:ivanm
+
+### Fixed 🛠️
+
+- feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data  by:jgallego
+- fix: prevent slow update  (HEAD -> 8452-testToMaster, origin/test, origin/8452-testToMaster, test) by:alexm
+- fix: refs #7202 fixed back test  by:Jon
+- fix: refs #7202 fixed sql  by:Jon
+- fix: refs #7569 refs·6861 ticketOrderReserve  by:sergiodt
+- fix: refs #7569 refs·6861 ticketOrderReserve  (origin/7569-sendEmailOrderTicket) by:sergiodt
+- fix: refs #7569 refs#8188 add IfNotExists  by:sergiodt
+- fix: refs #7832 update ticketService model test suite to correct describe block  by:jgallego
+- fix: refs #8298 remove duplicate entry in English locale file  by:jgallego
+- fix: refs #8361 streamline transaction handling in exchangeRateUpdate  by:jgallego
+- test: refs #8448 fix e2e  by:alexm
+
+# Version 25.00 - 2025-01-14
+
+### Added 🆕
+
+- feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests  by:jgallego
+- feat: refs #7301 update lastEntriesFilter to include landedDate and enhance test cases  (origin/7301-removeRedundantInventories) by:pablone
+- feat: refs #7880 error code and translations  by:ivanm
+- feat: refs #7924 add isCustomInspectionRequired field to item and update related logic  by:jgallego
+- feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases  by:jgallego
+- feat: refs #8167 update locale and improve invoicing logic with error handling  by:jgallego
+- feat: refs #8246 added relation for the front's new field  by:Jon
+- feat: refs #8266 added itemFk and needed fixtures  by:jtubau
+- feat: refs #8324 country unique  by:Carlos Andrés
+
+### Changed 📦
+
+
+### Fixed 🛠️
+
+- feat: refs #8266 added itemFk and needed fixtures  by:jtubau
+- fix: add isCustomInspectionRequired column to item table for customs inspection indication  by:jgallego
+- fix: canBeInvoiced only in makeInvoice  by:alexm
+- fix: hotFix getMondayWeekYear  by:alexm
+- fix: refs #6598 update ACL property assignment  by:jorgep
+- fix: refs #6861 refs#6861 addPrevOK  by:sergiodt
+- fix: refs #7301 remove debug console log and update test cases in lastEntriesFilter  by:pablone
+- fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic  by:pablone
+
 # Version 24.52 - 2024-01-07
 
 ### Added 🆕

back/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update \
         graphicsmagick \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g corepack@0.31.0 \
     && corepack enable pnpm
 
 # Puppeteer

back/methods/chat/sendCheckingPresence.js

@@ -67,7 +67,6 @@ module.exports = Self => {
                 INSERT INTO util.debug (variable, value)
                     VALUES ('sendCheckingPresence_error', ?)
             `, [`User: ${userId}, recipient: ${recipientId}, message: ${message}, error: ${e}`]);
-            throw e;
         }
     };
 };

back/methods/collection/getTickets.js

@@ -65,7 +65,8 @@ module.exports = Self => {
                     iss.id itemShelvingSaleFk,
                     iss.isPicked,
                     iss.itemShelvingFk,
-                    st.code stateCode
+                    st.code stateCode,
+                    ac.username
                 FROM ticketCollection tc
                     LEFT JOIN collection c ON c.id = tc.collectionFk
                     JOIN sale s ON s.ticketFk = tc.ticketFk
@@ -80,6 +81,7 @@ module.exports = Self => {
                     LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                     LEFT JOIN origin o ON o.id = i.originFk
                     LEFT JOIN state st ON st.id = sg.stateFk
+                    LEFT JOIN account.user ac ON ac.id = iss.userFk
                 WHERE tc.collectionFk = ?
                 GROUP BY s.id, ish.id, p.code, p2.code
             UNION ALL
@@ -109,7 +111,8 @@ module.exports = Self => {
                 iss.id itemShelvingSaleFk,
                 iss.isPicked,
                 iss.itemShelvingFk,
-                st.code stateCode
+                st.code stateCode,
+                ac.username
             FROM sectorCollection sc
                 JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
                 JOIN saleGroup sg ON sg.id = ss.saleGroupFk
@@ -124,6 +127,7 @@ module.exports = Self => {
                 LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                 LEFT JOIN origin o ON o.id = i.originFk
                 LEFT JOIN state st ON st.id = sg.stateFk
+                LEFT JOIN account.user ac ON ac.id = sg.userFk
             WHERE sc.id = ? 
                 AND sgd.saleGroupFk
             GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);

back/models/payment.json

@@ -52,7 +52,7 @@
         },
         "payMethod": {
             "type": "belongsTo",
-            "model": "PayMethodFk",
+            "model": "PayMethod",
             "foreignKey": "payMethodFk"
         },
         "company": {
@@ -61,4 +61,4 @@
             "foreignKey": "companyFk"
         }
     }
-}
+}

db/dump/.dump/data.sql

@@ -4,7 +4,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','11385','72bf27f08d3ddf646ec0bb6594fc79cecd4b72f2','2025-01-07 07:46:33','11395');
+INSERT INTO `version` VALUES ('vn-database','11410','7a02af9a3acae14a658de1557baa44542c24d480','2025-01-28 07:44:02','11423');
 
 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);
@@ -1041,6 +1041,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11261','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11262','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11263','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-27 12:05:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11264','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11269','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11271','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11272','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11273','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 10:50:51',NULL,NULL);
@@ -1078,6 +1079,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11315','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11316','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11317','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11319','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11320','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:07',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11321','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11322','00-entryAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11324','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 10:49:47',NULL,NULL);
@@ -1139,6 +1141,24 @@ INSERT INTO `versionLog` VALUES ('vn-database','11379','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11379','01-secScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11384','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11385','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:33',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11387','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11390','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11391','00-itemAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11396','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zoneEventPriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zonePriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11398','01-zoneUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11398','02-clientAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11398','03-clientConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11400','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-09 09:55:24',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11405','00-entryAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11406','00-currrencyAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11406','01-currrencyUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11407','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11410','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11415','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-20 08:12:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11418','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-21 11:03:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11423','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-23 15:19:32',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1237,6 +1257,7 @@ INSERT INTO `role` VALUES (127,'timeControl','Tablet para fichar',1,'2024-01-09
 INSERT INTO `role` VALUES (129,'buyerAssistant','Comprador que tienes mas permisos para ayudar al buyerBoss en algunas tareas',1,'2024-02-06 06:59:12','2024-02-06 06:59:12',783);
 INSERT INTO `role` VALUES (130,'reviewer','Revisor de producción',1,'2024-06-11 00:00:00','2024-06-11 00:00:00',10578);
 INSERT INTO `role` VALUES (131,'supplier','Privilegios básicos de un proveedor',1,'2024-07-05 10:18:58','2024-07-05 10:18:58',19295);
+INSERT INTO `role` VALUES (132,'salesPersonClaim','Departamento de ventas con funciones de reclamaciones',1,'2025-01-17 07:07:40','2025-01-17 07:07:40',19295);
 
 INSERT INTO `roleInherit` VALUES (1,1,2,NULL);
 INSERT INTO `roleInherit` VALUES (2,1,3,NULL);
@@ -1248,7 +1269,6 @@ INSERT INTO `roleInherit` VALUES (8,5,33,NULL);
 INSERT INTO `roleInherit` VALUES (10,11,6,NULL);
 INSERT INTO `roleInherit` VALUES (11,13,1,NULL);
 INSERT INTO `roleInherit` VALUES (12,15,35,NULL);
-INSERT INTO `roleInherit` VALUES (16,17,20,NULL);
 INSERT INTO `roleInherit` VALUES (17,17,37,NULL);
 INSERT INTO `roleInherit` VALUES (18,17,39,NULL);
 INSERT INTO `roleInherit` VALUES (19,17,64,NULL);
@@ -1323,7 +1343,6 @@ INSERT INTO `roleInherit` VALUES (105,72,18,NULL);
 INSERT INTO `roleInherit` VALUES (106,73,5,NULL);
 INSERT INTO `roleInherit` VALUES (107,73,64,NULL);
 INSERT INTO `roleInherit` VALUES (108,73,19,NULL);
-INSERT INTO `roleInherit` VALUES (109,59,50,NULL);
 INSERT INTO `roleInherit` VALUES (115,39,76,NULL);
 INSERT INTO `roleInherit` VALUES (117,65,76,NULL);
 INSERT INTO `roleInherit` VALUES (118,30,76,NULL);
@@ -1515,6 +1534,10 @@ INSERT INTO `roleInherit` VALUES (378,101,15,19294);
 INSERT INTO `roleInherit` VALUES (379,103,121,19294);
 INSERT INTO `roleInherit` VALUES (381,119,123,19295);
 INSERT INTO `roleInherit` VALUES (382,48,72,783);
+INSERT INTO `roleInherit` VALUES (383,114,111,19295);
+INSERT INTO `roleInherit` VALUES (384,132,18,19295);
+INSERT INTO `roleInherit` VALUES (385,132,72,19295);
+INSERT INTO `roleInherit` VALUES (386,109,132,19295);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -2311,9 +2334,9 @@ INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',
 INSERT INTO `ACL` VALUES (939,'Machine','*','*','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (940,'ItemTypeLog','find','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (941,'Entry','buyLabel','READ','ALLOW','ROLE','employee',10578);
-INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','production',10578);
+INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','employee',19295);
-INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','production',10578);
+INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','employee',19295);
-INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','production',10578);
+INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','employee',19295);
 INSERT INTO `ACL` VALUES (945,'Collection','create','WRITE','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (946,'Collection','upsert','WRITE','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (947,'Collection','replaceById','WRITE','ALLOW','ROLE','productionBoss',10578);
@@ -2327,7 +2350,6 @@ INSERT INTO `ACL` VALUES (954,'RouteComplement','find','READ','ALLOW','ROLE','de
 INSERT INTO `ACL` VALUES (955,'RouteComplement','create','WRITE','ALLOW','ROLE','delivery',10578);
 INSERT INTO `ACL` VALUES (956,'RouteComplement','deleteById','WRITE','ALLOW','ROLE','delivery',10578);
 INSERT INTO `ACL` VALUES (957,'SaleGroup','find','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (958,'Worker','canCreateAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (959,'WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (960,'WorkerRelative','crud','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (961,'WorkerRelative','findById','*','ALLOW','ROLE','hr',10578);
@@ -2383,6 +2405,9 @@ INSERT INTO `ACL` VALUES (1010,'InventoryConfig','find','READ','ALLOW','ROLE','b
 INSERT INTO `ACL` VALUES (1011,'SiiTypeInvoiceIn','find','READ','ALLOW','ROLE','salesPerson',10578);
 INSERT INTO `ACL` VALUES (1012,'OsrmConfig','optimize','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (1013,'Route','optimizePriority','*','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1014,'Worker','canModifyAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1015,'Worker','__get__sip','READ','ALLOW','ROLE','employee',19294);
+INSERT INTO `ACL` VALUES (1016,'VnUser','adminUser','WRITE','ALLOW','ROLE','sysadmin',10578);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2681,71 +2706,72 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');
 
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,130,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,132,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,37,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,39,NULL,72,1,1,1,12,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',38,39,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',40,41,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',40,89,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',42,91,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',96,97,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',98,99,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',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 (49,NULL,'PROPIEDAD',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',104,107,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',106,109,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',108,109,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',110,111,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',45,46,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
-INSERT INTO `department` VALUES (61,NULL,'VNH',110,113,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',112,115,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',114,115,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',116,117,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',25,26,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',116,117,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',118,119,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',45,46,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',47,48,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',118,119,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',120,121,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',120,121,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',122,123,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',111,112,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',113,114,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',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',47,48,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 (92,NULL,'EQUIPO SILVERIO',49,50,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,'spainTeam2','EQUIPO ESPAÑA 2',49,50,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',51,52,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',51,52,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',53,54,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',53,54,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 (96,NULL,'EQUIPO C LOPEZ',55,56,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',55,56,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 (115,NULL,'EQUIPO CLAUDI',57,58,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',57,58,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 (123,NULL,'EQUIPO ELENA BASCUÑANA',59,60,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',122,123,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',124,125,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',61,62,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,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',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
-INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
+INSERT INTO `department` VALUES (130,'reviewers','REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',105,106,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',107,108,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',63,64,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',63,64,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
+INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',65,66,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
-INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',65,66,8964,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
+INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',67,68,8964,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',124,125,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',126,127,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',126,127,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',128,129,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',128,129,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',130,131,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',67,68,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',69,70,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',69,70,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',71,72,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
+INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',73,74,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
-INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',73,74,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
+INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',75,76,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
-INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',75,76,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
+INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',77,78,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
-INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'levanteislas.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',79,80,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
-INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',79,80,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'noroeste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',81,82,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'noreste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',83,84,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
-INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',83,84,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'sur.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',85,86,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',85,86,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'centro.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',87,88,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',87,88,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'vip.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5600',NULL);
+INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',89,90,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
+INSERT INTO `department` VALUES (156,NULL,'COCINA',37,38,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
@@ -3046,6 +3072,7 @@ INSERT INTO `message` VALUES (20,'clientNotVerified','Incomplete tax data, pleas
 INSERT INTO `message` VALUES (21,'quantityLessThanMin','The quantity cannot be less than the minimum');
 INSERT INTO `message` VALUES (22,'ORDER_ROW_UNAVAILABLE','The ordered quantity exceeds the available');
 INSERT INTO `message` VALUES (23,'AMOUNT_NOT_MATCH_GROUPING','The quantity ordered does not match the grouping');
+INSERT INTO `message` VALUES (24,'orderLinesWithZero','There are empty lines. Please delete them');
 
 INSERT INTO `metatag` VALUES (2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración');
 INSERT INTO `metatag` VALUES (3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.');

db/dump/.dump/privileges.sql

@@ -602,7 +602,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','projectState'
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','entrySplit__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','entryType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','projectNotes','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','project','juan@10.5.1.1','0000-00-00 00:00:00','Select,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','project','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','productionConfig','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','productionConfig','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','creditInsurance','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1494,6 +1494,17 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','travelThermograph','
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','thermograph','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Tickets','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','sim','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','zoneGeo','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemCampaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemCampaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','campaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','awb','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','awbComponent','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','awbComponentType','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemSoldOutTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemDurationTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemGrowingTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','receipt','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -2138,6 +2149,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','buffer_settypebynam
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expedition_scan','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financial','remittance_calc','PROCEDURE','jgallego@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_getsaledate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_filterbuyer','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2200,7 +2212,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','entry_getTransfe
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 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','alexm@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 ('','account','developer','user_hasRole','FUNCTION','root@localhost','Execute','0000-00-00 00:00:00');
@@ -2308,6 +2319,7 @@ INSERT IGNORE INTO `global_priv` VALUES ('','root','{\"access\": 549755781119, \
 INSERT IGNORE INTO `global_priv` VALUES ('','salesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salesBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salesPerson','{\"access\": 0, \"is_role\": true,\"version_id\":101106}');
+INSERT IGNORE INTO `global_priv` VALUES ('','salesPersonClaim','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salesTeamBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salix','{\"access\":33555456,\"version_id\":100707,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','sysadmin','{\"access\": 201326592, \"is_role\": true, \"version_id\": 100707}');

db/dump/.dump/structure.sql

@@ -2543,17 +2543,17 @@ CREATE TABLE `defaulting` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `f_tvc`
+-- Table structure for table `f_tvc__`
 --
 
-DROP TABLE IF EXISTS `f_tvc`;
+DROP TABLE IF EXISTS `f_tvc__`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `f_tvc` (
+CREATE TABLE `f_tvc__` (
   `Id_Ticket` int(11) NOT NULL,
   PRIMARY KEY (`Id_Ticket`),
   CONSTRAINT `id_ticket_to_comisionantes` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Almacenamos la lista de tickets para agilizar la consulta. Corresponde a los clientes REAL y en los almacenes COMISIONANTES';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2025-01-15';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6249,19 +6249,27 @@ BEGIN
  * @param vDateFrom Fecha desde
  * @param vDateTo Fecha hasta
  */
-	IF vDateFrom IS NULL THEN
+	DECLARE vDaysInYear INT;
-		SET vDateFrom = util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+	SET vDaysInYear = DATEDIFF(util.lastDayOfYear(CURDATE()), util.firstDayOfYear(CURDATE()));
+
+	SET vDateFrom = COALESCE(vDateFrom, util.VN_CURDATE());
+	SET vDateTo = COALESCE(vDateTo, util.VN_CURDATE());
+
+	IF DATEDIFF(vDateTo, vDateFrom) > vDaysInYear THEN
+		CALL util.throw('The period cannot be longer than one year');
 	END IF;
 
-	IF vDateTo IS NULL THEN
+	-- Obtiene el primer día de la semana de esa fecha
-		SET vDateTo = vDateFrom + INTERVAL 6 DAY;
+	SET vDateFrom = DATE_SUB(vDateFrom, INTERVAL ((WEEKDAY(vDateFrom) + 1) % 7) DAY);
-	END IF;
+
+	-- Obtiene el último día de la semana de esa fecha
+	SET vDateTo = DATE_ADD(vDateTo, INTERVAL (6 - ((WEEKDAY(vDateTo) + 1) % 7)) DAY);
 
 	CALL cache.last_buy_refresh(FALSE);
 
 	REPLACE bs.waste
-		SELECT YEAR(t.shipped),
+		SELECT YEARWEEK(t.shipped, 6) DIV 100,
-				WEEK(t.shipped, 4),
+				WEEK(t.shipped, 6),
 				it.workerFk,
 				it.id,
 				s.itemFk,
@@ -6307,9 +6315,9 @@ BEGIN
 				JOIN cache.last_buy lb ON lb.item_id = i.id
 					AND lb.warehouse_id = w.id
 				JOIN vn.buy b ON b.id = lb.buy_id
-			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
+			WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDateTo)
 				AND w.isManaged
-			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
+			GROUP BY YEARWEEK(t.shipped, 6) DIV 100, WEEK(t.shipped, 6), i.id;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -13807,7 +13815,7 @@ BEGIN
 	) INTO vHas0Amount;
 
 	IF vHas0Amount THEN
-		CALL util.throw('Hay líneas vacías. Por favor, elimínelas');
+		CALL util.throw('orderLinesWithZero');
 	END IF;
 
 	START TRANSACTION;
@@ -25870,7 +25878,7 @@ CREATE TABLE `address` (
   `isActive` tinyint(4) NOT NULL DEFAULT 1,
   `longitude` decimal(11,7) DEFAULT NULL COMMENT 'Indica la última longitud proporcionada por tabla delivery',
   `latitude` decimal(11,7) DEFAULT NULL COMMENT 'Indica la última latitud proporcionada por tabla delivery',
-  `isEqualizated` tinyint(1) NOT NULL DEFAULT 0,
+  `isEqualizated` tinyint(1) DEFAULT NULL,
   `customsAgentFk` int(11) DEFAULT NULL,
   `incotermsFk` varchar(3) DEFAULT NULL,
   `isLogifloraAllowed` tinyint(4) NOT NULL DEFAULT 0,
@@ -27717,6 +27725,7 @@ CREATE TABLE `client` (
   `hasDailyInvoice` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Indica si el cliente requiere facturación diaria por defecto se copiará lo que tenga country.hasDailyInvoice',
   `geoFk` int(11) DEFAULT NULL,
   `editorFk` int(10) unsigned DEFAULT NULL,
+  `packagesDiscountFactor` decimal(4,3) NOT NULL DEFAULT 1.000 COMMENT 'Porcentaje de ajuste entre el numero de bultos medio del cliente, y el número medio óptimo para las zonas en las que compra',
   PRIMARY KEY (`id`),
   UNIQUE KEY `IF` (`fi`),
   KEY `Id_Trabajador` (`salesPersonFk`),
@@ -27796,6 +27805,8 @@ CREATE TABLE `clientConfig` (
   `defaultHasCoreVnl` tinyint(1) DEFAULT NULL,
   `defaultMandateTypeFk` smallint(5) DEFAULT NULL,
   `monthsToDisableUser` int(10) unsigned DEFAULT NULL,
+  `packagesOptimum` int(10) unsigned NOT NULL DEFAULT 20 COMMENT 'Numero de bultos por cliente/dia para conseguir el precio optimo',
+  `monthsToCalcOptimumPrice` tinyint(3) unsigned NOT NULL DEFAULT 3 COMMENT 'Número de meses a usar para el cálculo de client.packagesDiscountFactor',
   PRIMARY KEY (`id`),
   KEY `clientNewConfigPayMethod_FK` (`defaultPayMethodFk`),
   KEY `clientNewConfigMandateType_FK` (`defaultMandateTypeFk`),
@@ -28922,6 +28933,7 @@ CREATE TABLE `country` (
   `isSocialNameUnique` tinyint(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `country_unique` (`code`),
+  UNIQUE KEY `country_unique_name` (`name`),
   KEY `currency_id_fk_idx` (`currencyFk`),
   KEY `country_Ix4` (`name`),
   KEY `continent_id_fk_idx` (`continentFk`),
@@ -29052,6 +29064,7 @@ CREATE TABLE `currency` (
   `code` varchar(3) NOT NULL,
   `name` varchar(45) DEFAULT NULL,
   `ratio` double NOT NULL DEFAULT 1,
+  `hasToDownloadRate` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Si se guarda el tipo de cambio diariamente en referenceRate',
   PRIMARY KEY (`id`),
   UNIQUE KEY `Moneda_UNIQUE` (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@@ -29963,6 +29976,8 @@ CREATE TABLE `entry` (
   `editorFk` int(10) unsigned DEFAULT NULL,
   `lockerUserFk` int(10) unsigned DEFAULT NULL,
   `locked` datetime DEFAULT current_timestamp(),
+  `initialTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura de como lo recibimos del proveedor ej. en colombia',
+  `finalTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura final de como llega a nuestras instalaciones',
   PRIMARY KEY (`id`),
   KEY `Id_Proveedor` (`supplierFk`),
   KEY `Fecha` (`dated`),
@@ -31765,6 +31780,8 @@ CREATE TABLE `invoiceOut` (
   `cplusTaxBreakFk` int(10) unsigned NOT NULL DEFAULT 1,
   `cplusSubjectOpFk` int(10) unsigned NOT NULL DEFAULT 1,
   `siiTrascendencyInvoiceOutFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `customsAgentFk` int(11) DEFAULT NULL,
+  `incotermsFk` varchar(3) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `invoiceOut_unique` (`ref`),
   KEY `Id_Banco` (`bankFk`),
@@ -31777,9 +31794,13 @@ CREATE TABLE `invoiceOut` (
   KEY `Facturas_ibfk_5_idx` (`siiTrascendencyInvoiceOutFk`),
   KEY `Facturas_idx_Vencimiento` (`dued`),
   KEY `invoiceOut_serial` (`serial`),
+  KEY `invoiceOut_customsAgentFk` (`customsAgentFk`),
+  KEY `invoiceOut_incotermsFk` (`incotermsFk`),
+  CONSTRAINT `invoiceOut_customsAgentFk` FOREIGN KEY (`customsAgentFk`) REFERENCES `customsAgent` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceOut_ibfk_2` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceOut_ibfk_3` FOREIGN KEY (`cplusSubjectOpFk`) REFERENCES `cplusSubjectOp` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceOut_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `cplusTaxBreak` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceOut_incotermsFk` FOREIGN KEY (`incotermsFk`) REFERENCES `incoterms` (`code`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceOut_serial` FOREIGN KEY (`serial`) REFERENCES `invoiceOutSerial` (`code`),
   CONSTRAINT `invoice_bank_id` FOREIGN KEY (`bankFk`) REFERENCES `accounting` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoice_customer_id` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE
@@ -31971,6 +31992,7 @@ CREATE TABLE `item` (
   `value12` varchar(50) DEFAULT NULL,
   `tag13` varchar(20) DEFAULT NULL,
   `value13` varchar(50) DEFAULT NULL,
+  `isCustomInspectionRequired` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Indicates if the item requires physical inspection at customs',
   PRIMARY KEY (`id`),
   UNIQUE KEY `item_supplyResponseFk_idx` (`supplyResponseFk`),
   KEY `Color` (`inkFk`),
@@ -32249,6 +32271,21 @@ CREATE TABLE `itemCost` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Almacena los valores de rotacion en los ultimos 365 dias';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `itemDurationTag`
+--
+
+DROP TABLE IF EXISTS `itemDurationTag`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `itemDurationTag` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `itemEntryIn`
 --
@@ -32313,6 +32350,21 @@ CREATE TABLE `itemFarmingTag` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `itemGrowingTag`
+--
+
+DROP TABLE IF EXISTS `itemGrowingTag`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `itemGrowingTag` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `itemImageQueue`
 --
@@ -32861,6 +32913,21 @@ SET character_set_client = utf8;
   1 AS `removed` */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `itemSoldOutTag`
+--
+
+DROP TABLE IF EXISTS `itemSoldOutTag`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `itemSoldOutTag` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `itemStateTag`
 --
@@ -35450,6 +35517,21 @@ CREATE TABLE `productionConfigLog` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `productionCountry`
+--
+
+DROP TABLE IF EXISTS `productionCountry`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `productionCountry` (
+  `countryFk` mediumint(8) unsigned NOT NULL,
+  `volumeGrowthEstimatePercent` decimal(6,2) DEFAULT NULL COMMENT 'Porcentaje estimado de crecimiento del volumen',
+  PRIMARY KEY (`countryFk`),
+  CONSTRAINT `productionCountryVolume_countryFK` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Datos de producción por país';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `productionError`
 --
@@ -37982,7 +38064,7 @@ CREATE TABLE `supplier` (
   `payDay` tinyint(4) unsigned DEFAULT NULL,
   `payDemFk` tinyint(3) unsigned NOT NULL DEFAULT 7,
   `created` timestamp NOT NULL DEFAULT current_timestamp(),
-  `isReal` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `isReal` tinyint(1) unsigned NOT NULL DEFAULT 1,
   `note` text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `postcodeFk` int(11) unsigned DEFAULT NULL,
   `postCode` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
@@ -38575,6 +38657,7 @@ CREATE TABLE `ticket` (
   KEY `tickets_zone_fk_idx` (`zoneFk`),
   KEY `ticket_fk_editor` (`editorFk`),
   KEY `ticket_cmrFk` (`cmrFk`),
+  KEY `ticket_landed_IDX` (`landed`) USING BTREE,
   CONSTRAINT `ticketCompany_Fk` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticket_cmrFk` FOREIGN KEY (`cmrFk`) REFERENCES `cmr` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticket_customer_id` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
@@ -41251,6 +41334,7 @@ CREATE TABLE `zone` (
   `agencyModeFk` int(11) NOT NULL,
   `travelingDays` int(11) NOT NULL DEFAULT 1,
   `price` decimal(10,2) DEFAULT NULL,
+  `priceOptimum` decimal(10,2) NOT NULL COMMENT 'Precio mínimo que puede pagar un bulto',
   `bonus` double NOT NULL DEFAULT 0,
   `isVolumetric` tinyint(1) NOT NULL DEFAULT 0,
   `inflation` decimal(5,2) NOT NULL DEFAULT 1.00,
@@ -41267,7 +41351,8 @@ CREATE TABLE `zone` (
   KEY `zone_address_FK` (`addressFk`),
   CONSTRAINT `fk_zone_2` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `zone_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `zone_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`)
+  CONSTRAINT `zone_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
+  CONSTRAINT `ck_zone_priceOptimum` CHECK (`priceOptimum` <= `price`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -41360,6 +41445,7 @@ CREATE TABLE `zoneEvent` (
   `hour` datetime DEFAULT NULL,
   `travelingDays` int(11) DEFAULT NULL,
   `price` decimal(10,2) DEFAULT NULL,
+  `priceOptimum` decimal(10,2) DEFAULT NULL COMMENT 'Precio mínimo que puede pagar un bulto',
   `bonus` decimal(10,2) DEFAULT NULL,
   `m3Max` decimal(10,2) unsigned DEFAULT NULL,
   `editorFk` int(10) unsigned DEFAULT NULL,
@@ -41367,7 +41453,8 @@ CREATE TABLE `zoneEvent` (
   UNIQUE KEY `zoneFk` (`zoneFk`,`type`,`dated`),
   KEY `zoneEvent_fk_editor` (`editorFk`),
   CONSTRAINT `zoneEvent_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
-  CONSTRAINT `zoneEvent_ibfk_1` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `zoneEvent_ibfk_1` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `ck_zoneEvent_priceOptimum` CHECK (`priceOptimum` <= `price`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -41601,6 +41688,24 @@ END */ ;;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;;
 /*!50003 SET character_set_results = @saved_cs_results */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
+/*!50106 DROP EVENT IF EXISTS `client_setPackagesDiscountFactor` */;;
+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  = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET @saved_time_zone      = @@time_zone */ ;;
+/*!50003 SET time_zone             = 'SYSTEM' */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`vn`@`localhost`*/ /*!50106 EVENT `client_setPackagesDiscountFactor` ON SCHEDULE EVERY 1 DAY STARTS '2024-10-18 03:00:00' ON COMPLETION PRESERVE ENABLE DO CALL client_setPackagesDiscountFactor() */ ;;
+/*!50003 SET time_zone             = @saved_time_zone */ ;;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;;
+/*!50003 SET character_set_results = @saved_cs_results */ ;;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;;
 /*!50106 DROP EVENT IF EXISTS `client_unassignSalesPerson` */;;
 DELIMITER ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
@@ -49224,7 +49329,19 @@ BEGIN
 		SELECT tcc.warehouseFK,
 				tcc.itemFk,
 				c2.id,
-				z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
+				z.inflation
+				* ROUND(
+					ic.cm3delivery
+					* (
+						(
+							zo.priceOptimum + (( zo.price - zo.priceOptimum) * 2 * ( 1 - c.packagesDiscountFactor))
+						)
+						- IFNULL(zo.bonus, 0)
+					)
+					/ (1000 * vc.standardFlowerBox),
+					4
+				) cost
+
 		FROM tmp.ticketComponentCalculate tcc
 			JOIN item i ON i.id = tcc.itemFk
 			JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
@@ -49232,6 +49349,7 @@ BEGIN
 			JOIN agencyMode am ON am.id = z.agencyModeFk
 			JOIN vn.volumeConfig vc
 			JOIN vn.component c2 ON c2.code = 'delivery'
+			JOIN `client` c on c.id = vClientFk
 			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
 				AND ic.itemFk = tcc.itemFk
 			HAVING cost <> 0;
@@ -50934,6 +51052,41 @@ BEGIN
         ORDER BY clientFk;
 
 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `client_setPackagesDiscountFactor` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`vn`@`localhost` PROCEDURE `client_setPackagesDiscountFactor`()
+BEGIN
+	/**
+	 * Set the discount factor for the packages of the clients.
+	 */
+	UPDATE client c
+		JOIN (
+			SELECT t.clientFk,
+					LEAST((
+						SUM(t.packages) / COUNT(DISTINCT DATE(t.shipped))
+					) / cc.packagesOptimum, 1) discountFactor
+				FROM ticket t
+					JOIN clientConfig cc ON TRUE
+				WHERE t.shipped > util.VN_CURDATE() - INTERVAL cc.monthsToCalcOptimumPrice MONTH
+					AND t.packages
+				GROUP BY t.clientFk
+		) ca ON c.id = ca.clientFk
+	SET c.packagesDiscountFactor = ca.discountFactor;
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -58727,6 +58880,7 @@ BEGIN
 	DECLARE vMaxShipped DATE;
 	DECLARE vDone BOOL;
 	DECLARE vTicketFk INT;
+	DECLARE vAddressFk INT;
 	DECLARE vCursor CURSOR FOR
 		SELECT id
 			FROM tmp.ticketToInvoice;
@@ -58741,11 +58895,13 @@ BEGIN
 			DATE(vInvoiceDate) >= invoiceOut_getMaxIssued(
 				vSerial,
 				t.companyFk,
-				YEAR(vInvoiceDate))
+				YEAR(vInvoiceDate)),
+			t.addressFk
 			INTO vClientFk,
 				vCompanyFk,
 				vMaxShipped,
-				vIsCorrectInvoiceDate
+				vIsCorrectInvoiceDate,
+				vAddressFk
 		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id;
 
@@ -58798,7 +58954,9 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			siiTypeInvoiceOutFk
+			siiTypeInvoiceOutFk,
+			customsAgentFk,
+			incotermsFk
 		)
 			SELECT
 					1,
@@ -58811,9 +58969,12 @@ BEGIN
 						vCplusCorrectingInvoiceTypeFk,
 						IF(vSerial = vSimplifiedSerial,
 							vCplusSimplifiedInvoiceTypeFk,
-							vCplusStandardInvoiceTypeFk))
+							vCplusStandardInvoiceTypeFk)),
-				FROM client
+					a.customsAgentFk,
-				WHERE id = vClientFk;
+					a.incotermsFk
+				FROM client c
+					JOIN address a ON a.id = vAddressFk
+				WHERE c.id = vClientFk;
 
 		SET vNewInvoiceId = LAST_INSERT_ID();
 
@@ -67481,14 +67642,14 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `remittance_calc` */;
 /*!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 collation_connection  = utf8mb4_general_ci */ ;
 DELIMITER ;;
 CREATE DEFINER=`vn`@`localhost` PROCEDURE `remittance_calc`(
 	vDated DATE
@@ -67552,7 +67713,7 @@ BEGIN
 										
 							) risk ON risk.clientFk = c.id
 						GROUP BY risk.companyFk, c.id
-						HAVING receipt > 10
+						HAVING receipt > 1
 				) sub ON sub.id = c.id
 			JOIN supplier s ON s.id = sub.companyFk
 			JOIN company co ON co.id = sub.companyFk
@@ -68661,10 +68822,11 @@ BEGIN
 				TRUE,
 				sc.userFk,
 				s.id
-			FROM vn.sectorCollection sc
+			FROM sectorCollection sc
-				JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+				JOIN sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
-				JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+				JOIN saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
-				JOIN vn.state s ON s.code = 'OK PREVIOUS'
+				JOIN state s ON s.code = 'OK PREVIOUS'
+				JOIN itemShelvingSale iss ON iss.saleFk = sgd.saleFk
 			WHERE sc.id = vSectorCollectionFk;
 END ;;
 DELIMITER ;
@@ -74493,9 +74655,6 @@ BEGIN
 				IFNULL(sat.supplierFk, su.id) supplierFk,
 				t.landed
 			FROM ticket t
-				JOIN ticketState ts ON ts.ticketFk = t.id
-				JOIN `state` s ON s.id = ts.stateFk
-				JOIN alertLevel al ON al.id = s.alertLevel
 				JOIN client c ON c.id = t.clientFk
 				JOIN `address` a ON a.id = t.addressFk
 				JOIN province p ON p.id = a.provinceFk
@@ -74512,8 +74671,7 @@ BEGIN
 				LEFT JOIN agency ag ON ag.id = am.agencyFk
 				LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
 					AND wo.isFreelance
-			WHERE al.code IN ('PACKED', 'DELIVERED')
+			WHERE co.code <> 'ES'
-				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
 				AND t.id = vSelf
@@ -81580,26 +81738,27 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`vn`@`localhost` PROCEDURE `zone_getAddresses`(
 	vSelf INT,
-	vShipped DATE,
+	vLanded DATE,
 	vDepartmentFk INT
 )
 BEGIN
 /**
  * Devuelve un listado de todos los clientes activos
  * con consignatarios a los que se les puede
- * vender producto para esa zona.
+ * entregar producto para esa zona.
  *
  * @param vSelf Id de zona
- * @param vShipped Fecha de envio
+ * @param vLanded Fecha de entrega
- * @param vDepartmentFk Id de departamento
+ * @param vDepartmentFk Id de departamento | NULL para mostrar todos
  * @return Un select
  */
 	CALL zone_getPostalCode(vSelf);
 
 	WITH clientWithTicket AS (
-		SELECT clientFk
+		SELECT DISTINCT clientFk
 			FROM vn.ticket
-			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
+			WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
+				AND NOT isDeleted
 	)
 	SELECT c.id,
 			c.name,
@@ -81609,7 +81768,7 @@ BEGIN
 			u.name username,
 			aai.invoiced,
 			cnb.lastShipped,
-			cwt.clientFk
+			IF(cwt.clientFk, TRUE, FALSE) hasTicket
 		FROM vn.client c
 			JOIN vn.worker w ON w.id = c.salesPersonFk
 			JOIN vn.workerDepartment wd ON wd.workerFk = w.id
@@ -81629,7 +81788,7 @@ BEGIN
 			AND c.isActive
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
-			AND (d.id = vDepartmentFk OR NOT vDepartmentFk)
+			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;
@@ -82321,7 +82480,7 @@ BEGIN
  * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
  */
 	DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
-		
+
 	DROP TEMPORARY TABLE IF EXISTS tLandings;
 	CREATE TEMPORARY TABLE tLandings
 		(INDEX (eventFk))
@@ -82342,6 +82501,7 @@ BEGIN
 						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
 						l.travelingDays,
 						IFNULL(e.price, z.price) price,
+						IFNULL(e.priceOptimum, z.priceOptimum) priceOptimum,
 						IFNULL(e.bonus, z.bonus) bonus,
 						l.landed,
 						vShipped shipped
@@ -90882,4 +91042,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-07  6:51:38
+-- Dump completed on 2025-01-28  7:08:42

db/dump/.dump/triggers.sql

@@ -6804,6 +6804,30 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT(NEW.`countryFk` <=> OLD.`countryFk`) OR NOT(NEW.`itemFk` <=> OLD.`itemFk`) THEN
+		CALL util.throw('Only the VAT can be modified');
+	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=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTaxCountry_beforeDelete`
+	BEFORE DELETE ON `itemTaxCountry`
+	FOR EACH ROW
+BEGIN
+	CALL util.throw('Records in this table cannot be deleted');
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11019,6 +11043,92 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerMana_beforeInsert`
+	BEFORE INSERT ON `workerMana`
+	FOR EACH ROW
+BEGIN
+	IF (SELECT EXISTS(SELECT TRUE FROM workerManaExcluded WHERE workerFk = NEW.workerFk)) THEN
+		CALL util.throw('Worker is excluded from mana');
+	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=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerMana_beforeUpdate`
+	BEFORE UPDATE ON `workerMana`
+	FOR EACH ROW
+BEGIN
+	IF (SELECT EXISTS(SELECT TRUE FROM workerManaExcluded WHERE workerFk = NEW.workerFk)) THEN
+		CALL util.throw('Worker is excluded from mana');
+	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=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerManaExcluded_beforeInsert`
+	BEFORE INSERT ON `workerManaExcluded`
+	FOR EACH ROW
+BEGIN
+	DELETE FROM workerMana
+		WHERE workerFk = NEW.workerFk;
+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=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerManaExcluded_beforeUpdate`
+	BEFORE UPDATE ON `workerManaExcluded`
+	FOR EACH ROW
+BEGIN
+	DELETE FROM workerMana
+		WHERE workerFk = NEW.workerFk;
+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=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_beforeInsert`
 	BEFORE INSERT ON `workerTimeControl`
 	FOR EACH ROW
@@ -11085,11 +11195,13 @@ DELIMITER ;;
 	AFTER DELETE ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
-	INSERT INTO workerLog
+	IF account.myUser_getId() IS NOT NULL THEN
-		SET `action` = 'delete',
+		INSERT INTO workerLog
-			`changedModel` = 'WorkerTimeControl',
+			SET `action` = 'delete',
-			`changedModelId` = OLD.id,
+				`changedModel` = 'WorkerTimeControl',
-			`userFk` = account.myUser_getId();
+				`changedModelId` = OLD.id,
+				`userFk` = account.myUser_getId();
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11499,4 +11611,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-07  6:51:57
+-- Dump completed on 2025-01-28  7:09:01

db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql

@@ -9,7 +9,7 @@ BEGIN
 	DECLARE vCalc INT;
 	DECLARE vWarehouseFk INT;
 
-	DECLARE cWarehouses CURSOR FOR 
+	DECLARE cWarehouses CURSOR FOR
 		SELECT id
 			FROM vn.warehouse
 			WHERE isInventory;
@@ -22,13 +22,13 @@ BEGIN
 	read_loop: LOOP
 		SET vDone = FALSE;
 		FETCH cWarehouses INTO vWarehouseFk;
-	
+
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
-	
+
 		CALL cache.visible_refresh(vCalc, FALSE, vWarehouseFk);
-	
+
 		CREATE OR REPLACE TEMPORARY TABLE tVisible
 			SELECT itemFk, SUM(visible) totalVisible
 				FROM vn.itemShelving ish
@@ -37,7 +37,7 @@ BEGIN
 					JOIN vn.sector sc ON sc.id = p.sectorFk
 					WHERE sc.warehouseFk = vWarehouseFk
 				GROUP BY itemFk;
-		
+
 		INSERT INTO inventoryDiscrepancyDetail(
 				warehouseFk,
 				itemFk,
@@ -65,7 +65,7 @@ BEGIN
 								JOIN vn.ticketState ts ON ts.ticketFk = t.id
 								JOIN vn.alertLevel al ON al.id = ts.alertLevel
 							WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-								AND s.isPicked = FALSE
+								AND NOT s.isPicked
 								AND al.code = 'FREE'
 								AND  t.warehouseFk = vWarehouseFk
 							GROUP BY s.itemFk
@@ -73,7 +73,6 @@ BEGIN
 					) s ON s.itemFk = v.item_id
 				WHERE v.calc_id = vCalc
 					AND NOT v.visible <=> tv.totalVisible;
-
 	END LOOP;
 	CLOSE cWarehouses;
 

db/routines/bs/procedures/ventas_contables_add.sql

@@ -15,7 +15,7 @@ BEGIN
 
 	DELETE FROM bs.ventas_contables
 		WHERE year = vYear
-	    	AND month = vMonth;
+			AND month = vMonth;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list

db/routines/cache/procedures/available_refresh.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_refres
 	OUT `vCalc` INT,
 	`vRefresh` INT,
 	`vWarehouse` INT,
-	`vDated` DATE
+	`vAvailabled` DATETIME
 )
 proc: BEGIN
 	DECLARE vStartDate DATE;
@@ -12,6 +12,7 @@ proc: BEGIN
 	DECLARE vInventoryDate DATE;
 	DECLARE vLifeScope DATE;
 	DECLARE vWarehouseFkInventory INT;
+	DECLARE vDated DATE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -19,13 +20,17 @@ proc: BEGIN
 		RESIGNAL;
 	END;
 
-	IF vDated < util.VN_CURDATE() THEN
+	IF vAvailabled < util.VN_CURDATE() THEN
 		LEAVE proc;
 	END IF;
 
+	SET vDated = DATE(vAvailabled);
+
+	SET vAvailabled = vDated + INTERVAL HOUR(vAvailabled) HOUR;
+
 	CALL vn.item_getStock(vWarehouse, vDated, NULL);
 
-	SET vParams = CONCAT_WS('/', vWarehouse, vDated);
+	SET vParams = CONCAT_WS('/', vWarehouse, vAvailabled);
 	CALL cache_calc_start (vCalc, vRefresh, 'available', vParams);
 
 	IF !vRefresh THEN
@@ -87,11 +92,10 @@ proc: BEGIN
 				SELECT i.itemFk, i.landed, i.quantity
 					FROM vn.itemEntryIn i
 						JOIN itemRange ir ON ir.itemFk = i.itemFk
-						LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
 					WHERE i.landed >= vStartDate
+						AND IFNULL(i.availabled, i.landed) <= vAvailabled
 						AND (ir.ended IS NULL OR i.landed <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
-						AND ISNULL(wf.entryFk)
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity
 					FROM vn.itemEntryOut i

db/routines/sage/procedures/accountingMovements_add.sql

@@ -1,11 +1,11 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`accountingMovements_add`(
-	vYear INT, 
+	vYear INT,
 	vCompanyFk INT
 )
 BEGIN
 /**
- * Traslada la info de contabilidad generada en base a vn.XDiario a la tabla sage.movConta 
+ * Traslada la info de contabilidad generada en base a vn.XDiario a la tabla sage.movConta
  * para poder ejecutar posteriormente el proceso de importación de datos de SQL Server
  * Solo traladará los asientos marcados con el campo vn.XDiario.enlazadoSage = FALSE
  * @vYear Año contable del que se quiere trasladar la información
@@ -23,6 +23,7 @@ BEGIN
 	DECLARE vInvoiceTypeInformativeCode VARCHAR(1);
 	DECLARE vCountryCanariasCode, vCountryCeutaMelillaCode VARCHAR(2);
 	DECLARE vCompanyCode INT;
+	DECLARE vHasErrorTax BOOL DEFAULT FALSE;
 
 	SELECT SiglaNacion INTO vCountryCanariasCode
 		FROM Naciones
@@ -44,12 +45,12 @@ BEGIN
 		FROM taxType
 		WHERE code = 'import4';
 
-	SELECT shipmentTransactionTypeFk, 
+	SELECT shipmentTransactionTypeFk,
-			definitiveExportTransactionTypeFk, 
+			definitiveExportTransactionTypeFk,
 			pendingServiceTransactionTypeFk,
 			company_getCode(vCompanyFk)
 			INTO vTransactionExportTaxFreeFk,
-				vTransactionExportFk, 
+				vTransactionExportFk,
 				vDuaTransactionFk,
 				vCompanyCode
 		FROM config;
@@ -66,6 +67,24 @@ BEGIN
 		WHERE enlazadoSage = FALSE
 			AND Asiento <> 1 ;
 
+	SELECT EXISTS (
+		SELECT TRUE
+			FROM vn.XDiario x
+				 JOIN vn.invoiceIn ii ON ii.id = x.CLAVE
+				 JOIN vn.invoiceInTax it ON it.invoiceInFk = ii.id
+				 LEFT JOIN TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
+				 LEFT JOIN taxType tt ON tt.id = it.taxTypeSageFk
+			WHERE x.FECHA BETWEEN vDatedFrom AND vDatedTo
+				AND NOT x.enlazadoSage
+				AND x.empresa_id = vCompanyFk
+				AND it.taxTypeSageFk
+				AND (ti.CodigoIva IS NULL OR tt.id IS NULL)
+	) INTO vHasErrorTax;
+
+	IF vHasErrorTax tHEN
+		CALL util.throw ('Error in tables for received invoices tax');
+	END IF;
+
 	CALL invoiceOut_manager(vYear, vCompanyFk);
  	CALL invoiceIn_manager(vYear, vCompanyFk);
 
@@ -306,8 +325,8 @@ BEGIN
 			mci.FechaFacturaOriginal = x.FECHA_EX,
 			mci.SuFacturaNo = x.FACTURAEX,
 			mci.FechaOperacion = x.FECHA_OP,
-			mci.ImporteFactura = mci.ImporteFactura + 
+			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO + 
+				x.BASEEURO +
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -326,7 +345,7 @@ BEGIN
 			mci.CodigoIva2 = vTaxImportFk,
 			mci.IvaDeducible2 = TRUE,
 			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO + 
+				x.BASEEURO +
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -344,8 +363,8 @@ BEGIN
 			mci.CodigoTransaccion3 = vDuaTransactionFk ,
 			mci.CodigoIva3 = vTaxImportSuperReducedFk,
 			mci.IvaDeducible3 = TRUE,
-			mci.ImporteFactura = mci.ImporteFactura + 
+			mci.ImporteFactura = mci.ImporteFactura +
-				x.BASEEURO + 
+				x.BASEEURO +
 				CAST((x.IVA / 100) * x.BASEEURO AS DECIMAL(10, 2))
 		WHERE pm.description = 'HP Iva pendiente'
 			AND mci.enlazadoSage = FALSE
@@ -379,14 +398,14 @@ BEGIN
 				OR CodigoTransaccion2 = vTransactionExportFk
 				OR CodigoTransaccion3 = vTransactionExportFk
 				OR CodigoTransaccion4 = vTransactionExportFk)
-			AND SiglaNacion IN (vCountryCanariasCode COLLATE utf8mb3_unicode_ci, 
+			AND SiglaNacion IN (vCountryCanariasCode COLLATE utf8mb3_unicode_ci,
 				vCountryCeutaMelillaCode COLLATE utf8mb3_unicode_ci);
 
 	UPDATE movConta mc
 		SET CodigoDivisa = 'USD',
 			FactorCambio = TRUE,
-			ImporteCambio = ABS( CAST( IF( ImporteDivisa <> 0 AND ImporteCambio = 0, 
+			ImporteCambio = ABS( CAST( IF( ImporteDivisa <> 0 AND ImporteCambio = 0,
-				ImporteAsiento / ImporteDivisa, 
+				ImporteAsiento / ImporteDivisa,
 				ImporteCambio) AS DECIMAL( 10, 2)))
 		WHERE enlazadoSage = FALSE
 			AND (ImporteCambio <> 0 OR ImporteDivisa <> 0 OR FactorCambio);
@@ -403,20 +422,20 @@ BEGIN
 	WITH client AS(
 	SELECT DISTINCT c.id
 		FROM sage.movConta mc
-			JOIN vn.client c ON c.accountingAccount = mc.CodigoCuenta 
+			JOIN vn.client c ON c.accountingAccount = mc.CodigoCuenta
-		WHERE NOT enlazadoSage 
+		WHERE NOT enlazadoSage
-	),supplier AS(			
+	),supplier AS(
 	SELECT DISTINCT s.id
 		FROM sage.movConta mc
-			JOIN vn.supplier s ON s.account = mc.CodigoCuenta 
+			JOIN vn.supplier s ON s.account = mc.CodigoCuenta
-		WHERE NOT enlazadoSage 
+		WHERE NOT enlazadoSage
 	),clientSupplierSync AS(
 	SELECT idClientSupplier, `type`
-		FROM sage.clientSupplier cs 
+		FROM sage.clientSupplier cs
-		WHERE isSync 
+		WHERE isSync
 	)
 	SELECT idClientSupplier, `type`
-		FROM sage.clientSupplier cs 
+		FROM sage.clientSupplier cs
 		WHERE NOT isSync
 	UNION
 	SELECT id, 'C'
@@ -424,7 +443,7 @@ BEGIN
 			LEFT JOIN clientSupplierSync cs ON cs.idClientSupplier = c.id
 				AND cs.Type ='C'
 		WHERE cs.idClientSupplier IS NULL
-	UNION 
+	UNION
 	SELECT id, 'P'
 		FROM supplier s
 			LEFT JOIN clientSupplierSync cs ON cs.idClientSupplier = s.id
@@ -436,7 +455,7 @@ BEGIN
 	INSERT IGNORE INTO sage.clientSupplier  (companyFk, `type`, idClientSupplier, isSync)
 		SELECT vCompanyCode, `type`, idClientSupplier, FALSE
 			FROM tmp.clientSupplier;
-			
+
 	DROP TEMPORARY TABLE tmp.clientSupplier;
 
 	CALL pgc_add(vCompanyFk);

db/routines/vn/events/client_setPackagesDiscountFactor.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`client_setPackagesDiscountFactor`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2024-10-18 03:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL client_setPackagesDiscountFactor()$$
+DELIMITER ;

db/routines/vn/functions/getTimeBetweenRoadmapAddresses.sql

@@ -0,0 +1,62 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`getTimeBetweenRoadmapAddresses`(
+	vRoadmapAddressFrom INT,
+	vRoadmapAddressTo INT
+)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Retorna el tiempo en segundos que se suele tardar en ir
+ * de un punto de distribución a otro en una ruta troncal.
+ *
+ * @param vRoadmapAddressFrom Punto de distribución de origen
+ * @param vRoadmapAddressTo Punto de distribución de destino
+ * @return Tiempo en segundos
+ */
+	DECLARE vSeconds INT;
+
+	WITH wRoadmapStop AS (
+		SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
+				roadmapFk,
+				roadmapAddressFk,
+				eta
+			FROM vn.roadmapStop
+			WHERE roadmapFk IS NOT NULL
+				AND roadmapAddressFk IS NOT NULL
+				AND eta IS NOT NULL
+	)
+	SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rsFrom.eta))) INTO vSeconds
+		FROM wRoadmapStop rsFrom
+			JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rsFrom.roadmapFk
+		WHERE rsFrom.roadmapAddressFk = vRoadmapAddressFrom
+			AND rsTo.roadmapAddressFk = vRoadmapAddressTo
+			AND rsFrom.`sequence` + 1 = rsTo.`sequence`;
+	
+	IF NOT IFNULL(vSeconds, 0) THEN
+		WITH wRoadmap AS (
+			SELECT id,
+					roadmapAddressFk,
+					etd
+				FROM vn.roadmap
+				WHERE roadmapAddressFk = vRoadmapAddressFrom
+					AND etd IS NOT NULL
+		), wRoadmapStop AS (
+			SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
+					roadmapFk,
+					roadmapAddressFk,
+					eta
+				FROM vn.roadmapStop
+				WHERE roadmapFk IS NOT NULL
+					AND roadmapAddressFk = vRoadmapAddressTo
+					AND eta IS NOT NULL
+		)
+		SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rFrom.etd))) INTO vSeconds
+			FROM wRoadmap rFrom
+				JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rFrom.id
+					AND rsTo.`sequence` = 1;
+	END IF;
+
+	RETURN vSeconds;
+END$$
+DELIMITER ;

db/routines/vn/procedures/catalog_componentCalculate.sql

@@ -231,7 +231,19 @@ BEGIN
 		SELECT tcc.warehouseFK,
 				tcc.itemFk,
 				c2.id,
-				z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
+				z.inflation
+				* ROUND(
+					ic.cm3delivery
+					* (
+						(
+							zo.priceOptimum + (( zo.price - zo.priceOptimum) * 2 * ( 1 - c.packagesDiscountFactor))
+						)
+						- IFNULL(zo.bonus, 0)
+					)
+					/ (1000 * vc.standardFlowerBox),
+					4
+				) cost
+
 		FROM tmp.ticketComponentCalculate tcc
 			JOIN item i ON i.id = tcc.itemFk
 			JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
@@ -239,6 +251,7 @@ BEGIN
 			JOIN agencyMode am ON am.id = z.agencyModeFk
 			JOIN vn.volumeConfig vc
 			JOIN vn.component c2 ON c2.code = 'delivery'
+			JOIN `client` c on c.id = vClientFk
 			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
 				AND ic.itemFk = tcc.itemFk
 			HAVING cost <> 0;

db/routines/vn/procedures/client_setPackagesDiscountFactor.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+PROCEDURE `vn`.`client_setPackagesDiscountFactor`()
+BEGIN
+	/**
+	 * Set the discount factor for the packages of the clients.
+	 */
+	UPDATE client c
+		JOIN (
+			SELECT t.clientFk,
+					LEAST((
+						SUM(t.packages) / COUNT(DISTINCT DATE(t.shipped))
+					) / cc.packagesOptimum, 1) discountFactor
+				FROM ticket t
+					JOIN clientConfig cc ON TRUE
+				WHERE t.shipped > util.VN_CURDATE() - INTERVAL cc.monthsToCalcOptimumPrice MONTH
+					AND t.packages
+				GROUP BY t.clientFk
+		) ca ON c.id = ca.clientFk
+	SET c.packagesDiscountFactor = ca.discountFactor;
+
+END$$
+
+DELIMITER ;

db/routines/vn/procedures/entry_clone.sql

@@ -1,20 +1,31 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(
+	vSelf INT,
+	OUT vOutputEntryFk INT
+)
 BEGIN
 /**
  * clones an entry.
  *
  * @param vSelf The entry id
+ * @param vOutputEntryFk The new entry id
  */
 	DECLARE vNewEntryFk INT;
 
-	START TRANSACTION;
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		CALL util.tx_rollback(vIsRequiredTx);
+		RESIGNAL;
+	END;
+
+	CALL util.tx_start(vIsRequiredTx);
 
 	CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL);
 	CALL entry_copyBuys(vSelf, vNewEntryFk);
 
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
+	SET vOutputEntryFk = vNewEntryFk;
 
-	SELECT vNewEntryFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -39,14 +39,14 @@ BEGIN
 
 	read_loop: LOOP
 		SET vDone = FALSE;
-	
+
 		FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers;
 
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
 
-		IF vIshStickers =  vBuyStickers THEN
+		IF vIshStickers = vBuyStickers THEN
 			UPDATE buy
 				SET entryFk = vToEntryFk
 				WHERE id = vBuyFk;

db/routines/vn/procedures/entry_transfer.sql

@@ -0,0 +1,158 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_transfer`(
+	vOriginalEntry INT,
+	OUT vNewEntryFk INT
+ )
+BEGIN
+/**
+ * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
+ *
+ * @param vOriginalEntry entrada que se quiera adelantar
+ * @param vNewEntry nueva entrada creada
+ */
+	DECLARE vTravelFk INT;
+	DECLARE vWarehouseFk INT;
+	DECLARE vWarehouseInFk INT;
+	DECLARE vWarehouseOutFk INT;
+	DECLARE vRef INT;
+	DECLARE vIsReceived INT;
+	DECLARE vAgencyModeFk INT;
+	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
+	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
+
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		CALL util.tx_rollback(vIsRequiredTx);
+		RESIGNAL;
+	END;
+
+	-- Clonar la entrada
+	CALL entry_clone(vOriginalEntry, vNewEntryFk);
+
+	CALL util.tx_start(vIsRequiredTx);
+
+	/* Hay que crear un nuevo travel, con salida hoy y llegada mañana y
+		asignar la entrada nueva al nuevo travel.*/
+	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
+		INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
+		WHERE e.id = vOriginalEntry;
+
+	SELECT id INTO vTravelFk
+		FROM travel t
+		WHERE shipped = vCurDate
+			AND landed = vTomorrow
+			AND warehouseInFk = vWarehouseInFk
+			AND warehouseOutFk = vWarehouseOutFk
+			AND `ref` = vRef
+			AND isReceived =vIsReceived
+			AND agencyModeFk = vAgencyModeFk;
+
+	IF vTravelFk IS NULL THEN
+			INSERT INTO travel(
+				shipped,
+				landed,
+				warehouseInFk,
+				warehouseOutFk,
+				`ref`,
+				isReceived,
+				agencyModeFk)
+			SELECT vCurDate,
+					vTomorrow,
+					t.warehouseInFk,
+					t.warehouseOutFk,
+					t.`ref`,
+					t.isReceived,
+					t.agencyModeFk
+				FROM travel t
+					JOIN entry e ON e.travelFk = t.id
+				WHERE e.id = vOriginalEntry;
+
+		SET vTravelFk = LAST_INSERT_ID();
+	END IF;
+
+	UPDATE entry
+		SET travelFk = vTravelFk,
+			evaNotes = vOriginalEntry
+		WHERE id = vNewEntryFk;
+
+	-- Poner a 0 las cantidades
+	UPDATE buy b
+		SET b.quantity = 0, b.stickers = 0
+		WHERE b.entryFk = vNewEntryFk;
+
+	-- Eliminar duplicados
+	DELETE b
+		FROM buy b
+			LEFT JOIN (SELECT b.id, b.itemFk
+							FROM buy b
+							WHERE b.entryFk = vNewEntryFk
+							GROUP BY b.itemFk) tBuy ON tBuy.id = b.id
+		WHERE b.entryFk = vNewEntryFk
+			AND tBuy.id IS NULL;
+
+	SELECT t.warehouseInFk INTO vWarehouseFk
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
+		WHERE e.id = vOriginalEntry;
+
+	/* Actualizar nueva entrada con lo que no está ubicado HOY,
+		descontando lo vendido HOY de esas ubicaciones*/
+	CREATE OR REPLACE TEMPORARY TABLE buys
+		WITH tBuy AS (
+			SELECT b.itemFk, SUM(b.quantity) totalQuantity
+				FROM vn.buy b
+				WHERE b.entryFk = vOriginalEntry
+				GROUP BY b.itemFk
+		),
+		itemShelvings AS (
+			SELECT ish.itemFk, SUM(ish.visible) visible
+				FROM vn.itemShelving ish
+					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+					JOIN vn.parking p ON p.id = sh.parkingFk
+					JOIN vn.sector s ON s.id = p.sectorFk
+					JOIN vn.buy b ON b.id = ish.buyFk
+					JOIN vn.entry e ON e.id = b.entryFk
+					JOIN tBuy t ON t.itemFk = ish.itemFk
+				WHERE s.warehouseFk = vWarehouseFk
+					AND sh.parked >= vCurDate
+				GROUP BY ish.itemFk
+		),
+		sales AS (
+			SELECT s.itemFk, SUM(s.quantity) sold
+				FROM vn.ticket t
+					JOIN vn.sale s ON s.ticketFk = t.id
+					JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
+					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
+					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
+					JOIN tBuy t ON t.itemFk = s.itemFk
+				WHERE t.shipped BETWEEN vCurDate AND util.dayend(vCurDate)
+					AND s2.parked >= vCurDate
+				GROUP BY s.itemFk
+		)
+		SELECT tmp.itemFk,
+				IFNULL(iss.visible, 0) visible,
+				tmp.totalQuantity,
+				IFNULL(s.sold, 0) sold
+			FROM tBuy tmp
+				LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk
+				LEFT JOIN sales s ON s.itemFk = tmp.itemFk
+			WHERE visible < tmp.totalQuantity
+				OR iss.itemFk IS NULL;
+
+	UPDATE buy b
+			JOIN buys tmp ON tmp.itemFk = b.itemFk
+		SET b.quantity = tmp.totalQuantity - tmp.visible - tmp.sold
+		WHERE b.entryFk = vNewEntryFk;
+
+	-- Limpia la nueva entrada
+	DELETE FROM buy WHERE entryFk = vNewEntryFk AND quantity = 0;
+
+	CALL util.tx_commit(vIsRequiredTx);
+
+	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
+	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, vCurDate);
+END$$
+DELIMITER ;

db/routines/vn/procedures/itemShelvingRadar.sql

@@ -1,207 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
-	vSectorFk INT
-)
-BEGIN
-/**
- * Calcula la información detallada respecto un sector.
- *
- * @param vSectorFk Id de sector
- */
-	DECLARE vCalcVisibleFk INT;
-	DECLARE vCalcAvailableFk INT;
-	DECLARE hasFatherSector BOOLEAN;
-	DECLARE vBuyerFk INT DEFAULT 0;
-	DECLARE vWarehouseFk INT DEFAULT 0;
-	DECLARE vSonSectorFk INT;
-	DECLARE vWorkerFk INT;
-
-	SELECT s.workerFk INTO vWorkerFk 
-		FROM sector s
-		WHERE s.id = vSectorFk;
-
-	SELECT COUNT(*) INTO hasFatherSector
-		FROM sector
-		WHERE sonFk = vSectorFk;
-
-	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
-		FROM sector
-		WHERE id = vSectorFk;
-
-	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
-	CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
-	IF hasFatherSector THEN
-		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
-			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY 
-			SELECT * 
-				FROM (
-					SELECT iss.itemFk,
-							i.longName,
-							i.size,
-							i.subName producer,
-							IFNULL(a.available, 0) available,
-							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible, 0), 0)) upstairs,
-							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible, 0), 0)) downstairs,
-							IF(it.isPackaging, NULL, IFNULL(v.visible, 0)) visible,
-							vSectorFk sectorFk,
-							ish.isChecked,
-							sub.isAllChecked
-						FROM itemShelvingStock iss
-							JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-							LEFT JOIN (
-								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,
-							i.longName,
-							i.size,
-							i.subName,
-							IFNULL(a.available, 0),
-							0,
-							0,
-							IF(it.isPackaging, NULL, v.visible),
-							vSectorFk,
-							NULL,
-							NULL
-						FROM cache.visible v  
-							JOIN item i ON i.id = v.item_id
-							JOIN itemType it ON it.id = i.typeFk
-							LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id
-								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;
-					
-		SELECT ishr.*, 
-				CAST(visible - upstairs - downstairs AS DECIMAL(10, 0)) nicho,
-				CAST(downstairs - IFNULL(notPickedYed, 0) AS DECIMAL(10, 0)) pendiente
-			FROM tItemShelvingRadar ishr
-				JOIN item i ON i.id = ishr.itemFk
-				LEFT JOIN (
-					SELECT s.itemFk, SUM(s.quantity) notPickedYed
-							FROM ticket t
-								JOIN ticketStateToday tst ON tst.ticketFk = t.id
-								JOIN alertLevel al ON al.id = tst.alertLevel
-								JOIN sale s ON s.ticketFk = t.id
-							WHERE t.warehouseFk = vWarehouseFk
-								AND al.code = 'FREE'
-							GROUP BY s.itemFk
-				) sub ON sub.itemFk = ishr.itemFk
-			ORDER BY i.typeFk, i.longName;
-	ELSE
-		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
-			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY 
-			SELECT iss.itemFk,
-					0 `hour`,
-					0 `minute`,
-					'--' itemPlacementCode,
-					i.longName,
-					i.size,
-					i.subName producer,
-					i.upToDown,
-					IFNULL(a.available, 0) available,
-					IFNULL(v.visible - iss.visible, 0) dayEndVisible,
-					IFNULL(v.visible - iss.visible, 0) firstNegative,
-					IFNULL(v.visible - iss.visible, 0) itemPlacementVisible, 
-					IFNULL(i.minimum * b.packing, 0) itemPlacementSize,
-					ips.onTheWay,
-					iss.visible itemShelvingStock,
-					IFNULL(v.visible, 0) visible,
-					b.isPickedOff,
-					iss.sectorFk
-				FROM itemShelvingStock iss
-					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 buy b ON b.id = lb.buy_id
-					LEFT JOIN cache.available a ON a.item_id = iss.itemFk
-						AND a.calc_id = vCalcAvailableFk
-					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
-						AND v.calc_id = vCalcVisibleFk
-					LEFT JOIN (
-						SELECT itemFk, SUM(saldo) onTheWay
-							FROM itemPlacementSupplyList 
-							WHERE saldo > 0 
-							GROUP BY itemFk
-					) ips ON ips.itemFk = i.id
-					WHERE iss.sectorFk = vSectorFk
-						OR iss.sectorFk IS NULL;            
-
-		CREATE OR REPLACE TEMPORARY TABLE tmp.itemOutTime
-			SELECT *, SUM(amount) quantity
-				FROM (
-					SELECT io.itemFk,
-							io.quantity amount, 
-							IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) `hours`, 
-							IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) `minutes`
-						FROM itemTicketOut `io`
-							JOIN tItemShelvingRadar isr ON isr.itemFk = io.itemFk
-							JOIN ticket t ON t.id= io.ticketFk
-							JOIN ticketState ts ON ts.ticketFk = io.ticketFk
-							JOIN `state` s ON s.id = ts.stateFk
-							LEFT JOIN `zone` z ON z.id = t.zoneFk
-							LEFT JOIN (
-								SELECT DISTINCT saleFk 
-									FROM saleTracking st 
-									WHERE st.created > util.VN_CURDATE() 
-										AND st.isChecked
-							) stPrevious ON stPrevious.saleFk = io.saleFk
-						WHERE t.warehouseFk = vWarehouseFk
-							AND NOT s.isPicked
-							AND NOT io.reserved 
-							AND stPrevious.saleFk IS NULL
-							AND io.shipped >= util.VN_CURDATE() 
-							AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
-				) sub
-				GROUP BY itemFk, `hours`, `minutes`;
-	
-		INSERT INTO tItemShelvingRadar (itemFk)
-			SELECT itemFk FROM tmp.itemOutTime
-				ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, 
-					firstNegative = IF(firstNegative < 0, firstNegative, firstNegative + quantity),
-					`hour` = IFNULL(IF(firstNegative > 0 , `hour`, `hours`), 0),
-					`minute` = IFNULL(IF(firstNegative > 0, `minute`, `minutes`), 0);
-
-		UPDATE tItemShelvingRadar isr
-				JOIN (
-					SELECT s.itemFk, SUM(s.quantity) amount
-						FROM sale s
-							JOIN ticket t ON t.id = s.ticketFk
-							JOIN ticketState ts ON ts.ticketFk = t.id
-						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-							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 tItemShelvingRadar;
-	END IF;
-
-	DROP TEMPORARY TABLE tItemShelvingRadar;
-	
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelving_inventory.sql

@@ -24,7 +24,7 @@ BEGIN
 	SELECT ish.id,
 			p.pickingOrder,
 			p.code parking,
-			ish.shelvingFk,
+			sh.code,
 			ish.itemFk,
 			i.longName,
 			ish.visible,

db/routines/vn/procedures/item_getStock.sql

@@ -15,8 +15,6 @@ BEGIN
  *
  * @return tmp.itemList(itemFk, stock, visible, available)
  */
-	DECLARE vIsLogifloraDay BOOL DEFAULT vn.isLogifloraDay(vDated, vWarehouseFk);
-
 	SET vDated = TIMESTAMP(vDated, '00:00:00');
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemList
@@ -36,14 +34,11 @@ BEGIN
 				UNION ALL
 				SELECT iei.itemFk, iei.quantity
 					FROM itemEntryIn iei
-						LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = iei.entryFk
 						JOIN item i ON i.id = iei.itemFk
 					WHERE iei.landed >= util.VN_CURDATE()
 						AND iei.landed < vDated
 						AND iei.warehouseInFk = vWarehouseFk
 						AND (vItemFk IS NULL OR iei.itemFk = vItemFk)
-						AND (wf.entryFk IS NULL OR vIsLogifloraDay)
-						AND NOT (iei.landed > util.VN_CURDATE() AND i.isFloramondo)
 				UNION ALL
 				SELECT ieo.itemFk, ieo.quantity
 					FROM itemEntryOut ieo
@@ -52,7 +47,6 @@ BEGIN
 						AND ieo.shipped < vDated
 						AND ieo.warehouseOutFk = vWarehouseFk
 						AND (vItemFk IS NULL OR ieo.itemFk = vItemFk)
-						AND NOT (ieo.shipped > util.VN_CURDATE() AND i.isFloramondo)
 			) sub
 			GROUP BY itemFk
 			HAVING stock;

db/routines/vn/procedures/prepareTicketList.sql

@@ -1,16 +1,18 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(vStartingDate DATETIME, vEndingDate DATETIME)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(
+	vStartingDate DATETIME, 
+	vEndingDate DATETIME
+)
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.productionTicket;
 	CREATE TEMPORARY TABLE tmp.productionTicket
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT t.id ticketFk, t.clientFk
+		SELECT t.id ticketFk
 			FROM ticket t
 				JOIN alertLevel al ON al.code = 'DELIVERED'
 				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
 				JOIN client c ON c.id = t.clientFk
-
 			WHERE c.typeFk IN ('normal','handMaking','internalUse')
 				AND (
 					t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate

db/routines/vn/procedures/productionControl.sql

@@ -24,24 +24,31 @@ proc: BEGIN
 	CALL prepareTicketList(util.yesterday(), vEndingDate);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
-		SELECT * FROM tmp.productionTicket;
-
-	CALL prepareClientList();
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
-		SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
+		SELECT ticketFk
-			FROM tmp.productionTicket tt
+			FROM tmp.productionTicket;
-				JOIN ticket t ON t.id = tt.ticketFk;
 
 	CALL ticket_getProblems(vIsTodayRelative);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.productionBuffer
 		(PRIMARY KEY(ticketFk), previaParking VARCHAR(255))
 		ENGINE = MEMORY
+		WITH saleProblemsDescription AS(
+		SELECT s.ticketFk,
+				LEFT(CONCAT('F: ', GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
+				LEFT(CONCAT('R: ', GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
+				LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost 
+			FROM tmp.saleProblems sp
+				JOIN vn.sale s ON s.id = sp.saleFk
+				LEFT JOIN vn.item i ON i.id = s.itemFk AND sp.hasItemShortage
+				LEFT JOIN vn.item i2 ON i2.id = s.itemFk AND sp.hasItemDelay
+				LEFT JOIN vn.item i3 ON i3.id = s.itemFk AND sp.hasItemLost
+			WHERE hasItemShortage OR hasItemDelay OR hasItemLost
+			GROUP BY s.ticketFk
+		)
 		SELECT tt.ticketFk,
-				tt.clientFk,
+				t.clientFk,
 				t.warehouseFk,
 				t.nickname,
 				t.packages,
@@ -59,7 +66,17 @@ proc: BEGIN
 				0 `lines`,
 				CAST( 0 AS DECIMAL(5,2)) m3,
 				CAST( 0 AS DECIMAL(5,2)) preparationRate,
-				"" problem,
+				TRIM(CAST(CONCAT(  IFNULL(sp.itemShortage, ''),
+					IFNULL(sp.itemDelay, ''),
+					IFNULL(sp.itemLost, ''),
+					IF(tpr.isFreezed, ' CONGELADO',''),
+					IF(tpr.hasHighRisk, ' RIESGO',''),
+					IF(tpr.hasTicketRequest, ' COD 100',''),
+					IF(tpr.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+					IF(tpr.hasComponentLack, ' COMPONENTES', ''),
+					IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour))) 
+						AND tpr.isTooLittle, ' PEQUEÑO', '')
+				) AS char(255))) problem,
 				IFNULL(tls.state,2) state,
 				w.code workerCode,
 				DATE(t.shipped) shipped,
@@ -79,29 +96,31 @@ proc: BEGIN
 				ag.isOwn,
 				rm.bufferFk
 			FROM tmp.productionTicket tt
-				JOIN ticket t ON tt.ticketFk = t.id
+				JOIN vn.ticket t ON tt.ticketFk = t.id
-				JOIN alertLevel al ON al.code = 'FREE'
+				JOIN vn.alertLevel al ON al.code = 'FREE'
-				LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
+				LEFT JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
-				LEFT JOIN `state` st ON st.id = tst.state
+				LEFT JOIN vn.`state` st ON st.id = tst.state
-				LEFT JOIN client c ON c.id = t.clientFk
+				LEFT JOIN vn.client c ON c.id = t.clientFk
-				LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+				LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
-				JOIN address a ON a.id = t.addressFk
+				JOIN vn.address a ON a.id = t.addressFk
-				LEFT JOIN province p ON p.id = a.provinceFk
+				LEFT JOIN vn.province p ON p.id = a.provinceFk
-				JOIN agencyMode am ON am.id = t.agencyModeFk
+				JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+				JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
-				JOIN agency ag ON ag.id = am.agencyFk
+				JOIN vn.agency ag ON ag.id = am.agencyFk
-				LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
+				LEFT JOIN vn.ticketState tls ON tls.ticketFk = tt.ticketFk
-				LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+				LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
-				LEFT JOIN worker w ON w.id = tls.userFk
+				LEFT JOIN vn.worker w ON w.id = tls.userFk
-				LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
+				LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-				LEFT JOIN `zone` z ON z.id = t.zoneFk
+				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
-				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+				LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
 					AND DATE(t.shipped) = zc.dated
-				LEFT JOIN ticketParking  tp ON tp.ticketFk = t.id
+				LEFT JOIN vn.ticketParking  tp ON tp.ticketFk = t.id
-				LEFT JOIN parking pk ON pk.id = tp.parkingFk
+				LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+				LEFT JOIN tmp.ticketProblems tpr ON tpr.ticketFk = tt.ticketFk
+				LEFT JOIN saleProblemsDescription sp ON sp.ticketFk = tt.ticketFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-
+				
 	 UPDATE tmp.productionBuffer pb
 			JOIN (
 				SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking
@@ -121,19 +140,6 @@ proc: BEGIN
 		ADD COLUMN `collectionV` INT,
 		ADD COLUMN `collectionN` INT;
 
-	UPDATE tmp.productionBuffer pb
-		JOIN  tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
-		SET pb.problem = TRIM(CAST(CONCAT(  IFNULL(tp.itemShortage, ''),
-				IFNULL(tp.itemDelay, ''),
-				IFNULL(tp.itemLost, ''),
-				IF(tp.isFreezed, ' CONGELADO',''),
-				IF(tp.hasHighRisk, ' RIESGO',''),
-				IF(tp.hasTicketRequest, ' COD 100',''),
-				IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
-				IF(tp.hasComponentLack, ' COMPONENTES', ''),
-				IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle, ' PEQUEÑO', '')
-			) AS char(255)));
-
 	-- Clientes Nuevos o Recuperados
 	UPDATE tmp.productionBuffer pb
 			LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
@@ -266,19 +272,20 @@ proc: BEGIN
 	UPDATE tmp.productionBuffer pb
 			JOIN sale s ON s.ticketFk = pb.ticketFk
 			JOIN item i ON i.id = s.itemFk
-			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk 
+			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk
 				AND lb.item_id = s.itemFk
 			JOIN buy b ON b.id = lb.buy_id
 			JOIN packaging p ON p.id = b.packagingFk
 		SET pb.hasPlantTray = TRUE
 		WHERE p.isPlantTray
 			AND s.quantity >= b.packing
-			AND pb.isOwn;		
+			AND pb.isOwn;
 
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,
 		tmp.ticket,
-		tmp.ticket_problems,
+		tmp.ticketProblems,
+		tmp.saleProblems,
 		tmp.ticketWithPrevia,
 		tItemShelvingStock,
 		tItemPackingType;

db/routines/vn/procedures/roadmap_cloneDay.sql

@@ -0,0 +1,72 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`roadmap_cloneDay`(
+	vDateToCopy DATE,
+	vDateToPaste DATE
+)
+BEGIN
+/**
+ * Clona roadmaps de un día a otro, incluyendo las paradas y sin algunos
+ * campos de la tabla principal, como matrículas, conductores...
+ *
+ * @param vDateToCopy Fecha para copiar
+ * @param vDateToPaste Fecha para pegar
+ */
+	DECLARE vDaysDiff INT;
+	DECLARE vRoadmapFk INT;
+	DECLARE vNewRoadmapFk INT;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vRoadmaps CURSOR FOR
+		SELECT id
+			FROM roadmap
+			WHERE etd BETWEEN vDateToCopy AND util.dayEnd(vDateToCopy);
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SET vDaysDiff = DATEDIFF(vDateToPaste, vDateToCopy);
+
+	IF vDaysDiff IS NULL THEN
+		CALL util.throw("No valid dates");
+	END IF;
+
+	START TRANSACTION;
+
+	OPEN vRoadmaps;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vRoadmaps INTO vRoadmapFk;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+	INSERT INTO roadmap (`name`, roadmapAddressFk, etd, eta, observations, price)
+		SELECT `name`,
+				roadmapAddressFk,
+				etd + INTERVAL vDaysDiff DAY,
+				eta + INTERVAL vDaysDiff DAY,
+				observations,
+				price
+			FROM roadmap
+			WHERE id = vRoadmapFk;
+
+	SET vNewRoadmapFk = LAST_INSERT_ID();
+
+	INSERT INTO roadmapStop (roadmapFk, roadmapAddressFk, eta, `description`, bufferFk)
+		SELECT vNewRoadmapFk,
+				roadmapAddressFk,
+				eta + INTERVAL vDaysDiff DAY,
+				`description`,
+				bufferFk
+			FROM roadmapStop
+			WHERE roadmapFk = vRoadmapFk;
+	END LOOP;
+	CLOSE vRoadmaps;
+
+	COMMIT;
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_getProblems.sql

@@ -1,86 +1,42 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblems`(
-	vIsTodayRelative tinyint(1)
+	vIsTodayRelative TINYINT(1)
 )
 BEGIN
 /**
- * Calcula los problemas de cada venta para un conjunto de tickets.
+ * Calcula los problemas para un conjunto de sale
  *
  * @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Tickets a calcular
+ * @table tmp.sale(saleFk) Identificadores de los sale a calcular
- * @return tmp.sale_problems
+ * @return tmp.saleProblems
  */
- 	DECLARE vWarehouseFk INT;
+	DECLARE vWarehouseFk INT;
 	DECLARE vDate DATE;
- 	DECLARE vAvailableCache INT;
+	DECLARE vAvailableCache INT;
 	DECLARE vVisibleCache INT;
 	DECLARE vDone BOOL;
- 	DECLARE vCursor CURSOR FOR
+	DECLARE vCursor CURSOR FOR
-		SELECT DISTINCT warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(shipped))
+		SELECT t.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(t.shipped)) dated
-			FROM tmp.sale_getProblems
+			FROM tmp.sale ts
-			WHERE shipped BETWEEN util.VN_CURDATE()
+				JOIN sale s ON s.id = ts.saleFk
-				AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY);
+				JOIN ticket t ON t.id = s.ticketFk
+			WHERE t.shipped BETWEEN util.VN_CURDATE()
+				AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
+			GROUP BY warehouseFk, dated;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
+	CREATE OR REPLACE TEMPORARY TABLE tmp.saleProblems(
-		ticketFk INT(11),
 		saleFk INT(11),
-		isFreezed INTEGER(1) DEFAULT 0,
+		hasItemShortage BOOL DEFAULT FALSE,
-		risk DECIMAL(10,1) DEFAULT 0,
+		hasItemLost BOOL DEFAULT FALSE,
-		hasRisk TINYINT(1) DEFAULT 0,
+		hasComponentLack BOOL DEFAULT FALSE,
-		hasHighRisk TINYINT(1) DEFAULT 0,
+		hasItemDelay BOOL DEFAULT FALSE,
-		hasTicketRequest INTEGER(1) DEFAULT 0,
+		hasRounding BOOL DEFAULT FALSE,
-		itemShortage VARCHAR(255),
+		PRIMARY KEY (saleFk)
-		isTaxDataChecked  INTEGER(1) DEFAULT 1,
+	) ENGINE = MEMORY;
-		itemDelay VARCHAR(255),
-		itemLost VARCHAR(255),
-		hasComponentLack INTEGER(1),
-		hasRounding VARCHAR(255),
-		isTooLittle BOOL DEFAULT FALSE,
-		isVip BOOL DEFAULT FALSE,
-		PRIMARY KEY (ticketFk, saleFk)
-	); -- No memory
 
-	INSERT INTO tmp.sale_problems(ticketFk,
+	CREATE OR REPLACE TEMPORARY TABLE tItemShelving
-									saleFk,
-									isFreezed,
-									risk,
-									hasRisk,
-									hasHighRisk,
-									hasTicketRequest,
-									isTaxDataChecked,
-									hasComponentLack,
-									isTooLittle)
-			SELECT sgp.ticketFk,
-					s.id,
-					IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed,
-					t.risk,
-					IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk,
-					IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk,
-					IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest,
-					IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isTaxDataChecked,
-					IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
-					IF(FIND_IN_SET('isTooLittle', t.problem)
-						AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE,
-						TRUE, FALSE) isTooLittle
-				FROM tmp.sale_getProblems sgp
-					JOIN ticket t ON t.id = sgp.ticketFk
-					LEFT JOIN sale s ON s.ticketFk = t.id
-					LEFT JOIN item i ON i.id = s.itemFk
-					LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-						AND zc.dated = util.VN_CURDATE()
-				WHERE s.problem <> '' OR t.problem <> '' OR t.risk
-				GROUP BY t.id, s.id;
-
-	INSERT INTO tmp.sale_problems(ticketFk, isVip)
-		SELECT sgp.ticketFk, TRUE
-			FROM tmp.sale_getProblems sgp
-				JOIN client c ON c.id = sgp.clientFk
-			WHERE c.businessTypeFk = 'VIP'
-		ON DUPLICATE KEY UPDATE isVIP = TRUE;
-
-	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
 		(INDEX (itemFk, warehouseFk))
 		ENGINE = MEMORY
 		SELECT ish.itemFk itemFk,
@@ -92,6 +48,14 @@ BEGIN
 				JOIN sector s ON s.id = p.sectorFk
 			GROUP BY ish.itemFk, s.warehouseFk;
 
+	-- Componentes: Algún componente obligatorio no se ha calcualdo
+		INSERT INTO tmp.saleProblems(saleFk, hasComponentLack)
+			SELECT s.id, TRUE
+				FROM tmp.sale ts
+					JOIN sale s ON s.id = ts.saleFk
+				WHERE FIND_IN_SET('hasComponentLack', s.problem)
+				GROUP BY s.id;
+
 	-- Disponible, faltas, inventario y retrasos
 	OPEN vCursor;
 	l: LOOP
@@ -104,130 +68,112 @@ BEGIN
 
 		-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
 		CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
-	
+
-		-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida	
+		-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
 		CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
 
-		INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
+		INSERT INTO tmp.saleProblems(saleFk, hasItemShortage)
-			SELECT ticketFk, problem, saleFk
+			SELECT s.id, TRUE
-				FROM (
+				FROM tmp.sale ts
-					SELECT sgp.ticketFk, 
+					JOIN sale s ON s.id = ts.saleFk
-							LEFT(CONCAT('F: ', GROUP_CONCAT(i.id, ' ', i.longName, ' ')), 250) problem, 
+					JOIN ticket t ON t.id = s.ticketFk
-							s.id saleFk
+					JOIN item i ON i.id = s.itemFk
-						FROM tmp.sale_getProblems sgp
+					JOIN itemType it ON it.id = i.typeFk
-							JOIN ticket t ON t.id = sgp.ticketFk
+					JOIN itemCategory ic ON ic.id = it.categoryFk
-							JOIN sale s ON s.ticketFk = t.id
+					LEFT JOIN cache.visible v ON v.item_id = i.id
-							JOIN item i ON i.id = s.itemFk
+						AND v.calc_id = vVisibleCache
-							JOIN itemType it ON it.id = i.typeFk
+					LEFT JOIN cache.available av ON av.item_id = i.id
-							JOIN itemCategory ic ON ic.id = it.categoryFk 
+						AND av.calc_id = vAvailableCache
-							LEFT JOIN cache.visible v ON v.item_id = i.id
+					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
-								AND v.calc_id = vVisibleCache
+						AND tis.warehouseFk = t.warehouseFk
-							LEFT JOIN cache.available av ON av.item_id = i.id
+				WHERE (s.quantity > v.visible OR (s.quantity > 0 AND v.visible IS NULL))
-								AND av.calc_id = vAvailableCache
+					AND (av.available < 0 OR av.available IS NULL)
-							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+					AND (s.quantity > tis.visible OR tis.visible IS NULL)
-								AND issw.warehouseFk = t.warehouseFk 
+					AND NOT s.isPicked
-						WHERE IFNULL(v.visible, 0) < s.quantity
+					AND NOT s.reserved
-							AND IFNULL(av.available, 0) < 0
+					AND ic.merchandise
-							AND IFNULL(issw.visible, 0) < s.quantity
+					AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
-							AND NOT s.isPicked
+					AND NOT i.generic
-							AND NOT s.reserved
+					AND util.VN_CURDATE() = vDate
-							AND ic.merchandise
+					AND t.warehouseFk = vWarehouseFk
-							AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+			GROUP BY s.id
-							AND NOT i.generic
+			ON DUPLICATE KEY UPDATE hasItemShortage = TRUE;
-							AND util.VN_CURDATE() = vDate
-							AND t.warehouseFk = vWarehouseFk
-					GROUP BY sgp.ticketFk) sub
-					ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
-		
-		-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
-		INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk)
-			SELECT ticketFk, problem, saleFk
-				FROM (
-					SELECT sgp.ticketFk,
-							LEFT(GROUP_CONCAT('I: ', i.id, ' ', i.longName, ' '), 250) problem,
-							s.id saleFk
-						FROM tmp.sale_getProblems sgp
-							JOIN ticket t ON t.id = sgp.ticketFk
-							JOIN sale s ON s.ticketFk = t.id
-							JOIN item i ON i.id = s.itemFk
-							JOIN itemType it ON it.id = i.typeFk
-							JOIN itemCategory ic ON ic.id = it.categoryFk
-							LEFT JOIN cache.visible v ON v.item_id = s.itemFk
-								AND v.calc_id = vVisibleCache
-							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
-								AND issw.warehouseFk = t.warehouseFk 
-						WHERE IFNULL(v.visible, 0) >= s.quantity
-							AND IFNULL(issw.visible, 0) < s.quantity
-							AND s.quantity > 0
-							AND NOT s.isPicked
-							AND NOT s.reserved
-							AND ic.merchandise
-							AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
-							AND NOT i.generic
-							AND util.VN_CURDATE() = vDate
-							AND t.warehouseFk = vWarehouseFk
-						GROUP BY sgp.ticketFk
-				) sub
-			ON DUPLICATE KEY UPDATE itemLost = sub.problem, saleFk = sub.saleFk;
-		
-		-- Retraso: Disponible suficiente, pero no visible ni ubicado
-		INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
-			SELECT ticketFk, problem, saleFk
-				FROM (
-					SELECT sgp.ticketFk,
-							LEFT(GROUP_CONCAT('R: ', i.id, ' ', i.longName, ' '), 250) problem,
-							s.id saleFk
-						FROM tmp.sale_getProblems sgp
-							JOIN ticket t ON t.id = sgp.ticketFk
-							JOIN sale s ON s.ticketFk = t.id
-							JOIN item i ON i.id = s.itemFk
-							JOIN itemType it ON it.id = i.typeFk
-							JOIN itemCategory ic ON ic.id = it.categoryFk
-							LEFT JOIN cache.visible v ON v.item_id = s.itemFk
-								AND v.calc_id = vVisibleCache
-							LEFT JOIN cache.available av ON av.item_id = i.id
-								AND av.calc_id = vAvailableCache
-							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
-								AND issw.warehouseFk = t.warehouseFk 
-						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) >= 0
-							AND IFNULL(issw.visible, 0) < s.quantity
-							AND s.quantity > 0
-							AND NOT s.isPicked
-							AND NOT s.reserved
-							AND ic.merchandise
-							AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
-							AND NOT i.generic
-							AND util.VN_CURDATE() = vDate
-							AND t.warehouseFk = vWarehouseFk
-						GROUP BY sgp.ticketFk
-				) sub
-			ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
 
-		-- Redondeo: cantidad incorrecta con respecto al grouping 
+		-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
+		INSERT INTO tmp.saleProblems(saleFk, hasItemLost)
+			SELECT s.id, TRUE
+				FROM tmp.sale ts
+					JOIN sale s ON s.id = ts.saleFk
+					JOIN ticket t ON t.id = s.ticketFk
+					JOIN item i ON i.id = s.itemFk
+					JOIN itemType it ON it.id = i.typeFk
+					JOIN itemCategory ic ON ic.id = it.categoryFk
+					LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+						AND v.calc_id = vVisibleCache
+					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+						AND tis.warehouseFk = t.warehouseFk
+				WHERE (v.visible >= s.quantity OR v.visible IS NULL)
+					AND (s.quantity > tis.visible  AND tis.visible IS NOT NULL)
+					AND s.quantity > 0
+					AND NOT s.isPicked
+					AND NOT s.reserved
+					AND ic.merchandise
+					AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+					AND NOT i.generic
+					AND util.VN_CURDATE() = vDate
+					AND t.warehouseFk = vWarehouseFk
+				GROUP BY s.id
+				ON DUPLICATE KEY UPDATE hasItemLost = TRUE;
+
+		-- Retraso: Disponible suficiente, pero no visible ni ubicado
+		INSERT INTO tmp.saleProblems(saleFk, hasItemDelay)
+			SELECT s.id, TRUE
+				FROM tmp.sale ts
+					JOIN sale s ON s.id = ts.saleFk
+					JOIN ticket t ON t.id = s.ticketFk
+					JOIN item i ON i.id = s.itemFk
+					JOIN itemType it ON it.id = i.typeFk
+					JOIN itemCategory ic ON ic.id = it.categoryFk
+					LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+						AND v.calc_id = vVisibleCache
+					LEFT JOIN cache.available av ON av.item_id = i.id
+						AND av.calc_id = vAvailableCache
+					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+						AND tis.warehouseFk = t.warehouseFk
+				WHERE (s.quantity > v.visible AND v.visible IS NULL)
+					AND (av.available >= 0 OR av.available IS NULL)
+					AND (s.quantity > tis.visible AND tis.visible IS NOT NULL)
+					AND s.quantity > 0
+					AND NOT s.isPicked
+					AND NOT s.reserved
+					AND ic.merchandise
+					AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+					AND NOT i.generic
+					AND util.VN_CURDATE() = vDate
+					AND t.warehouseFk = vWarehouseFk
+				GROUP BY s.id
+				ON DUPLICATE KEY UPDATE hasItemDelay = TRUE;
+
+		-- Redondeo: cantidad incorrecta con respecto al grouping
 		CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
-		INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
+
-			SELECT ticketFk, problem, saleFk
+		INSERT INTO tmp.saleProblems(saleFk, hasRounding)
-				FROM (
+			SELECT s.id, TRUE
-					SELECT sgp.ticketFk, 
+				FROM tmp.sale ts
-							s.id saleFk,
+					JOIN sale s ON s.id = ts.saleFk
-							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
+					JOIN ticket t ON t.id = s.ticketFk
-						FROM tmp.sale_getProblems sgp
+						AND t.warehouseFk = vWarehouseFk
-							JOIN ticket t ON t.id = sgp.ticketFk 
+					JOIN item i ON i.id = s.itemFk
-								AND t.warehouseFk = vWarehouseFk
+					JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-							JOIN sale s ON s.ticketFk = sgp.ticketFk
+					JOIN buy b ON b.id = bu.buyFk
-							JOIN item i ON i.id = s.itemFk
+				WHERE MOD(s.quantity, b.`grouping`)
-							JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+				GROUP BY s.id
-							JOIN buy b ON b.id = bu.buyFk
+				ON DUPLICATE KEY UPDATE hasRounding = TRUE;
-						WHERE MOD(s.quantity, b.`grouping`)	
-						GROUP BY sgp.ticketFk
-				)sub 
-			ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
 
 		DROP TEMPORARY TABLE tmp.buyUltimate;
 	END LOOP;
 	CLOSE vCursor;
 
-	DROP TEMPORARY TABLE tItemShelvingStock_byWarehouse;
+	DROP TEMPORARY TABLE tItemShelving;
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_getProblemsByTicket.sql

@@ -1,25 +1,25 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(
+    IN vTicketFk INT, 
+    IN vIsTodayRelative TINYINT(1)
+)
 BEGIN
 /**
- * Calcula los problemas de cada venta 
+ * Calcula los problemas de cada venta para un tickets.
- * para un conjunto de tickets.
  *
  * @return Problems result
  */
-    CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems 
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-    (INDEX (ticketFk))
+		(INDEX (saleFk))
-    ENGINE = MEMORY
+		ENGINE = MEMORY
-    SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped 
+		SELECT id saleFk FROM sale WHERE ticketFk = vTicketFk;
-        FROM ticket t
-        WHERE t.id = vTicketFk;
 
-    CALL sale_getProblems(vIsTodayRelative);
+	CALL sale_getProblems(vIsTodayRelative);
 
-    SELECT * FROM tmp.sale_problems;
+	SELECT * FROM tmp.saleProblems;
 
-    DROP TEMPORARY TABLE
+	DROP TEMPORARY TABLE 
-        tmp.sale_getProblems,
+		tmp.saleProblems, 
-        tmp.sale_problems;
+		tmp.sale;
 END$$
 DELIMITER ;

db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -41,6 +41,7 @@ BEGIN
 				) currencyBalance
 			FROM (
 				SELECT NULL bankFk,
+						NULL bank,
 						ii.companyFk,
 						ii.serial,
 						ii.id,
@@ -74,6 +75,7 @@ BEGIN
 					GROUP BY iid.id, ii.id
 				UNION ALL
 				SELECT p.bankFk,
+						a.bank,
 						p.companyFk,
 						NULL,
 						p.id,
@@ -109,6 +111,7 @@ BEGIN
 					AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
 				UNION ALL
 				SELECT NULL,
+						NULL bankFk,
 						companyFk,
 						NULL,
 						se.id,
@@ -136,6 +139,7 @@ BEGIN
 						AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
 				UNION ALL
 				SELECT NULL bankFk,
+					NULL,
 					e.companyFk,
 					'E' serial,
 					e.invoiceNumber id,
@@ -154,7 +158,7 @@ BEGIN
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN currency c ON c.id = e.currencyFk
 					WHERE e.supplierFk = vSupplierFk
-						AND tr.landed >= CURDATE()
+						AND tr.landed >= util.VN_CURDATE()
 						AND e.invoiceInFk IS NULL
 						AND vHasEntries
 				ORDER BY (dated IS NULL AND NOT isBooked),

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruck`(vWarehouserFk INT, vHour INT, vMinute INT)
-BEGIN
-	DECLARE done INT DEFAULT FALSE;
-	DECLARE vTicketFk INT;
-	DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tTicket;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
-	CALL vn.productionControl(vWarehouserFk,0) ;
-
-	DROP TEMPORARY TABLE IF EXISTS tTicket;
-	CREATE TEMPORARY TABLE tTicket
-		SELECT ticketFk
-		FROM tmp.productionBuffer
-			JOIN alertLevel al ON al.code = 'FREE'
-		WHERE shipped = util.VN_CURDATE()
-			AND problem LIKE '%I:%'
-			AND (HH <= vHour OR HH = vHour AND mm < vMinute)
-			AND alertLevel = al.id;
-
-	OPEN cur1;
-
-	read_loop: LOOP
-		FETCH cur1 INTO vTicketFk;
-		IF done THEN
-			LEAVE read_loop;
-		END IF;
-
-		CALL vn.ticket_DelayTruckSplit(vTicketFk);
-	END LOOP;
-
-	CLOSE cur1;
-	DROP TEMPORARY TABLE tTicket, tmp.productionBuffer;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruckSplit.sql

@@ -1,59 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruckSplit`(
-	vTicketFk INT
-)
-BEGIN
-/**
- * Splita las lineas de ticket que no estan ubicadas
- *
- * @param vTicketFk Id ticket
- */
-	DECLARE vNewTicketFk INT;
-	DECLARE vTotalLines INT;
-	DECLARE vLinesToSplit INT;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
-	
-	SELECT COUNT(*) INTO vTotalLines
-		FROM sale 
-		WHERE ticketFk = vTicketFk;
-			
-	CREATE TEMPORARY TABLE tmp.SalesToSplit
-		SELECT s.id saleFk
-			FROM ticket t
-				JOIN sale s ON t.id = s.ticketFk 
-				LEFT JOIN (
-					SELECT ish.itemFk itemFk,
-							SUM(ish.visible) visible,
-							s.warehouseFk warehouseFk
-						FROM itemShelving ish
-							JOIN shelving sh ON sh.id = ish.shelvingFk
-							JOIN parking p ON p.id = sh.parkingFk
-							JOIN sector s ON s.id = p.sectorFk
-						GROUP BY ish.itemFk,
-							s.warehouseFk
-				) issw ON issw.itemFk = s.itemFk
-					AND issw.warehouseFk = t.warehouseFk 
-			WHERE s.quantity > IFNULL(issw.visible, 0)
-				AND s.quantity > 0
-				AND NOT s.isPicked
-				AND NOT s.reserved
-				AND t.id = vTicketFk;
-
-	SELECT COUNT(*) INTO vLinesToSplit
-		FROM tmp.SalesToSplit;
-
-	IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
-		SET vNewTicketFk = vTicketFk;
-	ELSE
-		CALL ticket_Clone(vTicketFk, vNewTicketFk);
-		UPDATE sale s 
-			JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id 
-			SET s.ticketFk = vNewTicketFk;
-	END IF;
-
-	CALL ticket_setState(vNewTicketFk, 'FIXING');
-
-	DROP TEMPORARY TABLE tmp.SalesToSplit;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_canMerge.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_canMerge`(vDat
 BEGIN
 /**
  * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
- * 
+ *
  * @param vDated Fecha en cuestión
  * @param vScopeDays Dias en el futuro a sondear
  * @param vLitersMax Volumen máximo de los tickets a catapultar

db/routines/vn/procedures/ticket_canbePostponed.sql

@@ -19,6 +19,7 @@ BEGIN
 			sub2.iptd futureIpt,
 			sub2.state futureState,
 			t.clientFk,
+			cl.salespersonFk,
 			t.warehouseFk,
 			ts.alertLevel,
 			sub2.alertLevel futureAlertLevel,
@@ -29,15 +30,21 @@ BEGIN
 			st.code stateCode,
 			sub2.code futureStateCode,
 			st.classColor,
-			sub2.classColor futureClassColor
+			sub2.classColor futureClassColor,
+			am.id agencyFk,
+			am.name agency,
+			sub2.agencyModeFk futureAgencyFk,
+			sub2.agencyMode futureAgency
 		FROM vn.saleVolume sv
 			JOIN vn.sale s ON s.id = sv.saleFk
 			JOIN vn.item i ON i.id = s.itemFk
 			JOIN vn.ticket t ON t.id = sv.ticketFk
+			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
 			JOIN vn.address a ON a.id = t.addressFk
 			JOIN vn.province p ON p.id = a.provinceFk
 			JOIN vn.country c ON c.id = p.countryFk
 			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.client cl ON cl.id = t.clientFk
 			JOIN vn.state st ON st.id = ts.stateFk
 			JOIN vn.alertLevel al ON al.id = ts.alertLevel
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
@@ -52,16 +59,19 @@ BEGIN
 							st.name state,
 							st.code,
 							st.classColor,
+							am.id agencyModeFk,
+							am.name agencyMode,
 							GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
-							FROM vn.ticket t
+						FROM vn.ticket t
-								JOIN vn.ticketState ts ON ts.ticketFk = t.id
+							JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-								JOIN vn.state st ON st.id = ts.stateFk
+							JOIN vn.ticketState ts ON ts.ticketFk = t.id
-								JOIN vn.sale s ON s.ticketFk = t.id
+							JOIN vn.state st ON st.id = ts.stateFk
-								JOIN vn.item i ON i.id = s.itemFk
+							JOIN vn.sale s ON s.ticketFk = t.id
-							WHERE t.shipped BETWEEN vFutureDated
+							JOIN vn.item i ON i.id = s.itemFk
-											AND util.dayend(vFutureDated)
+						WHERE t.shipped BETWEEN vFutureDated
-								AND t.warehouseFk = vWarehouseFk
+										AND util.dayend(vFutureDated)
-							GROUP BY t.id
+							AND t.warehouseFk = vWarehouseFk
+						GROUP BY t.id
 					) sub
 					GROUP BY sub.addressFk
 				) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id

db/routines/vn/procedures/ticket_doCmr.sql

@@ -21,9 +21,6 @@ BEGIN
 				IFNULL(sat.supplierFk, su.id) supplierFk,
 				t.landed
 			FROM ticket t
-				JOIN ticketState ts ON ts.ticketFk = t.id
-				JOIN `state` s ON s.id = ts.stateFk
-				JOIN alertLevel al ON al.id = s.alertLevel
 				JOIN client c ON c.id = t.clientFk
 				JOIN `address` a ON a.id = t.addressFk
 				JOIN province p ON p.id = a.provinceFk
@@ -40,8 +37,7 @@ BEGIN
 				LEFT JOIN agency ag ON ag.id = am.agencyFk
 				LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
 					AND wo.isFreelance
-			WHERE al.code IN ('PACKED', 'DELIVERED')
+			WHERE co.code <> 'ES'
-				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
 				AND t.id = vSelf

db/routines/vn/procedures/ticket_getProblems.sql

@@ -1,53 +1,109 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getProblems`(
-	vIsTodayRelative tinyint(1)
+	vIsTodayRelative TINYINT(1)
 )
 BEGIN
 /**
  * Calcula los problemas para un conjunto de tickets.
- * Agrupados por ticket
  *
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
+ * @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
- * @return tmp.ticket_problems
+ * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
+ * @return tmp.ticketProblems, tmp.saleProblems
  */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale (
+		saleFk INT(11),
+		PRIMARY KEY (saleFk)
+	) ENGINE = MEMORY
+		SELECT DISTINCT s.id saleFk
+			FROM tmp.ticket tt
+				JOIN ticket t ON t.id = tt.ticketFk
+				JOIN sale s ON s.ticketFk = t.id
+			GROUP BY s.id;
+
 	CALL sale_getProblems(vIsTodayRelative);
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems 
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketProblems (
-		(PRIMARY KEY (ticketFk))
+		ticketFk INT(11),
-		ENGINE = MEMORY
+		isFreezed BOOL DEFAULT FALSE,
-		SELECT ticketFk,
+		risk DECIMAL(10,1) DEFAULT 0,
-			MAX(isFreezed) isFreezed,
+		hasRisk BOOL DEFAULT FALSE,
-			MAX(risk) risk,
+		hasHighRisk BOOL DEFAULT FALSE,
-			MAX(hasRisk) hasRisk,
+		hasTicketRequest BOOL DEFAULT FALSE,
-			MAX(hasHighRisk) hasHighRisk,
+		isTaxDataChecked BOOL DEFAULT FALSE,
-			MAX(hasTicketRequest) hasTicketRequest,
+		isTooLittle BOOL DEFAULT FALSE,
-			MAX(itemShortage) itemShortage,
+		isVip BOOL DEFAULT FALSE,
-			MIN(isTaxDataChecked) isTaxDataChecked,
+		hasItemShortage BOOL DEFAULT FALSE,
-			MAX(hasComponentLack) hasComponentLack,
+		hasItemDelay BOOL DEFAULT FALSE,
-			MAX(isTooLittle) isTooLittle,
+		hasItemLost BOOL DEFAULT FALSE,
-			MAX(itemDelay) itemDelay,
+		hasComponentLack BOOL DEFAULT FALSE,
-			MAX(hasRounding) hasRounding,
+		hasRounding BOOL DEFAULT FALSE,
-			MAX(itemLost) itemLost,
+		PRIMARY KEY (ticketFk)
-			MAX(isVip) isVip,
+	) ENGINE = MEMORY
+	WITH hasItemShortage AS(
+	SELECT s.ticketFk
+		FROM tmp.saleProblems sp
+			JOIN vn.sale s ON s.id = sp.saleFk
+		WHERE sp.hasItemShortage
+		GROUP BY s.ticketFk
+	),hasItemLost AS(
+	SELECT s.ticketFk
+		FROM tmp.saleProblems sp
+			JOIN vn.sale s ON s.id = sp.saleFk
+		WHERE sp.hasItemLost
+		GROUP BY s.ticketFk
+	),hasRounding AS(
+	SELECT s.ticketFk
+		FROM tmp.saleProblems sp
+			JOIN vn.sale s ON s.id = sp.saleFk
+		WHERE sp.hasRounding
+		GROUP BY s.ticketFk
+	), hasItemDelay AS(
+	SELECT s.ticketFk
+		FROM tmp.saleProblems sp
+			JOIN vn.sale s ON s.id = sp.saleFk
+		WHERE sp.hasItemDelay
+		GROUP BY s.ticketFk
+	), hasComponentLack AS(
+	SELECT s.ticketFk
+		FROM tmp.saleProblems sp
+			JOIN vn.sale s ON s.id = sp.saleFk
+		WHERE sp.hasComponentLack
+		GROUP BY s.ticketFk
+	)SELECT tt.ticketFk,
+			FIND_IN_SET('isFreezed', t.problem) > 0 isFreezed,
+			t.risk,
+			FIND_IN_SET('hasRisk', t.problem) > 0 hasRisk,
+			FIND_IN_SET('hasHighRisk', t.problem) > 0 hasHighRisk,
+			FIND_IN_SET('hasTicketRequest', t.problem) > 0 hasTicketRequest,
+			FIND_IN_SET('isTaxDataChecked', t.problem) > 0 isTaxDataChecked,
+			FIND_IN_SET('isTooLittle', t.problem) > 0
+				AND util.VN_NOW() < (util.VN_CURDATE() +
+					INTERVAL HOUR(zc.`hour`) HOUR) +
+					INTERVAL MINUTE(zc.`hour`) MINUTE isTooLittle,
+			c.businessTypeFk = 'VIP' isVip,
+			NOT (his.ticketFk IS NULL) hasItemShortage,
+			NOT (hid.ticketFk IS NULL) hasItemDelay,
+			NOT (hil.ticketFk IS NULL) hasItemLost,
+			NOT (hcl.ticketFk IS NULL) hasComponentLack,
+			NOT (hr.ticketFk IS NULL) hasRounding,
 			0 totalProblems
-		FROM tmp.sale_problems
+		FROM tmp.ticket tt
-			GROUP BY ticketFk;
+			JOIN vn.ticket t ON t.id = tt.ticketFk
+			JOIN vn.client c ON c.id = t.clientFk
+			LEFT JOIN hasItemShortage his ON his.ticketFk = t.id
+			LEFT JOIN hasItemLost hil ON hil.ticketFk = t.id
+			LEFT JOIN hasRounding hr ON hr.ticketFk = t.id
+			LEFT JOIN hasItemDelay hid ON hid.ticketFk = t.id
+			LEFT JOIN hasComponentLack hcl ON hcl.ticketFk = t.id
+			LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
+				AND zc.dated = util.VN_CURDATE()
+		GROUP BY t.id;
 
-	UPDATE tmp.ticket_problems
+	UPDATE tmp.ticketProblems
-		SET totalProblems = (
+		SET totalProblems = isFreezed + hasHighRisk + hasTicketRequest +
-			(isFreezed) +
+			isTaxDataChecked + hasComponentLack + hasItemDelay +
-			(hasHighRisk) +
+			isTooLittle + hasItemLost + hasRounding  + hasItemShortage + isVip;
-			(hasTicketRequest) +
-			(!isTaxDataChecked) +
-			(hasComponentLack) +
-			(itemDelay IS NOT NULL) +
-			(isTooLittle) +
-			(itemLost IS NOT NULL) +
-			(hasRounding IS NOT NULL) +
-			(itemShortage IS NOT NULL) +
-			(isVip)
-		);
 
-	DROP TEMPORARY TABLE tmp.sale_problems;
+	DROP TEMPORARY TABLE tmp.sale;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_getWarnings.sql

@@ -25,7 +25,7 @@ BEGIN
 				LEFT JOIN agencyMode am ON am.id = tt.agencyModeFk
 				LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 			WHERE dm.code IN ('AGENCY')
-				AND it.isFragile;
+				AND (it.isFragile OR i.isFragile);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_warnings
 		(PRIMARY KEY (ticketFk))

db/routines/vn/procedures/vehicle_checkNumberPlate.sql

@@ -1,14 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(vNumberPlate VARCHAR(10), vCountryCodeFk VARCHAR(2))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(
+	vNumberPlate VARCHAR(10),
+	vCountryCodeFk VARCHAR(2)
+)
 BEGIN
 /**
- * Comprueba si la matricula pasada tiene el formato correcto dependiendo del pais del vehiculo
+ * Comprueba si la matricula pasada tiene el formato
+ * correcto dependiendo del pais del vehiculo.
+ *
+ * @param vNumberPlate Número de matricula
+ * @param vCountryCodeFk Código de pais
  */
 	DECLARE vRegex VARCHAR(45);
 
-	SELECT vp.regex INTO vRegex
+	SELECT regex INTO vRegex
-		FROM vehiclePlateRegex vp
+		FROM vehiclePlateRegex
-		WHERE vp.countryCodeFk = vCountryCodeFk;
+		WHERE countryCodeFk = vCountryCodeFk;
 	
 	IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
 		CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));

db/routines/vn/procedures/zone_getAddresses.sql

@@ -1,26 +1,27 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
-	vShipped DATE,
+	vLanded DATE,
 	vDepartmentFk INT
 )
 BEGIN
 /**
  * Devuelve un listado de todos los clientes activos
  * con consignatarios a los que se les puede
- * vender producto para esa zona.
+ * entregar producto para esa zona.
  *
  * @param vSelf Id de zona
- * @param vShipped Fecha de envio
+ * @param vLanded Fecha de entrega
- * @param vDepartmentFk Id de departamento
+ * @param vDepartmentFk Id de departamento | NULL para mostrar todos
  * @return Un select
  */
 	CALL zone_getPostalCode(vSelf);
 
 	WITH clientWithTicket AS (
-		SELECT clientFk
+		SELECT DISTINCT clientFk
 			FROM vn.ticket
-			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
+			WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
+				AND NOT isDeleted
 	)
 	SELECT c.id,
 			c.name,
@@ -30,7 +31,7 @@ BEGIN
 			u.name username,
 			aai.invoiced,
 			cnb.lastShipped,
-			cwt.clientFk
+			IF(cwt.clientFk, TRUE, FALSE) hasTicket
 		FROM vn.client c
 			JOIN vn.worker w ON w.id = c.salesPersonFk
 			JOIN vn.workerDepartment wd ON wd.workerFk = w.id
@@ -50,7 +51,7 @@ BEGIN
 			AND c.isActive
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
-			AND (d.id = vDepartmentFk OR NOT vDepartmentFk)
+			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

db/routines/vn/procedures/zone_getOptionsForShipment.sql

@@ -9,7 +9,7 @@ BEGIN
  * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
  */
 	DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
-		
+
 	DROP TEMPORARY TABLE IF EXISTS tLandings;
 	CREATE TEMPORARY TABLE tLandings
 		(INDEX (eventFk))
@@ -30,6 +30,7 @@ BEGIN
 						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
 						l.travelingDays,
 						IFNULL(e.price, z.price) price,
+						IFNULL(e.priceOptimum, z.priceOptimum) priceOptimum,
 						IFNULL(e.bonus, z.bonus) bonus,
 						l.landed,
 						vShipped shipped

db/routines/vn/triggers/buy_beforeUpdate.sql

@@ -20,6 +20,7 @@ trig:BEGIN
 		THEN
 
 		CALL entry_isEditable(OLD.entryFk);
+		CALL entry_isEditable(NEW.entryFk);
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
@@ -88,11 +89,11 @@ trig:BEGIN
 		SET NEW.buyerFk = vBuyerFk;
 	END IF;
 
-	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
+	IF NOT (NEW.itemFk <=> OLD.itemFk) OR
-		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
+		NOT (OLD.entryFk <=> NEW.entryFk) THEN
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
 		SELECT NEW.id;
-		CALL buy_checkItem();		
+		CALL buy_checkItem();
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -10,7 +10,6 @@ BEGIN
 
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
-			NOT (NEW.dated <=> OLD.dated) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR

db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeDelete`
+	BEFORE DELETE ON `itemTaxCountry`
+	FOR EACH ROW
+BEGIN
+	CALL util.throw('Records in this table cannot be deleted');
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql

@@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeUp
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT(NEW.`countryFk` <=> OLD.`countryFk`) OR NOT(NEW.`itemFk` <=> OLD.`itemFk`) THEN
+		CALL util.throw('Only the VAT can be modified');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/mandate_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_afterDelete`
+	AFTER DELETE ON `mandate`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO mandateLog
+		SET `action` = 'delete',
+			`changedModel` = 'mandate',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/mandate_beforeInsert.sql

@@ -3,10 +3,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_beforeInsert`
 	BEFORE INSERT ON `mandate`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
 	IF (NEW.code IS NULL) THEN
-		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT 
+		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
-		    FROM information_schema.TABLES 
+			FROM information_schema.TABLES
-		    WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
+			WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
-    END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/mandate_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_beforeUpdate`
+	BEFORE INSERT ON `mandate`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeDelete.sql

@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeDelete`
+	BEFORE DELETE ON `roadmapStop`
+	FOR EACH ROW
+BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vRoadmapEta DATETIME;
+
+	IF OLD.roadmapFk IS NOT NULL THEN
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = OLD.roadmapFk
+				AND id <> OLD.id;
+
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = OLD.roadmapFk;
+
+		IF vMaxEta <> vRoadmapEta OR vMaxEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = OLD.roadmapFk;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,8 +3,30 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vRoadmapEta DATETIME;
 
-	SET NEW.description = UCASE(NEW.description);
+	SET NEW.editorFk = account.myUser_getId();
 
+	IF NEW.description IS NOT NULL THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
+
+	IF NEW.roadmapFk IS NOT NULL THEN
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
+
+	IF NEW.roadmapFk IS NOT NULL AND NEW.eta IS NOT NULL THEN
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF vRoadmapEta < NEW.eta OR vRoadmapEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = NEW.eta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,8 +3,40 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vCurrentEta DATETIME;
 
-	SET NEW.description = UCASE(NEW.description);
+	SET NEW.editorFk = account.myUser_getId();
 
+	IF NOT (NEW.description <=> OLD.description) THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
+
+	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
+		OR (NOT (NEW.eta <=> OLD.eta)) THEN
+
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = NEW.roadmapFk
+				AND id <> OLD.id;
+
+		IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
+			SET vMaxEta = NEW.eta;
+		END IF;
+
+		SELECT eta INTO vCurrentEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_afterUpdate.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_afterUpdate`
+	AFTER UPDATE ON `roadmap`
+	FOR EACH ROW
+BEGIN
+	DECLARE vSeconds INT;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		IF vSeconds IS NOT NULL AND vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmap_beforeInsert.sql

@@ -3,10 +3,31 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.name IS NOT NULL THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NEW.trailerPlate IS NOT NULL OR NEW.tugPlate IS NOT NULL THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
 	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
-	ELSE
+								FROM worker w
-		SET NEW.driverName = NULL;
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,10 +3,39 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	IF NEW.driver1Fk IS NOT NULL THEN
+	SET NEW.editorFk = account.myUser_getId();
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
+
-	ELSE
+	IF NOT (NEW.name <=> OLD.name) THEN
-		SET NEW.driverName = NULL;
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NOT (NEW.trailerPlate <=> OLD.trailerPlate) OR NOT (NEW.tugPlate <=> OLD.tugPlate) THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
+	IF NOT (NEW.driverName <=> OLD.driverName) THEN
+		SET NEW.driver1Fk = NULL;
+	END IF;
+
+	IF NOT (NEW.driver1Fk <=> OLD.driver1Fk) AND NEW.driver1Fk IS NOT NULL THEN
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NOT (NEW.driverChangeName <=> OLD.driverChangeName) THEN
+		SET NEW.driverChangeFk = NULL;
+	END IF;
+
+	IF NOT (NEW.driverChangeFk <=> OLD.driverChangeFk) AND NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -16,5 +16,9 @@ BEGIN
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -40,5 +40,9 @@ BEGIN
 	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

@@ -6,8 +6,7 @@ BEGIN
 	INSERT INTO zoneLog
 		SET `action` = 'delete',
 			`changedModel` = 'zoneIncluded',
-			`changedModelId` = OLD.zoneFk,
+			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
 END$$
 DELIMITER ;

db/routines/vn/views/agencyModeIncoming.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+SQL SECURITY DEFINER
+VIEW `vn`.`agencyModeIncoming` AS
+	SELECT
+		am.id,
+		am.name
+	FROM `vn`.`agencyMode` AS am
+		JOIN `vn`.`agencyIncoming` AS ai
+			ON am.id = ai.agencyModeFk;

db/routines/vn/views/itemEntryIn.sql

@@ -7,7 +7,8 @@ AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`,
 	`b`.`quantity` AS `quantity`,
 	`t`.`isReceived` AS `isReceived`,
 	`t`.`isRaid` AS `isVirtualStock`,
-	`e`.`id` AS `entryFk`
+	`e`.`id` AS `entryFk`,
+	`t`.`availabled`
 FROM (
 		(
 			`vn`.`buy` `b`

db/routines/vn2008/views/Cubos.sql

@@ -18,5 +18,6 @@ AS SELECT `p`.`id` AS `Id_Cubo`,
 	`p`.`base` AS `Base`,
 	`p`.`isBox` AS `box`,
 	`p`.`returnCost` AS `costeRetorno`,
-	`p`.`isActive` AS `isActive`
+	`p`.`isActive` AS `isActive`,
+	`p`.`flippingCost` AS `flippingCost`
 FROM `vn`.`packaging` `p`

db/routines/vn2008/views/Split_lines.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Split_lines`
-AS SELECT `sl`.`id` AS `Id_Split_lines`,
-	`sl`.`splitFk` AS `Id_Split`,
-	`sl`.`itemFk` AS `Id_Article`,
-	`sl`.`buyFk` AS `Id_Compra`
-FROM `vn`.`splitLine` `sl`

db/routines/vn2008/views/awb.sql

@@ -29,5 +29,6 @@ AS SELECT `a`.`id` AS `id`,
 	`a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`,
 	`a`.`observation` AS `observation`,
 	`a`.`hasFreightPrepaid` AS `hasFreightPrepaid`,
-	`a`.`propertyNumber` AS `propertyNumber`
+	`a`.`propertyNumber` AS `propertyNumber`,
+	`a`.`costPerKg` AS `costPerKg`
 FROM `vn`.`awb` `a`

db/routines/vn2008/views/travel.sql

@@ -16,7 +16,6 @@ AS SELECT `t`.`id` AS `id`,
 	`t`.`kg` AS `kg`,
 	`t`.`cargoSupplierFk` AS `cargoSupplierFk`,
 	`t`.`totalEntries` AS `totalEntries`,
-	`t`.`appointment` AS `appointment`,
 	`t`.`awbFk` AS `awbFk`,
 	`t`.`isRaid` AS `isRaid`,
 	`t`.`daysInForward` AS `daysInForward`

db/versions/11076-blueChico/00-firstScript.sql

@@ -0,0 +1,27 @@
+ALTER TABLE vn.business
+ADD CONSTRAINT `business_companyCodeFk` FOREIGN KEY (`companyCodeFk`) REFERENCES `company` (`code`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('CalendarType','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('OccupationCode','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('WorkerBusinessProfessionalCategory','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('WorkerBusinessAgreement','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('WorkerBusinessType','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('PayrollCategory','find','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Worker','__get__business','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Worker','__create__business','*','ALLOW','ROLE','hr');
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Business','crud','*','ALLOW','ROLE','hr');
+

db/versions/11202-limeRuscus/01-updateStateAlertLevel.sql

@@ -0,0 +1,14 @@
+UPDATE vn.state
+    SET alertLevel = 1 -- ON_PREVIOUS
+    WHERE id IN (
+        36, -- Previa Revisando
+        37, -- Previa Revisado
+        26, -- Prep Previa
+        28, -- Previa OK
+        29, -- Previa Impreso
+        31, -- Polizon Impreso
+        32, -- Polizon OK
+        20, -- Asignado
+        23, -- URGENTE
+        33  -- Auto_Impreso
+    );

db/versions/11269-wheatBirch/00-firstScript.sql

@@ -7,9 +7,9 @@ ALTER TABLE vn.invoiceOut ADD CONSTRAINT invoiceOut_customsAgentFk FOREIGN KEY (
 ALTER TABLE vn.invoiceOut ADD CONSTRAINT invoiceOut_incotermsFk FOREIGN KEY (incotermsFk)
     REFERENCES vn.incoterms (`code`) ON DELETE RESTRICT ON UPDATE CASCADE;
 
-UPDATE vn.invoiceOut io
+-- UPDATE vn.invoiceOut io
-		  JOIN vn.client c ON c.id = io.clientFk
+-- 		  JOIN vn.client c ON c.id = io.clientFk
-      JOIN vn.ticket t ON t.clientFk = c.id
+--       JOIN vn.ticket t ON t.clientFk = c.id
-		  JOIN vn.address a ON a.id = t.addressFk 
+-- 		  JOIN vn.address a ON a.id = t.addressFk
-    SET io.customsAgentFk = a.customsAgentFk,
+--     SET io.customsAgentFk = a.customsAgentFk,
-        io.incotermsFk = a.incotermsFk;
+--         io.incotermsFk = a.incotermsFk;

db/versions/11306-greenMonstera/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Ticket','getTicketProblems','READ','ALLOW','ROLE','employee');

db/versions/11334-grayRoebelini/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.claimConfig ADD IF NOT EXISTS daysToClaim int(11) NOT NULL DEFAULT 7 COMMENT 'Dias para reclamar';

db/versions/11383-maroonChico/00-town.sql

@@ -0,0 +1,10 @@
+UPDATE vn.town t
+		LEFT JOIN vn.zoneGeo zg ON zg.id = t.geoFk
+	SET t.geoFk = NULL
+	WHERE zg.id IS NULL;
+
+ALTER TABLE vn.town
+	ADD CONSTRAINT town_zoneGeo_FK FOREIGN KEY (geoFk)
+		REFERENCES vn.zoneGeo(id)
+		ON DELETE RESTRICT
+		ON UPDATE CASCADE;

db/versions/11383-maroonChico/01-postCode.sql

@@ -0,0 +1,10 @@
+UPDATE vn.postCode pc
+		LEFT JOIN vn.zoneGeo zg ON zg.id = pc.geoFk
+	SET pc.geoFk = NULL
+	WHERE zg.id IS NULL;
+
+ALTER TABLE vn.postCode
+	ADD CONSTRAINT postCode_zoneGeo_FK FOREIGN KEY (geoFk)
+		REFERENCES vn.zoneGeo(id)
+		ON DELETE RESTRICT
+		ON UPDATE CASCADE;

db/versions/11383-maroonChico/02-province.sql

@@ -0,0 +1,10 @@
+UPDATE vn.province p
+		LEFT JOIN vn.zoneGeo zg ON zg.id = p.geoFk
+	SET p.geoFk = NULL
+	WHERE zg.id IS NULL;
+
+ALTER TABLE vn.province
+	ADD CONSTRAINT province_zoneGeo_FK FOREIGN KEY (geoFk)
+		REFERENCES vn.zoneGeo(id)
+		ON DELETE RESTRICT
+		ON UPDATE CASCADE;

db/versions/11389-yellowChico/00-firstScript.sql

@@ -0,0 +1,23 @@
+CREATE TABLE vn.parkingCoordinates (
+	parkingFk int(11) NOT NULL,
+	x varchar(5) NOT NULL,
+	y varchar(5) NOT NULL,
+	z varchar(5) NOT NULL,
+	CONSTRAINT parkingCoordinates_pk PRIMARY KEY (parkingFk),
+	CONSTRAINT parkingCoordinates_parking_FK FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.parkingCoordinates (parkingFk, x, y, z)
+	SELECT id, `column`, `row`, `floor`
+		FROM vn.parking
+		WHERE `column` IS NOT NULL
+			OR `row` IS NOT NULL
+			OR `floor` IS NOT NULL;
+
+ALTER TABLE vn.parking
+	DROP COLUMN `column`,
+	DROP COLUMN `row`,
+	DROP COLUMN `floor`;

db/versions/11393-redCamellia/00-firstScript.sql

@@ -0,0 +1,19 @@
+INSERT INTO account.`role` (name,description,hasLogin)
+	VALUES ('deliveryFreelancer','Repartidor autónomo',1);
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+	VALUES
+		('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('AgencyTerm', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('Route', 'getRouteByAgency', 'WRITE', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('Route','filter','READ','ALLOW','ROLE','deliveryFreelancer'),
+		('UserConfig','getUserConfig','*','ALLOW','ROLE','deliveryFreelancer'),
+		('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('Route','guessPriority','WRITE','ALLOW','ROLE','deliveryFreelancer'),
+		('Route','getDeliveryPoint','READ','ALLOW','ROLE','deliveryFreelancer'),
+        ('Route', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
+		('Route','sendSms','WRITE','ALLOW','ROLE','deliveryFreelancer'),
+		('Ticket','updateAttributes','WRITE','ALLOW','ROLE','deliveryFreelancer'),
+		('Client','findById','READ','ALLOW','ROLE','deliveryFreelancer');
+;

db/versions/11394-brownAsparagus/00-firstScript.sql

@@ -0,0 +1,41 @@
+USE vn;
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', '__get__active', 'READ', 'ALLOW', 'ROLE', 'employee'),
+			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
+			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant' ),
+			('VehicleType', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative');
+			
+CREATE TABLE IF NOT EXISTS vehicleType (
+	id INT(11) PRIMARY KEY AUTO_INCREMENT,
+	name VARCHAR(45) NOT NULL
+);
+
+INSERT IGNORE INTO vehicleType (id, name)
+	VALUES (1,'vehículo empresa'),
+		(2, 'furgoneta'),
+		(3, 'cabeza tractora'),
+		(4, 'remolque');
+
+ALTER TABLE vehicle ADD COLUMN importCooler  decimal(10,2) DEFAULT NULL;
+ALTER TABLE vehicle ADD COLUMN vehicleTypeFk INT(11) DEFAULT 1;
+ALTER TABLE vehicle ADD CONSTRAINT fk_vehicle_vehicleType FOREIGN KEY (vehicleTypeFk) REFERENCES vehicleType(id);
+

db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`zoneEvent`
+  ADD COLUMN `priceOptimum` DECIMAL(10,2) NULL COMMENT 'Precio mínimo que puede pagar un bulto'
+    AFTER `price`,
+  ADD CONSTRAINT `ck_zoneEvent_priceOptimum`
+    CHECK (priceOptimum <= price)

db/versions/11398-orangeRose/00-zonePriceOptimum.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`zone`
+  ADD COLUMN `priceOptimum` DECIMAL(10,2) NOT NULL COMMENT 'Precio mínimo que puede pagar un bulto'
+    AFTER `price`,
+  ADD CONSTRAINT `ck_zone_priceOptimum`
+    CHECK (priceOptimum <= price)

db/versions/11398-orangeRose/01-zoneUpdate.sql

@@ -0,0 +1,2 @@
+UPDATE `vn`.`zone`
+	SET `priceOptimum` = `price`;

db/versions/11398-orangeRose/02-clientAlter.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`client`
+  ADD COLUMN `packagesDiscountFactor` DECIMAL(4,3) NOT NULL DEFAULT 1.000
+    COMMENT 'Porcentaje de ajuste entre el numero de bultos medio del cliente, y el número medio óptimo para las zonas en las que compra';

db/versions/11398-orangeRose/03-clientConfig.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`clientConfig`
+  ADD COLUMN `packagesOptimum` INT UNSIGNED NOT NULL DEFAULT 20 COMMENT 'Numero de bultos por cliente/dia para conseguir el precio optimo',
+  ADD COLUMN `monthsToCalcOptimumPrice` TINYINT UNSIGNED NOT NULL DEFAULT 3 COMMENT 'Número de meses a usar para el cálculo de client.packagesDiscountFactor';

db/versions/11404-azureAnthurium/00-firstScript.sql

@@ -0,0 +1,6 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES
+    ('WorkerDms', 'hasHighPrivs', 'READ', 'ALLOW', 'ROLE', 'hr'),
+    ('Business', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+    ('Worker', '__get__business', 'READ', 'ALLOW', 'ROLE', 'hr')
+    ;

db/versions/11405-blackMoss/00-entryAlter.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`entry`
+	ADD COLUMN `initialTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura de como lo recibimos del proveedor ej. en colombia',
+	ADD COLUMN `finalTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura final de como llega a nuestras instalaciones';

db/versions/11406-bronzeMoss/00-currrencyAlter.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`currency`
+ADD COLUMN `hasToDownloadRate` TINYINT(1) NOT NULL DEFAULT 0 comment 'Si se guarda el tipo de cambio diariamente en referenceRate';

db/versions/11406-bronzeMoss/01-currrencyUpdate.sql

@@ -0,0 +1,3 @@
+UPDATE `vn`.`currency`
+	SET `hasToDownloadRate` = TRUE
+	WHERE `code` IN ('USD', 'CNY', 'GBP');

db/versions/11407-turquoiseTulip/00-firstScript.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('VnUser','adminUser','WRITE','ALLOW','ROLE','sysadmin');

db/versions/11410-blackTulip/00-firstScript.sql

@@ -0,0 +1,2 @@
+RENAME TABLE bi.f_tvc TO bi.f_tvc__;
+ALTER TABLE bi.f_tvc__ COMMENT='@deprecated 2025-01-15';

db/versions/11411-turquoiseEucalyptus/00-agencyIncomingForeign.sql

@@ -0,0 +1,13 @@
+use `vn`;
+DELETE ai from
+		`vn`.`agencyIncoming` ai
+	LEFT JOIN `vn`.`agencyMode` am ON
+		am.id = ai.agencyModeFk
+	WHERE am.id IS null;
+
+ALTER TABLE `vn`.`agencyIncoming`
+  ADD CONSTRAINT `fk_agencyIncoming_agencyMode`
+    FOREIGN KEY (`agencyModeFk`)
+    REFERENCES `agencyMode`(`id`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE;

db/versions/11411-turquoiseEucalyptus/01-travelThermographAlter.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`travelThermograph`
+  ADD COLUMN `agencyModeFk` INT(11) NULL AFTER `editorFk`,
+  ADD CONSTRAINT `travelThermograph_agencyIncoming_fk`
+    FOREIGN KEY (`agencyModeFk`)
+    REFERENCES `agencyIncoming`(`agencyModeFk`)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE;

db/versions/11415-chocolateTulip/00-firstScript.sql

@@ -0,0 +1 @@
+CREATE INDEX ticket_landed_IDX USING BTREE ON vn.ticket (landed);

db/versions/11416-goldenTulip/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.roadmap
+	DROP FOREIGN KEY roadmap_worker_FK_2,
+	DROP FOREIGN KEY roadmap_worker_FK,
+	DROP FOREIGN KEY roadmap_ibfk_2;

db/versions/11416-goldenTulip/01-firstScript.sql

@@ -0,0 +1,20 @@
+ALTER TABLE vn.roadmap
+	COMMENT='Rutas troncales (trailers)',
+	MODIFY COLUMN m3 int(10) unsigned DEFAULT NULL NULL COMMENT 'Capacidad máxima del remolque',
+	MODIFY COLUMN trailerPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL,
+	MODIFY COLUMN etd datetime NOT NULL COMMENT 'Tiempo estimado de salida',
+	MODIFY COLUMN `name` varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL,
+	MODIFY COLUMN driver1Fk int(10) unsigned DEFAULT NULL NULL AFTER driverName,
+	MODIFY COLUMN driver2Fk int(10) unsigned DEFAULT NULL NULL AFTER driver1Fk,
+	ADD eta datetime DEFAULT NULL NULL COMMENT 'Tiempo estimado de llegada' AFTER etd,
+	ADD roadmapAddressFk int(11) DEFAULT NULL NULL AFTER `name`,
+	ADD dollyPlate varchar(10) DEFAULT NULL AFTER trailerPlate,
+	ADD tugPlate varchar(10) DEFAULT NULL AFTER dollyPlate,
+	ADD driverChangeName varchar(45) DEFAULT NULL AFTER driver2Fk,
+	ADD driverChangeFk int(10) unsigned DEFAULT NULL NULL AFTER driverChangeName;
+
+-- Separamos los CHANGE por que si no arriba no se aplican
+ALTER TABLE vn.roadmap
+	CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER m3;
+
+CREATE INDEX roadmap_etd_IDX USING BTREE ON vn.roadmap (etd);

db/versions/11416-goldenTulip/02-firstScript.sql

@@ -0,0 +1,15 @@
+UPDATE vn.roadmap
+	SET roadmapAddressFk = (SELECT MIN(addressFk) FROM vn.roadmapAddress),
+		eta = etd + INTERVAL 1 DAY;
+
+ALTER TABLE vn.roadmap
+	ADD CONSTRAINT roadmap_roadmapAddress_FK FOREIGN KEY (roadmapAddressFk)
+		REFERENCES vn.roadmapAddress(addressFk) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driver_FK FOREIGN KEY (driver1Fk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driver_FK2 FOREIGN KEY (driver2Fk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driverChange_FK FOREIGN KEY (driverChangeFk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_user_Fk FOREIGN KEY (editorFk)
+		REFERENCES account.user(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11416-goldenTulip/03-firstScript.sql

@@ -0,0 +1,7 @@
+ALTER TABLE vn.roadmapStop
+    CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL,
+    CHANGE addressFk roadmapAddressFk int(11) DEFAULT NULL NULL,
+    DROP FOREIGN KEY expeditionTruck_FK_2;
+
+ALTER TABLE vn.roadmapStop ADD CONSTRAINT roadmapStop_roadmap_FK
+    FOREIGN KEY (roadmapFk) REFERENCES vn.roadmap(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/11416-goldenTulip/04-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.route
+	ADD roadmapStopFk int(11) NULL,
+	ADD CONSTRAINT route_roadmapStop_FK FOREIGN KEY (roadmapStopFk) REFERENCES vn.roadmapStop(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	CHANGE editorFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER roadmapStopFk;

db/versions/11416-goldenTulip/05-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.roadmapAddress 
+	COMMENT='Direcciones de los troncales o también llamados puntos de distribución';

db/versions/11416-goldenTulip/06-firstScript.sql

@@ -0,0 +1,11 @@
+GRANT SELECT ON TABLE vn.roadmap TO 'delivery';
+GRANT SELECT ON TABLE vn.roadmapStop TO 'delivery';
+GRANT SELECT ON TABLE vn.roadmapAddress TO 'delivery';
+
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmap TO 'deliveryBoss';
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapStop TO 'deliveryBoss';
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapAddress TO 'deliveryBoss';
+
+-- Comentado debido a que da error porque ejecuta primero el script de la versión
+-- GRANT EXECUTE ON PROCEDURE vn.roadmap_cloneDay TO 'deliveryBoss';
+-- GRANT EXECUTE ON FUNCTION vn.getTimeBetweenRoadmapAddresses TO 'deliveryBoss';

db/versions/11416-goldenTulip/07-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.route DROP FOREIGN KEY fk_route_1;
+ALTER TABLE vn.route DROP COLUMN zoneFk;

db/versions/11416-goldenTulip/08-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.vehicle
+    ADD typeFk enum('car','van','truck','trailer','tug', 'tugDolly','dolly') DEFAULT 'van' NOT NULL;

db/versions/11416-goldenTulip/09-firstScript.sql

@@ -0,0 +1 @@
+CREATE INDEX route_dated_IDX USING BTREE ON vn.route (dated);

db/versions/11418-goldenRuscus/00-firstScript.sql

@@ -0,0 +1,130 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS `vn`.`itemSoldOutTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Ultimas unidades');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Temporalmente');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Descatalogado');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta mayo');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta febrero');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta diciembre');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta enero');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta marzo');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta nueva temporada');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta septiembre');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemSoldOutTag'
+	WHERE name= 'Agotado';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemDurationTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('10 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('11 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('12 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('13 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('17 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('7 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('16-20 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('17-21 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('19-23 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('3-4 semanas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('13-17 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14-16 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15-19 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('18-25 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('20 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('10-13 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 meses');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('5 años');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('10 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('20 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('35 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('11 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('12 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('18 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('19 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('24 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('25 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('30 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('32 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('4 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('40 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('45 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('50 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('55 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('70 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('8 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 horas');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemDurationTag'
+	WHERE name= 'Duracion';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemGrowingTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-05');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('02-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-05');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-07');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-08');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-07');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-08');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('09-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-04 / 10-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-04 / 9-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-05 / 10-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-05 / 11-12');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemGrowingTag'
+	WHERE name= 'Recolecta';
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemSoldOutTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemDurationTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemGrowingTag TO logisticAssist;

db/versions/11419-orangeSalal/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`tag`
+ADD COLUMN IF NOT EXISTS `validationRegex` varchar(50) DEFAULT NULL;

db/versions/11422-blackAsparagus/00-firstScript.sql

@@ -0,0 +1,5 @@
+RENAME TABLE vn.sorter TO vn.sorter__;
+ALTER TABLE vn.sorter__ COMMENT='@deprecated 2025-01-22';
+
+RENAME TABLE vn.splitLine TO vn.splitLine__;
+ALTER TABLE vn.splitLine__ COMMENT='@deprecated 2025-01-22';