Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta

back/methods/chat/sendCheckingPresence.js

@@ -27,38 +27,47 @@ module.exports = Self => {
     });
 
     Self.sendCheckingPresence = async(ctx, recipientId, message) => {
-        if (!recipientId) return false;
-        const models = Self.app.models;
-
         const userId = ctx.req.accessToken.userId;
-        const sender = await models.VnUser.findById(userId, {fields: ['id']});
-        const recipient = await models.VnUser.findById(recipientId, null);
-
-        // Prevent sending messages to yourself
-        if (recipientId == userId) return false;
-        if (!recipient)
-            throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
-
-        if (!isProduction())
-            message = `[Test:Environment to user ${userId}] ` + message;
-
-        const chat = await models.Chat.create({
-            senderFk: sender.id,
-            recipient: `@${recipient.name}`,
-            dated: Date.vnNew(),
-            checkUserStatus: 1,
-            message: message,
-            status: 'sending',
-            attempts: 0
-        });
-
         try {
-            await Self.sendCheckingUserStatus(chat);
+            const models = Self.app.models;
-            await Self.updateChat(chat, 'sent');
+            const sender = await models.VnUser.findById(userId, {fields: ['id']});
-        } catch (error) {
+            const error = `Could not send message from user ${userId}`;
-            await Self.updateChat(chat, 'error', error);
-        }
 
-        return true;
+            if (!recipientId) throw new Error(error);
+            const recipient = await models.VnUser.findById(recipientId, null);
+            if (!recipient)
+                throw new Error(error);
+
+            // Prevent sending messages to yourself
+            if (recipientId == userId) return false;
+
+            if (!isProduction())
+                message = `[Test:Environment to user ${userId}] ` + message;
+
+            const chat = await models.Chat.create({
+                senderFk: sender.id,
+                recipient: `@${recipient.name}`,
+                dated: Date.vnNew(),
+                checkUserStatus: 1,
+                message: message,
+                status: 'sending',
+                attempts: 0
+            });
+
+            try {
+                await Self.sendCheckingUserStatus(chat);
+                await Self.updateChat(chat, 'sent');
+            } catch (error) {
+                await Self.updateChat(chat, 'error', error);
+            }
+
+            return true;
+        } catch (e) {
+            await Self.rawSql(`
+                INSERT INTO util.debug (variable, value)
+                    VALUES ('sendCheckingPresence_error', ?)
+            `, [`User: ${userId}, recipient: ${recipientId}, message: ${message}, error: ${e}`]);
+            throw e;
+        }
     };
 };

back/methods/collection/getTickets.js

@@ -40,6 +40,7 @@ module.exports = Self => {
 
         const sales = await Self.rawSql(`
             SELECT s.ticketFk,
+                    NULL ticketOrder,
                     sgd.saleGroupFk,
                     s.id saleFk,
                     s.itemFk,
@@ -83,6 +84,7 @@ module.exports = Self => {
                 GROUP BY s.id, ish.id, p.code, p2.code
             UNION ALL
             SELECT s.ticketFk,
+                DENSE_RANK() OVER (ORDER BY ss.id),
                 sgd.saleGroupFk,
                 s.id saleFk,
                 s.itemFk,

back/methods/vn-user/update-user.js

@@ -22,7 +22,7 @@ module.exports = Self => {
                 description: 'The user email'
             }, {
                 arg: 'lang',
-                type: 'string',
+                type: 'any',
                 description: 'The user lang'
             }, {
                 arg: 'twoFactor',

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','11377','d3fe5098277c3935c434838b53facb271f84ebec','2024-12-10 07:22:33','11379');
+INSERT INTO `version` VALUES ('vn-database','11385','72bf27f08d3ddf646ec0bb6594fc79cecd4b72f2','2025-01-07 07:46:33','11395');
 
 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);
@@ -1083,6 +1083,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11322','00-entryAcl.sql','jenkin
 INSERT INTO `versionLog` VALUES ('vn-database','11324','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 10:49:47',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11325','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11326','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11327','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11330','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11331','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11332','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
@@ -1110,6 +1111,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11348','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11349','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11350','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11351','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11352','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11353','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11354','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11355','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
@@ -1120,6 +1122,8 @@ INSERT INTO `versionLog` VALUES ('vn-database','11362','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11363','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11366','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11367','00-deprecate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11368','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11368','01-acls.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11369','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:05',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11371','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:05',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11371','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:47',NULL,NULL);
@@ -1128,7 +1132,13 @@ INSERT INTO `versionLog` VALUES ('vn-database','11371','03-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11372','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-09 13:30:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11373','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-02 16:09:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11375','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-03 08:58:20',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11376','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11377','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:22:31',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11378','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11379','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
+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);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -2128,7 +2138,7 @@ INSERT INTO `ACL` VALUES (746,'Claim','getSummary','READ','ALLOW','ROLE','claimV
 INSERT INTO `ACL` VALUES (747,'CplusRectificationType','*','READ','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (748,'SiiTypeInvoiceOut','*','READ','ALLOW','ROLE','salesPerson',NULL);
 INSERT INTO `ACL` VALUES (749,'InvoiceCorrectionType','*','READ','ALLOW','ROLE','salesPerson',NULL);
-INSERT INTO `ACL` VALUES (750,'InvoiceOut','transfer','WRITE','ALLOW','ROLE','administrative',NULL);
+INSERT INTO `ACL` VALUES (750,'InvoiceOut','transfer','WRITE','ALLOW','ROLE','administrative',13657);
 INSERT INTO `ACL` VALUES (751,'Application','executeProc','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (752,'Application','executeFunc','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (753,'NotificationSubscription','getList','READ','ALLOW','ROLE','employee',NULL);
@@ -2369,6 +2379,10 @@ INSERT INTO `ACL` VALUES (1006,'Entry','latestBuysFilter','READ','ALLOW','ROLE',
 INSERT INTO `ACL` VALUES (1007,'ItemShelving','getItemsByReviewOrder','READ','ALLOW','ROLE','production',19294);
 INSERT INTO `ACL` VALUES (1008,'Entry','buyLabelSupplier','READ','ALLOW','ROLE','employee',19295);
 INSERT INTO `ACL` VALUES (1009,'Entry','buyLabel','READ','ALLOW','ROLE','supplier',19295);
+INSERT INTO `ACL` VALUES (1010,'InventoryConfig','find','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1011,'SiiTypeInvoiceIn','find','READ','ALLOW','ROLE','salesPerson',10578);
+INSERT INTO `ACL` VALUES (1012,'OsrmConfig','optimize','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1013,'Route','optimizePriority','*','ALLOW','ROLE','employee',10578);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2525,9 +2539,8 @@ INSERT INTO `companyI18n` VALUES (442,'en','In compliance with the provisions of
 INSERT INTO `companyI18n` VALUES (442,'fr','Conformément aux dispositions de la loi organique 15/1999 sur la protection des données personnelles, nous vous informons que les données personnelles que vous fournissez seront incluses dans des dossiers. VERDNATURA LEVANTE S.L., vous pouvez à tout moment, exercer les droits d``accès, de rectification, d``annulation et d``opposition, en communiquant par écrit au siège social de la société. Le dossier a pour objet la gestion administrative, la comptabilité et la facturation.');
 INSERT INTO `companyI18n` VALUES (442,'pt','Em cumprimento do disposto na lei Orgânica 15/1999, de Protecção de Dados de Carácter Pessoal, comunicamos que os dados pessoais que facilite se incluirão nos ficheiros automatizados de VERDNATURA LEVANTE S.L., podendo em todo momento exercer os direitos de acesso, rectificação, cancelação e oposição, comunicando por escrito ao domicílio social da entidade. A finalidade do ficheiro é a gestão administrativa, contabilidade e facturação.');
 
-INSERT INTO `cplusRectificationType` VALUES (1,'Campo vacio');
+INSERT INTO `cplusRectificationType` VALUES (1,'S – Por sustitución');
 INSERT INTO `cplusRectificationType` VALUES (2,'I – Por diferencias');
-INSERT INTO `cplusRectificationType` VALUES (3,'S – Por sustitución');
 
 INSERT INTO `cplusSubjectOp` VALUES (1,'Campo vacio');
 INSERT INTO `cplusSubjectOp` VALUES (2,'S1 – Sujeta – No exenta');
@@ -2619,6 +2632,8 @@ INSERT INTO `claimResult` VALUES (26,'Decepcion/Esperaba mas');
 INSERT INTO `claimResult` VALUES (27,'Otros');
 INSERT INTO `claimResult` VALUES (28,'Baboso/Cocido');
 INSERT INTO `claimResult` VALUES (29,'Videocámaras');
+INSERT INTO `claimResult` VALUES (30,'Manipulado');
+INSERT INTO `claimResult` VALUES (31,'ReclamReclamado PR/AG');
 
 INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0);
 INSERT INTO `component` VALUES (14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0);
@@ -2725,7 +2740,7 @@ INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,2
 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/ISLAS',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levanteislas_equipo',1,'levanteislas.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'levanteislas.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5000',NULL);
 INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',79,80,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'noroeste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5300',NULL);
 INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'noreste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',83,84,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'sur.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5400',NULL);

db/dump/.dump/privileges.sql

@@ -979,7 +979,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bi','officeBoss','Greuge_Evolution'
 INSERT IGNORE INTO `tables_priv` VALUES ('','bi','claimManager','rotacion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bs','grafana','sale','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','zonePromo__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accountingConfig','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accountingConfig','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accountingType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logistic','agencyMode','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','cache','employee','visible','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
@@ -1417,9 +1417,11 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail',
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerActivityType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerSalesAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','zoneConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerSalesAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','workCenter','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Rutas','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','specialPrice','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','genericAllocation','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','businessReasonEnd','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1488,6 +1490,10 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBaseTag',
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBreederTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemTextureTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','travelThermograph','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','thermograph','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Tickets','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','sim','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1873,6 +1879,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','subordinateget
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','dayend','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','buffer_settypebyname','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','grafana','clientGetMana','FUNCTION','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','barcodeToItem','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticket_splititempackingtype','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');

db/dump/.dump/structure.sql

@@ -2569,28 +2569,6 @@ SET character_set_client = utf8;
   1 AS `Consumo` */;
 SET character_set_client = @saved_cs_client;
 
---
--- Temporary table structure for view `rotacion`
---
-
-DROP TABLE IF EXISTS `rotacion`;
-/*!50001 DROP VIEW IF EXISTS `rotacion`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `rotacion` AS SELECT
- 1 AS `Id_Article`,
-  1 AS `warehouse_id`,
-  1 AS `total`,
-  1 AS `rotacion`,
-  1 AS `cm3`,
-  1 AS `almacenaje`,
-  1 AS `manipulacion`,
-  1 AS `auxiliar`,
-  1 AS `mermas`,
-  1 AS `cm3reparto`,
-  1 AS `grams` */;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Table structure for table `rutasBoard`
 --
@@ -17481,10 +17459,10 @@ BEGIN
 /**
  * Traslada la info de contabilidad relacionada con las facturas recibidas
  *
- * @vInvoiceInFk Factura recibida
+ * @param vInvoiceInFk Factura recibida
- * @vXDiarioFk Id tabla XDiario
+ * @param vXDiarioFk Id tabla XDiario
  */
-    DECLARE vInvoiceInOriginalFk INT;
+	DECLARE vInvoiceInOriginalFk INT;
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBase DOUBLE;
 	DECLARE vVat DOUBLE;
@@ -17502,7 +17480,7 @@ BEGIN
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT it.taxableBase,
+		SELECT SUM(it.taxableBase),
 				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
@@ -17681,32 +17659,31 @@ BEGIN
 		FROM vn.invoiceInCorrection
 		WHERE correctingFk = vInvoiceInFk;
 
-	IF vInvoiceInOriginalFk THEN 
+	IF vInvoiceInOriginalFk THEN
-
 		UPDATE movContaIVA mci
-				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
+				JOIN vn.invoiceInCorrection iic ON iic.correctingFk = vInvoiceInFk
+				JOIN vn.siiTypeInvoiceIn st ON st.id = iic.siiTypeInvoiceInFk
 				JOIN (SELECT issued,
-							SUM(sub.taxableBase) taxableBase, 
+							SUM(sub.taxableBase) taxableBase,
 							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
 						FROM(SELECT issued,
-									SUM(iit.taxableBase) taxableBase, 
+									SUM(iit.taxableBase) taxableBase,
 									ti.PorcentajeIva
-								FROM vn.invoiceIn i 
+								FROM vn.invoiceIn i
 									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
-									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+									JOIN TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
 								WHERE i.id = vInvoiceInOriginalFk
 								GROUP BY ti.CodigoIva)sub
 					)invoiceInOriginal
 				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
 			SET mci.TipoRectificativa = iir.refundCategoryFk,
-				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.ClaseAbonoRectificativas = iir.refundType,
 				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
 				mci.FechaOperacion = invoiceInOriginal.issued,
 				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
 				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
 				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
 			WHERE mci.id = vXDiarioFk;
-
 	END IF;
 END ;;
 DELIMITER ;
@@ -18178,6 +18155,7 @@ BEGIN
 		UPDATE movContaIVA mci
 				JOIN vn.invoiceOut i ON i.id = vInvoiceOutCorrectedFk
 				JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutCorrectedFk
+				JOIN vn.siiTypeInvoiceOut st ON st.id = ic.siiTypeInvoiceOutFk
 				JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase, 
 							 SUM(IF(IFNULL(e.vatFk, TRUE), iot.vat, 0)) vat,
 							 SUM(IF(IFNULL(e.vatFk, TRUE), 0, iot.vat)) equ
@@ -18186,8 +18164,8 @@ BEGIN
 						WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk
 					) tax
 				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
-			SET mci.TipoRectificativa = 2,
+			SET mci.TipoRectificativa = ic.cplusRectificationTypeFk,
-				mci.ClaseAbonoRectificativas = 1, 
+				mci.ClaseAbonoRectificativas = REGEXP_REPLACE(st.`code`, '[^0-9]', ''), 
 				mci.FechaFacturaOriginal = i.issued,
 				mci.FechaOperacion = i.issued,
 				mci.BaseImponibleOriginal = tax.taxableBase,
@@ -29528,14 +29506,16 @@ CREATE TABLE `deviceProductionUser` (
   `userFk` int(10) unsigned NOT NULL,
   `created` timestamp NULL DEFAULT current_timestamp(),
   `editorFk` int(10) unsigned DEFAULT NULL,
-  `simSerialNumber` text DEFAULT NULL,
+  `simFk` varchar(25) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `deviceProductionUser_unique` (`deviceProductionFk`),
   KEY `userFgn_idx` (`userFk`),
   KEY `deviceProductionUser_fk_editor` (`editorFk`),
+  KEY `deviceProductionUser_sim_FK` (`simFk`),
   CONSTRAINT `deviceProductionUser_PK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `deviceProductionUser_deviceProduction_FK` FOREIGN KEY (`deviceProductionFk`) REFERENCES `deviceProduction` (`id`),
-  CONSTRAINT `deviceProductionUser_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`)
+  CONSTRAINT `deviceProductionUser_fk_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
+  CONSTRAINT `deviceProductionUser_sim_FK` FOREIGN KEY (`simFk`) REFERENCES `sim` (`code`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -31354,13 +31334,27 @@ CREATE TABLE `inventoryConfig` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `inventoryFailure`
+-- Table structure for table `inventoryFailureCause__`
 --
 
-DROP TABLE IF EXISTS `inventoryFailure`;
+DROP TABLE IF EXISTS `inventoryFailureCause__`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `inventoryFailure` (
+CREATE TABLE `inventoryFailureCause__` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `description` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2024-12-16';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `inventoryFailure__`
+--
+
+DROP TABLE IF EXISTS `inventoryFailure__`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `inventoryFailure__` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `dated` date NOT NULL,
   `itemFk` int(11) NOT NULL,
@@ -31381,22 +31375,8 @@ CREATE TABLE `inventoryFailure` (
   CONSTRAINT `inventoryFailure_fk2` FOREIGN KEY (`throwerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inventoryFailure_fk3` FOREIGN KEY (`guiltyFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inventoryFailure_fk4` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `inventoryFailure_fk5` FOREIGN KEY (`causeFk`) REFERENCES `inventoryFailureCause` (`id`) ON UPDATE CASCADE
+  CONSTRAINT `inventoryFailure_fk5` FOREIGN KEY (`causeFk`) REFERENCES `inventoryFailureCause__` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2024-12-16';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `inventoryFailureCause`
---
-
-DROP TABLE IF EXISTS `inventoryFailureCause`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `inventoryFailureCause` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `description` varchar(100) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31554,18 +31534,18 @@ CREATE TABLE `invoiceInCorrection` (
   `correctingFk` mediumint(8) unsigned NOT NULL COMMENT 'Factura rectificativa',
   `correctedFk` mediumint(8) unsigned NOT NULL COMMENT 'Factura rectificada',
   `cplusRectificationTypeFk` int(10) unsigned NOT NULL,
-  `siiTypeInvoiceOutFk` int(10) unsigned NOT NULL,
+  `siiTypeInvoiceInFk` int(10) unsigned NOT NULL,
   `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
   PRIMARY KEY (`correctingFk`),
   KEY `invoiceInCorrection_correctedFk` (`correctedFk`),
   KEY `invoiceInCorrection_cplusRectificationTypeFk` (`cplusRectificationTypeFk`),
-  KEY `invoiceInCorrection_siiTypeInvoiceOut` (`siiTypeInvoiceOutFk`),
+  KEY `invoiceInCorrection_siiTypeInvoiceIn` (`siiTypeInvoiceInFk`),
   KEY `invoiceInCorrection_invoiceCorrectionTypeFk` (`invoiceCorrectionTypeFk`),
   CONSTRAINT `invoiceInCorrection_correctedFk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `invoiceInCorrection_correctingFk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `invoiceInCorrection_cplusRectificationTypeFk` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoiceInCorrection_invoiceCorrectionTypeFk` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `invoiceInCorrection_siiTypeInvoiceOut` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE
+  CONSTRAINT `invoiceInCorrection_siiTypeInvoiceIn` FOREIGN KEY (`siiTypeInvoiceInFk`) REFERENCES `siiTypeInvoiceIn` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -33837,7 +33817,9 @@ DROP TABLE IF EXISTS `mistakeType`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mistakeType` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(50) DEFAULT NULL,
   `description` varchar(45) NOT NULL,
+  `time` int(10) DEFAULT NULL COMMENT 'Segundos que se suelen tardar en arreglar el fallo',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -34204,6 +34186,22 @@ CREATE TABLE `osTicketConfig` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `osrmConfig`
+--
+
+DROP TABLE IF EXISTS `osrmConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `osrmConfig` (
+  `id` int(10) unsigned NOT NULL,
+  `url` varchar(100) NOT NULL COMMENT 'Dirección base de la API',
+  `tolerance` decimal(6,6) NOT NULL DEFAULT 0.000000 COMMENT 'Tolerancia entre las coordenadas enviadas y las retornadas',
+  PRIMARY KEY (`id`),
+  CONSTRAINT `osrmConfig_check` CHECK (`id` = 1)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `outgoingInvoiceVat`
 --
@@ -35763,26 +35761,6 @@ CREATE TABLE `punchState` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Table for storing punches that have cars with errors';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `quadmindsApiConfig`
---
-
-DROP TABLE IF EXISTS `quadmindsApiConfig`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `quadmindsApiConfig` (
-  `id` int(10) unsigned NOT NULL,
-  `url` varchar(255) DEFAULT NULL,
-  `key` varchar(255) DEFAULT NULL,
-  `maxObjects` int(11) DEFAULT NULL COMMENT 'Número máximo de objetos en el array por petición',
-  `limit` int(11) DEFAULT NULL COMMENT 'Limite de objetos solicitados por petición',
-  `orderTimeFrom` varchar(5) DEFAULT NULL COMMENT 'Inicio de ventana horaria de pedido',
-  `orderTimeTo` varchar(5) DEFAULT NULL COMMENT 'Fin de ventana horaria de pedido',
-  PRIMARY KEY (`id`),
-  CONSTRAINT `quadMindsConfig_check` CHECK (`id` = 1)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `quality`
 --
@@ -37542,6 +37520,23 @@ CREATE TABLE `siiTypeInvoiceOut` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Tipo de Factura Emitidas en el suministro de inmediato';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `sim`
+--
+
+DROP TABLE IF EXISTS `sim`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sim` (
+  `code` varchar(25) NOT NULL COMMENT 'No se ha puesto BIGINT por incompatibilidad con Access',
+  `line` varchar(15) NOT NULL CHECK (`line` regexp '^[0-9]+$'),
+  `ext` int(4) NOT NULL,
+  `pin` varchar(4) NOT NULL CHECK (`pin` regexp '^[0-9]+$'),
+  `puk` varchar(15) NOT NULL CHECK (`pin` regexp '^[0-9]+$'),
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `sinister`
 --
@@ -41255,7 +41250,7 @@ CREATE TABLE `zone` (
   `hour` datetime NOT NULL,
   `agencyModeFk` int(11) NOT NULL,
   `travelingDays` int(11) NOT NULL DEFAULT 1,
-  `price` double NOT NULL DEFAULT 0 CHECK (`price` > 0),
+  `price` decimal(10,2) DEFAULT NULL,
   `bonus` double NOT NULL DEFAULT 0,
   `isVolumetric` tinyint(1) NOT NULL DEFAULT 0,
   `inflation` decimal(5,2) NOT NULL DEFAULT 1.00,
@@ -41264,11 +41259,14 @@ CREATE TABLE `zone` (
   `code` varchar(45) DEFAULT NULL,
   `editorFk` int(10) unsigned DEFAULT NULL,
   `itemMaxLength` int(11) DEFAULT NULL COMMENT 'Longitud maxima para articulos acostados que esa agencia puede transportar',
+  `addressFk` int(11) DEFAULT NULL COMMENT 'Punto de distribución de donde salen para repartir',
   PRIMARY KEY (`id`),
   KEY `fk_zone_2_idx` (`agencyModeFk`),
   KEY `zone_name_idx` (`name`),
   KEY `zone_fk_editor` (`editorFk`),
+  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`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -41318,7 +41316,10 @@ CREATE TABLE `zoneConfig` (
   `id` int(10) unsigned NOT NULL,
   `scope` int(10) unsigned NOT NULL,
   `forwardDays` int(10) NOT NULL DEFAULT 7 COMMENT 'days forward to show zone_upcomingDeliveries',
+  `defaultAddressFk` int(11) DEFAULT NULL COMMENT 'Punto de distribución por defecto',
   PRIMARY KEY (`id`),
+  KEY `zoneConfig_address_FK` (`defaultAddressFk`),
+  CONSTRAINT `zoneConfig_address_FK` FOREIGN KEY (`defaultAddressFk`) REFERENCES `address` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `zoneConfig_check` CHECK (`id` = 1)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -43244,6 +43245,7 @@ BEGIN
 	DECLARE vCurrentCommission INT;
 	DECLARE vIsNotEUR INT;
 	DECLARE vLastEntryFk INT;
+	DECLARE vLanded INT;
 
 	SELECT count(*) INTO vIsNotEUR
 			FROM currency c
@@ -43259,23 +43261,25 @@ BEGIN
 
 		RETURN IFNULL(vCommission, 0);
 	ELSE
+		SELECT landed INTO vLanded
+			FROM travel
+			WHERE id = vTravelFk;
+
 		SELECT e.id INTO vLastEntryFk
 			FROM `entry` e
 				JOIN travel tr ON tr.id = e.travelFk
-				WHERE e.supplierFk = vSupplierFk
+			WHERE e.supplierFk = vSupplierFk
-				ORDER BY tr.landed DESC
+			ORDER BY (vLanded <= tr.landed), tr.landed DESC
-				LIMIT 1;
+			LIMIT 1;
 
 		IF vLastEntryFk THEN
 			SELECT commission INTO vCurrentCommission
 				FROM `entry`
 				WHERE id = vLastEntryFk;
-
 		ELSE
 			SELECT commission INTO vCurrentCommission
 				FROM supplier s
 				WHERE s.id = vSupplierFk;
-
 		END IF;
 
 		RETURN vCurrentCommission;
@@ -49455,7 +49459,7 @@ BEGIN
 				JOIN claimDestination cd ON cd.id = ce.claimDestinationFk
 				JOIN claim c ON c.id = ce.claimFk
 				JOIN claimState cs ON cs.id = c.claimStateFk
-			WHERE cd.description NOT IN ('Bueno', 'Corregido')
+			WHERE cd.code NOT IN ('good', 'corrected', 'supplierClaim')
 				AND NOT ce.isGreuge
 				AND cs.code = 'resolved';
 
@@ -49480,7 +49484,7 @@ BEGIN
 				JOIN claimDestination cd ON cd.id = ce.claimDestinationFk
 				JOIN claim c ON c.id = ce.claimFk
 				JOIN claimState cs ON cs.id = c.claimStateFk
-			WHERE cd.description NOT IN ('Bueno', 'Corregido')
+			WHERE cd.code NOT IN ('good', 'corrected', 'supplierClaim')
 				AND NOT ce.isGreuge
 				AND cs.code = 'resolved'
 				AND c.isChargedToMana;
@@ -49491,7 +49495,7 @@ BEGIN
 				JOIN claim c ON c.id = ce.claimFk
 				JOIN claimState cs ON cs.id = c.claimStateFk
 			SET ce.isGreuge = TRUE
-			WHERE cd.description NOT IN ('Bueno', 'Corregido')
+			WHERE cd.code NOT IN ('good', 'corrected', 'supplierClaim')
 				AND NOT ce.isGreuge
 				AND cs.code = 'resolved';
 
@@ -49570,7 +49574,7 @@ BEGIN
 							JOIN claimDestination cd ON cd.id = ce.claimDestinationFk
 							JOIN claim c ON c.id = ce.claimFk
 							JOIN claimState cs ON cs.id = c.claimStateFk
-						WHERE cd.description NOT IN ('Bueno', 'Corregido')
+						WHERE cd.code NOT IN ('good', 'corrected', 'supplierClaim')
 							AND cs.code = 'resolved'
 							AND c.ticketCreated >= util.VN_CURDATE() - INTERVAL 1 YEAR
 						GROUP BY c.clientFk
@@ -56857,67 +56861,6 @@ BEGIN
 
 	UPDATE greugeConfig
 		SET lastNotifyCheck = vTimeEnd;
-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 `inventoryFailureAdd` */;
-/*!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 `inventoryFailureAdd`()
-BEGIN
-
-DECLARE done BOOL DEFAULT FALSE;
-DECLARE vTicketFk INT;
-
-DECLARE rs CURSOR FOR
-		SELECT id FROM vn.ticket 
-			WHERE shipped = util.yesterday() 
-				AND clientFk = 400
-                AND warehouseFk IN (1,44);
-
-DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
-OPEN rs;
-
-FETCH rs INTO vTicketFk;
-
-WHILE NOT done DO
-   
-    INSERT INTO vn.inventoryFailure(dated, itemFk, quantity, value, warehouseFk, throwerFk)
-		SELECT 	t.shipped, 
-				s.itemFk, 
-				s.quantity, 
-				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue,
-				t.warehouseFk, 
-				w.id
-			FROM vn.ticket t
-				JOIN vn.sale s ON s.ticketFk = t.id
-				LEFT JOIN cache.last_buy lb ON lb.warehouse_id = t.warehouseFk AND item_id = s.itemFk
-				LEFT JOIN vn.buy b ON b.id = lb.buy_id
-				LEFT JOIN vn.worker w ON w.code = LEFT(s.concept, 3)
-		WHERE t.id = vTicketFk
-			AND s.quantity > 0;
-
-	FETCH rs INTO vTicketFk;
-    
-END WHILE;
-
-
-CLOSE rs;
-
-
-
-
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -57927,7 +57870,7 @@ BEGIN
 				ii.cplusTaxBreakFk,
 				ii.cplusSubjectOpFk,
 				ii.siiTypeInvoiceInFk,
-				ii.cplusRectificationTypeFk,
+				ic.cplusRectificationTypeFk,
 				ii.booked,
 				IFNULL(a.isUeeMember, c.isUeeMember) isUeeMember,
 				(c.id = cc.id) isSameCountry,
@@ -57950,6 +57893,7 @@ BEGIN
 				e.name expenseName
 			FROM invoiceIn ii
 				JOIN supplier s ON s.id = ii.supplierFk
+				LEFT JOIN invoiceInCorrection ic ON ic.correctingFk = ii.id	
 				LEFT JOIN province p ON p.id = s.provinceFk
 				LEFT JOIN autonomy a ON a.id = p.autonomyFk
 				JOIN country c ON c.id = s.countryFk
@@ -62647,10 +62591,6 @@ BEGIN
 			SET itemFk = vItemNew
 			WHERE itemFk = vItemOld;
 
-		UPDATE inventoryFailure
-			SET itemFk = vItemNew
-			WHERE itemFk = vItemOld;
-
 		UPDATE genericAllocation
 			SET itemFk = vItemNew
 			WHERE itemFk = vItemOld;
@@ -73325,7 +73265,8 @@ BEGIN
 				IFNULL(dest.nickname, origin.nickname) nickname,
 				dest.landed,
 				dest.preparation,
-				origin.departmentFk
+				origin.departmentFk,
+				origin.saleClonedFk
 			FROM (
 				SELECT s.ticketFk,
 						c.salesPersonFk workerFk,
@@ -73346,11 +73287,13 @@ BEGIN
 						t.warehouseFk,
 						t.companyFk,
 						t.agencyModeFk,
-						wd.departmentFk
+						wd.departmentFk,
+						sc.saleClonedFk
 					FROM ticket t
 						JOIN client c ON c.id = t.clientFk
 						JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
 						JOIN sale s ON s.ticketFk = t.id
+						LEFT JOIN saleCloned sc ON sc.saleClonedFk = s.id
 						JOIN saleVolume sv ON sv.saleFk = s.id
 						JOIN item i ON i.id = s.itemFk
 						JOIN ticketState ts ON ts.ticketFk = t.id
@@ -77747,8 +77690,8 @@ BEGIN
  * @param vIsRaid idRaid value
  * @param vDaysInForward daysInForward value
  */
-	IF (NOT vIsRaid AND vDaysInForward IS NOT NULL) OR (vIsRaid AND vDaysInForward IS NULL) THEN
+	IF NOT vIsRaid AND vDaysInForward THEN
-		CALL util.throw('The raid information is not correct');
+		CALL util.throw('If daysInForward has a value, the raid cannot be unchecked');
 	END IF;
 END ;;
 DELIMITER ;
@@ -78115,22 +78058,15 @@ BEGIN
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBuyerEmail VARCHAR(40);
 	DECLARE vTravelLink TEXT;
-	DECLARE vMailBody TEXT DEFAULT '';
+	DECLARE vMailBody TEXT;
+	DECLARE vDaysBetweenDates INT;
+	DECLARE vSubject VARCHAR(30);
 
-	DECLARE vCur CURSOR FOR
+	DECLARE vTravels CURSOR FOR
-		SELECT GROUP_CONCAT(DISTINCT
+		SELECT GROUP_CONCAT(DISTINCT travelLink ORDER BY id SEPARATOR '\n\r'),
-				CONCAT('https://salix.verdnatura.es/#!/travel/',
+				buyerEmail
-					ttm.travelFk,
+			FROM tTravelToMove
-					'/summary ')
+			GROUP BY buyerEmail;
-				ORDER BY ttm.travelFk SEPARATOR '\n\r') travelLink,
-			CONCAT(u.name, '@verdnatura.es') buyerEmail
-			FROM tTravelToMove ttm
-				JOIN entry e ON e.travelFk = ttm.travelFk
-				JOIN buy b ON b.entryFk = e.id
-				JOIN item i ON i.id = b.itemFk
-				JOIN itemType it ON it.id = i.typeFk
-				JOIN account.user u ON u.id = it.workerFk
-			GROUP BY u.name;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -78141,35 +78077,50 @@ BEGIN
 	END;
 
 	CREATE OR REPLACE TEMPORARY TABLE tTravelToMove
-		SELECT id travelFk,
+		WITH travels AS (
-				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
+		SELECT id,
-			FROM travel
+				CONCAT('https://salix.verdnatura.es/#!/travel/', id,'/summary') travelLink,
+				util.VN_CURDATE() + INTERVAL daysInForward DAY newLanded,
+				util.VN_CURDATE() - INTERVAL DATEDIFF(landed, shipped) + daysInForward DAY newShipped
+			FROM vn.travel
 			WHERE isRaid
-				AND daysInForward;
+				AND daysInForward
+		)SELECT t.id,
+				t.travelLink,
+				t.newLanded,
+				t.newShipped,
+				CONCAT(u.name, '@verdnatura.es') buyerEmail
+			FROM travels t
+				STRAIGHT_JOIN vn.entry e ON e.travelFk = t.id
+				JOIN vn.buy b ON b.entryFk = e.id
+				JOIN vn.item i ON i.id = b.itemFk
+				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN account.user u ON u.id = it.workerFk
+			GROUP BY t.id;
 
 	START TRANSACTION;
 
 	UPDATE travel tr
-			JOIN tTravelToMove ttm ON ttm.travelFk = tr.id
+			JOIN tTravelToMove ttm ON ttm.id = tr.id
-		SET tr.landed = ttm.newLanded;
+		SET tr.landed = ttm.newLanded,
+			tr.shipped = ttm.newShipped;
 
-	OPEN vCur;
+	OPEN vTravels;
 
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vCur INTO vTravelLink, vBuyerEmail;
+		FETCH vTravels INTO vTravelLink, vBuyerEmail;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		CALL `vn`.`mail_insert`(
+		SET vSubject = 'Cambio de fecha en Redadas',
-			vBuyerEmail,
+			vMailBody = CONCAT('Se ha movido los siguientes travels: \n\r ', vTravelLink);
-			'noreply@verdnatura.es',
+
-			'Cambio de fecha en Redadas',
+		CALL mail_insert(vBuyerEmail, 'noreply@verdnatura.es', vSubject, vMailBody);
-			CONCAT('Se ha movido los siguientes travels: \n\r ', vTravelLink));
 	END LOOP;
-	CLOSE vCur;
+	CLOSE vTravels;
 	COMMIT;
 	DROP TEMPORARY TABLE tTravelToMove;
 END ;;
@@ -85618,24 +85569,6 @@ USE `bi`;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
---
--- Final view structure for view `rotacion`
---
-
-/*!50001 DROP VIEW IF EXISTS `rotacion`*/;
-/*!50001 SET @saved_cs_client          = @@character_set_client */;
-/*!50001 SET @saved_cs_results         = @@character_set_results */;
-/*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8mb4 */;
-/*!50001 SET character_set_results     = utf8mb4 */;
-/*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `rotacion` AS select `ic`.`itemFk` AS `Id_Article`,`ic`.`warehouseFk` AS `warehouse_id`,`ic`.`quantity` AS `total`,`ic`.`rotation` AS `rotacion`,`ic`.`cm3` AS `cm3`,`ic`.`storage` AS `almacenaje`,`ic`.`handling` AS `manipulacion`,`ic`.`extraCharge` AS `auxiliar`,`ic`.`wasted` AS `mermas`,`ic`.`cm3delivery` AS `cm3reparto`,`ic`.`grams` AS `grams` from `vn`.`itemCost` `ic` */;
-/*!50001 SET character_set_client      = @saved_cs_client */;
-/*!50001 SET character_set_results     = @saved_cs_results */;
-/*!50001 SET collation_connection      = @saved_col_connection */;
-
 --
 -- Final view structure for view `tarifa_componentes`
 --
@@ -90949,4 +90882,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-12-10  8:17:51
+-- Dump completed on 2025-01-07  6:51:38

db/dump/.dump/triggers.sql

@@ -5701,7 +5701,7 @@ BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF (SELECT COUNT(*) FROM vn.invoiceIn 
+	IF (SELECT COUNT(*) FROM invoiceIn 
 			WHERE supplierRef = NEW.supplierRef 
 				AND supplierFk = NEW.supplierFk 
 				AND YEAR(issued) = YEAR(NEW.issued)
@@ -5713,7 +5713,7 @@ BEGIN
 	IF 	NEW.supplierFk != OLD.supplierFk THEN
 		CALL supplier_checkIsActive(NEW.supplierFk);
 		SELECT withholdingSageFk INTO vWithholdingSageFk
-				FROM vn.supplier 
+				FROM supplier 
 				WHERE id = NEW.supplierFk;
 		SET NEW.withholdingSageFk = vWithholdingSageFk;
 	END IF;
@@ -5737,25 +5737,31 @@ DELIMITER ;;
 	AFTER UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
-	IF NEW.issued != OLD.issued    
+	DECLARE vIsEuro BOOL;
-		OR NEW.currencyFk != OLD.currencyFk THEN
+	
+	SELECT `code` = 'EUR' INTO vIsEuro 
+		FROM currency 
+		WHERE id = NEW.currencyFk;
+
+	IF (NOT NEW.issued <=> OLD.issued    
+		OR NEW.currencyFk <> OLD.currencyFk) THEN
 
 		UPDATE invoiceInTax iit
 				JOIN invoiceIn ii ON ii.id = iit.invoiceInFk
 				LEFT JOIN referenceRate rr ON rr.dated = ii.issued
 					AND rr.currencyFk = ii.currencyFk 
-			SET iit.taxableBase = IF(iit.foreignValue IS NULL, iit.taxableBase, iit.foreignValue / rr.value)
+			SET iit.taxableBase = IF(vIsEuro, iit.taxableBase, iit.foreignValue / rr.value),
+				iit.foreignValue = IF(vIsEuro, NULL, iit.foreignValue)
 			WHERE ii.id = NEW.id;
 		
 		UPDATE invoiceInDueDay iidd
 				JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk
 				LEFT JOIN referenceRate rr ON rr.dated = ii.issued
 					AND rr.currencyFk = ii.currencyFk 
-			SET iidd.amount = IF(iidd.foreignValue IS NULL, iidd.amount, iidd.foreignValue / rr.value)
+			SET iidd.amount = IF(vIsEuro, iidd.amount, iidd.foreignValue / rr.value),
+				iidd.foreignValue = IF(vIsEuro, NULL, iidd.foreignValue)
 			WHERE ii.id = NEW.id;    
-        
     END IF;
-
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8161,6 +8167,7 @@ BEGIN
 		OR !(NEW.workerFk <=> OLD.workerFk)
 		OR !(NEW.m3 <=> OLD.m3)
 		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)
+        OR !(NEW.dated <=> OLD.dated)
 		OR !(NEW.vehicleFk <=> OLD.vehicleFk)THEN
 			CALL route_calcCommission(NEW.id);
 	END IF;
@@ -10582,6 +10589,10 @@ BEGIN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;
 
+	IF NOT (NEW.isRaid <=> OLD.isRaid)  OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
+		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
+	END IF;
+
 	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
 		SELECT COUNT(*) INTO vHasAnyInvoiceBooked
 			FROM travel t
@@ -11488,4 +11499,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-12-10  8:18:11
+-- Dump completed on 2025-01-07  6:51:57

db/routines/bs/procedures/waste_addSales.sql

@@ -10,19 +10,27 @@ BEGIN
  * @param vDateFrom Fecha desde
  * @param vDateTo Fecha hasta
  */
-	IF vDateFrom IS NULL THEN
+	DECLARE vDaysInYear INT;
-		SET vDateFrom = util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+	SET vDaysInYear = DATEDIFF(util.lastDayOfYear(CURDATE()), util.firstDayOfYear(CURDATE()));
+
+	SET vDateFrom = COALESCE(vDateFrom, util.VN_CURDATE());
+	SET vDateTo = COALESCE(vDateTo, util.VN_CURDATE());
+
+	IF DATEDIFF(vDateTo, vDateFrom) > vDaysInYear THEN
+		CALL util.throw('The period cannot be longer than one year');
 	END IF;
 
-	IF vDateTo IS NULL THEN
+	-- Obtiene el primer día de la semana de esa fecha
-		SET vDateTo = vDateFrom + INTERVAL 6 DAY;
+	SET vDateFrom = DATE_SUB(vDateFrom, INTERVAL ((WEEKDAY(vDateFrom) + 1) % 7) DAY);
-	END IF;
+
+	-- Obtiene el último día de la semana de esa fecha
+	SET vDateTo = DATE_ADD(vDateTo, INTERVAL (6 - ((WEEKDAY(vDateTo) + 1) % 7)) DAY);
 
 	CALL cache.last_buy_refresh(FALSE);
 
 	REPLACE bs.waste
-		SELECT YEAR(t.shipped),
+		SELECT YEARWEEK(t.shipped, 6) DIV 100,
-				WEEK(t.shipped, 4),
+				WEEK(t.shipped, 6),
 				it.workerFk,
 				it.id,
 				s.itemFk,
@@ -68,8 +76,8 @@ BEGIN
 				JOIN cache.last_buy lb ON lb.item_id = i.id
 					AND lb.warehouse_id = w.id
 				JOIN vn.buy b ON b.id = lb.buy_id
-			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
+			WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDateTo)
 				AND w.isManaged
-			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
+			GROUP BY YEARWEEK(t.shipped, 6) DIV 100, WEEK(t.shipped, 6), i.id;
 END$$
 DELIMITER ;

db/versions/11400-turquoiseChrysanthemum/00-firstScript.sql

@@ -0,0 +1,4 @@
+DELETE FROM salix.ACL WHERE property = 'canCreateAbsenceInPast';
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Worker','canModifyAbsenceInPast','WRITE','ALLOW','ROLE','hr');

modules/worker/back/methods/worker-time-control/sendMail.js

@@ -41,22 +41,10 @@ module.exports = Self => {
         const stmts = [];
         let stmt;
 
-        if (!args.week || !args.year) {
+        const {date: started, week, year} = Self.getMondayWeekYear(args.week, args.year);
-            const from = Date.vnNew();
+        args.week = week;
-            const to = Date.vnNew();
+        args.year = year;
 
-            const time = await models.Time.findOne({
-                where: {
-                    dated: {between: [from.setDate(from.getDate() - 10), to.setDate(to.getDate() - 4)]}
-                },
-                order: 'week ASC'
-            }, myOptions);
-
-            args.week = time.week;
-            args.year = time.year;
-        }
-
-        const started = getStartDateOfWeekNumber(args.week, args.year);
         started.setHours(0, 0, 0, 0);
 
         const ended = new Date(started);
@@ -388,17 +376,6 @@ module.exports = Self => {
         return true;
     };
 
-    function getStartDateOfWeekNumber(week, year) {
-        const simple = new Date(year, 0, 1 + (week - 1) * 7);
-        const dow = simple.getDay();
-        const weekStart = simple;
-        if (dow <= 4)
-            weekStart.setDate(simple.getDate() - simple.getDay() + 1);
-        else
-            weekStart.setDate(simple.getDate() + 8 - simple.getDay());
-        return weekStart;
-    }
-
     function getTime(timeString) {
         const [hours, minutes, seconds] = timeString.split(':');
         return [parseInt(hours), parseInt(minutes), parseInt(seconds)];

modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js

@@ -55,8 +55,8 @@ module.exports = Self => {
             }
         }, myOptions);
 
-        const dated = getMondayDateFromYearWeek(args.year, args.week);
+        const {date} = Self.getMondayWeekYear(args.week, args.year);
-        const timestamp = dated.getTime() / 1000;
+        const timestamp = date.getTime() / 1000;
 
         const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
         ctx.args.url = url;
@@ -64,23 +64,4 @@ module.exports = Self => {
         await models.WorkerTimeControl.updateMailState(ctx, ctx.args.workerId, myOptions);
         return Self.sendTemplate(ctx, 'weekly-hour-record');
     };
-
-    function getMondayDateFromYearWeek(yearNumber, weekNumber) {
-        const yearStart = new Date(yearNumber, 0, 1);
-        const firstMonday = new Date(yearStart.getTime() + ((7 - yearStart.getDay() + 1) % 7) * 86400000);
-        const firstMondayWeekNumber = getWeekNumber(firstMonday);
-
-        if (firstMondayWeekNumber > 1)
-            firstMonday.setDate(firstMonday.getDate() + 7);
-
-        firstMonday.setDate(firstMonday.getDate() + (weekNumber - 1) * 7);
-
-        return firstMonday;
-    }
-
-    function getWeekNumber(date) {
-        const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
-        const daysPassed = (date - firstDayOfYear) / 86400000;
-        return Math.ceil((daysPassed + firstDayOfYear.getDay() + 1) / 7);
-    }
 };

modules/worker/back/methods/worker/createAbsence.js

@@ -58,12 +58,10 @@ module.exports = Self => {
             if (!isSubordinate || (isSubordinate && userId == id && !isTeamBoss))
                 throw new UserError(`You don't have enough privileges`);
 
-            const canCreateAbsenceInPast =
-                await models.ACL.checkAccessAcl(ctx, 'Worker', 'canCreateAbsenceInPast', 'WRITE');
             const now = Date.vnNew();
             const newDate = new Date(args.dated).getTime();
 
-            if ((now.getTime() > newDate) && !canCreateAbsenceInPast)
+            if (!await Self.canModifyAbsenceInPast(ctx, newDate))
                 throw new UserError(`Holidays to past days not available`);
 
             const labour = await models.WorkerLabour.findById(args.businessFk,

modules/worker/back/methods/worker/deleteAbsence.js

@@ -53,6 +53,10 @@ module.exports = Self => {
                     }
                 }
             }, myOptions);
+
+            if (!await Self.canModifyAbsenceInPast(ctx, absence.dated.getTime()))
+                throw new UserError(`Holidays to past days not available`);
+
             const result = await absence.destroy(myOptions);
             const labour = absence.labour();
             const department = labour && labour.department();

modules/worker/back/methods/worker/specs/deleteAbsence.spec.js

@@ -4,6 +4,8 @@ const LoopBackContext = require('loopback-context');
 describe('Worker deleteAbsence()', () => {
     const businessId = 18;
     const workerId = 18;
+    const hrId = 37;
+    const salesBossId = 19;
     const activeCtx = {
         accessToken: {userId: 1106},
         headers: {origin: 'http://localhost'}
@@ -50,16 +52,16 @@ describe('Worker deleteAbsence()', () => {
     });
 
     it('should successfully delete an absence', async() => {
-        activeCtx.accessToken.userId = 19;
+        activeCtx.accessToken.userId = salesBossId;
 
         const tx = await app.models.Calendar.beginTransaction({});
-
+        const pastDate = new Date(Date.vnNow() + 24 * 60 * 60 * 1000);
         try {
             const options = {transaction: tx};
             const createdAbsence = await app.models.Calendar.create({
                 businessFk: businessId,
                 dayOffTypeFk: 1,
-                dated: Date.vnNew()
+                dated: pastDate
             }, options);
 
             ctx.args = {absenceId: createdAbsence.id};
@@ -76,4 +78,61 @@ describe('Worker deleteAbsence()', () => {
             throw e;
         }
     });
+
+    it('should successfully delete an absence if the user is HR even if the date is in the past', async() => {
+        activeCtx.accessToken.userId = hrId;
+        const tx = await app.models.Calendar.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const pastDate = new Date(Date.vnNow() - 24 * 60 * 60 * 1000); // Restar un día
+            const createdAbsence = await app.models.Calendar.create({
+                businessFk: businessId,
+                dayOffTypeFk: 1,
+                dated: pastDate
+            }, options);
+
+            ctx.args = {absenceId: createdAbsence.id};
+            await app.models.Worker.deleteAbsence(ctx, workerId, options);
+
+            const deletedAbsence = await app.models.Calendar.findById(createdAbsence.id, null, options);
+
+            expect(deletedAbsence).toBeNull();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should throw an error if the date is in the past', async() => {
+        activeCtx.accessToken.userId = salesBossId;
+        const tx = await app.models.Calendar.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const pastDate = new Date(Date.vnNow() - 24 * 60 * 60 * 1000);
+            const createdAbsence = await app.models.Calendar.create({
+                businessFk: businessId,
+                dayOffTypeFk: 1,
+                dated: pastDate
+            }, options);
+
+            ctx.args = {absenceId: createdAbsence.id};
+            await app.models.Worker.deleteAbsence(ctx, workerId, options);
+
+            const deletedAbsence = await app.models.Calendar.findById(createdAbsence.id, null, options);
+
+            expect(deletedAbsence).toBeNull();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toBe('Holidays to past days not available');
+    });
 });

modules/worker/back/models/worker-time-control.js

@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const moment = require('moment');
 
 module.exports = Self => {
     require('../methods/worker-time-control/filter')(Self);
@@ -19,4 +20,15 @@ module.exports = Self => {
             return new UserError(`The introduced hour already exists`);
         return err;
     });
+
+    Self.getMondayWeekYear = (week, year) => {
+        if (!week || !year) {
+            const today = Date.vnNew();
+            today.setDate(today.getDate() - 7);
+            week = moment(today).isoWeek();
+            year = moment(today).isoWeekYear();
+        }
+        const date = moment(year, 'YYYY').week(week).startOf('isoweek').toDate();
+        return {date, year, week};
+    };
 };

modules/worker/back/models/worker.js

@@ -26,6 +26,13 @@ module.exports = Self => {
         message: 'Invalid TIN'
     });
 
+    Self.canModifyAbsenceInPast = async(ctx, time) => {
+        const hasPrivs = await Self.app.models.ACL.checkAccessAcl(ctx, 'Worker', 'canModifyAbsenceInPast', 'WRITE');
+        const today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
+        return hasPrivs || today.getTime() < time;
+    };
+
     async function tinIsValid(err, done) {
         const country = await Self.app.models.Country.findOne({
             fields: ['code'],

print/templates/reports/buy-label-supplier/assets/css/style.css

@@ -1,7 +1,7 @@
 html {
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
     margin-top: -7px;
-    font-size: 28px;
+    font-size: 20px;
 }
 table {
     border: 1px solid;
@@ -10,22 +10,22 @@ table {
 }
 td {
     border: 1px solid;
-    padding: 5px;
+    padding: 2px;
     width: 100%;
 }
 span {
-    font-size: 48px;
+    font-size: 34px;
     font-weight: bold;
 }
 .lbl {
     color: gray;
     font-weight: lighter;
-    font-size: 18px;
+    font-size: 12px;
     display: block;
 }
 .cell {
     width: 157px;
-    height: 50px;
+    height: 35px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

print/templates/reports/buy-label-supplier/buy-label-supplier.js

@@ -10,7 +10,7 @@ module.exports = {
     async serverPrefetch() {
         const buy = await models.Buy.findById(this.id, null);
         this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id, this.id]);
-        const date = new Date();
+        const date = Date.vnNew();
         this.weekNum = moment(date).isoWeek();
         this.dayNum = moment(date).day();
     },
@@ -24,7 +24,8 @@ module.exports = {
                 format: 'code128',
                 displayValue: false,
                 width: 3.8,
-                height: 115,
+                height: 60,
+                margin: 3,
             });
             return new XMLSerializer().serializeToString(svgNode);
         },

print/templates/reports/buy-label-supplier/options.json

@@ -1,6 +1,6 @@
 {
     "width": "10cm",
-    "height": "10cm",
+    "height": "6.5cm",
     "margin": {
         "top": "0.17cm",
         "right": "0.2cm",