Merge pull request '8267-devToTest' (!3270) from 8267-devToTest into test

Reviewed-on: #3270 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-12-03 12:18:19 +00:00 · 2024-12-03 12:18:19 +00:00 · 87136f1aba
parent c52e03c677 fb13a9ff38
commit 87136f1aba
87 changed files with 626 additions and 676 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@ -36,3 +36,7 @@ rules:
    jasmine/no-focused-tests: 0
    jasmine/prefer-toHaveBeenCalledWith: 0
    arrow-spacing: ["error", { "before": true, "after": true }]
+    no-restricted-syntax:
+    - "error"
+    - selector: "NewExpression[callee.name='Date']"
+      message: "Use Date.vnNew() instead of new Date()."
--- a/back/methods/collection/spec/assign.spec.js
+++ b/back/methods/collection/spec/assign.spec.js
@ -28,9 +28,10 @@ describe('ticket assign()', () => {
        await tx.rollback();
    });

-    it('should throw an error when  there is not picking tickets', async() => {
+    it('should throw an error when there are no picking tickets', async() => {
        try {
            await models.Collection.assign(ctx, options);
+            fail('Expected an error to be thrown, but none was thrown.');
        } catch (e) {
            expect(e.message).toEqual('There are not picking tickets');
        }
--- a/back/methods/url/getUrl.js
+++ b/back/methods/url/getUrl.js
@ -22,7 +22,7 @@ module.exports = Self => {
        const url = await Self.app.models.Url.findOne({
            where: {
                appName,
-                environment: process.env.NODE_ENV || 'dev'
+                environment: process.env.NODE_ENV || 'development'
            }
        });
        return url?.url;
--- a/back/methods/workerActivity/add.js
+++ b/back/methods/workerActivity/add.js
@ -31,7 +31,7 @@ module.exports = Self => {
        return await Self.rawSql(`
            INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
                SELECT ?, ?, ?
-                    FROM workerTimeControlParams wtcp
+                    FROM workerTimeControlConfig wtcc
                        LEFT JOIN (
                            SELECT wa.workerFk,
                                wa.created,
@ -44,7 +44,7 @@ module.exports = Self => {
                        ) sub ON TRUE
                    WHERE sub.workerFk IS NULL
                        OR sub.code <> ? 
-                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcp.dayBreak;`
+                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
        , [userId, code, model, userId, code], myOptions);
    };
 };
--- a/db/.pullinfo.json
+++ b/db/.pullinfo.json
@ -9,7 +9,7 @@
    },
    "vn": {
      "view": {
-        "expeditionPallet_Print": "99f75145ac2e7b612a6d71e74b6e55f194a465780fd9875a15eb01e6596b447e"
+        "expeditionPallet_Print": "04fc5f2967ce53bfbb85f7f48b9a3dca4a4f7111ac41e1775f4cc7d6538774b2"
      }
    }
  }
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -745,15 +745,15 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)

 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`)
+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),
-        (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),
-        (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),
-        (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),
-        (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),
-        (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),
-        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5);
+        (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()),
+        (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());

 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
@ -1511,26 +1511,26 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, FALSE, NULL),
        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, FALSE, NULL),
        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, FALSE, NULL),
-        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, FALSE, NULL),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, FALSE,NULL),
        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, TRUE, 2),
        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, FALSE, NULL),
        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);

-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`)
-    VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1,''),
-        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, ''),
-        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, '');
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
+	VALUES
+		(1,		1,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 	1, 442, 'IN2001', 'Movement 1', 0, '', 'packaging'),
+		(2,		2,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 442, 'IN2002', 'Movement 2', 0, 'observation two', 'product'),
+		(3,		1, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 	0, 442, 'IN2003', 'Movement 3', 0, 'observation three', 'product'),
+		(4,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 69,	'IN2004', 'Movement 4', 0, 'observation four', 'product'),
+		(5,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 	0, 442, 'IN2005', 'Movement 5', 0, 'observation five', 'product'),
+		(6,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 	0, 442, 'IN2006', 'Movement 6', 0, 'observation six', 'product'),
+		(7,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2007', 'Movement 7', 0, 'observation seven', 'product'),
+		(8,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2008', 'Movement 8', 1, '', 'product'),
+		(9,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 9', 1, '', 'product'),
+		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 10', 1, '', 'product'),
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99', 0, '', 'product');

 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@ -2521,10 +2521,6 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
        (2, 'Normal', 'normal'),
        (3, 'Baja', 'low');

-INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
-    VALUES
-        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
-
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');

 INSERT INTO `vn`.`thermograph`(`id`, `model`)
@ -4008,6 +4004,9 @@ INSERT IGNORE INTO pbx.queueMember
 UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
 UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";

+INSERT INTO vn.workerRelatives (workerFk, isDescendant, disabilityGradeFk, birthed, adoptionYear, isDependend, isJointCustody, updated)
+	VALUES
+		(1106, 1, NULL, 0, NULL, 0, 0, '2024-10-29 08:42:44.000');
 INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
 INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);

@ -4025,7 +4024,6 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
            (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
            (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);

-
 INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
 	VALUES (19, '1169'),
 			(8, '1183'),
@ -4033,3 +4031,6 @@ INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)

 INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
 	VALUES ('saysimle-url-mock', '1819');
+
+INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
+	VALUES (1106,'26493101E','2019-09-20');
--- a/db/routines/bi/procedures/rutasAnalyze.sql
+++ b/db/routines/bi/procedures/rutasAnalyze.sql
@ -19,14 +19,14 @@ BEGIN
 			bultos)
 		SELECT r.id,
 				r.agencyModeFk,
-				r.created,
+				r.dated,
 				SUM(sv.volume / ebv.m3)
 			FROM vn.route r
 				JOIN vn.ticket t ON t.routeFk = r.id
 				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
 				JOIN vn.saleVolume sv ON sv.ticketFk = t.id
 				JOIN vn.expeditionBoxVol ebv ON ebv.code = 'transportBox'
-			WHERE r.created BETWEEN vDatedFrom AND vDatedTo
+			WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
 				AND z.isVolumetric
 			GROUP BY r.id;
 		
@ -38,12 +38,12 @@ BEGIN
 			Bultos)
 		SELECT r.id,
 				r.agencyModeFk,
-				r.created,
+				r.dated,
 				SUM(t.packages)
 			FROM vn.route r
 				JOIN vn.ticket t ON t.routeFk = r.id
 				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
-			WHERE r.created BETWEEN vDatedFrom AND vDatedTo
+			WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
 				AND NOT z.isVolumetric
 			GROUP BY r.id
 		ON DUPLICATE KEY UPDATE Bultos = Bultos + VALUES(Bultos);
@ -60,7 +60,7 @@ BEGIN
 						JOIN vn.component c ON c.id = sc.componentFk
 						JOIN vn.componentType ct ON ct.id = c.typeFk
 					WHERE ct.code = 'freight'
-						AND r.created BETWEEN vDatedFrom AND vDatedTo
+						AND r.dated BETWEEN vDatedFrom AND vDatedTo
 					GROUP BY r.id
 			 ) sub ON sub.routeFk = r.Id_Ruta
 		SET r.practico = IFNULL(sub.totalPractice / r.Bultos, 0);
@ -77,7 +77,7 @@ BEGIN
 					JOIN vn.address ad ON ad.id = t.addressFk
 					JOIN vn.client c ON c.id = ad.clientFk
 					LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
-				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
+				WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
 					AND NOT z.isVolumetric
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk
@ -93,7 +93,7 @@ BEGIN
 					JOIN vn.saleVolume sf ON sf.ticketFk = t.id
 					JOIN vn.client c ON c.id = t.clientFk
 					JOIN vn.`zone` z ON z.id = t.zoneFk
-				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
+				WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
 					AND z.isVolumetric
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk
@ -108,7 +108,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 					JOIN vn.greuge g ON g.ticketFk = t.id
 					JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
-				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
+				WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
 					AND gt.code = 'freightDifference'
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk
--- a/db/routines/sage/procedures/invoiceIn_add.sql
+++ b/db/routines/sage/procedures/invoiceIn_add.sql
@ -26,7 +26,7 @@ BEGIN

 	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
-				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
+				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
@ -39,7 +39,8 @@ BEGIN
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
 			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL;
+				AND d.id IS NULL
+			GROUP BY it.taxTypeSageFk;

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

--- a/db/routines/stock/procedures/log_refreshBuy.sql
+++ b/db/routines/stock/procedures/log_refreshBuy.sql
@ -6,8 +6,7 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
 	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
-		SELECT
-				b.id buyFk,
+		SELECT b.id buyFk,
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
--- a/db/routines/vn/functions/routeProposal.sql
+++ b/db/routines/vn/functions/routeProposal.sql
@ -26,7 +26,7 @@ BEGIN
 				JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
 			WHERE friendship >= vSignificativeFriendship
 				AND zf.zoneFk = vZoneFk
-                AND r.created = vLanded
+                AND r.dated = vLanded
            ORDER BY friendship;
 	
    -- Se eliminan aquellas que superan el volumen máximo
--- a/db/routines/vn/functions/routeProposal_beta.sql
+++ b/db/routines/vn/functions/routeProposal_beta.sql
@ -26,7 +26,7 @@ BEGIN
 				JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
 			WHERE friendship >= vSignificativeFriendship
 				AND zf.zoneFk = vZoneFk
-                AND r.created = vLanded
+                AND r.dated = vLanded
            ORDER BY friendship;
 	
    -- Se eliminan aquellas que superan el volumen máximo
--- a/db/routines/vn/functions/timeWorkerControl_getDirection.sql
+++ b/db/routines/vn/functions/timeWorkerControl_getDirection.sql
@ -1,65 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME)
-	RETURNS varchar(6) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-/**
- * Verifica la dirección de la fichada 
- * @param vUserFk Identificador del trabajador
- * @param vTimed Hora de la fichada
- * @return Retorna sentido de la fichada 'in, out, middle'
- */
-
-	DECLARE vPrevious DATETIME ;
-    DECLARE vNext DATETIME ;
-    DECLARE vPreviousDirection VARCHAR(3) ;
-    DECLARE vNextDirection VARCHAR(3) ;
-    DECLARE vDayStayMax INT;
-    DECLARE vTimedSeconds INT;
-    DECLARE vLastTimeIn INT;
-	
-    SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds;
-    
-    SELECT dayStayMax INTO vDayStayMax
-		FROM vn.workerTimeControlParams;
-
-    SELECT timed, direction INTO vNext,vNextDirection
-		FROM vn.workerTimeControl 
-        WHERE userFk = vUserFk 
-			AND direction IN ('in','out')
-            AND timed > vTimed
-		ORDER BY timed ASC
-        LIMIT 1;
-        
-    SELECT timed, direction INTO vPrevious, vPreviousDirection
-		FROM vn.workerTimeControl 
-        WHERE userFk = vUserFk 
-			AND direction IN ('in','out')
-            AND timed < vTimed
-		ORDER BY timed DESC
-        LIMIT 1;   
-	
-    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN 
-		RETURN 'middle';
-	END IF;
-    
-    
-    IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN
-		IF vPreviousDirection = 'in' THEN 
-			RETURN 'out';
-		ELSE
-			SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn
-				FROM vn.workerTimeControl 
-				WHERE userFk = vUserFk 
-					AND direction ='in'
-					AND timed < vPrevious;
-			IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN
-				RETURN 'out';
-            END IF;
-		END IF;
-	END IF;
-
-	RETURN 'in';
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/entry_isEditable.sql
+++ b/db/routines/vn/procedures/entry_isEditable.sql
@ -9,16 +9,18 @@ BEGIN
 *
 * @param vSelf Id de entrada
 */
-	DECLARE vIsEditable BOOL;
+	DECLARE vIsNotEditable BOOL DEFAULT FALSE;

-	SELECT e.isBooked INTO vIsEditable
+	SELECT TRUE INTO vIsNotEditable
 		FROM `entry` e
-			JOIN entryType et ON et.code = e.typeFk 
-		WHERE NOT et.isInformal
-			AND e.id = vSelf;
+			LEFT JOIN entryType et ON et.code = e.typeFk
+		WHERE e.id = vSelf
+			AND e.isBooked
+			AND (e.typeFk IS NULL OR NOT et.isInformal);

-	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+	IF vIsNotEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
+
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/expedition_getFromRoute.sql
+++ b/db/routines/vn/procedures/expedition_getFromRoute.sql
@ -41,6 +41,6 @@ BEGIN
 				    	WHERE expeditionFk = e.id)
 			LEFT JOIN expeditionState es2 ON es2.id = es.id
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
-		ORDER BY  r.created,  t.priority DESC;
+		ORDER BY  r.dated,  t.priority DESC;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/invoiceIn_booking.sql
+++ b/db/routines/vn/procedures/invoiceIn_booking.sql
@ -219,7 +219,7 @@ BEGIN
 						) eWithheld ON TRUE 
 			WHERE tii.taxTypeSageFk IS NOT NULL 
 				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) 
-			GROUP BY tii.PorcentajeIva, tii.expenseFk;
+			GROUP BY tii.CuentaIvaRepercutido;

 	-- Línea iva inversor sujeto pasivo
 	INSERT INTO XDiario( 
@ -284,7 +284,7 @@ BEGIN
 				AND NOT(tii.isVies 
 					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
-			GROUP BY tii.PorcentajeIva, tii.expenseFk;
+			GROUP BY tii.CuentaIvaRepercutido;
 		
 	-- Actualización del registro original		
 	UPDATE invoiceIn ii
--- a/db/routines/vn/procedures/itemShelvingLog_get.sql
+++ b/db/routines/vn/procedures/itemShelvingLog_get.sql
@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(
-	vShelvingCode VARCHAR(10)
-)
-BEGIN
-/**
- * Devuelve el log de los item en cada carro
- *
- * @param vShelvingCode Matrícula del carro 
- * 
- */
-	SELECT isl.itemShelvingFk, 
-			isl.created, 
-			isl.accion, 
-			isl.itemFk, 
-			isl.shelvingFk, 
-			isl.quantity, 
-			isl.visible,
-			isl.available, 
-			isl.grouping, 
-			isl.packing, 
-			isl.stars, 
-			item.longName, 
-			item.size, 
-			item.subName, 
-			worker.code, 
-			isl.accion
-	FROM item 
-		JOIN itemShelvingLog isl ON item.id = isl.itemFk 
-		JOIN worker ON isl.workerFk = worker.id
-		JOIN shelving sh ON sh.id = isl.shelvingFk
-	WHERE sh.code = vShelvingCode COLLATE utf8mb3_unicode_ci
-		OR isl.itemFk = vShelvingCode -- ?? Respeto porque ya estaba
-	ORDER BY isl.created DESC;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/routeMonitor_calculate.sql
+++ b/db/routines/vn/procedures/routeMonitor_calculate.sql
@ -27,7 +27,7 @@ BEGIN
 			rm.ticketFree = 0,
 			rm.ticketProduction = 0,
 			rm.ticketPacked = 0,
-			rm.dated = r.created;
+			rm.dated = r.dated;

 	UPDATE routesMonitor rm
 			JOIN (
--- a/db/routines/vn/procedures/route_calcCommission.sql
+++ b/db/routines/vn/procedures/route_calcCommission.sql
@ -14,7 +14,7 @@ BEGIN
 	DECLARE vIsKmTruckRate BOOL;
 	DECLARE vCountryFk INT;

-	SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
+	SELECT r.dated >= rc.cutoffDated INTO vIsUpdatable
 		FROM route r
 			JOIN routeConfig rc
 		WHERE r.id = vSelf;
--- a/db/routines/vn/procedures/ticket_splitItemPackingType.sql
+++ b/db/routines/vn/procedures/ticket_splitItemPackingType.sql
@ -5,122 +5,122 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 )
 BEGIN
 /**
- * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id inicial para el tipo propuesto.
+ * Separa en diferentes tickets según el tipo de empaquetado
+ * El ticket original conserva las líneas del tipo de empaquetado especificado
+ * Las líneas sin tipo de empaquetado se asignan al ticket del tipo por defecto.
 *
- * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
+ * @param vSelf Id del ticket original
+ * @param vOriginalItemPackingTypeFk Tipo de empaquetado a mantener en el ticket original
 * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 */
-	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
+	DECLARE vIsDone BOOLEAN DEFAULT FALSE;
+	DECLARE vCurrentPackingType VARCHAR(1);
+	DECLARE vDefaultPackingType VARCHAR(1);
+	DECLARE vHasOriginalPackingType BOOLEAN;
 	DECLARE vNewTicketFk INT;
-	DECLARE vPackingTypesToSplit INT;
-	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vTicketFk INT;

-	DECLARE vSaleGroup CURSOR FOR
-		SELECT itemPackingTypeFk
-			FROM tSaleGroup
-			WHERE itemPackingTypeFk IS NOT NULL
-			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
+	DECLARE vItemPackingTypes CURSOR FOR
+		SELECT DISTINCT itemPackingTypeFk FROM tSalesToMove;

-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
+		ticketFk INT,
+		saleFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE=MEMORY;
+
+	SELECT COALESCE(MAX(ic.defaultPackingTypeFk), MAX(i.itemPackingTypeFk)) INTO vDefaultPackingType
+		FROM vn.sale s
+			JOIN item i ON i.id = s.itemFk
+			LEFT JOIN itemConfig ic ON ic.defaultPackingTypeFk = i.itemPackingTypeFk
+		WHERE s.ticketFk = vSelf
+		GROUP BY s.ticketFk;
+
+	SELECT EXISTS (
+		SELECT TRUE
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+			WHERE s.ticketFk = vSelf
+				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk
+	) INTO vHasOriginalPackingType;
+
+	IF vOriginalItemPackingTypeFk IS NULL OR NOT vHasOriginalPackingType THEN
+		SET vOriginalItemPackingTypeFk = vDefaultPackingType;
+	END IF;

 	START TRANSACTION;

-	SELECT id
-		FROM sale
-		WHERE ticketFk = vSelf
-			AND NOT quantity
+	SELECT t.id INTO vTicketFk
+		FROM ticket t
+			JOIN sale s ON s.id = t.id
+		WHERE t.id = vSelf
 		FOR UPDATE;

-	DELETE FROM sale
-		WHERE NOT quantity
-		AND ticketFk = vSelf;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSale
-		(PRIMARY KEY (id))
-		ENGINE = MEMORY
-		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
+	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
+		SELECT s.id, i.itemPackingTypeFk
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
-			WHERE s.ticketFk = vSelf;
+			WHERE s.ticketFk = vSelf
+				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;

-	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
-		ENGINE = MEMORY
-		SELECT itemPackingTypeFk, SUM(litros) totalLitros
-			FROM tSale
-			GROUP BY itemPackingTypeFk;
+	OPEN vItemPackingTypes;
+	l: LOOP
+		SET vIsDone = FALSE;
+		FETCH vItemPackingTypes INTO vCurrentPackingType;

-	SELECT COUNT(*) INTO vPackingTypesToSplit
-		FROM tSaleGroup
-		WHERE itemPackingTypeFk IS NOT NULL;
+		IF vIsDone THEN
+			LEAVE l;
+		END IF;

-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
-		ticketFk INT,
-		itemPackingTypeFk VARCHAR(1)
-	) ENGINE = MEMORY;
+		CALL ticket_Clone(vSelf, vNewTicketFk);

-	CASE vPackingTypesToSplit
-		WHEN 0 THEN
-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vSelf, vItemPackingTypeFk);
-		WHEN 1 THEN
-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				SELECT vSelf, itemPackingTypeFk
-					FROM tSaleGroup
-					WHERE itemPackingTypeFk IS NOT NULL;
-		ELSE
-			OPEN vSaleGroup;
-			FETCH vSaleGroup INTO vItemPackingTypeFk;
+		SELECT id INTO vTicketFk
+			FROM ticket t
+			WHERE t.id = vNewTicketFk
+			FOR UPDATE;

-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vSelf, vItemPackingTypeFk);
+		UPDATE tSalesToMove
+			SET ticketFk = vNewTicketFk
+			WHERE itemPackingTypeFk = vCurrentPackingType;

-			l: LOOP
-				SET vDone = FALSE;
-				FETCH vSaleGroup INTO vItemPackingTypeFk;
+		IF vCurrentPackingType = vDefaultPackingType THEN
+			INSERT INTO tSalesToMove (ticketFk, saleFk, itemPackingTypeFk)
+				SELECT vNewTicketFk, s.id, i.itemPackingTypeFk
+					FROM sale s
+						JOIN item i ON i.id = s.itemFk
+				WHERE s.ticketFk = vSelf
+					AND i.itemPackingTypeFk IS NULL;
+		END IF;

-				IF vDone THEN
-					LEAVE l;
-				END IF;
+	END LOOP;
+	CLOSE vItemPackingTypes;

-				CALL ticket_Clone(vSelf, vNewTicketFk);
+	UPDATE sale s
+			JOIN tSalesToMove t ON t.saleFk = s.id
+		SET s.ticketFk = t.ticketFk;

-				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-					VALUES(vNewTicketFk, vItemPackingTypeFk);
-			END LOOP;
-
-			CLOSE vSaleGroup;
-
-			SELECT s.id
-				FROM sale s
-					JOIN tSale ts ON ts.id = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-				FOR UPDATE;
-
-			UPDATE sale s
-					JOIN tSale ts ON ts.id = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-				SET s.ticketFk = t.ticketFk;
-
-			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-				FROM tSaleGroup sg
-				WHERE sg.itemPackingTypeFk IS NOT NULL
-				ORDER BY sg.itemPackingTypeFk
-				LIMIT 1;
-
-			UPDATE sale s
-					JOIN tSale ts ON ts.id = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
-				SET s.ticketFk = t.ticketFk
-				WHERE ts.itemPackingTypeFk IS NULL;
-	END CASE;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT
+			ENGINE=MEMORY
+		SELECT s.ticketFk, MAX(i.itemPackingTypeFk) itemPackingTypeFk
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+			WHERE s.ticketFk = vSelf
+			GROUP BY s.ticketFk
+		UNION
+		SELECT ticketFk, MAX(itemPackingTypeFk)
+			FROM tSalesToMove
+			GROUP BY ticketFk;

 	COMMIT;

-	DROP TEMPORARY TABLE
-		tSale,
-		tSaleGroup;
+	DROP TEMPORARY TABLE tSalesToMove;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/workerTimeControl_check.sql
+++ b/db/routines/vn/procedures/workerTimeControl_check.sql
@ -1,168 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
-proc: BEGIN
-/**
- * Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
- *
- * @param vUserFk Identificador del trabajador
- * @return Retorna si encuentra un problema 'odd','maxTimeWork','breakDay','breakWeek' ;
- *	En caso de tener algun problema retorna el primero que encuentra
- */
-	DECLARE vLastIn DATETIME ;
-	DECLARE vLastOut DATETIME ;
-	DECLARE vDayWorkMax INT;
-	DECLARE vDayBreak INT;
-	DECLARE vWeekBreak INT ;
-	DECLARE vWeekScope INT;
-	DECLARE vDayStayMax INT;
-	DECLARE vProblem VARCHAR(20) DEFAULT NULL;
-	DECLARE vTimedWorked INT;
-	DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
-	DECLARE vDepartmentFk INT;
-	DECLARE vTo VARCHAR(50) DEFAULT NULL;
-	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
-	DECLARE vBody VARCHAR(255) DEFAULT NULL;
-		
-	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax 
-		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
-		FROM workerTimeControlParams;
-
-	SELECT MAX(timed) INTO vLastIn
-		FROM workerTimeControl 
-		WHERE userFk = vUserFk 
-			AND direction = 'in';
-		
-	SELECT MAX(timed) INTO vLastOut
-		FROM workerTimeControl 
-		WHERE userFk = vUserFk 
-			AND direction = 'out'; 
-
-	SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
-		FROM account.user u
-		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);   
-		
-	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
-		FROM worker w
-		WHERE w.id = vUserFk;
-
-
-	IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-		
-		-- VERIFICAR DESCANSO DIARIO 
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
-			SELECT "Descansos 12 h" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;   
-		
-		-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
-		IF (SELECT MOD(COUNT(*),2) -- <>0 							
-				FROM workerTimeControl 
-				WHERE userFk = vUserFk
-					AND timed >= vLastIn
-			) THEN				
-			SELECT "Dias con fichadas impares" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;	  
-		END IF;
-		
-		-- VERIFICAR VACACIONES
-		SELECT at2.name INTO vCalendarStateType
-			FROM calendar c 
-				JOIN business b ON b.id = c.businessFk
-				JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
-			WHERE c.dated = util.VN_CURDATE()
-				AND at2.isAllowedToWork = FALSE
-				AND b.workerFk = vUserFk
-			LIMIT 1;
-		
-			IF(LENGTH(vCalendarStateType)) THEN
-			SELECT vCalendarStateType AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;	
-				
-			END IF;
-		
-		-- VERIFICAR CONTRATO EN VIGOR
-			IF (SELECT COUNT(*)
-					FROM business b
-					WHERE b.workerFk = vUserFk
-						AND b.started <= vDated
-						AND IFNULL(b.ended, vDated) >= vDated
-				) = 0 THEN
-				SELECT "No hay un contrato en vigor" AS problem;
-				-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-				LEAVE proc;	
-					
-			END IF;
-
-		-- VERIFICAR DESCANSO SEMANAL
-		SET @vHasBreakWeek:= FALSE;
-		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); 
-		
-		DROP TEMPORARY TABLE IF EXISTS tmp.trash;
-		CREATE TEMPORARY TABLE tmp.trash
-		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
-				@vLastTimed:= UNIX_TIMESTAMP(timed)
-			FROM workerTimeControl 
-			WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
-				AND userFk= vUserFk
-				AND direction IN ('in','out')
-			ORDER BY timed ASC;   
-			
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
-			SELECT "Descansos 36 h" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;
-		
-		DROP TEMPORARY TABLE tmp.trash;    
-
-	ELSE  -- DIA ACTUAL   
-		
-		-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
-		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked 
-			FROM workerTimeControl wtc
-			WHERE userFk = vUserFk 
-				AND timed >= vLastIn
-			ORDER BY timed;
-
-		IF  vTimedWorked > vDayWorkMax THEN 
-			SELECT "Jornadas" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;
-
-	END IF;
-
-		-- VERIFICAR DEPARTAMENTO
-	/*	IF vTabletFk IS NOT NULL  THEN
-			SELECT wtcu.departmentFk INTO vDepartmentFk
-				FROM workerTimeControlUserInfo wtcu
-				WHERE wtcu.userFk = vUserFk;
-			IF (SELECT COUNT(td.tabletFk)
-						FROM tabletDepartment td
-						WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk
-					) = 0 THEN
-					SELECT "No perteneces a este departamento." AS problem;
-					-- ENVIAMOS CORREO AL BOSSFK
-					SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
-					CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-					LEAVE proc;	
-			END IF;
-		END IF;*/
-	
-END$$
-DELIMITER ;
--- a/db/routines/vn/triggers/itemCost_beforeUpdate.sql
+++ b/db/routines/vn/triggers/itemCost_beforeUpdate.sql
@ -16,7 +16,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 				WHERE r.isOk = FALSE 
 					AND ic.itemFk = NEW.itemFk
-					AND r.created >= util.VN_CURDATE()
+					AND r.dated >= util.VN_CURDATE()
 				GROUP BY r.id;
 		IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
 			CALL mail_insert(
--- a/db/routines/vn/triggers/itemShelving_afterInsert.sql
+++ b/db/routines/vn/triggers/itemShelving_afterInsert.sql
@ -1,18 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterInsert`
-	AFTER INSERT ON `itemShelving`
-	FOR EACH ROW
-BEGIN 
-	INSERT INTO itemShelvingLog
-		SET itemShelvingFk = NEW.id,
-			workerFk = account.myUser_getId(),
-			accion = 'CREA REGISTRO',
-			itemFk = NEW.itemFk,
-			shelvingFk = NEW.shelvingFk,
-			visible = NEW.visible,
-			`grouping` = NEW.`grouping`,
-			packing = NEW.packing,
-			available = NEW.available;
-			
-END$$
-DELIMITER ;
--- a/db/routines/vn/triggers/itemShelving_afterUpdate.sql
+++ b/db/routines/vn/triggers/itemShelving_afterUpdate.sql
@ -1,18 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterUpdate`
-	AFTER UPDATE ON `itemShelving`
-	FOR EACH ROW
-BEGIN 
-	INSERT INTO itemShelvingLog
-		SET itemShelvingFk = NEW.id,
-			workerFk = account.myUser_getId(),
-			accion = 'CAMBIO',
-			itemFk = NEW.itemFk,
-			shelvingFk = NEW.shelvingFk,
-			visible = NEW.visible,
-			`grouping` = NEW.`grouping`,
-			packing = NEW.packing,
-			available = NEW.available; 
-
-END$$
-DELIMITER ;
--- a/db/routines/vn/triggers/itemShelving_beforeDelete.sql
+++ b/db/routines/vn/triggers/itemShelving_beforeDelete.sql
@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_beforeDelete`
-	BEFORE DELETE ON `itemShelving`
-	FOR EACH ROW
-INSERT INTO vn.itemShelvingLog(itemShelvingFk, 
-									workerFk, 
-									accion,
-									shelvingFk,
-									itemFk)
-						VALUES(	OLD.id,
-								account.myUser_getId(),
-								'ELIMINADO',
-								OLD.shelvingFk,
-								OLD.itemFk)$$
-DELIMITER ;
--- a/db/routines/vn/triggers/route_beforeInsert.sql
+++ b/db/routines/vn/triggers/route_beforeInsert.sql
@ -14,7 +14,7 @@ BEGIN
 			SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
 				FROM vn.routeConfig r
 					LEFT JOIN vn.business b ON b.workerFk = vUserFk
-						AND NEW.created BETWEEN b.started AND IFNULL(b.ended, NEW.created));
+						AND NEW.dated BETWEEN b.started AND IFNULL(b.ended, NEW.dated));

 	IF ISNULL(NEW.agencyModeFk) THEN
 		SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
--- a/db/routines/vn/triggers/sale_afterInsert.sql
+++ b/db/routines/vn/triggers/sale_afterInsert.sql
@ -23,7 +23,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 				WHERE r.isOk = FALSE
 					AND s.id = NEW.id
-					AND r.created >= util.VN_CURDATE()
+					AND r.dated >= util.VN_CURDATE()
 				GROUP BY r.id;
 	END IF;
 END$$
--- a/db/routines/vn/triggers/sale_afterUpdate.sql
+++ b/db/routines/vn/triggers/sale_afterUpdate.sql
@ -54,7 +54,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 				WHERE r.isOk = FALSE
 					AND s.id = NEW.id
-					AND r.created >= util.VN_CURDATE()
+					AND r.dated >= util.VN_CURDATE()
 				GROUP BY r.id;
 	END IF;

--- a/db/routines/vn/triggers/sale_beforeDelete.sql
+++ b/db/routines/vn/triggers/sale_beforeDelete.sql
@ -11,7 +11,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 				WHERE r.isOk = FALSE 
 					AND s.id = OLD.id
-					AND r.created >= util.VN_CURDATE()
+					AND r.dated >= util.VN_CURDATE()
 				GROUP BY r.id;
 	END IF;
 END$$
--- a/db/routines/vn/triggers/ticket_beforeDelete.sql
+++ b/db/routines/vn/triggers/ticket_beforeDelete.sql
@ -8,7 +8,7 @@ BEGIN
 			FROM vn.route r
 			WHERE r.isOk = FALSE 
 				AND r.id = OLD.routeFk
-				AND r.created >= util.VN_CURDATE()
+				AND r.dated >= util.VN_CURDATE()
 			GROUP BY r.id;

 	DELETE FROM sale WHERE ticketFk = OLD.id;
--- a/db/routines/vn/triggers/ticket_beforeUpdate.sql
+++ b/db/routines/vn/triggers/ticket_beforeUpdate.sql
@ -22,7 +22,7 @@ BEGIN
 				FROM `route`
 				WHERE NOT isOk
 					AND id IN (OLD.routeFk, NEW.routeFk)
-					AND created >= util.VN_CURDATE()
+					AND dated >= util.VN_CURDATE()
 				GROUP BY id;
 	END IF;

@ -45,7 +45,7 @@ BEGIN
 					JOIN vn.route r ON r.id = t.routeFk
 				WHERE r.isOk = FALSE
 					AND t.id = NEW.id
-					AND r.created >= util.VN_CURDATE()
+					AND r.dated >= util.VN_CURDATE()
 				GROUP BY r.id;
 		SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
 		SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
--- a/db/routines/vn/views/expeditionPallet_Print.sql
+++ b/db/routines/vn/views/expeditionPallet_Print.sql
@ -9,8 +9,8 @@ AS SELECT `rs2`.`description` AS `truck`,
 	`rs`.`id` <=> `rm`.`roadmapStopFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
-		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
-		ucase(dayname(`r`.`created`)),
+		`r`.`dated` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
+		ucase(dayname(`r`.`dated`)),
 		NULL
 	) AS `nombreDia`
 FROM (
--- a/db/routines/vn/views/expeditionRoute_Monitor.sql
+++ b/db/routines/vn/views/expeditionRoute_Monitor.sql
@ -6,7 +6,7 @@ AS SELECT `r`.`id` AS `routeFk`,
 	COUNT(DISTINCT `e`.`id`) AS `expeditions`,
 	COUNT(DISTINCT `es`.`id`) AS `scanned`,
 	max(`e`.`created`) AS `lastPacked`,
-	`r`.`created` AS `created`
+	`r`.`dated` AS `created`
 FROM (
 		(
 			(
@ -23,5 +23,5 @@ FROM (
 		)
 		LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`)
 	)
-WHERE `r`.`created` >= `util`.`yesterday`()
+WHERE `r`.`dated` >= `util`.`yesterday`()
 GROUP BY `r`.`id`
--- a/db/routines/vn2008/views/Rutas.sql
+++ b/db/routines/vn2008/views/Rutas.sql
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `vn2008`.`Rutas`
 AS SELECT `r`.`id` AS `Id_Ruta`,
 	`r`.`workerFk` AS `Id_Trabajador`,
-	`r`.`created` AS `Fecha`,
+	`r`.`dated` AS `Fecha`,
 	`r`.`vehicleFk` AS `Id_Vehiculo`,
 	`r`.`agencyModeFk` AS `Id_Agencia`,
 	`r`.`time` AS `Hora`,
--- a/db/versions/11312-navyAralia/00-firstScript.sql
+++ b/db/versions/11312-navyAralia/00-firstScript.sql
@ -0,0 +1,23 @@
+ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
+ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES
+		('WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr'),
+		('WorkerRelative','crud','WRITE','ALLOW','ROLE','hr'),
+		('WorkerRelative','findById','*','ALLOW','ROLE','hr'),
+		('WorkerRelative','find','*','ALLOW','ROLE','hr'),
+		('WorkerRelative','upsert','*','ALLOW','ROLE','hr'),
+		('WorkerRelative','filter','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','updateAttributes','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','crud','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','findById','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','find','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','upsert','*','ALLOW','ROLE','hr'),
+		('WorkerIrpf','filter','*','ALLOW','ROLE','hr'),
+		('DisabilityGrade','updateAttributes','*','ALLOW','ROLE','hr'),
+		('DisabilityGrade','crud','*','ALLOW','ROLE','hr'),
+		('DisabilityGrade','findById','*','ALLOW','ROLE','hr'),
+		('DisabilityGrade','find','*','ALLOW','ROLE','hr'),
+		('DisabilityGrade','upsert','*','ALLOW','ROLE','hr');
+
--- a/db/versions/11322-azureAspidistra/00-entryAcl.sql
+++ b/db/versions/11322-azureAspidistra/00-entryAcl.sql
@ -0,0 +1,40 @@
+-- Eliminar registros existentes donde property = '*'
+DELETE FROM `salix`.ACL WHERE model = 'entry' AND property = '*';
+
+-- Insertar permisos para los métodos solicitados en el modelo Entry
+INSERT INTO `salix`.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES
+    -- Permisos para administrative
+    ('Entry', 'upsert', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'isBooked', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'count', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'getEntry', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'getBuys', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'findOne', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'deleteBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'editLatestBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'importBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'importBuysPreview', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'lastItemBuys', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+    ('Entry', 'latestBuysFilter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+
+    -- Permisos para buyer (excluyendo isBooked)
+    ('Entry', 'upsert', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'findById', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'find', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'filter', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'count', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'getEntry', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'getBuys', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'findOne', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'deleteBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'editLatestBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'importBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'importBuysPreview', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'lastItemBuys', 'READ', 'ALLOW', 'ROLE', 'buyer'),
+    ('Entry', 'latestBuysFilter', 'READ', 'ALLOW', 'ROLE', 'buyer');
--- a/db/versions/11332-tealErica/00-firstScript.sql
+++ b/db/versions/11332-tealErica/00-firstScript.sql
@ -0,0 +1,4 @@
+ALTER TABLE vn.travel ADD IF NOT EXISTS isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
+
+ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
+	COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';
--- a/db/versions/11341-pinkSalal/00-firstScript.sql
+++ b/db/versions/11341-pinkSalal/00-firstScript.sql
@ -0,0 +1,5 @@
+
+ALTER TABLE vn.travel ADD IF NOT EXISTS isRaid  tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
+
+ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
+	COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';
--- a/db/versions/11351-bronzeMedeola/00-firstScript.sql
+++ b/db/versions/11351-bronzeMedeola/00-firstScript.sql
@ -0,0 +1,2 @@
+
+ALTER TABLE vn.itemConfig ADD defaultPackingTypeFk VARCHAR(1) DEFAULT 'H' NULL;
--- a/db/versions/11354-aquaMastic/00-firstScript.sql
+++ b/db/versions/11354-aquaMastic/00-firstScript.sql
@ -0,0 +1,2 @@
+RENAME TABLE vn.workerTimeControlParams TO vn.workerTimeControlParams__;
+ALTER TABLE vn.workerTimeControlParams__ COMMENT='@deprecated 2024-11-19';
--- a/db/versions/11359-navyPaniculata/00-firstScript.sql
+++ b/db/versions/11359-navyPaniculata/00-firstScript.sql
@ -0,0 +1,8 @@
+DELETE FROM vn.stateI18n
+    WHERE `name` IN ('Billed', 'Facturado', 'Assisted preparation', 'Preparación asistida', 'Shipped', 'Embarcado', 'Stowaway OK', 'Polizón OK');
+
+UPDATE vn.`state` SET nextStateFk = 43
+    WHERE nextStateFk IN (11, 27, 30, 32, 41);
+
+DELETE FROM vn.`state`
+    WHERE code IN ('INVOICED', 'ASSISTED_PREPARATION', 'BOARD', 'OK STOWAWAY', 'PARTIAL_PREPARATION');
--- a/db/versions/11366-navyBirch/00-firstScript.sql
+++ b/db/versions/11366-navyBirch/00-firstScript.sql
@ -0,0 +1,2 @@
+RENAME TABLE vn.itemShelvingLog TO vn.itemShelvingLog__;
+ALTER TABLE vn.itemShelvingLog__ COMMENT='@deprecated 2024-11-26';
--- a/db/versions/11367-grayOrchid/00-deprecate.sql
+++ b/db/versions/11367-grayOrchid/00-deprecate.sql
@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`creditInsurance` DROP COLUMN `creditClassification__`;
+ALTER TABLE `vn`.`worker` DROP COLUMN `isF11Allowed__`;
+ALTER TABLE `util`.`config` DROP COLUMN `dbVersion__`;
+ALTER TABLE `util`.`config` DROP COLUMN `hasTriggersDisabled__`;
+ALTER TABLE `vn`.`agencyMode` DROP COLUMN `showAgencyName__`;
+DROP TABLE `account`.`accountLog__`;
+DROP TABLE `vn`.`silexACL__`;
--- a/db/versions/11369-azureChrysanthemum/00-firstScript.sql
+++ b/db/versions/11369-azureChrysanthemum/00-firstScript.sql
@ -0,0 +1,5 @@
+ALTER TABLE vn.duaInvoiceIn DROP KEY IF EXISTS duaFk_UNIQUE;
+ALTER TABLE vn.duaInvoiceIn DROP KEY IF EXISTS duaInvoiceIn_unique;
+ALTER TABLE vn.duaInvoiceIn ADD CONSTRAINT duaInvoiceIn_unique
+	UNIQUE KEY (invoiceInFk);
+
--- a/db/versions/11371-salmonRuscus/00-firstScript.sql
+++ b/db/versions/11371-salmonRuscus/00-firstScript.sql
@ -0,0 +1 @@
+ALTER TABLE vn.route ADD dated DATE;
--- a/db/versions/11371-salmonRuscus/01-firstScript.sql
+++ b/db/versions/11371-salmonRuscus/01-firstScript.sql
@ -0,0 +1 @@
+UPDATE vn.route SET dated = created;
--- a/db/versions/11371-salmonRuscus/02-firstScript.sql
+++ b/db/versions/11371-salmonRuscus/02-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.route
+MODIFY COLUMN dated DATE NOT NULL;
--- a/db/versions/11371-salmonRuscus/03-firstScript.sql
+++ b/db/versions/11371-salmonRuscus/03-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.route
+MODIFY COLUMN created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -791,7 +791,7 @@ export default {
    },
    createRouteView: {
        worker: 'vn-route-create vn-worker-autocomplete[ng-model="$ctrl.route.workerFk"]',
-        createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.created"]',
+        createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.dated"]',
        vehicleAuto: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
        agency: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
        description: 'vn-route-create [ng-model="$ctrl.route.description"]',
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -241,10 +241,11 @@
 	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
 	"The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
 	"There are tickets for this area, delete them first": "There are tickets for this area, delete them first",
-	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
+	"You do not have permission to modify the booked field": "You do not have permission to modify the booked field",
 	"Invalid or expired verification code": "Invalid or expired verification code",
+	"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",
-    "The raid information is not correct": "The raid information is not correct",
    "Sales already moved": "Sales already moved",
    "There are tickets to be invoiced": "There are tickets to be invoiced for this zone, please delete them first"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -385,9 +385,11 @@
 	"type cannot be blank": "Se debe rellenar el tipo",
 	"There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero",
 	"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
+	"You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
 	"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
 	"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",
    "There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero"
 }
+
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@ -362,8 +362,9 @@
 	"The invoices have been created but the PDFs could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré",
 	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré",
 	"Cannot send mail": "Impossible d'envoyer le mail",
-	"Original invoice not found": "Facture originale introuvable",
-	"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",
+    "Original invoice not found": "Facture originale introuvable",
+    "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à"
 }
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@ -1,3 +1,4 @@
+const UserError = require('vn-loopback/util/user-error');
 const LoopBackContext = require('loopback-context');
 module.exports = Self => {
    require('../methods/entry/filter')(Self);
@ -19,11 +20,20 @@ module.exports = Self => {

        const changes = ctx.data || ctx.instance;
        const orgData = ctx.currentInstance;
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const accessToken = {req: loopBackContext.active};
+        const hasChanges = orgData && changes;
+
+        const isBookedChanged = changes.isBooked !== undefined && orgData.isBooked !== changes.isBooked;
+
+        if (isBookedChanged) {
+            const canEditIsBooked = await Self.app.models.ACL.checkAccessAcl(accessToken, 'Entry', 'isBooked', 'READ');
+            if (!canEditIsBooked)
+                throw new UserError('You do not have permission to modify the booked field');
+        }

        const observation = changes.observation || orgData.observation;
-        const hasChanges = orgData && changes;
-        const observationChanged = hasChanges
-         && orgData.observation != observation;
+        const observationChanged = hasChanges && orgData.observation != observation;

        if (observationChanged) {
            let tx;
@ -38,8 +48,7 @@ module.exports = Self => {
            }

            try {
-                const loopbackContext = LoopBackContext.getCurrentContext();
-                const userId = loopbackContext.active.accessToken.userId;
+                const userId = loopBackContext.active.accessToken.userId;
                const id = changes.id || orgData.id;
                const entry = await Self.app.models.Entry.findById(id, null, myOptions);
                await entry.updateAttribute('observationEditorFk', userId, myOptions);
--- a/modules/entry/back/models/specs/entry.spec.js
+++ b/modules/entry/back/models/specs/entry.spec.js
@ -0,0 +1,97 @@
+const {models} = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('entry_isEditable trigger', () => {
+    const activeCtx = {
+        accessToken: {userId: 5},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+    const ctx = {req: activeCtx};
+    const entryId = 1;
+    let tx;
+    let options;
+    let entry;
+
+    beforeEach(async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: ctx.req});
+        tx = await models.Entry.beginTransaction({});
+        options = {transaction: tx};
+
+        entry = await models.Entry.findById(entryId, null, options);
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    async function prepareEntry(isBooked, typeFk) {
+        let newCreated = Date.vnNew();
+        await entry.updateAttributes({isBooked, typeFk}, options);
+        await entry.updateAttributes({dated: newCreated}, options);
+    }
+
+    it('should throw an error when entry is booked and typeFk is null', async() => {
+        let error;
+        try {
+            await prepareEntry(true, null);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error.message).toContain(`Entry ${entryId} is not editable`);
+    });
+
+    it('should throw an error when entry is booked and typeFk is not informal', async() => {
+        let error;
+        try {
+            const type = await models.EntryType.findOne({where: {isInformal: false}}, options);
+            await prepareEntry(true, type.code);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error.message).toContain(`Entry ${entryId} is not editable`);
+    });
+
+    it('should not throw an error when entry is booked and typeFk is informal', async() => {
+        let error;
+        try {
+            const type = await models.EntryType.findOne({where: {isInformal: true}}, options);
+            await prepareEntry(true, type.code);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should not throw an error when entry is not booked', async() => {
+        let error;
+        try {
+            const type = await models.EntryType.findOne({}, options);
+            await prepareEntry(false, type.code);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should not throw an error when @isModeInventory is true', async() => {
+        let error;
+        try {
+            await models.Application.rawSql('SET @isModeInventory = TRUE;', null, options);
+            await prepareEntry(true, null);
+        } catch (e) {
+            error = e;
+        } finally {
+            await models.Application.rawSql('SET @isModeInventory = FALSE;', null, options);
+        }
+
+        expect(error).toBeUndefined();
+    });
+});
--- a/modules/entry/front/descriptor/index.html
+++ b/modules/entry/front/descriptor/index.html
@ -30,7 +30,7 @@
            <vn-icon
                vn-tooltip="Is virtual entry"
                icon="icon-net"
-                ng-if="$ctrl.entryData.travel.isRaid">
+               ng-if="$ctrl.entryData.travel.isRaid">
            </vn-icon>
        </div>
        <div class="quicklinks">
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@ -56,9 +56,6 @@
    "ItemShelving": {
        "dataSource": "vn"
    },
-    "ItemShelvingLog": {
-        "dataSource": "vn"
-    },
    "ItemShelvingSale": {
        "dataSource": "vn"
    },
--- a/modules/item/back/models/item-shelving-log.json
+++ b/modules/item/back/models/item-shelving-log.json
@ -1,52 +0,0 @@
-{
-	"name": "ItemShelvingLog",
-	"base": "VnModel",
-	"mixins": {
-		"Loggable": true
-	},
-	"options": {
-		"mysql": {
-			"table": "itemShelvingLog"
-		}
-	},
-	"properties": {
-		"id": {
-			"type": "number",
-			"id": true,
-			"description": "Identifier"
-		},
-		"created": {
-			"type": "date"
-		},
-		"shelvingFk": {
-			"type": "string"
-		},
-		"itemFk": {
-			"type": "number"
-		},
-		"visible": {
-			"type": "number"
-		},
-		"accion": {
-			"type": "string"
-		}
-	},
-	"relations": {
-		"item": {
-			"type": "belongsTo",
-			"model": "Item",
-			"foreignKey": "itemFk"
-		},
-		"worker": {
-			"type": "belongsTo",
-			"model": "Worker",
-			"foreignKey": "workerFk"
-		},
-		"shelving": {
-			"type": "belongsTo",
-			"model": "Shelving",
-			"foreignKey": "shelvingFk",
-			"primaryKey": "code"
-		}
-	}
-}
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@ -342,7 +342,6 @@ module.exports = Self => {
                        'CHECKED',
                        'PACKING',
                        'PACKED',
-                        'INVOICED',
                        'ON_DELIVERY',
                        'PREPARED',
                        'WAITING_FOR_PICKUP',
@ -350,10 +349,7 @@ module.exports = Self => {
                        'PRINTED_BACK',
                        'LAST_CALL',
                        'PREVIOUS_PREPARATION',
-                        'ASSISTED_PREPARATION',
-                        'BOARD',
                        'PRINTED STOWAWAY',
-                        'OK STOWAWAY',
                        'HALF_PACKED',
                        'COOLER_PREPARATION'
                    ]}};
--- a/modules/route/back/methods/agency-term/filter.js
+++ b/modules/route/back/methods/agency-term/filter.js
@ -66,9 +66,9 @@ module.exports = Self => {
            case 'agencyFk':
                return {'agencyFk': value};
            case 'from':
-                return {'created': {gte: value}};
+                return {'dated': {gte: value}};
            case 'to':
-                return {'created': {lte: value}};
+                return {'dated': {lte: value}};
            }
        });

@ -81,7 +81,7 @@ module.exports = Self => {
            `SELECT *
                FROM (
                    SELECT r.id routeFk,
-                        r.created,
+                        r.dated,
                        r.agencyModeFk,
                        am.name agencyModeName,
                        am.agencyFk,
@ -103,7 +103,7 @@ module.exports = Self => {
                        LEFT JOIN vn.ticket t ON t.routeFk = r.id
                        LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
                        LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
-                    WHERE r.created > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
+                    WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
                    GROUP BY r.id
                ) a`
            , [date]);
--- a/modules/route/back/methods/route/clone.js
+++ b/modules/route/back/methods/route/clone.js
@ -10,10 +10,10 @@ module.exports = Self => {
                description: 'The routes ids to clone'
            },
            {
-                arg: 'created',
+                arg: 'dated',
                type: 'date',
                required: true,
-                description: 'The created date for all routes'
+                description: 'The date for all routes'
            }
        ],
        returns: {
@ -26,7 +26,7 @@ module.exports = Self => {
        }
    });

-    Self.clone = async(ids, created) => {
+    Self.clone = async(ids, dated) => {
        const tx = await Self.beginTransaction({});
        try {
            const options = {transaction: tx};
@ -39,7 +39,7 @@ module.exports = Self => {
                throw new Error(`The amount of routes found don't match`);

            const routes = originalRoutes.map(route => {
-                route.created = created;
+                route.dated = dated;
                return route;
            });

--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@ -93,9 +93,9 @@ module.exports = Self => {
            case 'search':
                return {'id': value};
            case 'from':
-                return {'created': {gte: value}};
+                return {'dated': {gte: value}};
            case 'to':
-                return {'created': {lte: value}};
+                return {'dated': {lte: value}};
            case 'description':
                return {'description': {like: `%${value}%`}};
            case 'isOk':
@ -119,7 +119,7 @@ module.exports = Self => {
                    SELECT
                        r.id,
                        r.workerFk,
-                        r.created,
+                        r.dated,
                        r.vehicleFk,
                        r.agencyModeFk,
                        r.time,
--- a/modules/route/back/methods/route/getByWorker.js
+++ b/modules/route/back/methods/route/getByWorker.js
@ -46,14 +46,14 @@ module.exports = Self => {
                and: [
                    {
                        or: [
-                            {'created': currentDate},
-                            {'created': nextDay}
+                            {'dated': currentDate},
+                            {'dated': nextDay}
                        ]
                    }
                ]
            },
            order: [
-                'created ASC',
+                'dated ASC',
                'time ASC',
                'agencyName ASC'
            ]
--- a/modules/route/back/methods/route/getSuggestedTickets.js
+++ b/modules/route/back/methods/route/getSuggestedTickets.js
@ -43,10 +43,10 @@ module.exports = Self => {
        for (let zoneAgencyMode of zoneAgencyModes)
            zoneIds.push(zoneAgencyMode.zoneFk);

-        const minDate = new Date(route.created);
+        const minDate = new Date(route.dated);
        minDate.setHours(0, 0, 0, 0);

-        const maxDate = new Date(route.created);
+        const maxDate = new Date(route.dated);
        maxDate.setHours(23, 59, 59, 59);

        let tickets = await Self.app.models.Ticket.find({
--- a/modules/route/back/methods/route/insertTicket.js
+++ b/modules/route/back/methods/route/insertTicket.js
@ -42,10 +42,10 @@ module.exports = Self => {

        try {
            const route = await models.Route.findById(routeId, null, myOptions);
-            const minDate = new Date(route.created);
+            const minDate = new Date(route.dated);
            minDate.setHours(0, 0, 0, 0);

-            const maxDate = new Date(route.created);
+            const maxDate = new Date(route.dated);
            maxDate.setHours(23, 59, 59, 59);
            const ticket = await models.Ticket.findOne({
                where: {
--- a/modules/route/back/models/route.json
+++ b/modules/route/back/models/route.json
@ -15,7 +15,7 @@
            "id": true,
            "description": "Identifier"
        },
-        "created": {
+        "dated": {
            "type": "date"
        },
        "time": {
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@ -32,7 +32,7 @@
        <div class="attributes">
            <vn-label-value
                label="Date"
-                value="{{$ctrl.route.created | date: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.route.dated | date: 'dd/MM/yyyy'}}">
            </vn-label-value>
            <vn-label-value
                label="Agency"
--- a/modules/route/front/descriptor/index.js
+++ b/modules/route/front/descriptor/index.js
@ -48,7 +48,7 @@ class Controller extends Descriptor {
                'id',
                'workerFk',
                'agencyModeFk',
-                'created',
+                'dated',
                'm3',
                'warehouseFk',
                'description',
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@ -14,7 +14,7 @@
                value="{{$ctrl.summary.route.id}}">
            </vn-label-value>
            <vn-label-value label="Date"
-                value="{{$ctrl.summary.route.created | date: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.route.dated | date: 'dd/MM/yyyy'}}">
            </vn-label-value>
            <vn-label-value label="Agency"
                value="{{$ctrl.summary.route.agencyMode.name}}">
--- a/modules/supplier/back/methods/supplier/getWithPackaging.js
+++ b/modules/supplier/back/methods/supplier/getWithPackaging.js
@ -15,7 +15,7 @@ module.exports = Self => {
    Self.getWithPackaging = async options => {
        const models = Self.app.models;
        const myOptions = {};
-        const oneYearAgo = new Date();
+        const oneYearAgo = Date.vnNew();
        oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);

        if (typeof options == 'object')
--- a/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js
@ -1,26 +1,12 @@
 const {models} = require('vn-loopback/server/server');

 describe('Supplier getWithPackaging()', () => {
+    beforeAll.mockLoopBackContext();
    it('should return a list of suppliers with an entry of type packaging', async() => {
-        const typeFk = 'packaging';
-
        const tx = await models.Supplier.beginTransaction({});
        const myOptions = {transaction: tx};

        try {
-            const entry = await models.Entry.findOne(
-                {
-                    where: {
-                        id: 1
-                    },
-                    myOptions
-                });
-
-            await entry.updateAttributes({
-                typeFk: typeFk,
-                created: new Date()
-            });
-
            const result = await models.Supplier.getWithPackaging(myOptions);

            expect(result.length).toEqual(1);
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@ -265,7 +265,8 @@ module.exports = Self => {
                            FROM sale s2
                            JOIN item i2 ON i2.id = s2.itemFk
                            WHERE s2.ticketFk = t.id
-                        ) AS packing
+                        ) AS packing,
+                        c.credit
                   FROM ticket t
                       LEFT JOIN invoiceOut io ON t.refFk = io.ref
                       LEFT JOIN zone z ON z.id = t.zoneFk
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@ -154,8 +154,8 @@ module.exports = Self => {
                    t.landingHour,
                    t.cargoSupplierFk,
                    t.totalEntries,
-                    t.daysInForward,
                    t.isRaid,
+                    t.daysInForward,
                    am.name agencyModeName,
                    win.name warehouseInName,
                    wout.name warehouseOutName,
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@ -86,30 +86,30 @@ module.exports = Self => {
                'Tipo Documento': 'description',
                'Stored on': 'created',
                'Document ID': 'id',
-                'URL': 'download',
+                'URL': 'url',
                'Stored by': 'name',
                'Estado': 'state'
            };

            workerDocuware =
-                await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
-            const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
+                await models.Docuware.getById('hr', worker?.lastName + ' ' + worker?.firstName, docuwareParse) ?? [];
+
            for (document of workerDocuware) {
-                const docuwareId = document.id;
+                const {id: documentId, dmsFk} = document;
                const defaultData = {
-                    id: docuwareId,
+                    id: documentId,
                    workerFk: id,
-                    dmsFk: docuwareId,
+                    dmsFk: dmsFk,
                    dms: {
-                        id: docuwareId,
-                        file: docuwareId + '.pdf',
+                        id: documentId,
+                        file: dmsFk + '.pdf',
                        isDocuware: true,
                        hasFile: false,
-                        reference: worker.fi,
-                        dmsFk: docuwareId,
-                        url,
+                        reference: worker?.fi,
+                        dmsFk: dmsFk,
+                        url: document.url,
+                        download: `WorkerDms/${document.dmsFk}/docuwareDownload`,
                        description: document.description + ' - ' + document.state,
-                        download: document.download,
                        created: document.created,
                        dmsType: {name: 'Docuware'},
                        worker: {id: null, user: {name: document.name}},
--- a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
+++ b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
@ -16,7 +16,7 @@ module.exports = Self => {
    });

    Self.checkInbox = async() => {
-        let imapConfig = await Self.app.models.WorkerTimeControlParams.findOne();
+        let imapConfig = await Self.app.models.WorkerTimeControlConfig.findOne();
        let imap = new Imap({
            user: imapConfig.mailUser,
            password: imapConfig.mailPass,
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@ -58,9 +58,8 @@ module.exports = Self => {
            if (!isSubordinate || (isSubordinate && userId == id && !isTeamBoss))
                throw new UserError(`You don't have enough privileges`);

-            const labour = await models.WorkerLabour.findById(args.businessFk, {
-                include: {relation: 'department'}
-            }, myOptions);
+            const labour = await models.WorkerLabour.findById(args.businessFk,
+                {fields: ['started', 'ended', 'businessFk']}, myOptions);

            if (args.dated < labour.started || (labour.ended != null && args.dated > labour.ended))
                throw new UserError(`The contract was not active during the selected date`);
@ -87,7 +86,8 @@ module.exports = Self => {
                `SELECT COUNT(*) halfHolidayCounter
                    FROM vn.calendar c
                        JOIN vn.business b ON b.id = c.businessFk
-                    WHERE c.dayOffTypeFk = 6
+                        JOIN vn.absenceType at ON at.id = c.dayOffTypeFk
+                    WHERE at.code = 'halfHoliday'
                        AND b.workerFk = ?
                        AND c.dated BETWEEN util.firstDayOfYear(?)
                        AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
@ -119,25 +119,23 @@ module.exports = Self => {
                dated: args.dated
            }, myOptions);

-            const department = labour.department();
-            if (department && department.notificationEmail) {
-                const absenceType = await models.AbsenceType.findById(args.absenceTypeId, null, myOptions);
-                const account = await models.VnUser.findById(userId, null, myOptions);
-                const subordinated = await models.VnUser.findById(id, null, myOptions);
-                const url = await Self.app.models.Url.getUrl();
-                const body = $t('Created absence', {
-                    author: account.nickname,
-                    employee: subordinated.nickname,
-                    absenceType: absenceType.name,
-                    dated: formatDate(args.dated),
-                    workerUrl: `${url}worker/${id}/calendar`
-                });
-                await models.Mail.create({
-                    subject: $t('Absence change notification on the labour calendar'),
-                    body: body,
-                    receiver: department.notificationEmail
-                }, myOptions);
-            }
+            const account = await models.VnUser.findById(userId, null, myOptions);
+            const subordinated = await models.VnUser.findById(id, null, myOptions);
+            const worker = await models.Worker.findById(subordinated.id, null, myOptions);
+            const departmentBoss = await models.VnUser.findById(worker.bossFk, null, myOptions);
+            const url = await Self.app.models.Url.getUrl();
+            const body = $t('Created absence', {
+                author: account.nickname,
+                employee: subordinated.nickname,
+                absenceType: absenceType.name,
+                dated: formatDate(args.dated),
+                workerUrl: `${url}worker/${id}/calendar`
+            });
+            await models.Mail.create({
+                subject: $t('Absence change notification on the labour calendar'),
+                body: body,
+                receiver: departmentBoss.email
+            }, myOptions);

            if (tx) await tx.commit();

--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@ -113,9 +113,6 @@
    "WorkerTimeControlConfig": {
        "dataSource": "vn"
    },
-    "WorkerTimeControlParams": {
-        "dataSource": "vn"
-    },
    "WorkerTimeControlMail": {
        "dataSource": "vn"
    },
@ -125,6 +122,15 @@
    "Locker": {
        "dataSource": "vn"
    },
+    "WorkerIrpf": {
+        "dataSource": "vn"
+    },
+    "DisabilityGrade": {
+        "dataSource": "vn"
+    },
+    "WorkerRelative": {
+        "dataSource": "vn"
+    },
    "MedicalReview": {
        "dataSource": "vn"
    },
--- a/modules/worker/back/models/disability-grade.json
+++ b/modules/worker/back/models/disability-grade.json
@ -0,0 +1,18 @@
+{
+	"name": "DisabilityGrade",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "disabilityGrade"
+		}
+	},
+	"properties": {
+		"id": {
+			"id": true,
+			"type": "number"
+		},
+		"description": {
+			"type": "string"
+		}
+	}
+}
--- a/modules/worker/back/models/worker-irpf.json
+++ b/modules/worker/back/models/worker-irpf.json
@ -0,0 +1,55 @@
+{
+    "name": "WorkerIrpf",
+    "description": "Model 145 IRPF",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerIrpf"
+        }
+    },
+    "properties": {
+        "workerFk": {
+            "type": "number",
+            "id": 1,
+            "description": "Identifier"
+        },
+        "spouseNif": {
+            "type": "string"
+        },
+        "geographicMobilityDate": {
+            "type": "date"
+        },
+        "disabilityGradeFk": {
+            "type" : "number"
+        },
+        "isDependend": {
+            "type" : "number"
+        },
+        "familySituation": {
+            "type" : "number"
+        },
+        "spousePension": {
+            "type" : "number"
+        },
+        "childPension": {
+            "type" : "number"
+        },
+        "hasHousingPaymentBefore": {
+            "type" : "number"
+        },
+        "hasHousingPaymentAfter": {
+            "type" : "number"
+        },
+        "updated": {
+            "type" : "date"
+        }
+
+    },
+    "relations": {
+        "disabilityGrade": {
+            "type": "belongsTo",
+            "model": "disabilityGrade",
+            "foreignKey": "disabilityGradeFk"
+        }
+    }
+}
--- a/modules/worker/back/models/worker-relatives.json
+++ b/modules/worker/back/models/worker-relatives.json
@ -0,0 +1,53 @@
+{
+    "name": "WorkerRelative",
+    "description": "Model 145 IRPF",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerRelatives"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "workerFk": {
+            "type": "number"
+        },
+        "isDescendant": {
+            "type": "number"
+        },
+        "disabilityGradeFk": {
+            "type" : "number"
+        },
+        "birthed": {
+            "type" : "number"
+        },
+        "adoptionYear": {
+            "type" : "number"
+        },
+        "isDependend": {
+            "type" : "boolean"
+        },
+        "isJointCustody": {
+            "type" : "boolean"
+        },
+        "updated": {
+            "type" : "date"
+        }
+    },
+    "relations": {
+        "disabilityGrade": {
+            "type": "belongsTo",
+            "model": "disabilityGrade",
+            "foreignKey": "disabilityGradeFk"
+        },
+        "worker": {
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "workerFK"
+        }
+    }
+}
--- a/modules/worker/back/models/worker-time-control-config.json
+++ b/modules/worker/back/models/worker-time-control-config.json
@ -11,6 +11,15 @@
            "id": true,
            "type": "number"
        },
+        "mailPass": {
+            "type": "string"
+        },
+        "mailHost": {
+            "type": "string"
+        },
+        "mailUser": {
+            "type": "string"
+        },
        "breakTime": {
            "type": "number"
        },
@ -23,5 +32,13 @@
        "teleworkingStartBreakTime": {
            "type": "number"
        }
-    }
+    },
+    "acls": [
+      {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+      }
+    ]
 }
--- a/modules/worker/back/models/worker-time-control-params.json
+++ b/modules/worker/back/models/worker-time-control-params.json
@ -1,35 +0,0 @@
-{
-    "name": "WorkerTimeControlParams",
-    "description": "imap config",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "workerTimeControlParams"
-        }
-    },
-    "properties": {
-        "mailHost": {
-            "type": "string"
-        },
-        "mailUser": {
-            "type": "string"
-        },
-        "mailPass": {
-            "type": "string"
-        },
-        "mailSuccessFolder": {
-            "type": "string"
-        },
-        "mailErrorFolder": {
-            "type": "string"
-        }
-    },
-    "acls": [
-      {
-        "accessType": "READ",
-        "principalType": "ROLE",
-        "principalId": "$everyone",
-        "permission": "ALLOW"
-      }
-    ]
-}
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -132,6 +132,16 @@
            "type": "hasMany",
            "model": "WorkerTimeControlMail",
            "foreignKey": "workerFk"
+        },
+        "irpf": {
+            "type": "hasMany",
+            "model": "WorkerIrpf",
+            "foreignKey": "workerFk"
+        },
+        "workerRelative": {
+            "type": "hasMany",
+            "model": "WorkerRelative",
+            "foreignKey": "workerFK"
        }
    },
    "acls": [
--- a/myt.config.yml
+++ b/myt.config.yml
@ -258,7 +258,6 @@ localFixtures:
    - itemFamily
    - itemLog
    - itemShelving
-    - itemShelvingLog
    - itemShelvingSale
    - itemTag
    - itemTaxCountry
@ -385,7 +384,6 @@ localFixtures:
    - workerTimeControl
    - workerTimeControlConfig
    - workerTimeControlMail
-    - workerTimeControlParams
    - zone
    - zoneAgencyMode
    - zoneClosure
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "24.48.0",
+    "version": "24.50.0",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@ -16,7 +16,7 @@
                                </tr>
                                <tr>
                                    <th class="font gray align-right">{{$t('date')}}</th>
-                                    <td>{{formatDate(route.created, '%d-%m-%Y')}}</td>
+                                    <td>{{formatDate(route.dated, '%d-%m-%Y')}}</td>
                                    <th class="font gray align-right">{{$t('vehicle')}}</th>
                                    <td>{{route.vehicleTradeMark}} {{route.vehicleModel}}</td>
                                </tr>
--- a/print/templates/reports/driver-route/sql/routes.sql
+++ b/print/templates/reports/driver-route/sql/routes.sql
@ -1,6 +1,6 @@
 SELECT r.id,
        r.m3,
-        r.created,
+        r.dated,
        r.time,
        u.nickName userNickName,
        v.tradeMark vehicleTradeMark,
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@ -4,7 +4,7 @@ SELECT ep.id palletFk,
 		r.description `zone`,
 		COUNT(es.id) labels,
 		t.warehouseFk warehouseFk,
-		dayname(r.created) `dayName`,
+		dayname(r.dated) `dayName`,
 		rs.id <=> rm.roadmapStopFk isMatch
 	FROM vn.roadmapStop rs
 		JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id
				`@ -0,0 +1,2 @@`

				`ALTER TABLE vn.itemConfig ADD defaultPackingTypeFk VARCHAR(1) DEFAULT 'H' NULL;`