Merge pull request 'feat: refs #8477 add costPerKg to awb view' (!3409) from 8477-addColumnToAwbView into dev

Reviewed-on: #3409
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

CHANGELOG.md

@@ -1,3 +1,49 @@
+# 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 🆕

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": {

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','11391','43edb1f82e88dcc44eedc8501b93c1fac66d71e9','2025-01-14 07:32:09','11407');
+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);
@@ -1140,9 +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 */;
@@ -1241,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);
@@ -1252,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);
@@ -1327,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);
@@ -1520,6 +1535,9 @@ 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);
 
@@ -2389,6 +2407,7 @@ INSERT INTO `ACL` VALUES (1012,'OsrmConfig','optimize','READ','ALLOW','ROLE','em
 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');
@@ -2687,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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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',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',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',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',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',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',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',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',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 (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 (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 (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 (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 (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',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',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',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',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 (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 (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 (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 (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 (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',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',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',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',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 (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 (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 (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 (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 (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 (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 (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 (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',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',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',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',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',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',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',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,'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 (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 (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 (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 (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 (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 (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 (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 (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 (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',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',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',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',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',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',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',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 (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 (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 (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',77,78,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,'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,'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,'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,'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,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',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',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',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',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',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',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',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',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',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);

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','');
@@ -1498,6 +1498,13 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','zoneGeo','guillermo
 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 */;
@@ -2142,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');
@@ -2204,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');
@@ -2312,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 */;
 
 --
@@ -25878,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,
@@ -27725,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`),
@@ -27804,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`),
@@ -29061,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;
@@ -29972,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`),
@@ -31774,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`),
@@ -31786,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
@@ -32259,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`
 --
@@ -32323,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`
 --
@@ -32871,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`
 --
@@ -35460,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`
 --
@@ -37992,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,
@@ -38585,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,
@@ -41261,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,
@@ -41277,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 */;
 
@@ -41370,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,
@@ -41377,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 */;
 
@@ -41611,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 */ ;;
@@ -49234,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
@@ -49242,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;
@@ -50944,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 */ ;
@@ -58737,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;
@@ -58751,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;
 
@@ -58808,7 +58954,9 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			siiTypeInvoiceOutFk
+			siiTypeInvoiceOutFk,
+			customsAgentFk,
+			incotermsFk
 		)
 			SELECT
 					1,
@@ -58821,9 +58969,12 @@ BEGIN
 						vCplusCorrectingInvoiceTypeFk,
 						IF(vSerial = vSimplifiedSerial,
 							vCplusSimplifiedInvoiceTypeFk,
-							vCplusStandardInvoiceTypeFk))
-				FROM client
-				WHERE id = vClientFk;
+							vCplusStandardInvoiceTypeFk)),
+					a.customsAgentFk,
+					a.incotermsFk
+				FROM client c
+					JOIN address a ON a.id = vAddressFk
+				WHERE c.id = vClientFk;
 
 		SET vNewInvoiceId = LAST_INSERT_ID();
 
@@ -67491,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
@@ -67562,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
@@ -74504,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
@@ -74523,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')
-				AND co.code <> 'ES'
+			WHERE co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
 				AND t.id = vSelf
@@ -81591,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 vDepartmentFk Id de departamento
+ * @param vLanded Fecha de entrega
+ * @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,
@@ -81620,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
@@ -81640,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;
@@ -82353,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
@@ -90893,4 +91042,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-14  6:39:04
+-- 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
+	IF account.myUser_getId() IS NOT NULL THEN
 		INSERT INTO workerLog
 			SET `action` = 'delete',
 				`changedModel` = 'WorkerTimeControl',
 				`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-14  6:39:25
+-- Dump completed on 2025-01-28  7:09:01

db/dump/fixtures.before.sql

@@ -158,13 +158,13 @@ INSERT INTO `account`.`mailForward`(`account`, `forwardTo`)
 
 
 
-INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
+INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`, `hasToDownloadRate`)
     VALUES
-        (1, 'EUR', 'Euro',          1),
-        (2, 'USD', 'Dollar USA',    1.4),
-        (3, 'GBP', 'Libra',         1),
-        (4, 'JPY', 'Yen Japones',   1),
-        (5, 'CNY',  'Yuan Chino',   1.2);
+        (1, 'EUR', 'Euro',          1,		FALSE),
+        (2, 'USD', 'Dollar USA',    1.4,	TRUE),
+        (3, 'GBP', 'Libra',         1,		TRUE),
+        (4, 'JPY', 'Yen Japones',   1,		FALSE),
+        (5, 'CNY',  'Yuan Chino',   1.2,	TRUE);
 
 INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES
@@ -321,6 +321,11 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
+INSERT INTO `vn`.`agencyIncoming`(`agencyModeFk`)
+    VALUES
+        (1),
+		(2);
+
 INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`)
     VALUES
         (1, NULL,           'PayMethod one',            0,  001,    0, 0, 0),
@@ -694,22 +699,22 @@ INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`
         (6, 4, 8.07,    2000000000, util.VN_CURDATE()),
         (7, 5, 8.07,    2000000000, util.VN_CURDATE());
 
-INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`)
+INSERT INTO `vn`.`zone`
+    (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`, `priceOptimum`)
 VALUES
-        (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
-        (4,  'Zone 247 B',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
-        (5,  'Zone expensive A',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
-        (6,  'Zone expensive B',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
-        (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1,    0, 100),
-        (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1,    0, 100),
-        (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 1,    0, 100),
-        (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 1,    0, 100),
-        (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 1,    0, 100),
-        (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 1,    0, 100);
-
+    (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 1),
+    (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 1),
+    (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100, 1),
+    (4,  'Zone 247 B',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100, 1),
+    (5,  'Zone expensive A',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100, 500),
+    (6,  'Zone expensive B',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100, 500),
+    (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1,    0, 100, 0.5),
+    (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1,    0, 100, 0.5),
+    (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 1,    0, 100, 0.5),
+    (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 1,    0, 100, 0.5),
+    (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 0.5),
+    (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 1,    0, 100, 0.5),
+    (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 1,    0, 100, 0.5);
 
 INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
     VALUES
@@ -747,13 +752,15 @@ INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
 
 INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`, `dated`)
     VALUES
-        (1, '1899-12-30 12:15:00', 56, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1,  util.VN_CURDATE()),
+        (1, '1899-12-30 12:15:00', 133, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1,  util.VN_CURDATE()),
         (2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route',  0.2,   20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9,  util.VN_CURDATE()),
         (3, '1899-12-30 14:30:00', 56, util.VN_CURDATE(), 2, 3, 'third route',   0.5,   30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 10, util.VN_CURDATE()),
         (4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route',  0,     40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 12, util.VN_CURDATE()),
         (5, '1899-12-30 16:00:00', 56, util.VN_CURDATE(), 4, 5, 'fifth route',   0.1,   50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 13, util.VN_CURDATE()),
         (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3,  util.VN_CURDATE()),
-        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5,  util.VN_CURDATE());
+        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5,  util.VN_CURDATE()),
+		(8, NULL,                  133, util.VN_CURDATE(), 1, 1, 'eighth route', 1.8, 10.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1, util.VN_CURDATE()),
+    	(9, NULL,                  133, util.VN_CURDATE(), 1, 2, 'ninth route', 0.2, 20.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9, util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
     VALUES
@@ -2634,9 +2641,9 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
         (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
         (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
 
-INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`, `balanceStartingDate`)
     VALUES
-        (1, -2, '2% retention', 2, 45);
+        (1, -2, '2% retention', 2, 45, '2000-01-01');
 
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
@@ -3200,7 +3207,7 @@ UPDATE vn.department
     SET workerFk = null;
 
 INSERT INTO vn.packaging
-    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1);
+    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1,0);
 
 
 INSERT IGNORE INTO vn.intrastat
@@ -4045,6 +4052,9 @@ INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
 INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
 	VALUES (1106,'26493101E','2019-09-20');
 
+INSERT INTO vn.payment (received, supplierFk, amount, currencyFk, divisa, bankFk, payMethodFk, bankingFees, concept, companyFk, created, isConciliated, dueDated, workerFk) VALUES
+	 (util.VN_CURDATE(), 1, 1000.00, 1, NULL, 1, 1, 0.0, 'n/pago', 442, util.VN_CURDATE(), 1, util.VN_CURDATE(), 9);
+
 INSERT INTO vn.referenceRate (currencyFk, dated, value)
     VALUES (2, '2000-12-01', 1.0495),
             (2, '2001-01-01', 1.0531),
@@ -4056,3 +4066,8 @@ INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance)
 INSERT IGNORE INTO  vn.inventoryConfig
     SET id = 1,
         supplierFk = 4;
+
+UPDATE vn.worker
+	SET isFreelance=1
+	WHERE firstName='deliveryFreelancer';
+

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

@@ -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
@@ -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);
 

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/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_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/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/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_canbePostponed.sql

@@ -19,6 +19,7 @@ BEGIN
 			sub2.iptd futureIpt,
 			sub2.state futureState,
 			t.clientFk,
+			cl.salespersonFk,
 			t.warehouseFk,
 			ts.alertLevel,
 			sub2.alertLevel futureAlertLevel,
@@ -38,6 +39,7 @@ BEGIN
 			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

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')
-				AND co.code <> 'ES'
+			WHERE co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
 				AND t.id = vSelf

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 vDepartmentFk Id de departamento
+ * @param vLanded Fecha de entrega
+ * @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

@@ -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/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/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/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/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/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
-		  JOIN vn.client c ON c.id = io.clientFk
-      JOIN vn.ticket t ON t.clientFk = c.id
-		  JOIN vn.address a ON a.id = t.addressFk 
-    SET io.customsAgentFk = a.customsAgentFk,
-        io.incotermsFk = a.incotermsFk;
+-- UPDATE vn.invoiceOut io
+-- 		  JOIN vn.client c ON c.id = io.clientFk
+--       JOIN vn.ticket t ON t.clientFk = c.id
+-- 		  JOIN vn.address a ON a.id = t.addressFk
+--     SET io.customsAgentFk = a.customsAgentFk,
+--         io.incotermsFk = a.incotermsFk;

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/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/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/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/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/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';

db/versions/11423-maroonMonstera/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.address MODIFY COLUMN isEqualizated tinyint(1) NULL;

db/versions/11424-navyRose/00-travel.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.travel ADD IF NOT EXISTS availabled DATETIME NULL 
+COMMENT 'Indicates the moment in time when the goods become available for picking';

db/versions/11425-aquaCordyline/00-firstScript.sql

@@ -0,0 +1,2 @@
+INSERT IGNORE INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES('Entry', 'transfer', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss');

db/versions/11427-azureChico/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.packaging
+    ADD COLUMN flippingCost decimal(10, 2) NOT NULL DEFAULT 0.00

db/versions/11428-blackArborvitae/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.travel CHANGE appointment appointment__ datetime DEFAULT NULL COMMENT '@deprecated 2025-01-28';

db/versions/11429-brownBamboo/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`awb`
+    ADD COLUMN `costPerKg` DECIMAL(10, 2) UNSIGNED DEFAULT NULL COMMENT 'Tarifa que indica a cuanto cuesta el kilo en ese vuelo';

e2e/paths/02-client/21_defaulter.spec.js

@@ -1,65 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Client defaulter path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('insurance', 'client');
-        await page.accessToSection('client.defaulter');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should count the amount of clients in the turns section', async() => {
-        const result = await page.countElement(selectors.clientDefaulter.anyClient);
-
-        expect(result).toEqual(6);
-    });
-
-    it('should check contain expected client', async() => {
-        const clientName =
-            await page.waitToGetProperty(selectors.clientDefaulter.firstClientName, 'innerText');
-        const salesPersonName =
-            await page.waitToGetProperty(selectors.clientDefaulter.firstSalesPersonName, 'innerText');
-
-        expect(clientName).toEqual('Ororo Munroe');
-        expect(salesPersonName).toEqual('salesperson');
-    });
-
-    it('should first observation not changed', async() => {
-        const expectedObservation = 'Madness, as you know, is like gravity, all it takes is a little push';
-        const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
-
-        expect(result).toContain(expectedObservation);
-    });
-
-    it('should not add empty observation', async() => {
-        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
-
-        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
-        await page.write(selectors.clientDefaulter.observation, '');
-        await page.waitToClick(selectors.clientDefaulter.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain(`The message can't be empty`);
-    });
-
-    it('should checked all defaulters', async() => {
-        await page.loginAndModule('insurance', 'client');
-        await page.accessToSection('client.defaulter');
-
-        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
-    });
-
-    it('should add observation for all clients', async() => {
-        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
-        await page.write(selectors.clientDefaulter.observation, 'My new observation');
-        await page.waitToClick(selectors.clientDefaulter.saveButton);
-    });
-});

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -238,25 +238,11 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.globalItems.cancelButton);
     });
 
-    it('should select the third sale and create a claim of it', async() => {
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitForNavigation();
-    });
-
-    it('should search for a ticket then access to the sales section', async() => {
-        await page.goBack();
-        await page.goBack();
+    it('should select the third sale and delete it', async() => {
         await page.loginAndModule('salesPerson', 'ticket');
         await page.accessToSearchResult('16');
         await page.accessToSection('ticket.card.sale');
-    });
 
-    it('should select the third sale and delete it', async() => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.deleteSaleButton);
         await page.waitToClick(selectors.globalItems.acceptButton);

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
         const result = await page
             .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
 
-        expect(result).toContain('-€228.25');
+        expect(result).toContain('-€111.75');
     });
 
     it(`should select a new reason for the changes made then click on finalize`, async() => {

loopback/locale/en.json

@@ -247,9 +247,11 @@
 	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
 	"The raid information is not correct": "The raid information is not correct",
 	"Payment method is required": "Payment method is required",
-	"Sales already moved": "Sales already moved",
-	"Holidays to past days not available": "Holidays to past days not available",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
-	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent"
+	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent",
+	"Sales already moved": "Sales already moved",
+	"Holidays to past days not available": "Holidays to past days not available",
+	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
+	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order."
 }

loopback/locale/es.json

@@ -390,13 +390,11 @@
 	"The web user's email already exists": "El correo del usuario web ya existe",
 	"Sales already moved": "Ya han sido transferidas",
 	"The raid information is not correct": "La información de la redada no es correcta",
-	"No trips found because input coordinates are not connected": "No se encontraron rutas porque las coordenadas de entrada no están conectadas",
-	"This request is not supported": "Esta solicitud no es compatible",
-	"Invalid options or too many coordinates": "Opciones invalidas o demasiadas coordenadas",
-	"No address has coordinates": "Ninguna dirección tiene coordenadas",
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"All tickets have a route order": "Todos los tickets tienen orden de ruta",
-	"Price cannot be blank": "Price cannot be blank",
-    "There are tickets to be invoiced": "La zona tiene tickets por facturar"
+	"There are tickets to be invoiced": "La zona tiene tickets por facturar",
+	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
+	"Price cannot be blank": "El precio no puede estar en blanco"
 }

loopback/locale/fr.json

@@ -366,5 +366,7 @@
 	"The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne",
 	"You do not have permission to modify the booked field": "Vous n'avez pas la permission de modifier le champ comptabilisé",
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
-	"The web user's email already exists": "L'email de l'internaute existe déjà"
+	"The web user's email already exists": "L'email de l'internaute existe déjà",
+	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre."
 }

loopback/locale/pt.json

@@ -365,5 +365,7 @@
 	"Cannot send mail": "Não é possível enviar o email",
 	"The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha",
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
-	"The web user's email already exists": "O e-mail do utilizador da web já existe."
+	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
+	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem."
 }

modules/claim/back/methods/claim/filter.js

@@ -109,6 +109,7 @@ module.exports = Self => {
         const args = ctx.args;
         const myOptions = {};
         let to;
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -133,21 +134,8 @@ module.exports = Self => {
             claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
         }
 
-        // Apply filter by team
-        const teamMembersId = [];
-        if (args.myTeam != null) {
-            const worker = await models.Worker.findById(userId, {
-                include: {
-                    relation: 'collegues'
-                }
-            }, myOptions);
-            const collegues = worker.collegues() || [];
-            for (let collegue of collegues)
-                teamMembersId.push(collegue.collegueFk);
-
-            if (teamMembersId.length == 0)
-                teamMembersId.push(userId);
-        }
+        if (args.myTeam != null)
+            myTeamIds = await models.Worker.myTeam(userId);
 
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -184,9 +172,9 @@ module.exports = Self => {
                 return {'t.zoneFk': value};
             case 'myTeam':
                 if (value)
-                    return {'cl.workerFk': {inq: teamMembersId}};
+                    return {'cl.workerFk': {inq: myTeamIds}};
                 else
-                    return {'cl.workerFk': {nin: teamMembersId}};
+                    return {'cl.workerFk': {nin: myTeamIds}};
             }
         });
 

modules/client/back/methods/client/createAddress.js

@@ -52,6 +52,14 @@ module.exports = function(Self) {
             arg: 'customsAgentFk',
             type: 'number'
         },
+        {
+            arg: 'longitude',
+            type: 'number'
+        },
+        {
+            arg: 'latitude',
+            type: 'number'
+        },
         {
             arg: 'isActive',
             type: 'boolean'

modules/client/back/methods/client/extendedListFilter.js

@@ -43,6 +43,14 @@ module.exports = Self => {
                 arg: 'postcode',
                 type: 'string',
             },
+            {
+                arg: 'sageTransactionTypeFk',
+                type: 'number',
+            },
+            {
+                arg: 'sageTaxTypeFk',
+                type: 'number',
+            },
             {
                 arg: 'provinceFk',
                 type: 'number',
@@ -79,6 +87,10 @@ module.exports = Self => {
                 return /^\d+$/.test(value)
                     ? {'c.id': {inq: value}}
                     : {'c.name': {like: `%${value}%`}};
+            case 'sageTaxTypeFk':
+                return {'sti.CodigoIva': value};
+            case 'sageTransactionTypeFk':
+                return {'stt.CodigoTransaccion': value};
             case 'name':
             case 'salesPersonFk':
             case 'fi':

modules/client/back/methods/client/filter.js

@@ -158,10 +158,12 @@ module.exports = Self => {
                     a.provinceFk AS provinceAddressFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
-                    u.name AS salesPerson
+                    u.name AS salesPerson,
+                    co.name AS country
                 FROM client c
                     LEFT JOIN account.user u ON u.id = c.salesPersonFk
                     LEFT JOIN province p ON p.id = c.provinceFk
+                    LEFT JOIN country co ON co.id = c.countryFk
                     JOIN address a ON a.clientFk = c.id
             `
         );

modules/client/back/methods/client/specs/updateAddress.spec.js

@@ -157,4 +157,52 @@ describe('Address updateAddress', () => {
             throw e;
         }
     });
+
+    it('should update ticket observations when updateObservations is true', async() => {
+        const tx = await models.Client.beginTransaction({});
+        const client = 1103;
+        const address = 123;
+        const ticket = 31;
+        const observationType = 3;
+
+        const salesAssistantId = 21;
+        const addressObservation = 'nuevo texto';
+        const ticketObservation = 'texto a modificar';
+
+        try {
+            const options = {transaction: tx};
+            ctx.req.accessToken.userId = salesAssistantId;
+            ctx.args = {
+                updateObservations: true,
+                incotermsFk: incotermsId,
+                provinceFk: provinceId,
+                customsAgentFk: customAgentOneId
+            };
+
+            await models.AddressObservation.create({
+                addressFk: address,
+                observationTypeFk: observationType,
+                description: addressObservation
+            }, options);
+
+            await models.TicketObservation.create({
+                ticketFk: ticket,
+                observationTypeFk: observationType,
+                description: ticketObservation
+            }, options);
+
+            await models.Client.updateAddress(ctx, client, address, options);
+
+            const updatedObservation = await models.TicketObservation.findOne({
+                where: {ticketFk: ticket, observationTypeFk: observationType}
+            }, options);
+
+            expect(updatedObservation.description).toEqual(addressObservation);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/client/back/methods/client/updateAddress.js

@@ -80,6 +80,10 @@ module.exports = function(Self) {
             {
                 arg: 'latitude',
                 type: 'any',
+            },
+            {
+                arg: 'updateObservations',
+                type: 'boolean'
             }
         ],
         returns: {
@@ -135,6 +139,17 @@ module.exports = function(Self) {
         delete args.ctx; // Remove unwanted properties
 
         const updatedAddress = await address.updateAttributes(ctx.args, myOptions);
+        if (args.updateObservations) {
+            const ticket = await Self.rawSql(`
+                UPDATE ticketObservation to2
+                        JOIN ticket t ON t.id = to2.ticketFk
+                        JOIN address a ON a.id = t.addressFk
+                        JOIN addressObservation ao ON ao.addressFk = a.id
+                    SET to2.description  = ao.description
+                    WHERE ao.observationTypeFk = to2.observationTypeFk
+                        AND a.id = ?
+                        AND t.shipped >= util.VN_CURDATE()`, [addressId], myOptions);
+        }
 
         return updatedAddress;
     };

modules/client/back/methods/defaulter/filter.js

@@ -21,7 +21,7 @@ module.exports = Self => {
             }
         ],
         returns: {
-            type: ['object'],
+            type: 'object',
             root: true
         },
         http: {
@@ -41,23 +41,28 @@ module.exports = Self => {
             switch (param) {
             case 'search':
                 return {or: [
-                    {'d.clientFk': value},
-                    {'d.clientName': {like: `%${value}%`}}
+                    {'c.id': value},
+                    {'c.name': {like: `%${value}%`}}
                 ]};
             }
         });
 
-        filter = mergeFilters(ctx.args.filter, {where});
+        const date = Date.vnNew();
+        date.setHours(0, 0, 0, 0);
+
+        filter = mergeFilters({where: {'d.created': date, 'd.amount': {gt: 0}}}, ctx.args.filter);
+        filter = mergeFilters(filter, {where});
 
         const stmts = [];
 
-        const date = Date.vnNew();
-        date.setHours(0, 0, 0, 0);
-        const stmt = new ParameterizedSQL(
-            `SELECT *
-                FROM (
-                    SELECT
-                        DISTINCT c.id clientFk,
+        let stmt = new ParameterizedSQL(
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.defaulters
+                WITH clientObservations AS
+                (SELECT clientFk,text, created, workerFk
+                    FROM vn.clientObservation
+                    GROUP BY clientFk
+                    ORDER BY created DESC
+                )SELECT c.id clientFk,
                         c.name clientName,
                         c.salesPersonFk,
                         c.businessTypeFk = 'worker' isWorker,
@@ -80,36 +85,43 @@ module.exports = Self => {
                         JOIN client c ON c.id = d.clientFk
                         JOIN country cn ON cn.id = c.countryFk
                         JOIN payMethod pm ON pm.id = c.payMethodFk
-                        LEFT JOIN clientObservation co ON co.clientFk = c.id
+                        LEFT JOIN clientObservations co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
                         LEFT JOIN account.user uw ON uw.id = co.workerFk
                         LEFT JOIN (
                         SELECT r1.started, r1.clientFk, r1.finished
                             FROM recovery r1
                                 JOIN (
-                                    SELECT MAX(started) AS maxStarted, clientFk
+                                    SELECT MAX(started) maxStarted, clientFk
                                         FROM recovery
                                         GROUP BY clientFk
                                 ) r2 ON r1.clientFk = r2.clientFk
                                     AND r1.started = r2.maxStarted
+                            WHERE r1.finished
+                            GROUP BY r1.clientFk
                         ) r ON r.clientFk = c.id
                         LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
-                        JOIN department dp ON dp.id = wd.departmentFk
-                    WHERE
-                        d.created = ?
-                        AND d.amount > 0
-                    ORDER BY co.created DESC) d`
-            , [date]);
+                        LEFT JOIN department dp ON dp.id = wd.departmentFk`);
 
         stmt.merge(conn.makeWhere(filter.where));
-        stmt.merge(`GROUP BY d.clientFk`);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL(`
+            SELECT SUM(amount) amount
+                FROM tmp.defaulters
+        `);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL(`
+            SELECT *
+                FROM tmp.defaulters
+        `);
         stmt.merge(conn.makeOrderBy(filter.order));
-        stmt.merge(conn.makeLimit(filter));
 
         const itemsIndex = stmts.push(stmt) - 1;
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);
 
-        return itemsIndex === 0 ? result : result[itemsIndex];
+        return {defaulters: result[itemsIndex], amount: result[itemsIndex - 1][0].amount};
     };
 };

modules/client/back/methods/defaulter/specs/filter.spec.js

@@ -11,10 +11,10 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {filter: filter}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result[0];
+            const firstRow = result.defaulters[0];
 
             expect(firstRow.clientFk).toEqual(1101);
-            expect(result.length).toEqual(5);
+            expect(result.defaulters.length).toEqual(5);
 
             await tx.rollback();
         } catch (e) {
@@ -31,7 +31,7 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result[0];
+            const firstRow = result.defaulters[0];
 
             expect(firstRow.clientFk).toEqual(1101);
 
@@ -50,7 +50,7 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'Petter Parker'}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result[0];
+            const firstRow = result.defaulters[0];
 
             expect(firstRow.clientName).toEqual('Petter Parker');
 
@@ -60,4 +60,23 @@ describe('defaulter filter()', () => {
             throw e;
         }
     });
+
+    it('should return the defaulter the sum of every defaulters', async() => {
+        const tx = await models.Defaulter.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
+            const {defaulters, amount} = await models.Defaulter.filter(ctx, null, options);
+
+            const total = defaulters.reduce((total, row) => total + row.amount, 0);
+
+            expect(total).toEqual(amount);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/client/back/model-config.json

@@ -139,5 +139,23 @@
     },
     "Xdiario": {
         "dataSource": "vn"
+    },
+    "BusinessReasonEnd": {
+        "dataSource": "vn"
+    },
+    "OccupationCode": {
+        "dataSource": "vn"
+    },
+    "WorkerBusinessProfessionalCategory": {
+        "dataSource": "vn"
+    },
+    "CalendarType": {
+        "dataSource": "vn"
+    },
+    "WorkerBusinessType": {
+        "dataSource": "vn"
+    },
+    "PayrollCategory": {
+        "dataSource": "vn"
     }
 }

modules/client/back/models/business-reason-end.json

@@ -0,0 +1,17 @@
+{
+    "name": "BusinessReasonEnd",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "businessReasonEnd"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number"
+        },
+        "reason": {
+            "type": "string"
+        }
+    }
+}

modules/client/back/models/business.json

@@ -13,6 +13,63 @@
         },
         "workcenterFk" : {
             "type": "number"
+        },
+        "companyCodeFk" : {
+            "type": "string"
+        },
+        "started" : {
+            "type": "date"
+        },
+        "ended" : {
+            "type": "date"
+        },
+        "workerBusiness" : {
+            "type": "string"
+        },
+        "reasonEndFk" : {
+            "type": "number"
+        },
+        "payedHolidays" : {
+            "type": "number"
+        },
+        "occupationCodeFk" : {
+            "type": "string"
+        },
+        "workerFk" : {
+            "type": "number"
+        },
+        "notes" : {
+            "type": "string"
+        },
+        "departmentFk": {
+            "type": "string"
+        },
+        "workerBusinessProfessionalCategoryFk": {
+            "type": "number"
+        },
+        "calendarTypeFk": {
+            "type": "string"
+        },
+        "isHourlyLabor": {
+            "type": "boolean"
+        },
+        "rate": {
+            "type": "number"
+        },
+        "workerBusinessCategoryFk": {
+            "type": "number"
+        },
+        "workerBusinessTypeFk": {
+            "type": "number"
+        },
+        "amount": {
+            "type": "number"
+        },
+        "workerBusinessAgreementFk": {
+            "type": "number"
+        },
+        "basicSalary": {
+            "type": "number"
         }
     },
     "relations": {
@@ -25,6 +82,59 @@
             "type": "belongsTo",
             "model": "Department",
             "foreignKey": "departmentFk"
-        }
+        },
+        "workCenter": {
+            "type": "belongsTo",
+            "model": "WorkCenter",
+            "foreignKey": "workcenterFk"
+        },
+        "companyCode": {
+            "type": "belongsTo",
+            "model": "Company",
+            "foreignKey": "companyCodeFk",
+            "primaryKey": "code"
+        },
+        "reasonEnd": {
+            "type": "belongsTo",
+            "model": "BusinessReasonEnd",
+            "foreignKey": "reasonEndFk"
+        },
+        "occupationCode": {
+            "type": "belongsTo",
+            "model": "OccupationCode",
+            "foreignKey":"occupationCodeFk",
+            "primaryKey": "code"
+        },
+        "payrollCategory": {
+            "type": "belongsTo",
+            "model": "PayrollCategory",
+            "foreignKey":"workerBusinessCategoryFk"
+        },
+        "workerBusinessProfessionalCategory": {
+            "type": "belongsTo",
+            "model": "WorkerBusinessProfessionalCategory",
+            "foreignKey": "workerBusinessProfessionalCategoryFk"
+        },
+        "calendarType": {
+            "type": "belongsTo",
+            "model": "CalendarType",
+            "foreignKey": "calendarTypeFk"
+        },
+        "workerBusinessCategory": {
+            "type": "belongsTo",
+            "model": "WorkerBusinessCategory",
+            "foreignKey": "workerBusinessCategoryFk"
+        },
+        "workerBusinessType": {
+            "type": "belongsTo",
+            "model": "WorkerBusinessType",
+            "foreignKey": "workerBusinessTypeFk"
+        },
+        "workerBusinessAgreement": {
+            "type": "belongsTo",
+            "model": "WorkerBusinessAgreement",
+            "foreignKey": "workerBusinessAgreementFk"
+        }
+
     }
 }

modules/client/back/models/calendar-type.json

@@ -0,0 +1,21 @@
+{
+    "name": "CalendarType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "calendarType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number"
+        },
+        "description": {
+            "type": "string"
+        },
+        "hoursWeek": {
+            "type": "number"
+        },
+        "isPartial": "number"
+    }
+}

modules/client/back/models/client-credit.json

@@ -19,6 +19,9 @@
         },
         "created": {
             "type": "date"
+        },
+        "workerFk": {
+            "type": "number"
         }
     },
     "relations": {

modules/client/back/models/occupation-code.json

@@ -0,0 +1,18 @@
+{
+    "name": "OccupationCode",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "occupationCode"
+        }
+    },
+    "properties": {
+        "code": {
+            "type": "string",
+            "id": true
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}

modules/client/back/models/payroll-categories.json

@@ -0,0 +1,20 @@
+{
+    "name": "PayrollCategory",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "payrollCategories"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number"
+        },
+        "description": {
+            "type": "string"
+        },
+        "rate": {
+            "type": "number"
+        }
+    }
+}

modules/client/back/models/professional-category.json

@@ -0,0 +1,20 @@
+{
+    "name": "WorkerBusinessProfessionalCategory",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "professionalCategory"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number"
+        },
+        "description": {
+            "type": "string"
+        },
+        "code": {
+            "type": "string"
+        }
+    }
+}

modules/client/back/models/worker-business-agreement.json

@@ -0,0 +1,29 @@
+{
+    "name": "WorkerBusinessAgreement",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerBusinessAgreement"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number"
+        },
+        "name": {
+            "type": "string"
+        },
+        "monthHolidays": {
+            "type": "number"
+        },
+        "yearsHours": {
+            "type": "number"
+        },
+        "started": {
+            "type": "date"
+        },
+        "ended": {
+            "type": "date"
+        }
+    }
+}

modules/client/back/models/worker-business-type.json

@@ -0,0 +1,27 @@
+{
+    "name": "WorkerBusinessType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerBusinessType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "name": {
+            "type": "string"
+        },
+        "isFullTime": {
+            "type": "number"
+        },
+        "isPermanent": {
+            "type": "number"
+        },
+        "hasHolidayEntitlement": {
+            "type": "number"
+        }
+    }
+}

modules/client/front/defaulter/index.html

@@ -1,200 +1,2 @@
-<vn-crud-model
-    vn-id="model"
-    url="Defaulters/filter"
-    filter="::$ctrl.filter"
-    limit="20"
-    order="amount DESC"
-    data="$ctrl.defaulters"
-    on-data-change="$ctrl.reCheck()"
-    auto-load="true">
-</vn-crud-model>
-<vn-portal slot="topbar">
-    <vn-searchbar
-        vn-focus
-        placeholder="Search client"
-        info="Search client by id or name"
-        auto-state="false"
-        model="model">
-    </vn-searchbar>
-</vn-portal>
 <vn-card>
-    <smart-table
-        model="model"
-        options="$ctrl.smartTableOptions"
-        expr-builder="$ctrl.exprBuilder(param, value)">
-        <slot-actions>
-            <div>
-                <div class="totalBox" style="text-align: center;">
-                    <h6 translate>Total</h6>
-                    <vn-label-value
-                        label="Balance due"
-                        value="{{$ctrl.balanceDueTotal | currency: 'EUR': 2}}">
-                    </vn-label-value>
-                </div>
-            </div>
-            <div class="vn-pa-md">
-                <vn-button
-                    disabled="$ctrl.checked.length == 0"
-                    ng-click="notesDialog.show()"
-                    name="notesDialog"
-                    vn-tooltip="Add observation"
-                    icon="icon-notes">
-                </vn-button>
-            </div>
-        </slot-actions>
-        <slot-table>
-            <table>
-                <thead>
-                    <tr>
-                        <th shrink>
-                            <vn-multi-check
-                                model="model">
-                            </vn-multi-check>
-                        </th>
-                        <th field="clientFk">
-                            <span translate>Client</span>
-                        </th>
-                        <th field="isWorker">
-                            <span translate>Es trabajador</span>
-                        </th>
-                        <th field="salesPersonFk">
-                            <span translate>Comercial</span>
-                        </th>
-                        <th field="countryFk">
-                            <span translate>Country</span>
-                        </th>
-                        <th field="payMethod"
-                            vn-tooltip="Pay Method">
-                            <span translate>P.Method</span>
-                        </th>
-                        <th
-                            field="amount"
-                            vn-tooltip="Balance due">
-                            <span translate>Balance D.</span>
-                        </th>
-                        <th
-                            field="workerFk"
-                            vn-tooltip="Worker who made the last observation">
-                            <span translate>Author</span>
-                        </th>
-                        <th field="observation" expand>
-                            <span translate>Last observation</span>
-                        </th>
-                        <th
-                            vn-tooltip="Last observation date"
-                            field="created">
-                            <span translate>L. O. Date</span>
-                        </th>
-                        <th
-                            vn-tooltip="Credit insurance"
-                            field="creditInsurance"
-                            shrink>
-                            <span translate>Credit I.</span>
-                        </th>
-                        <th field="defaulterSinced">
-                            <span translate>From</span>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr ng-repeat="defaulter in $ctrl.defaulters">
-                        <td shrink>
-                            <vn-check
-                                ng-model="defaulter.checked"
-                                on-change="$ctrl.saveChecked(defaulter.clientFk)"
-                                vn-click-stop>
-                            </vn-check>
-                        </td>
-                        <td title="{{::defaulter.clientName}}">
-                            <span
-                                vn-click-stop="clientDescriptor.show($event, defaulter.clientFk)"
-                                title ="{{::defaulter.clientName}}"
-                                class="link">
-                                {{::defaulter.clientName}}
-                            </span>
-                        </td>
-                        <td>
-                            <vn-check
-                                ng-model="defaulter.isWorker"
-                                disabled="true">
-                            </vn-check>
-                        </td>
-                        <td>
-                            <span
-                                title="{{::defaulter.salesPersonName}}"
-                                vn-click-stop="workerDescriptor.show($event, defaulter.salesPersonFk)"
-                                class="link">
-                                {{::defaulter.salesPersonName | dashIfEmpty}}
-                            </span>
-                        </td>
-                        <td>
-                            {{::defaulter.country}}
-                        </td>
-                        <td>
-                            {{::defaulter.payMethod}}
-                        </td>
-                        <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
-                        <td>
-                            <span
-                                title="{{::defaulter.workerName}}"
-                                vn-click-stop="workerDescriptor.show($event, defaulter.workerFk)"
-                                class="link">
-                                {{::defaulter.workerName | dashIfEmpty}}
-                            </span>
-                        </td>
-                        <td expand>
-                            <vn-textarea
-                                vn-three
-                                disabled="true"
-                                ng-model="defaulter.observation">
-                            </vn-textarea>
-                        </td>
-                        <td shrink-date>
-                            <span class="chip {{::$ctrl.chipColor(defaulter.created)}}">
-                                {{::defaulter.created | date: 'dd/MM/yyyy'}}
-                            </span>
-                        </td>
-                        <td shrink>{{::defaulter.creditInsurance | currency: 'EUR': 2}}</td>
-                        <td shrink-date>{{::defaulter.defaulterSinced | date: 'dd/MM/yyyy'}}</td>
-                    </tr>
-                </tbody>
-            </table>
-        </slot-table>
-    </smart-table>
 </vn-card>
-<vn-client-descriptor-popover
-    vn-id="client-descriptor">
-</vn-client-descriptor-popover>
-<vn-worker-descriptor-popover
-    vn-id="worker-descriptor">
-</vn-worker-descriptor-popover>
-<vn-popup vn-id="dialog-summary-client">
-    <vn-client-summary
-        client="$ctrl.clientSelected">
-    </vn-client-summary>
-</vn-popup>
-
-<!-- Dialog of add notes button -->
-<vn-dialog
-    vn-id="notesDialog"
-    on-accept="$ctrl.onResponse()">
-    <tpl-body>
-        <section class="SMSDialog">
-            <h5 class="vn-py-sm">{{$ctrl.$t('Add observation to all selected clients', {total: $ctrl.checked.length})}}</h5>
-            <vn-horizontal>
-                <vn-textarea vn-one
-                    vn-id="message"
-                    label="Message"
-                    ng-model="$ctrl.defaulter.observation"
-                    rows="3"
-                    required="true"
-                    rule>
-                </vn-textarea>
-            </vn-horizontal>
-        </section>
-    </tpl-body>
-    <tpl-buttons>
-        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
-        <button response="accept" translate>Save</button>
-    </tpl-buttons>
-</vn-dialog>

modules/client/front/defaulter/index.js

@@ -1,199 +1,13 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import UserError from 'core/lib/user-error';
 
 export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.defaulter = {};
-        this.defaulters = [];
-        this.checkedDefaulers = [];
-
-        this.smartTableOptions = {
-            activeButtons: {
-                search: true
-            },
-            columns: [
-                {
-                    field: 'clientFk',
-                    autocomplete: {
-                        url: 'Clients',
-                        showField: 'name',
-                        valueField: 'id'
     }
-                }, {
-                    field: 'salesPersonFk',
-                    autocomplete: {
-                        url: 'Workers/activeWithInheritedRole',
-                        where: `{role: 'salesPerson'}`,
-                        searchFunction: '{firstName: $search}',
-                        showField: 'name',
-                        valueField: 'id',
-                    }
-                }, {
-                    field: 'countryFk',
-                    autocomplete: {
-                        url: 'Countries',
-                        showField: 'country',
-                        valueField: 'id'
-                    }
-                }, {
-                    field: 'payMethodFk',
-                    autocomplete: {
-                        showField: 'name',
-                        valueField: 'id'
-                    }
-                },
-                {
-                    field: 'workerFk',
-                    autocomplete: {
-                        url: 'Workers/activeWithInheritedRole',
-                        searchFunction: '{firstName: $search}',
-                        showField: 'name',
-                        valueField: 'id',
-                    }
-                },
-                {
-                    field: 'observation',
-                    searchable: false
-                },
-                {
-                    field: 'isWorker',
-                    checkbox: true,
-
-                },
-                {
-                    field: 'created',
-                    datepicker: true
-                },
-                {
-                    field: 'defaulterSinced',
-                    datepicker: true
-                }
-            ]
-        };
-
-        this.getBalanceDueTotal();
-    }
-
-    set defaulters(value) {
-        if (!value || !value.length) return;
-        this._defaulters = value;
-    }
-
-    get defaulters() {
-        return this._defaulters;
-    }
-
-    get checked() {
-        const clients = this.$.model.data || [];
-        const checkedLines = [];
-        for (let defaulter of clients) {
-            if (defaulter.checked)
-                checkedLines.push(defaulter);
-        }
-
-        return checkedLines;
-    }
-
-    saveChecked(clientId) {
-        this.checkedDefaulers = this.checkedDefaulers.includes(clientId) ?
-            this.checkedDefaulers.filter(id => id !== clientId) : [...this.checkedDefaulers, clientId];
-    }
-
-    reCheck() {
-        if (!this.$.model.data || !this.checkedDefaulers.length) return;
-
-        this.$.model.data.forEach(defaulter => {
-            defaulter.checked = this.checkedDefaulers.includes(defaulter.clientFk);
-        });
-    }
-
-    getBalanceDueTotal() {
-        this.$http.get('Defaulters/filter')
-            .then(res => {
-                if (!res.data) return 0;
-
-                this.balanceDueTotal = res.data.reduce(
-                    (accumulator, currentValue) => {
-                        return accumulator + (currentValue['amount'] || 0);
-                    }, 0);
-            });
-    }
-
-    chipColor(date) {
-        const day = 24 * 60 * 60 * 1000;
-        const today = Date.vnNew();
-        today.setHours(0, 0, 0, 0);
-
-        const observationShipped = new Date(date);
-        observationShipped.setHours(0, 0, 0, 0);
-
-        const difference = today - observationShipped;
-
-        if (difference > (day * 20))
-            return 'alert';
-        if (difference > (day * 10))
-            return 'warning';
-    }
-
-    onResponse() {
-        if (!this.defaulter.observation)
-            throw new UserError(`The message can't be empty`);
-
-        const params = [];
-        for (let defaulter of this.checked) {
-            params.push({
-                text: this.defaulter.observation,
-                clientFk: defaulter.clientFk
-            });
-        }
-
-        this.$http.post(`ClientObservations`, params) .then(() => {
-            this.vnApp.showSuccess(this.$t('Observation saved!'));
-            this.sendMail();
-            this.$state.reload();
-        });
-    }
-
-    sendMail() {
-        const params = {
-            defaulters: this.checked,
-            observation: this.defaulter.observation,
-        };
-        this.$http.post(`Defaulters/observationEmail`, params);
-    }
-
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'isWorker':
-            return {isWorker: value};
-        case 'creditInsurance':
-        case 'amount':
-        case 'clientFk':
-        case 'workerFk':
-        case 'countryFk':
-        case 'payMethod':
-        case 'salesPersonFk':
-            return {[`d.${param}`]: value};
-        case 'created':
-            return {'d.created': {
-                between: this.dateRange(value)}
-            };
-        case 'defaulterSinced':
-            return {'d.defaulterSinced': {
-                between: this.dateRange(value)}
-            };
-        }
-    }
-
-    dateRange(value) {
-        const minHour = new Date(value);
-        minHour.setHours(0, 0, 0, 0);
-        const maxHour = new Date(value);
-        maxHour.setHours(23, 59, 59, 59);
-
-        return [minHour, maxHour];
+    async $onInit() {
+        this.$state.go('customer.defaulter', {id: this.$params.id});
+        window.location.href = await this.vnApp.getUrl(`customer/defaulter`);
     }
 }
 

modules/client/front/defaulter/index.spec.js

@@ -1,179 +0,0 @@
-import './index';
-import crudModel from 'core/mocks/crud-model';
-
-describe('client defaulter', () => {
-    describe('Component vnClientDefaulter', () => {
-        let controller;
-        let $httpBackend;
-
-        beforeEach(ngModule('client'));
-
-        beforeEach(inject(($componentController, _$httpBackend_) => {
-            $httpBackend = _$httpBackend_;
-            const $element = angular.element('<vn-client-defaulter></vn-client-defaulter>');
-            controller = $componentController('vnClientDefaulter', {$element});
-            controller.$.model = crudModel;
-            controller.$.model.data = [
-                {clientFk: 1101, amount: 125},
-                {clientFk: 1102, amount: 500},
-                {clientFk: 1103, amount: 250}
-            ];
-        }));
-
-        describe('checked() getter', () => {
-            it('should return the checked lines', () => {
-                const data = controller.$.model.data;
-                data[1].checked = true;
-                data[2].checked = true;
-
-                const checkedRows = controller.checked;
-
-                const firstCheckedRow = checkedRows[0];
-                const secondCheckedRow = checkedRows[1];
-
-                expect(firstCheckedRow.clientFk).toEqual(1102);
-                expect(secondCheckedRow.clientFk).toEqual(1103);
-            });
-        });
-
-        describe('chipColor()', () => {
-            it('should return undefined when the date is the present', () => {
-                let today = Date.vnNew();
-                let result = controller.chipColor(today);
-
-                expect(result).toEqual(undefined);
-            });
-
-            it('should return warning when the date is 10 days in the past', () => {
-                let pastDate = Date.vnNew();
-                pastDate = pastDate.setDate(pastDate.getDate() - 11);
-                let result = controller.chipColor(pastDate);
-
-                expect(result).toEqual('warning');
-            });
-
-            it('should return alert when the date is 20 days in the past', () => {
-                let pastDate = Date.vnNew();
-                pastDate = pastDate.setDate(pastDate.getDate() - 21);
-                let result = controller.chipColor(pastDate);
-
-                expect(result).toEqual('alert');
-            });
-        });
-
-        describe('onResponse()', () => {
-            it('should return error for empty message', () => {
-                let error;
-                try {
-                    controller.onResponse();
-                } catch (e) {
-                    error = e;
-                }
-
-                expect(error).toBeDefined();
-                expect(error.message).toBe(`The message can't be empty`);
-            });
-
-            it('should return saved message', () => {
-                const data = controller.$.model.data;
-                data[1].checked = true;
-                controller.defaulter = {observation: 'My new observation'};
-
-                const params = [{text: controller.defaulter.observation, clientFk: data[1].clientFk}];
-
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expect('GET', `Defaulters/filter`).respond(200);
-                $httpBackend.expect('POST', `ClientObservations`, params).respond(200, params);
-                $httpBackend.expect('POST', `Defaulters/observationEmail`).respond(200);
-
-                controller.onResponse();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Observation saved!');
-            });
-        });
-
-        describe('exprBuilder()', () => {
-            it('should search by sales person', () => {
-                const expr = controller.exprBuilder('salesPersonFk', '5');
-
-                expect(expr).toEqual({'d.salesPersonFk': '5'});
-            });
-
-            it('should search by client', () => {
-                const expr = controller.exprBuilder('clientFk', '5');
-
-                expect(expr).toEqual({'d.clientFk': '5'});
-            });
-        });
-
-        describe('getBalanceDueTotal()', () => {
-            it('should return balance due total', () => {
-                const defaulters = controller.$.model.data;
-                $httpBackend.when('GET', `Defaulters/filter`).respond(defaulters);
-
-                controller.getBalanceDueTotal();
-                $httpBackend.flush();
-
-                expect(controller.balanceDueTotal).toEqual(875);
-            });
-        });
-
-        describe('dateRange()', () => {
-            it('should return two dates with the hours at the start and end of the given date', () => {
-                const now = Date.vnNew();
-
-                const today = now.getDate();
-
-                const dateRange = controller.dateRange(now);
-                const start = dateRange[0].toString();
-                const end = dateRange[1].toString();
-
-                expect(start).toContain(today);
-                expect(start).toContain('00:00:00');
-
-                expect(end).toContain(today);
-                expect(end).toContain('23:59:59');
-            });
-        });
-
-        describe('reCheck()', () => {
-            it(`should recheck buys`, () => {
-                controller.$.model.data = [
-                    {checked: false, clientFk: 1},
-                    {checked: false, clientFk: 2},
-                    {checked: false, clientFk: 3},
-                    {checked: false, clientFk: 4},
-                ];
-                controller.checkedDefaulers = [1, 2];
-
-                controller.reCheck();
-
-                expect(controller.$.model.data[0].checked).toEqual(true);
-                expect(controller.$.model.data[1].checked).toEqual(true);
-                expect(controller.$.model.data[2].checked).toEqual(false);
-                expect(controller.$.model.data[3].checked).toEqual(false);
-            });
-        });
-
-        describe('saveChecked()', () => {
-            it(`should check buy`, () => {
-                const buyCheck = 3;
-                controller.checkedDefaulers = [1, 2];
-
-                controller.saveChecked(buyCheck);
-
-                expect(controller.checkedDefaulers[2]).toEqual(buyCheck);
-            });
-
-            it(`should uncheck buy`, () => {
-                const buyUncheck = 3;
-                controller.checkedDefaulers = [1, 2, 3];
-
-                controller.saveChecked(buyUncheck);
-
-                expect(controller.checkedDefaulers[2]).toEqual(undefined);
-            });
-        });
-    });
-});

modules/client/front/defaulter/locale/es.yml

@@ -1,14 +0,0 @@
-Add observation: Añadir observación
-Add observation to all selected clients: Añadir observación a {{total}} cliente(s) seleccionado(s)
-Balance D.: Saldo V.
-Credit I.: Crédito A.
-Last observation: Última observación
-L. O. Date: Fecha Ú. O.
-Last observation date: Fecha última observación
-Search client: Buscar clientes
-Worker who made the last observation: Trabajador que ha realizado la última observación
-Email sended!: Email enviado!
-Observation saved!: Observación añadida!
-P.Method: F.Pago
-Pay Method: Forma de Pago
-Country: Pais

modules/entry/back/methods/entry/filter.js

@@ -119,6 +119,16 @@ module.exports = Self => {
                 arg: 'invoiceAmount',
                 type: 'number',
                 description: `The invoice amount`
+            },
+            {
+                arg: 'initialTemperature',
+                type: 'number',
+                description: 'Initial temperature value'
+            },
+            {
+                arg: 'finalTemperature',
+                type: 'number',
+                description: 'Final temperature value'
             }
         ],
         returns: {
@@ -170,6 +180,10 @@ module.exports = Self => {
             case 'invoiceInFk':
                 param = `e.${param}`;
                 return {[param]: value};
+            case 'initialTemperature':
+                return {'e.initialTemperature': {lte: value}};
+            case 'finalTemperature':
+                return {'e.finalTemperature': {gte: value}};
             }
         });
         filter = mergeFilters(ctx.args.filter, {where});
@@ -204,6 +218,8 @@ module.exports = Self => {
                     e.gestDocFk,
                     e.invoiceInFk,
                     e.invoiceAmount,
+                    e.initialTemperature,
+                    e.finalTemperature,
                     t.landed,
                     s.name supplierName,
                     s.nickname supplierAlias,

modules/entry/back/methods/entry/specs/transfer.spec.js

@@ -0,0 +1,43 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Transfer merchandise from one entry to the next day()', () => {
+    it('should Transfer buys not located', async() => {
+        const tx = await models.ItemShelving.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const id = 3;
+            const item = 8;
+            const buy = 6;
+            const originalEntry = 4;
+            const ctx = {req: {accessToken: {userId: 48}}};
+
+            const currentItemShelving = await models.ItemShelving.findOne({where: {id}}, options);
+            await currentItemShelving.updateAttributes({itemFk: item, buyFk: buy}, options);
+
+            const {newEntryFk} = await models.Entry.transfer(ctx, originalEntry, options);
+            const originalEntrybuys = await models.Buy.find({where: {entryFk: originalEntry}}, options);
+
+            const newEntrybuys = await models.Buy.find({where: {entryFk: newEntryFk}}, options);
+
+            const itemShelvingsWithBuys = await models.Buy.find({
+                include: {
+                    relation: 'itemShelving',
+                    scope: {
+                        fields: ['id'],
+                    },
+                },
+                where: {entryFk: originalEntry},
+            }, options);
+
+            const hasItemShelving = await itemShelvingsWithBuys.filter(buy => buy.itemShelving().length);
+
+            expect(newEntrybuys.length).toEqual(originalEntrybuys.length - hasItemShelving.length);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/entry/back/methods/entry/transfer.js

@@ -0,0 +1,46 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('transfer', {
+        description: 'Transfer merchandise from one entry to the next day',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                http: {source: 'path'}
+            }
+        ],
+        http: {
+            path: '/:id/transfer',
+            verb: 'POST'
+        },
+        returns: {
+            arg: 'newEntryFk',
+            type: 'number'
+        }
+    });
+
+    Self.transfer = async(ctx, id, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
+            const [newEntryFk] = await Self.rawSql('SELECT @vNewEntry newEntryFk', null, myOptions);
+
+            if (tx) await tx.commit();
+            return newEntryFk;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/models/buy.json

@@ -114,6 +114,11 @@
 			"type": "belongsTo",
 			"model": "Delivery",
 			"foreignKey": "deliveryFk"
+		},
+        "itemShelving": {
+            "type": "hasMany",
+            "model": "ItemShelving",
+            "foreignKey": "buyFk"
         }
     }
 }

modules/entry/back/models/entry.js

@@ -12,6 +12,7 @@ module.exports = Self => {
     require('../methods/entry/addFromPackaging')(Self);
     require('../methods/entry/addFromBuy')(Self);
     require('../methods/entry/buyLabel')(Self);
+    require('../methods/entry/transfer')(Self);
     require('../methods/entry/labelSupplier')(Self);
     require('../methods/entry/buyLabelSupplier')(Self);
 

modules/entry/back/models/entry.json

@@ -68,6 +68,12 @@
         },
         "invoiceAmount": {
             "type": "number"
+        },
+        "initialTemperature": {
+            "type": "number"
+        },
+        "finalTemperature": {
+            "type": "number"
         }
     },
     "relations": {

modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js

@@ -13,66 +13,114 @@ module.exports = Self => {
         }
     });
 
-    Self.exchangeRateUpdate = async() => {
+    Self.exchangeRateUpdate = async(options = {}) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
             const response = await axios.get('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml');
             const xmlData = response.data;
 
-        const doc = new DOMParser({errorHandler: {warning: () => {}}})?.parseFromString(xmlData, 'text/xml');
+            const doc = new DOMParser({errorHandler: {warning: () => {}}})
+                .parseFromString(xmlData, 'text/xml');
             const cubes = doc?.getElementsByTagName('Cube');
             if (!cubes || cubes.length === 0)
                 throw new UserError('No cubes found. Exiting the method.');
 
-        const models = Self.app.models;
-
-        const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'});
-
+            const currencies = await models.Currency.find({where: {hasToDownloadRate: true}}, myOptions);
+            const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'}, myOptions);
             const maxDate = maxDateRecord?.dated ? new Date(maxDateRecord.dated) : null;
+            let lastProcessedDate = maxDate;
 
             for (const cube of Array.from(cubes)) {
                 if (cube.nodeType === doc.ELEMENT_NODE && cube.attributes.getNamedItem('time')) {
                     const xmlDate = new Date(cube.getAttribute('time'));
-                const xmlDateWithoutTime = new Date(xmlDate.getFullYear(), xmlDate.getMonth(), xmlDate.getDate());
-                if (!maxDate || maxDate < xmlDateWithoutTime) {
-                    for (const rateCube of Array.from(cube.childNodes)) {
-                        if (rateCube.nodeType === doc.ELEMENT_NODE) {
-                            const currencyCode = rateCube.getAttribute('currency');
-                            const rate = rateCube.getAttribute('rate');
-                            if (['USD', 'CNY', 'GBP'].includes(currencyCode)) {
-                                const currency = await models.Currency.findOne({where: {code: currencyCode}});
-                                if (!currency) throw new UserError(`Currency not found for code: ${currencyCode}`);
-                                const existingRate = await models.ReferenceRate.findOne({
-                                    where: {currencyFk: currency.id, dated: xmlDate}
-                                });
+                    const xmlDateWithoutTime = new Date(
+                        xmlDate.getFullYear(),
+                        xmlDate.getMonth(),
+                        xmlDate.getDate()
+                    );
 
-                                if (existingRate) {
-                                    if (existingRate.value !== rate)
-                                        await existingRate.updateAttributes({value: rate});
-                                } else {
-                                    await models.ReferenceRate.create({
-                                        currencyFk: currency.id,
-                                        dated: xmlDate,
-                                        value: rate
-                                    });
-                                }
-                                const monday = 1;
-                                if (xmlDateWithoutTime.getDay() === monday) {
-                                    const saturday = new Date(xmlDateWithoutTime);
-                                    saturday.setDate(xmlDateWithoutTime.getDate() - 2);
-                                    const sunday = new Date(xmlDateWithoutTime);
-                                    sunday.setDate(xmlDateWithoutTime.getDate() - 1);
-
-                                    for (const date of [saturday, sunday]) {
-                                        await models.ReferenceRate.upsertWithWhere(
-                                            {currencyFk: currency.id, dated: date},
-                                            {currencyFk: currency.id, dated: date, value: rate}
+                    if (!maxDate || xmlDateWithoutTime > maxDate) {
+                        if (lastProcessedDate && xmlDateWithoutTime > lastProcessedDate) {
+                            for (const currency of currencies) {
+                                await fillMissingDates(
+                                    models, currency, lastProcessedDate, xmlDateWithoutTime, myOptions
                                 );
                             }
                         }
                     }
+
+                    for (const rateCube of Array.from(cube.childNodes)) {
+                        if (rateCube.nodeType === doc.ELEMENT_NODE) {
+                            const currencyCode = rateCube.getAttribute('currency');
+                            const rate = rateCube.getAttribute('rate');
+                            const currency = currencies.find(c => c.code === currencyCode);
+                            if (currency) {
+                                const existingRate = await models.ReferenceRate.findOne({
+                                    where: {currencyFk: currency.id, dated: xmlDateWithoutTime}
+                                }, myOptions);
+
+                                if (existingRate) {
+                                    if (existingRate.value !== rate)
+                                        await existingRate.updateAttributes({value: rate}, myOptions);
+                                } else {
+                                    await models.ReferenceRate.create({
+                                        currencyFk: currency.id,
+                                        dated: xmlDateWithoutTime,
+                                        value: rate
+                                    }, myOptions);
                                 }
                             }
                         }
                     }
+
+                    lastProcessedDate = xmlDateWithoutTime;
+                }
+            }
+
+            if (tx) await tx.commit();
+        } catch (error) {
+            if (tx) await tx.rollback();
+            throw error;
+        }
+    };
+
+    async function getLastValidRate(models, currencyId, date, myOptions) {
+        return models.ReferenceRate.findOne({
+            where: {currencyFk: currencyId, dated: {lt: date}},
+            order: 'dated DESC'
+        }, myOptions);
+    }
+
+    async function fillMissingDates(models, currency, startDate, endDate, myOptions) {
+        const cursor = new Date(startDate);
+        cursor.setDate(cursor.getDate() + 1);
+        while (cursor < endDate) {
+            const existingRate = await models.ReferenceRate.findOne({
+                where: {currencyFk: currency.id, dated: cursor}
+            }, myOptions);
+
+            if (!existingRate) {
+                const lastValid = await getLastValidRate(models, currency.id, cursor, myOptions);
+                if (lastValid) {
+                    await models.ReferenceRate.create({
+                        currencyFk: currency.id,
+                        dated: new Date(cursor),
+                        value: lastValid.value
+                    }, myOptions);
+                }
+            }
+            cursor.setDate(cursor.getDate() + 1);
+        }
     }
 };
-};

modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js

@@ -1,52 +1,190 @@
 describe('exchangeRateUpdate functionality', function() {
     const axios = require('axios');
     const models = require('vn-loopback/server/server').models;
+    let tx; let options;
 
-    beforeEach(function() {
-        spyOn(axios, 'get').and.returnValue(Promise.resolve({
-            data: `<Cube>
-                    <Cube time='2024-04-12'>
+    function formatYmd(d) {
+        const mm = (d.getMonth() + 1).toString().padStart(2, '0');
+        const dd = d.getDate().toString().padStart(2, '0');
+        return `${d.getFullYear()}-${mm}-${dd}`;
+    }
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    beforeEach(async() => {
+        tx = await models.Sale.beginTransaction({});
+        options = {transaction: tx};
+        spyOn(axios, 'get').and.returnValue(Promise.resolve({data: ''}));
+    });
+
+    it('should process XML data and create rates', async function() {
+        const d1 = Date.vnNew();
+        const d4 = Date.vnNew();
+        d4.setDate(d4.getDate() + 1);
+        const xml = `<Cube>
+        <Cube time='${formatYmd(d1)}'>
           <Cube currency='USD' rate='1.1'/>
           <Cube currency='CNY' rate='1.2'/>
         </Cube>
-                </Cube>`
-        }));
-    });
-
-    it('should process XML data and update or create rates in the database', async function() {
+        <Cube time='${formatYmd(d4)}'>
+          <Cube currency='USD' rate='1.3'/>
+        </Cube>
+      </Cube>`;
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
         spyOn(models.ReferenceRate, 'findOne').and.returnValue(Promise.resolve(null));
         spyOn(models.ReferenceRate, 'create').and.returnValue(Promise.resolve());
+        await models.InvoiceIn.exchangeRateUpdate(options);
 
-        await models.InvoiceIn.exchangeRateUpdate();
-
-        expect(models.ReferenceRate.create).toHaveBeenCalledTimes(2);
+        expect(models.ReferenceRate.create).toHaveBeenCalledTimes(3);
     });
 
-    it('should not create or update rates when no XML data is available', async function() {
+    it('should handle no data', async function() {
         axios.get.and.returnValue(Promise.resolve({}));
         spyOn(models.ReferenceRate, 'create');
-
-        let thrownError = null;
+        let e;
         try {
-            await models.InvoiceIn.exchangeRateUpdate();
-        } catch (error) {
-            thrownError = error;
+            await models.InvoiceIn.exchangeRateUpdate(options);
+        } catch (err) {
+            e = err;
         }
 
-        expect(thrownError.message).toBe('No cubes found. Exiting the method.');
+        expect(e.message).toBe('No cubes found. Exiting the method.');
+        expect(models.ReferenceRate.create).not.toHaveBeenCalled();
     });
 
-    it('should handle errors gracefully', async function() {
+    it('should handle errors', async function() {
         axios.get.and.returnValue(Promise.reject(new Error('Network error')));
-        let error;
-
+        let e;
         try {
-            await models.InvoiceIn.exchangeRateUpdate();
-        } catch (e) {
-            error = e;
+            await models.InvoiceIn.exchangeRateUpdate(options);
+        } catch (err) {
+            e = err;
         }
 
-        expect(error).toBeDefined();
-        expect(error.message).toBe('Network error');
+        expect(e).toBeDefined();
+        expect(e.message).toBe('Network error');
+    });
+
+    it('should update existing rate', async function() {
+        const existingRate = await models.ReferenceRate.findOne({
+            order: 'id DESC'
+        }, options);
+
+        if (!existingRate) return fail('No ReferenceRate records in DB');
+
+        const currency = await models.Currency.findById(existingRate.currencyFk, null, options);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(existingRate.dated)}'>
+            <Cube currency='${currency.code}' rate='2.22'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const updatedRate = await models.ReferenceRate.findById(existingRate.id, null, options);
+
+        expect(updatedRate.value).toBeCloseTo('2.22');
+    });
+
+    it('should not update if same rate', async function() {
+        const existingRate = await models.ReferenceRate.findOne({order: 'id DESC'}, options);
+        if (!existingRate) return fail('No existing ReferenceRate in DB');
+
+        const currency = await models.Currency.findById(existingRate.currencyFk, null, options);
+
+        const oldValue = existingRate.value;
+        const xml = `<Cube>
+          <Cube time='${formatYmd(existingRate.dated)}'>
+            <Cube currency='${currency.code}' rate='${oldValue}'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const updatedRate = await models.ReferenceRate.findById(existingRate.id, null, options);
+
+        expect(updatedRate.value).toBe(oldValue);
+    });
+
+    it('should backfill missing dates', async function() {
+        const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
+        if (!lastRate) return fail('No existing ReferenceRate data in DB');
+
+        const currency = await models.Currency.findById(lastRate.currencyFk, null, options);
+
+        const d1 = new Date(lastRate.dated);
+        d1.setDate(d1.getDate() + 1);
+        const d4 = new Date(lastRate.dated);
+        d4.setDate(d4.getDate() + 4);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(d1)}'>
+            <Cube currency='${currency.code}' rate='1.0'/>
+          </Cube>
+          <Cube time='${formatYmd(d4)}'>
+            <Cube currency='${currency.code}' rate='2.0'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        const beforeCount = await models.ReferenceRate.count({}, options);
+        await models.InvoiceIn.exchangeRateUpdate(options);
+        const afterCount = await models.ReferenceRate.count({}, options);
+
+        expect(afterCount - beforeCount).toBe(4);
+    });
+
+    it('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
+        const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
+        if (!lastRate) return fail('No existing ReferenceRate data in DB');
+
+        const currency = await models.Currency.findById(lastRate.currencyFk, null, options);
+        if (!currency) return fail(`No currency for ID ${lastRate.currencyFk}`);
+
+        const day1 = new Date(lastRate.dated);
+        day1.setDate(day1.getDate() + 1);
+
+        const day2 = new Date(lastRate.dated);
+        day2.setDate(day2.getDate() + 2);
+
+        const day3 = new Date(lastRate.dated);
+        day3.setDate(day3.getDate() + 3);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(day1)}'>
+            <Cube currency='${currency.code}' rate='1.1'/>
+          </Cube>
+          <Cube time='${formatYmd(day2)}'>
+            <Cube currency='${currency.code}' rate='2.2'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const day3Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day3}
+        }, options);
+
+        expect(day3Record).toBeNull();
+
+        const day1Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day1}
+        }, options);
+        const day2Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day2}
+        }, options);
+
+        expect(day1Record.value).toBeCloseTo('1.1');
+        expect(day2Record.value).toBeCloseTo('2.2');
     });
 });

modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js

@@ -74,7 +74,8 @@ module.exports = Self => {
                         AND t.companyFk = ?
                         AND NOT t.isDeleted
                     GROUP BY IF(c.hasToInvoiceByAddress, a.id, c.id)
-                    HAVING SUM(t.totalWithVat) > 0;`;
+                    HAVING SUM(t.totalWithVat) > 0
+                    ORDER BY c.id`;
 
             const addresses = await Self.rawSql(query, [
                 minShipped,

modules/item/back/models/item-shelving.json

@@ -61,6 +61,11 @@
 			"type": "belongsTo",
 			"model": "Shelving",
 			"foreignKey": "shelvingFk"
+		},
+        "buy": {
+            "type": "belongsTo",
+            "model": "Buy",
+            "foreignKey": "buyFk"
         }
 	}
 }

modules/item/back/models/item-tag.js

@@ -10,4 +10,27 @@ module.exports = Self => {
             return new UserError(`Tag value cannot be blank`);
         return err;
     });
+
+    Self.observe('before save', async ctx => {
+        let tagFk;
+        let value;
+
+        if (ctx.isNewInstance) {
+            tagFk = ctx.instance.tagFk;
+            value = ctx.instance.value;
+        } else {
+            tagFk = ctx.currentInstance.tagFk;
+            value = ctx.data.value;
+        }
+        const models = Self.app.models;
+        const validTag = await models.Tag.findById(tagFk);
+
+        if (validTag.validationRegex) {
+            const regexString = validTag.validationRegex.replace(/\\\\/g, '\\');
+            const validExpresion = new RegExp(regexString);
+
+            if (value && !validExpresion.test(value))
+                throw new UserError('The value must be a number or a range of numbers');
+        }
+    });
 };

modules/item/back/models/tag.json

@@ -30,6 +30,9 @@
         "mysql": {
           "columnName": "isQuantitatif"
         }
+      },
+      "validationRegex": {
+        "type": "string"
       }
     },
     "acls": [

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -123,25 +123,13 @@ module.exports = Self => {
         date.setHours(0, 0, 0, 0);
         const args = ctx.args;
         const myOptions = {};
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        // Apply filter by team
-        const teamMembersId = [];
-        if (args.myTeam != null) {
-            const worker = await models.Worker.findById(userId, {
-                include: {
-                    relation: 'collegues'
-                }
-            }, myOptions);
-            const collegues = worker.collegues() || [];
-            for (let collegue of collegues)
-                teamMembersId.push(collegue.collegueFk);
-
-            if (teamMembersId.length == 0)
-                teamMembersId.push(userId);
-        }
+        if (args.myTeam != null)
+            myTeamIds = await models.Worker.myTeam(userId);
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -163,9 +151,9 @@ module.exports = Self => {
             case 'mine':
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
             case 'id':
             case 'clientFk':
                 param = `t.${param}`;

modules/order/back/methods/order/filter.js

@@ -80,29 +80,15 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const myOptions = {};
         const userId = ctx.req.accessToken.userId;
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         const args = ctx.args;
-        // Apply filter by team
-        const teamMembersId = [];
-        if (args.myTeam != null) {
-            const worker = await models.Worker.findById(userId, {
-                include: {
-                    relation: 'collegues'
-                }
-            }, myOptions);
-            const collegues = worker.collegues() || [];
-            for (let collegue of collegues)
-                teamMembersId.push(collegue.collegueFk);
 
-            if (teamMembersId.length == 0)
-                teamMembersId.push(userId);
-        }
-
-        if (args?.myTeam)
-            args.teamIds = teamIds;
+        if (args.myTeam != null)
+            myTeamIds = await models.Worker.myTeam(userId);
 
         if (args?.to)
             args.to.setHours(23, 59, 0, 0);
@@ -133,9 +119,9 @@ module.exports = Self => {
                 return {'o.confirmed': value ? 1 : 0};
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
             case 'showEmpty':
                 return {'o.total': {neq: value}};
             case 'id':