63 changed files with 636 additions and 622 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@ -36,7 +36,3 @@ 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,10 +28,9 @@ describe('ticket assign()', () => {
        await tx.rollback();
    });

-    it('should throw an error when there are no picking tickets', async() => {
+    it('should throw an error when  there is not 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/mrw-config/cancelShipment.js
+++ b/back/methods/mrw-config/cancelShipment.js
@ -24,13 +24,12 @@ module.exports = Self => {

    Self.cancelShipment = async expeditionFk => {
        const models = Self.app.models;
+
        const mrw = await models.MrwConfig.findOne();
        const {externalId} = await models.Expedition.findById(expeditionFk);
        const clientType = await models.MrwConfig.getClientType(expeditionFk);
        const template = fs.readFileSync(__dirname + '/cancelShipment.ejs', 'utf-8');
        const renderedXml = ejs.render(template, {mrw, externalId, clientType});
-
-        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', renderedXml]);
        const response = await axios.post(mrw.url, renderedXml, {
            headers: {
                'Content-Type': 'application/soap+xml; charset=utf-8'
@ -38,11 +37,12 @@ module.exports = Self => {
        });

        const xmlString = response.data;
-        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipmentResponse', xmlString]);
        const parser = new DOMParser();
        const xmlDoc = parser.parseFromString(xmlString, 'text/xml');

+        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
+
        const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
-        return ['no se ha encontrado', 'se ha cancelado correctamente'].some(res => result.toLowerCase().includes(res));
+        return result.toLowerCase().includes('se ha cancelado correctamente');
    };
 };
--- 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 || 'development'
+                environment: process.env.NODE_ENV || 'dev'
            }
        });
        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 workerTimeControlConfig wtcc
+                    FROM workerTimeControlParams wtcp
                        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()) > wtcc.dayBreak;`
+                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcp.dayBreak;`
        , [userId, code, model, userId, code], myOptions);
    };
 };
--- a/back/model-config.json
+++ b/back/model-config.json
@ -133,9 +133,6 @@
    "Postcode": {
        "dataSource": "vn"
    },
-    "Prefix": {
-        "dataSource": "vn"
-    },
    "ReferenceRate": {
        "dataSource": "vn"
    },
--- a/back/models/prefix.json
+++ b/back/models/prefix.json
@ -1,27 +0,0 @@
-{
-    "name": "Prefix",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "pbx.prefix"
-        }
-    },
-    "properties": {
-        "country": {
-            "type": "string",
-            "id": true
-        },
-        "prefix": {
-            "type": "string"
-        }
-    },
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "employee",
-            "permission": "ALLOW"
-        }
-    ]
-}
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -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`, `typeFk`)
+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, '', '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');
+        (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`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@ -2521,6 +2521,10 @@ 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`)
@ -4004,9 +4008,6 @@ 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);

@ -4024,12 +4025,10 @@ 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');

 INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
 	VALUES ('saysimle-url-mock', 1320);
-
-INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
-	VALUES (1106,'26493101E','2019-09-20');
--- 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(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
+				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
@ -39,8 +39,7 @@ 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
-			GROUP BY it.taxTypeSageFk;
+				AND d.id IS NULL;

 	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,7 +6,8 @@ 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/timeWorkerControl_getDirection.sql
+++ b/db/routines/vn/functions/timeWorkerControl_getDirection.sql
@ -0,0 +1,65 @@
+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,18 +9,16 @@ BEGIN
 *
 * @param vSelf Id de entrada
 */
-	DECLARE vIsNotEditable BOOL DEFAULT FALSE;
+	DECLARE vIsEditable BOOL;

-	SELECT TRUE INTO vIsNotEditable
+	SELECT e.isBooked INTO vIsEditable
 		FROM `entry` e
-			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);
+			JOIN entryType et ON et.code = e.typeFk 
+		WHERE NOT et.isInformal
+			AND e.id = vSelf;

-	IF vIsNotEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
-
 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.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;

 	-- 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.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;
 		
 	-- Actualización del registro original		
 	UPDATE invoiceIn ii
--- a/db/routines/vn/procedures/itemShelvingLog_get.sql
+++ b/db/routines/vn/procedures/itemShelvingLog_get.sql
@ -0,0 +1,36 @@
+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/route_calcCommission.sql
+++ b/db/routines/vn/procedures/route_calcCommission.sql
@ -23,15 +23,14 @@ BEGIN
 		DELETE FROM routeCommission
 			WHERE routeFk = vSelf;

-		SELECT w.isFreelance, v.isKmTruckRate, p.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
+		SELECT w.isFreelance, v.isKmTruckRate, c.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
 			FROM route r
 				JOIN worker w ON w.id = r.workerFk
 				JOIN vehicle v ON v.id = r.vehicleFk
 				LEFT JOIN ticket t ON t.routeFk = r.id
-				LEFT JOIN address a ON a.id = t.addressFk
-				LEFT JOIN province p ON p.id = a.provinceFk
+				LEFT JOIN client c ON c.id = t.clientFk
 			WHERE r.id = vSelf
-			GROUP BY p.countryFk
+			GROUP BY c.countryFk
 			ORDER BY COUNT(*) DESC
 			LIMIT 1;

@ -91,9 +90,7 @@ BEGIN
 						(r.kmEnd - r.kmStart) *
 							IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
 						IFNULL(r.m3, 0) *
-							IF(v.isKmTruckRate,
-								IFNULL(wc.deliveryM3Cat5, rc.deliveryM3Cat5),
-								IFNULL(wc.deliveryM3Cat4, rc.deliveryM3Cat4)),
+							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
 						(r.kmEnd - r.kmStart) * rc.kmYearly,
 						IFNULL(r.m3, 0) * rc.m3Yearly,
 						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
--- 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
 /**
- * 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.
+ * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
+ * Respeta el id inicial para el tipo propuesto.
 *
- * @param vSelf Id del ticket original
- * @param vOriginalItemPackingTypeFk Tipo de empaquetado a mantener en el ticket original
+ * @param vSelf Id ticket
+ * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
 * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 */
-	DECLARE vIsDone BOOLEAN DEFAULT FALSE;
-	DECLARE vCurrentPackingType VARCHAR(1);
-	DECLARE vDefaultPackingType VARCHAR(1);
-	DECLARE vHasOriginalPackingType BOOLEAN;
+	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
 	DECLARE vNewTicketFk INT;
-	DECLARE vTicketFk INT;
+	DECLARE vPackingTypesToSplit INT;
+	DECLARE vDone INT DEFAULT FALSE;

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

-	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;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

 	START TRANSACTION;

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

-	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
-		SELECT s.id, i.itemPackingTypeFk
+	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
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-			WHERE s.ticketFk = vSelf
-				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
+			WHERE s.ticketFk = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
+		ENGINE = MEMORY
+		SELECT itemPackingTypeFk, SUM(litros) totalLitros
+			FROM tSale
+			GROUP BY itemPackingTypeFk;
+
+	SELECT COUNT(*) INTO vPackingTypesToSplit
+		FROM tSaleGroup
+		WHERE itemPackingTypeFk IS NOT NULL;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+		ticketFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE = MEMORY;
+
+	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;
+
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				VALUES(vSelf, vItemPackingTypeFk);

-	OPEN vItemPackingTypes;
 			l: LOOP
-		SET vIsDone = FALSE;
-		FETCH vItemPackingTypes INTO vCurrentPackingType;
+				SET vDone = FALSE;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;

-		IF vIsDone THEN
+				IF vDone THEN
 					LEAVE l;
 				END IF;

 				CALL ticket_Clone(vSelf, vNewTicketFk);

-		SELECT id INTO vTicketFk
-			FROM ticket t
-			WHERE t.id = vNewTicketFk
+				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 tSalesToMove
-			SET ticketFk = vNewTicketFk
-			WHERE itemPackingTypeFk = vCurrentPackingType;
-
-		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;
-
-	END LOOP;
-	CLOSE vItemPackingTypes;
-
 			UPDATE sale s
-			JOIN tSalesToMove t ON t.saleFk = s.id
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
 				SET s.ticketFk = t.ticketFk;

-	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;
+			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;

 	COMMIT;

-	DROP TEMPORARY TABLE tSalesToMove;
+	DROP TEMPORARY TABLE
+		tSale,
+		tSaleGroup;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/workerTimeControl_check.sql
+++ b/db/routines/vn/procedures/workerTimeControl_check.sql
@ -0,0 +1,168 @@
+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/itemShelving_afterInsert.sql
+++ b/db/routines/vn/triggers/itemShelving_afterInsert.sql
@ -0,0 +1,18 @@
+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
@ -0,0 +1,18 @@
+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
@ -0,0 +1,15 @@
+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/versions/11312-navyAralia/00-firstScript.sql
+++ b/db/versions/11312-navyAralia/00-firstScript.sql
@ -1,23 +0,0 @@
-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
@ -1,40 +0,0 @@
-- 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
@ -1,4 +0,0 @@
-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
@ -1,5 +0,0 @@
-
-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
@ -1,2 +0,0 @@
-
-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
@ -1,2 +0,0 @@
-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
@ -1,8 +0,0 @@
-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/11363-silverCarnation/00-firstScript.sql
+++ b/db/versions/11363-silverCarnation/00-firstScript.sql
@ -1,7 +0,0 @@
-ALTER TABLE vn.workCenterCommission ADD IF NOT EXISTS deliveryM3Cat4 DECIMAL(5,2) DEFAULT NULL NULL;
-ALTER TABLE vn.workCenterCommission ADD IF NOT EXISTS deliveryM3Cat5 DECIMAL(5,2) DEFAULT NULL NULL;
-
-INSERT IGNORE  INTO vn.workCenterCommission (workCenterFk, deliveryM3Cat4, deliveryM3Cat5)
-	VALUES (5,8.0,8.0);
-
-
--- a/db/versions/11366-navyBirch/00-firstScript.sql
+++ b/db/versions/11366-navyBirch/00-firstScript.sql
@ -1,2 +0,0 @@
-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
@ -1,7 +0,0 @@
-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
@ -1,5 +0,0 @@
-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/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -241,10 +241,10 @@
 	"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",
-	"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",
+	"Invalid or expired verification code": "Invalid or expired verification code",
 	"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"
+
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -385,10 +385,8 @@
 	"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"
 }
-
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@ -364,7 +364,6 @@
 	"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",
-    "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/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@ -54,7 +54,7 @@ module.exports = Self => {
                {
                    relation: 'country',
                    scope: {
-                        fields: ['id', 'name', 'code'],
+                        fields: ['id', 'name'],
                        include: {
                            relation: 'saySimpleCountry',
                        }
--- a/modules/entry/back/methods/entry/labelSupplier.js
+++ b/modules/entry/back/methods/entry/labelSupplier.js
@ -1,6 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
-    Self.remoteMethodCtx('labelSupplier', {
+    Self.remoteMethodCtx('print', {
        description: 'Print stickers of all entries',
        accessType: 'READ',
        accepts: [
@ -28,13 +28,13 @@ module.exports = Self => {
            }
        ],
        http: {
-            path: '/:id/labelSupplier',
+            path: '/:id/print',
            verb: 'GET'
        },
        accessScopes: ['DEFAULT', 'read:multimedia']
    });

-    Self.labelSupplier = async function(ctx, id, options) {
+    Self.print = async function(ctx, id, options) {
        const models = Self.app.models;
        const myOptions = {};
        if (typeof options == 'object')
@ -49,7 +49,7 @@ module.exports = Self => {
            if (buy.stickers < 1) continue;
            ctx.args.id = buy.id;
            ctx.args.copies = buy.stickers;
-            const pdfBuffer = await models.Entry.buyLabelSupplier(ctx, myOptions);
+            const pdfBuffer = await models.Entry.buyLabel(ctx, myOptions);
            await merger.add(new Uint8Array(pdfBuffer[0]));
        }

--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@ -1,4 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
 const LoopBackContext = require('loopback-context');
 module.exports = Self => {
    require('../methods/entry/filter')(Self);
@ -12,7 +11,7 @@ module.exports = Self => {
    require('../methods/entry/addFromPackaging')(Self);
    require('../methods/entry/addFromBuy')(Self);
    require('../methods/entry/buyLabel')(Self);
-    require('../methods/entry/labelSupplier')(Self);
+    require('../methods/entry/print')(Self);
    require('../methods/entry/buyLabelSupplier')(Self);

    Self.observe('before save', async function(ctx, options) {
@ -20,20 +19,11 @@ 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 observationChanged = hasChanges && orgData.observation != observation;
+        const hasChanges = orgData && changes;
+        const observationChanged = hasChanges
+         && orgData.observation != observation;

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

            try {
-                const userId = loopBackContext.active.accessToken.userId;
+                const loopbackContext = LoopBackContext.getCurrentContext();
+                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
@ -1,97 +0,0 @@
-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/item/back/methods/item-shelving/getListItemNewer.js
+++ b/modules/item/back/methods/item-shelving/getListItemNewer.js
@ -51,7 +51,7 @@ module.exports = Self => {
                            JOIN vn.productionConfig pc
                        WHERE sh.code = ? AND s.code = pc.sectorFromCode
                    ), tItemInSector  AS (
-                    SELECT is2.itemFk, is2.created, sh.code
+                    SELECT is2.itemFk, is2.created, is2.shelvingFk
                        FROM vn.itemShelving is2
                            JOIN vn.shelving sh ON sh.id = is2.shelvingFk
                            JOIN vn.parking p ON p.id = sh.parkingFk
@ -59,7 +59,7 @@ module.exports = Self => {
                            JOIN vn.productionConfig pc
                        WHERE sh.code <> ?
                        AND s.code = pc.sectorFromCode)
-            SELECT ti.itemFK, tis.code shelvingFk
+            SELECT ti.itemFK, tis.shelvingFk
                    FROM tItemShelving ti
                        JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
                        JOIN vn.productionConfig pc
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@ -56,6 +56,9 @@
    "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
@ -0,0 +1,52 @@
+{
+	"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,6 +342,7 @@ module.exports = Self => {
                        'CHECKED',
                        'PACKING',
                        'PACKED',
+                        'INVOICED',
                        'ON_DELIVERY',
                        'PREPARED',
                        'WAITING_FOR_PICKUP',
@ -349,7 +350,10 @@ module.exports = Self => {
                        'PRINTED_BACK',
                        'LAST_CALL',
                        'PREVIOUS_PREPARATION',
+                        'ASSISTED_PREPARATION',
+                        'BOARD',
                        'PRINTED STOWAWAY',
+                        'OK STOWAWAY',
                        'HALF_PACKED',
                        'COOLER_PREPARATION'
                    ]}};
--- 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 = Date.vnNew();
+        const oneYearAgo = new Date();
        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,12 +1,26 @@
 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/expedition/deleteExpeditions.js
+++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js
@ -52,8 +52,7 @@ module.exports = Self => {

                const deletedExpedition = await models.Expedition.destroyById(expeditionId);
                deletedExpeditions.push(deletedExpedition);
-            } catch (error) {
-                console.error('error: ', error);
+            } catch (e) {
                notDeletedExpeditions.push(expeditionId);
            }
        }
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@ -265,8 +265,7 @@ module.exports = Self => {
                            FROM sale s2
                            JOIN item i2 ON i2.id = s2.itemFk
                            WHERE s2.ticketFk = t.id
-                        ) AS packing,
-                        c.credit
+                        ) AS packing
                   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.isRaid,
                    t.daysInForward,
+                    t.isRaid,
                    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': 'url',
+                'URL': 'download',
                'Stored by': 'name',
                'Estado': 'state'
            };

            workerDocuware =
-                await models.Docuware.getById('hr', worker?.lastName + ' ' + worker?.firstName, docuwareParse) ?? [];
-
+                await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
+            const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
            for (document of workerDocuware) {
-                const {id: documentId, dmsFk} = document;
+                const docuwareId = document.id;
                const defaultData = {
-                    id: documentId,
+                    id: docuwareId,
                    workerFk: id,
-                    dmsFk: dmsFk,
+                    dmsFk: docuwareId,
                    dms: {
-                        id: documentId,
-                        file: dmsFk + '.pdf',
+                        id: docuwareId,
+                        file: docuwareId + '.pdf',
                        isDocuware: true,
                        hasFile: false,
-                        reference: worker?.fi,
-                        dmsFk: dmsFk,
-                        url: document.url,
-                        download: `WorkerDms/${document.dmsFk}/docuwareDownload`,
+                        reference: worker.fi,
+                        dmsFk: docuwareId,
+                        url,
                        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.WorkerTimeControlConfig.findOne();
+        let imapConfig = await Self.app.models.WorkerTimeControlParams.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,8 +58,9 @@ 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,
-                {fields: ['started', 'ended', 'businessFk']}, myOptions);
+            const labour = await models.WorkerLabour.findById(args.businessFk, {
+                include: {relation: 'department'}
+            }, 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`);
@ -86,8 +87,7 @@ module.exports = Self => {
                `SELECT COUNT(*) halfHolidayCounter
                    FROM vn.calendar c
                        JOIN vn.business b ON b.id = c.businessFk
-                        JOIN vn.absenceType at ON at.id = c.dayOffTypeFk
-                    WHERE at.code = 'halfHoliday'
+                    WHERE c.dayOffTypeFk = 6
                        AND b.workerFk = ?
                        AND c.dated BETWEEN util.firstDayOfYear(?)
                        AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
@ -119,10 +119,11 @@ 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 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,
@ -134,8 +135,9 @@ module.exports = Self => {
                await models.Mail.create({
                    subject: $t('Absence change notification on the labour calendar'),
                    body: body,
-                receiver: departmentBoss.email
+                    receiver: department.notificationEmail
                }, myOptions);
+            }

            if (tx) await tx.commit();

--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@ -113,6 +113,9 @@
    "WorkerTimeControlConfig": {
        "dataSource": "vn"
    },
+    "WorkerTimeControlParams": {
+        "dataSource": "vn"
+    },
    "WorkerTimeControlMail": {
        "dataSource": "vn"
    },
@ -122,15 +125,6 @@
    "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
@ -1,18 +0,0 @@
-{
-	"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
@ -1,55 +0,0 @@
-{
-    "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
@ -1,53 +0,0 @@
-{
-    "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,15 +11,6 @@
            "id": true,
            "type": "number"
        },
-        "mailPass": {
-            "type": "string"
-        },
-        "mailHost": {
-            "type": "string"
-        },
-        "mailUser": {
-            "type": "string"
-        },
        "breakTime": {
            "type": "number"
        },
@ -32,13 +23,5 @@
        "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
@ -0,0 +1,35 @@
+{
+    "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,16 +132,6 @@
            "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,6 +258,7 @@ localFixtures:
    - itemFamily
    - itemLog
    - itemShelving
+    - itemShelvingLog
    - itemShelvingSale
    - itemTag
    - itemTaxCountry
@ -384,6 +385,7 @@ localFixtures:
    - workerTimeControl
    - workerTimeControlConfig
    - workerTimeControlMail
+    - workerTimeControlParams
    - zone
    - zoneAgencyMode
    - zoneClosure
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "24.50.0",
+    "version": "24.48.0",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
--- a/print/templates/reports/buy-label-barcode/assets/css/style.css
+++ b/print/templates/reports/buy-label-barcode/assets/css/style.css
@ -33,9 +33,7 @@ td {
    font-size: 26px;
 }
 .lg-txt {
-    font-size: 40px;
-    padding: 0px;
-    line-height: 1;
+    font-size: 32px;
 }
 .xl-txt {
    font-size: 50px;
--- a/print/templates/reports/buy-label-barcode/buy-label-barcode.html
+++ b/print/templates/reports/buy-label-barcode/buy-label-barcode.html
@ -36,12 +36,12 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="bold center lg-txt xl-width">
+				<td class="lg-txt xl-width bold center">
 					<div class="overflow-line">
 						{{formatNumber(buy.itemFk)}}
 					</div>
 				</td>
-				<td colspan="2" class="center md-txt md-width">
+				<td colspan="2" class="md-txt md-width center">
 					<div class="overflow-line">
 						{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
 					</div>
				`@ -1,2 +0,0 @@`

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