Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/models/specs/mailAliasAccount.spec.js

@@ -1,23 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('loopback model MailAliasAccount', () => {
-    it('should fail to add a mail Alias if the worker doesnt have ACLs', async() => {
-        const tx = await models.MailAliasAccount.beginTransaction({});
-        let error;
-
-        try {
-            const options = {transaction: tx, accessToken: {userId: 57}};
-            await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            error = e;
-        }
-
-        expect(error.message).toEqual('The alias cant be modified');
-    });
-
     it('should add a mail Alias', async() => {
         const tx = await models.MailAliasAccount.beginTransaction({});
         let error;

db/.pullinfo.json

@@ -0,0 +1,4 @@
+{
+  "lastPull": "2024-02-15T08:58:24.000Z",
+  "shaSums": {}
+}

db/changes/240404/00-revokeMailAliasAccount.sql

@@ -0,0 +1,5 @@
+DELETE FROM salix.ACL
+	WHERE model = 'MailAliasAccount'
+		AND property = 'canEditAlias'
+		AND principalType = 'ROLE'
+		AND principalId = 'marketingBoss';

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -1,5 +1,5 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
 BEGIN
 	DECLARE vLastMonth DATE;
 
@@ -49,5 +49,5 @@ BEGIN
             LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
             LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
         WHERE bt.fecha >= vLastMonth AND r.mercancia;
-END$$
-DELIMITER ;
+END$$
+DELIMITER ;

db/routines/util/procedures/tx_commit.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
+BEGIN
+/**
+ * Confirma los cambios asociados a una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        COMMIT;
+    END IF;
+END$$
+DELIMITER ;

db/routines/util/procedures/tx_rollback.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
+BEGIN
+/**
+ * Deshace los cambios asociados a una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        ROLLBACK;
+    END IF;
+END$$
+DELIMITER ;

db/routines/util/procedures/tx_start.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
+BEGIN
+/**
+ * Inicia una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        START TRANSACTION;
+    END IF;
+END$$
+DELIMITER ;

db/routines/vn/functions/hasAnyNegativeBase.sql

@@ -4,32 +4,25 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`(
 	DETERMINISTIC
 BEGIN
 
-/*	Calcula si existe alguna base imponible negativa
-*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+/**
+*	Calcula si existe alguna base imponible negativa
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
 */
+
 	DECLARE hasAnyNegativeBase BOOLEAN;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-	CREATE TEMPORARY TABLE tmp.ticket
-		(KEY (ticketFk))
-		ENGINE = MEMORY
-		SELECT id ticketFk
-			FROM tmp.ticketToInvoice;
+    CALL getTaxBases();
 
-	CALL ticket_getTax(NULL);
+	SELECT negative INTO hasAnyNegativeBase
+        FROM tmp.taxBases
+        LIMIT 1;
 
-	SELECT COUNT(*) INTO hasAnyNegativeBase
-		FROM(
-			SELECT SUM(taxableBase) as taxableBase
-				FROM tmp.ticketTax
-				GROUP BY pgcFk
-				HAVING taxableBase < 0
-			) t;
-
-	DROP TEMPORARY TABLE tmp.ticketTax;
-	DROP TEMPORARY TABLE tmp.ticket;
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
 
 	RETURN hasAnyNegativeBase;
 

db/routines/vn/functions/hasAnyPositiveBase.sql

@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`()
+	RETURNS tinyint(1)
+	DETERMINISTIC
+BEGIN
+
+/**
+*	Calcula si existe alguna base imponible positiva
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyPositiveBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT positive INTO hasAnyPositiveBase
+        FROM tmp.taxBases
+        LIMIT 1;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyPositiveBase;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/clean.sql

@@ -9,6 +9,7 @@ BEGIN
 	DECLARE v26Month DATE;
 	DECLARE v3Month DATE;
 	DECLARE vTrashId VARCHAR(15);
+	DECLARE v2Years DATE;
 	DECLARE v5Years DATE;
 
 	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
@@ -18,6 +19,7 @@ BEGIN
 	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
 	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
 	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
+	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
 	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
 
 	DELETE FROM ticketParking WHERE created < vDateShort;
@@ -163,7 +165,11 @@ BEGIN
 		FROM tmp.duaToDelete tmp
 		JOIN vn.dua d ON d.id = tmp.id;
 
-	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+	DELETE a
+		FROM vn.awb a
+			LEFT JOIN vn.travel t ON t.awbFk = a.id
+		WHERE a.created < v2Years
+			AND t.id IS NULL;
 
 	-- Borra los registros de collection y ticketcollection
 	DELETE FROM vn.collection  WHERE created < vDateShort;

db/routines/vn/procedures/collection_assign.sql

@@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
-)
+)
 proc:BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
@@ -84,5 +84,5 @@ proc:BEGIN
 		WHERE id = vCollectionFk;
 
 	DO RELEASE_LOCK('collection_assign');
-END$$
-DELIMITER ;
+END$$
+DELIMITER ;

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -1,70 +1,74 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`duaInvoiceInBooking`(vDuaFk INT)
 BEGIN
-
+/**
+ * Genera el asiento de un DUA y marca las entradas como confirmadas
+ *
+ * @param vDuaFk Id del dua a recalcular
+ */
 	DECLARE done BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
-    DECLARE vASIEN BIGINT DEFAULT 0;
-    DECLARE vCounter INT DEFAULT 0;
-    
+	DECLARE vASIEN BIGINT DEFAULT 0;
+	DECLARE vCounter INT DEFAULT 0;
+
 	DECLARE rs CURSOR FOR
-		SELECT e.invoiceInFk
+		SELECT DISTINCT e.invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
-                JOIN invoiceIn ii ON ii.id = e.invoiceInFk
-            WHERE de.duaFk = vDuaFk
+				JOIN invoiceIn ii ON ii.id = e.invoiceInFk
+			WHERE de.duaFk = vDuaFk
 				AND de.customsValue
 				AND ii.isBooked = FALSE;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
 	OPEN rs;
-     
+
 	UPDATE invoiceIn ii
 			JOIN entry e ON e.invoiceInFk = ii.id
-            JOIN duaEntry de ON de.entryFk = e.id
-            JOIN dua d ON d.id = de.duaFk
+			JOIN duaEntry de ON de.entryFk = e.id
+			JOIN dua d ON d.id = de.duaFk
 		SET ii.isBooked = TRUE,
 			ii.booked = IFNULL(ii.booked,d.booked),
 			ii.operated = IFNULL(ii.operated,d.operated),
-            ii.issued = IFNULL(ii.issued,d.issued),
-            ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
-            e.isConfirmed = TRUE
+			ii.issued = IFNULL(ii.issued,d.issued),
+			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
-    
-    SELECT IFNULL(ASIEN,0) INTO vASIEN
+
+	SELECT IFNULL(ASIEN,0) INTO vASIEN
 		FROM dua
 			WHERE id = vDuaFk;
-    
+
 	FETCH rs INTO vInvoiceFk;
-     
+
 	WHILE NOT done DO
 
 		CALL invoiceIn_booking(vInvoiceFk);
-        
-        IF vCounter > 0 OR vASIEN > 0 THEN
-        
-			UPDATE vn.XDiario x
-				JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
-                SET x.ASIEN = vASIEN;
-        
-        ELSE
-        
-			SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig;
-            
+
+		IF vCounter > 0 OR vASIEN > 0 THEN
+
+			UPDATE vn2008.XDiario x
+				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
+				SET x.ASIEN = vASIEN;
+
+		ELSE
+
+			SELECT lastBookEntry INTO vASIEN FROM ledgerConfig;
+
 		END IF;
-			     
-        SET vCounter = vCounter + 1;
-        
+
+		SET vCounter = vCounter + 1;
+
 		FETCH rs INTO vInvoiceFk;
 
 	END WHILE;
-    
-    CLOSE rs;
-    
-    UPDATE dua 
-        SET ASIEN = vASIEN
-        WHERE id = vDuaFk;
-        
+
+	CLOSE rs;
+
+	UPDATE dua
+		SET ASIEN = vASIEN
+		WHERE id = vDuaFk;
+
 END$$
 DELIMITER ;

db/routines/vn/procedures/getTaxBases.sql

@@ -0,0 +1,32 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
+BEGIN
+/**
+*   Calcula y devuelve en número de bases imponibles postivas y negativas
+*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+*
+*	returns tmp.taxBases
+*/
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+		(KEY (ticketFk))
+		ENGINE = MEMORY
+		SELECT id ticketFk
+			FROM tmp.ticketToInvoice;
+
+	CALL ticket_getTax(NULL);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.taxBases;
+	CREATE TEMPORARY TABLE tmp.taxBases
+		ENGINE = MEMORY
+		SELECT
+                SUM(taxableBase > 0) as positive,
+				SUM(taxableBase < 0) as negative
+			FROM(
+				SELECT SUM(taxableBase) taxableBase
+					FROM tmp.ticketTax
+					GROUP BY pgcFk
+				) t;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/inventoryMake.sql

@@ -1,182 +1,175 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vDate DATE, vWh INT)
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vInventoryDate DATE)
+BEGIN
 /**
-* Recalcula los inventarios de todos los almacenes, si vWh = 0
+* Recalculate the inventories
 *
-* @param vDate Fecha de los nuevos inventarios
-* @param vWh almacen al cual hacer el inventario
+* @param vInventoryDate date for the new inventory
 */
-
 	DECLARE vDone BOOL;
 	DECLARE vEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vDateLastInventory DATE;
-	DECLARE vDateYesterday DATETIME DEFAULT vDate - INTERVAL 1 SECOND;
+	DECLARE vDateYesterday DATETIME DEFAULT vInventoryDate - INTERVAL 1 SECOND;
 	DECLARE vWarehouseOutFkInventory INT;
 	DECLARE vInventorySupplierFk INT;
 	DECLARE vAgencyModeFkInventory INT;
+	DECLARE vMaxRecentInventories INT;
+	DECLARE vWarehouseFk INT;
 
 	DECLARE cWarehouses CURSOR FOR
 		SELECT id
 			FROM warehouse
-			WHERE isInventory
-				AND vWh IN (0,id);
+			WHERE isInventory;
+	
+	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	SELECT inventorySupplierFk	INTO vInventorySupplierFk FROM entryConfig LIMIT 1;
+	SELECT inventoried INTO vDateLastInventory FROM config LIMIT 1;
+	SELECT maxRecentInventories,
+			warehouseOutFk,
+			agencyModeFk
+			INTO vMaxRecentInventories,
+				vWarehouseOutFkInventory,
+				vAgencyModeFkInventory
+		FROM inventoryConfig 
+		LIMIT 1;
+
+	IF vDateLastInventory IS NULL 
+		OR vInventorySupplierFk IS NULL
+		OR vMaxRecentInventories IS NULL 
+		OR vInventoryDate IS NULL 
+		OR vWarehouseOutFkInventory IS NULL
+		OR vAgencyModeFkInventory IS NULL THEN
+		CALL util.throw('Some config parameters are not set');
+	END IF;
+	
+	START TRANSACTION;
+
 	OPEN cWarehouses;
+	-- Environment variable to disable the triggers of the affected tables
 	SET @isModeInventory := TRUE;
 	l: LOOP
-
 		SET vDone = FALSE;
-		FETCH cWarehouses INTO vWh;
+		SET vEntryFk = NULL;
+		SET vTravelFk = NULL;
+
+		FETCH cWarehouses INTO vWarehouseFk;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SELECT w.id INTO vWarehouseOutFkInventory
-			FROM warehouse w
-			WHERE w.code = 'inv';
-
-		SELECT inventorySupplierFk	INTO vInventorySupplierFk
-			FROM entryConfig;
-
-		SELECT am.id INTO vAgencyModeFkInventory
-				FROM agencyMode am
-					where code = 'inv';
-
-		SELECT MAX(landed) INTO vDateLastInventory
-			FROM travel tr
-				JOIN entry e ON e.travelFk = tr.id
-				JOIN buy b ON b.entryFk = e.id
-			WHERE warehouseOutFk = vWarehouseOutFkInventory
-				AND landed < vDate
-				AND e.supplierFk = vInventorySupplierFk
-				AND warehouseInFk = vWh
-				AND NOT isRaid;
-
-		IF vDateLastInventory IS NULL THEN
-			SELECT inventoried INTO vDateLastInventory FROM config;
-		END IF;
-
-		-- Generamos travel, si no existe.
-		SET vTravelFK = 0;
-
+		-- Generate travel, if it does not exist
 		SELECT id INTO vTravelFk
 			FROM travel
 			WHERE warehouseOutFk = vWarehouseOutFkInventory
-				AND warehouseInFk = vWh
-				AND landed = vDate
+				AND warehouseInFk = vWarehouseFk
+				AND landed = vInventoryDate
 				AND agencyModeFk = vAgencyModeFkInventory
 				AND ref = 'inventario'
 			LIMIT 1;
 
-		IF NOT vTravelFK THEN
-
-			INSERT INTO travel SET
-				warehouseOutFk = vWarehouseOutFkInventory,
-				warehouseInFk = vWh,
-				shipped = vDate,
-				landed = vDate,
-				agencyModeFk = vAgencyModeFkInventory,
-				ref = 'inventario',
-				isDelivered = TRUE,
-				isReceived = TRUE;
+		IF vTravelFk IS NULL THEN
+			INSERT INTO travel 
+				SET warehouseOutFk = vWarehouseOutFkInventory,
+					warehouseInFk = vWarehouseFk,
+					shipped = vInventoryDate,
+					landed = vInventoryDate,
+					agencyModeFk = vAgencyModeFkInventory,
+					ref = 'inventario',
+					isDelivered = TRUE,
+					isReceived = TRUE;
 
 			SELECT LAST_INSERT_ID() INTO vTravelFk;
-
 		END IF;
 
-		-- Generamos entrada si no existe, o la vaciamos.
-		SET vEntryFk = 0;
-
+		-- Generate an entry if it does not exist, or we empty it
 		SELECT id INTO vEntryFk
 			FROM entry
 			WHERE supplierFk = vInventorySupplierFk
 			AND travelFk = vTravelFk;
 
-		IF NOT vEntryFk THEN
-
-			INSERT INTO entry SET
-				supplierFk = vInventorySupplierFk,
-				isConfirmed = TRUE,
-				isOrdered = TRUE,
-				travelFk = vTravelFk;
+		IF vEntryFk IS NULL THEN
+			INSERT INTO entry 
+				SET supplierFk = vInventorySupplierFk,
+					isConfirmed = TRUE,
+					isOrdered = TRUE,
+					travelFk = vTravelFk;
 
 			SELECT LAST_INSERT_ID() INTO vEntryFk;
-
 		ELSE
-
 			DELETE FROM buy WHERE entryFk = vEntryFk;
-
 		END IF;
 
-		-- Preparamos tabla auxilar
-		CREATE OR REPLACE TEMPORARY TABLE tmp.inventory (
-				itemFk INT(11) NOT NULL PRIMARY KEY,
-				quantity int(11) DEFAULT '0',
-				buyingValue decimal(10,4) DEFAULT '0.0000',
-				freightValue decimal(10,3) DEFAULT '0.000',
-				packing int(11) DEFAULT '0',
-				`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
-				groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
-				comissionValue decimal(10,3) DEFAULT '0.000',
-				packageValue decimal(10,3) DEFAULT '0.000',
-				packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
-				price1 decimal(10,2) DEFAULT '0.00',
-				price2 decimal(10,2) DEFAULT '0.00',
-				price3 decimal(10,2) DEFAULT '0.00',
-				minPrice decimal(10,2) DEFAULT '0.00',
-				producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-		INDEX (itemFK)) ENGINE = MEMORY;
+		-- Prepare the auxiliary table
+		CREATE OR REPLACE TEMPORARY TABLE tInventory (
+			itemFk INT(11) NOT NULL PRIMARY KEY,
+			quantity int(11) DEFAULT '0',
+			buyingValue decimal(10,4) DEFAULT '0.0000',
+			freightValue decimal(10,3) DEFAULT '0.000',
+			packing int(11) DEFAULT '0',
+			`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
+			groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
+			comissionValue decimal(10,3) DEFAULT '0.000',
+			packageValue decimal(10,3) DEFAULT '0.000',
+			packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
+			price1 decimal(10,2) DEFAULT '0.00',
+			price2 decimal(10,2) DEFAULT '0.00',
+			price3 decimal(10,2) DEFAULT '0.00',
+			minPrice decimal(10,2) DEFAULT '0.00',
+			producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+			INDEX (itemFK)
+		) ENGINE = MEMORY;
 
-		-- Compras
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		-- Buys
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT b.itemFk, SUM(b.quantity)
 				FROM buy b
 					JOIN entry e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
-				WHERE tr.warehouseInFk = vWh
-					AND tr.landed BETWEEN vDateLastInventory
-					AND vDateYesterday
+				WHERE tr.warehouseInFk = vWarehouseFk
+					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
 					AND NOT isRaid
 				GROUP BY b.itemFk;
-	SELECT vDateLastInventory , vDateYesterday;
 
-		-- Traslados
-		INSERT INTO tmp.inventory(itemFk, quantity)
+		-- Transfers
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, quantityOut
-			FROM (
+				FROM (
 					SELECT b.itemFk,- SUM(b.quantity) quantityOut
 						FROM buy b
 							JOIN entry e ON e.id = b.entryFk
 							JOIN travel tr ON tr.id = e.travelFk
-						WHERE tr.warehouseOutFk = vWh
-							AND tr.shipped BETWEEN vDateLastInventory
-							AND vDateYesterday
+						WHERE tr.warehouseOutFk = vWarehouseFk
+							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
 							AND NOT isRaid
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;
 
-		-- Ventas
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		-- Sales
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, saleOut
-			FROM (
+				FROM (
 					SELECT s.itemFk, - SUM(s.quantity) saleOut
 						FROM sale s
 							JOIN ticket t ON t.id = s.ticketFk
-						WHERE t.warehouseFk = vWh
+						WHERE t.warehouseFk = vWarehouseFk
 							AND t.shipped BETWEEN vDateLastInventory AND vDateYesterday
 						GROUP BY s.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity,0) + sub.saleOut;
 
-		-- Actualiza valores de la ultima compra
-		UPDATE tmp.inventory inv
-				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWh
+		-- Update values of the last purchase
+		UPDATE tInventory inv
+				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWarehouseFk
 				JOIN buy b ON b.id = lb.buy_id
 				JOIN item i ON i.id = b.itemFk
 				LEFT JOIN producer p ON p.id = i.producerFk
@@ -194,7 +187,7 @@ proc: BEGIN
 				inv.minPrice = b.minPrice,
 				inv.producer = p.name;
 
-		INSERT INTO buy( itemFk,
+		INSERT INTO buy(itemFk,
 				quantity,
 				buyingValue,
 				freightValue,
@@ -224,42 +217,53 @@ proc: BEGIN
 					price3,
 					minPrice,
 					vEntryFk
-				FROM tmp.inventory;
+				FROM tInventory;
 
-		SELECT vWh, COUNT(*), util.VN_NOW() FROM tmp.inventory;
-
-	-- Actualizamos el campo lastUsed de item
-	UPDATE item i
-			JOIN tmp.inventory i2 ON i2.itemFk = i.id
-		SET i.lastUsed = NOW()
-		WHERE i2.quantity;
-
-	-- DROP TEMPORARY TABLE tmp.inventory;
+		-- Update the 'lastUsed' field of the item
+		UPDATE item i
+				JOIN tInventory i2 ON i2.itemFk = i.id
+			SET i.lastUsed = NOW()
+			WHERE i2.quantity;
+	
+		DROP TEMPORARY TABLE tInventory;
 
 	END LOOP;
-
+	
 	CLOSE cWarehouses;
 
-	UPDATE config SET inventoried = vDate;
-	SET @isModeInventory := FALSE;
+	UPDATE config SET inventoried = vInventoryDate;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
-		(INDEX(entryId) USING BTREE) ENGINE = MEMORY
-		SELECT e.id as entryId,
-				t.id as travelId
+	SET @isModeInventory := FALSE;
+	
+	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
+		(INDEX(entryId)) ENGINE = MEMORY
+		SELECT e.id entryId,
+				t.id travelId
 			FROM travel t
 				JOIN `entry` e ON e.travelFk = t.id
+				JOIN (
+					SELECT t.shipped
+						FROM travel t
+							JOIN `entry` e ON e.travelFk = t.id
+						WHERE e.supplierFk = vInventorySupplierFk
+							AND t.shipped <= vInventoryDate
+						GROUP BY t.shipped
+						ORDER BY t.shipped DESC
+						OFFSET vMaxRecentInventories ROWS
+				) sub
 			WHERE e.supplierFk = vInventorySupplierFk
-				AND t.shipped <= util.VN_CURDATE() - INTERVAL 12 DAY
-				AND (DAY(t.shipped) <> 1 OR shipped < util.VN_CURDATE() - INTERVAL 12 DAY);
+				AND t.shipped IN (sub.shipped);
 
-	DELETE e
+	DELETE e 
 		FROM `entry` e
-			JOIN tmp.entryToDelete tmp ON tmp.entryId = e.id;
+			JOIN tEntryToDelete tmp ON tmp.entryId = e.id;
 
 	DELETE IGNORE t
 		FROM travel t
-			JOIN tmp.entryToDelete tmp ON tmp.travelId = t.id;
+			JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
+
+	DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
+
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/inventoryMakeLauncher.sql

@@ -2,10 +2,11 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMakeLauncher`()
 BEGIN
 /**
- * Recalcula los inventarios de todos los almacenes.
+ * Recalculate the inventories of all warehouses
  */
-
-	call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0);
-
+	CALL inventoryMake(
+		util.VN_CURDATE() - 
+		INTERVAL (SELECT daysInPastForInventory FROM inventoryConfig LIMIT 1) DAY
+	);
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceInTaxMakeByDua.sql

@@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(vDuaFk INT)
 BEGIN
-
-	DECLARE done BOOL DEFAULT FALSE;
+/**
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
+ *  
+ * @param vDuaFk Id del dua a recalcular
+ */
+	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
 
-	DECLARE rs CURSOR FOR
-			SELECT invoiceInFk
-				FROM entry e
-					JOIN duaEntry de ON de.entryFk = e.id
-				WHERE de.duaFk = vDuaFk;
+	DECLARE vInvoices CURSOR FOR
+		SELECT DISTINCT invoiceInFk
+			FROM entry e
+				JOIN duaEntry de ON de.entryFk = e.id
+			WHERE de.duaFk = vDuaFk;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	OPEN rs;
+	OPEN vInvoices;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vInvoices INTO vInvoiceInFk;
 
-	FETCH rs INTO vInvoiceInFk;
-
-	WHILE NOT done DO
+		IF vDone THEN
+			LEAVE l;
+		END IF;
 
 		CALL vn2008.recibidaIvaInsert(vInvoiceInFk);
 		CALL invoiceInDueDay_recalc(vInvoiceInFk);
 
-		FETCH rs INTO vInvoiceInFk;
-
-	END WHILE;
-
-	CLOSE rs;
-
+	END LOOP;
+	CLOSE vInvoices;
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceInTax_getFromDua.sql

@@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromDua`(vDuaFk INT)
 BEGIN
-
-	DECLARE done BOOL DEFAULT FALSE;
+/**
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
+ *  
+ * @param vDuaFk Id del dua a recalcular
+ */
+	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
 
-	DECLARE rs CURSOR FOR
-		SELECT invoiceInFk
+	DECLARE vInvoices CURSOR FOR
+		SELECT DISTINCT invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
 			WHERE de.duaFk = vDuaFk;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	OPEN rs;
+	OPEN vInvoices;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vInvoices INTO vInvoiceInFk;
 
-	FETCH rs INTO vInvoiceInFk;
-
-	WHILE NOT done DO
+		IF vDone THEN
+			LEAVE l;
+		END IF;
 
 		CALL invoiceInTax_getFromEntries(vInvoiceInFk);
 		CALL invoiceInDueDay_calculate(vInvoiceInFk);
-        
-		FETCH rs INTO vInvoiceInFk;
-
-	END WHILE;
-
-	CLOSE rs;
 
+	END LOOP;
+	CLOSE vInvoices;
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceInTax_getFromEntries.sql

@@ -1,13 +1,22 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vId INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vInvoiceInFk INT)
 BEGIN
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);
+	DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
 
+	SELECT isBooked INTO vIsBooked  
+		FROM invoiceIn ii 
+		WHERE id = vInvoiceInFk;
+
+	IF vIsBooked THEN 
+		CALL util.throw('A booked invoice cannot be modified');
+	END IF;
+	
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
-			JOIN invoiceIn ii ON ii.id = vId
+			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued 
 			AND rr.currencyFk = ii.currencyFk ;
 
@@ -24,7 +33,7 @@ BEGIN
 		LIMIT 1;
 		
 	DELETE FROM invoiceInTax 
-		WHERE invoiceInFk = vId;
+		WHERE invoiceInFk = vInvoiceInFk;
 
 	INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk)
 		SELECT ii.id,
@@ -39,7 +48,7 @@ BEGIN
 				JOIN buy b ON b.entryFk = e.id
 				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk 
 					AND rr.dated = ii.issued
-			WHERE ii.id = vId 
+			WHERE ii.id = vInvoiceInFk 
 			HAVING taxableBase IS NOT NULL;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemProposal_Add.sql

@@ -67,4 +67,4 @@ BEGIN
 
 	COMMIT;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/procedures/itemShelving_selfConsumption.sql

@@ -20,20 +20,23 @@ BEGIN
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
 	DECLARE vItemShelvingFk INT;
+	DECLARE vAddressFk INT;
 
 	SELECT c.id,
 			pc.clientSelfConsumptionFk,
-			s.warehouseFk
+			s.warehouseFk,
+			pc.addressSelfConsumptionFk
 			INTO vCompanyFk,
 			vClientFk,
-			vWarehouseFk
+			vWarehouseFk,
+			vAddressFk
 		FROM company c
 			JOIN address a ON a.clientFk = c.clientFk
 			JOIN warehouse w ON w.addressFk = a.id
 			JOIN sector s ON s.warehouseFk = w.id
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
-			JOIN productionConfig pc ON TRUE
+			JOIN productionConfig pc
 		WHERE s2.code = vShelvingFk;
 
 	IF vClientFk IS NULL THEN
@@ -65,7 +68,7 @@ BEGIN
 			vClientFk,
 			vWarehouseFk,
 			CURDATE(),
-			NULL,
+			vAddressFk,
 			vCompanyFk,
 			NULL,
 			vTicketFk

db/routines/vn/procedures/test.sql

@@ -1,6 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`test`()
-BEGIN
-select 'procedimiento ejecutado con éxito';
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_getMovable.sql

@@ -1,44 +1,55 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(
+	vTicketFk INT,
+	vNewShipped DATETIME,
+	vWarehouseFk INT
+)
 BEGIN
 /**
  * Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * vNewShipped debe ser menor que vOldShipped, en los otros casos se
  * asume que siempre es posible
  *
  * @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
+ * @param vNewShipped -> Nueva fecha
  * @return Sales con Movible
-*/    
-    DECLARE vDatedOld DATETIME;
-	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
+*/
+    DECLARE vOldShipped DATETIME;
 
-    SELECT t.shipped INTO vDatedOld
-        FROM ticket t 
+    SELECT t.shipped INTO vOldShipped
+        FROM ticket t
         WHERE t.id = vTicketFk;
 
-    CALL item_getStock(vWarehouseFk, vDatedNew, NULL); 
-    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
-	
-    SELECT s.id, 
-			s.itemFk, 
-			s.quantity, 
-			s.concept, 
-			s.price, 
+	-- Añadimos un dia más para calcular el stock hasta vNewShipped inclusive
+    CALL item_getStock(vWarehouseFk, DATE_ADD(vNewShipped, INTERVAL 1 DAY), NULL);
+    CALL item_getMinacum(
+		vWarehouseFk,
+		vNewShipped,
+		DATEDIFF(DATE_SUB(vOldShipped, INTERVAL 1 DAY), vNewShipped),
+		NULL
+	);
+
+    SELECT s.id,
+			s.itemFk,
+			s.quantity,
+			s.concept,
+			s.price,
 			s.reserved,
-			s.discount,  
-			i.image, 
-			i.subName, 
+			s.discount,
+			i.image,
+			i.subName,
 			il.stock + IFNULL(im.amount, 0) AS movable
         FROM ticket t
             JOIN sale s ON s.ticketFk = t.id
-            JOIN item i ON i.id = s.itemFk 
-            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+            JOIN item i ON i.id = s.itemFk
+            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk
+				AND im.warehouseFk = vWarehouseFk
             LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
         WHERE t.id = vTicketFk;
 
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum; 
-    
+    DROP TEMPORARY TABLE IF EXISTS
+		tmp.itemList,
+		tmp.itemMinacum;
+
 END$$
 DELIMITER ;

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -1,21 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_cloneWithEntries`(
-	IN vTravelFk INT, 
-	IN vDateStart DATE, 
+	IN vTravelFk INT,
+	IN vDateStart DATE,
 	IN vDateEnd DATE,
 	IN vWarehouseOutFk INT,
-	IN vWarehouseInFk INT, 
-	IN vRef VARCHAR(255), 
-	IN vAgencyModeFk INT, 
+	IN vWarehouseInFk INT,
+	IN vRef VARCHAR(255),
+	IN vAgencyModeFk INT,
 	OUT vNewTravelFk INT)
 BEGIN
 /**
  * Clona un travel junto con sus entradas y compras
- *
  * @param vTravelFk travel plantilla a clonar
  * @param vDateStart fecha del shipment del nuevo travel
  * @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
  * @param vWarehouseInFk warehouse de landing del nuevo travel
  * @param vRef referencia del nuevo travel
  * @param vAgencyModeFk del nuevo travel
@@ -25,34 +24,35 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
 				JOIN travel t ON t.id = e.travelFk
 			WHERE e.travelFk = vTravelFk;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN 
-		ROLLBACK;
+	BEGIN
+		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-	
-	START TRANSACTION;
+
+    CALL util.tx_start(vTx);
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
 			FROM travel
 			WHERE id = vTravelFk;
-	
+
 	SET vNewTravelFk = LAST_INSERT_ID();
 
 	SET vDone = FALSE;
 	SET @isModeInventory = TRUE;
 
 	OPEN vRsEntry;
-	
+
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vRsEntry INTO vAuxEntryFk;
@@ -62,7 +62,7 @@ BEGIN
 		END IF;
 
 		CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
-		CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+        CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
 
 		SELECT evaNotes INTO vEvaNotes
 			FROM entry
@@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
 
-	COMMIT;
+    CALL util.tx_commit(vTx);
 END$$
 DELIMITER ;

db/routines/vn/triggers/calendar_afterDelete.sql

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

db/routines/vn/triggers/calendar_beforeInsert.sql

@@ -5,4 +5,4 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeInsert
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/calendar_beforeUpdate.sql

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

db/routines/vn/triggers/workerTimeControl_afterDelete.sql

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

db/routines/vn/triggers/workerTimeControl_beforeInsert.sql

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

db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql

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

db/routines/vn/views/awbVolume.sql

@@ -28,4 +28,4 @@ FROM (
 		JOIN `vn`.`volumeConfig` `vc`
 	)
 WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
-	AND t.awbFk	
+	AND `t`.`awbFk` <> 0

db/routines/vn/views/expeditionPallet_Print.sql

@@ -9,7 +9,7 @@ AS SELECT `et2`.`description` AS `truck`,
 	`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
-		`r`.`created` > util.VN_CURDATE() + INTERVAL 1 DAY,
+		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
 		ucase(dayname(`r`.`created`)),
 		NULL
 	) AS `nombreDia`

db/routines/vn/views/itemShelvingAvailable.sql

@@ -1,7 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`itemShelvingAvailable`
-AS SELECT `s`.`id` `saleFk`,
+AS SELECT `s`.`id` AS `saleFk`,
 	`tst`.`updated` AS `Modificado`,
 	`s`.`ticketFk` AS `ticketFk`,
 	0 AS `isPicked`,

db/routines/vn/views/ticketStateToday.sql

@@ -1,8 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`ticketStateToday`
-AS SELECT
-	`ts`.`ticketFk` AS `ticketFk`,
+AS SELECT `ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`state` AS `state`,
 	`ts`.`productionOrder` AS `productionOrder`,
 	`ts`.`alertLevel` AS `alertLevel`,
@@ -10,6 +9,8 @@ AS SELECT
 	`ts`.`code` AS `code`,
 	`ts`.`updated` AS `updated`,
 	`ts`.`isPicked` AS `isPicked`
-FROM `ticketState` `ts`
-	JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
+FROM (
+		`vn`.`ticketState` `ts`
+		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
+	)
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())

db/routines/vn/views/zoneEstimatedDelivery.sql

@@ -1,24 +1,48 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`zoneEstimatedDelivery`
-	AS SELECT t.zoneFk,
-		zc.`hour` zoneClosureHour,
-		z.`hour` zoneHour,
-		sv.volume volume,
-		al.hasToRecalcPrice,
-		lhp.m3,
-		dl.minSpeed
-	FROM ticket t
-		JOIN ticketStateToday tst ON tst.ticketFk = t.id
-		JOIN state s ON	s.id = tst.state
-		JOIN saleVolume sv ON sv.ticketFk = t.id
-		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
-		JOIN warehouse w ON w.id = t.warehouseFk
-		STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
-		LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-			AND zc.dated = util.VN_CURDATE()
-		LEFT JOIN cache.departure_limit dl ON dl.warehouse_id = t.warehouseFk
-			AND dl.fecha = util.VN_CURDATE()
-		JOIN alertLevel al ON al.id = s.alertLevel
-	WHERE w.hasProduction
-		AND DATE(t.shipped) = util.VN_CURDATE()
+AS SELECT `t`.`zoneFk` AS `zoneFk`,
+	`zc`.`hour` AS `zoneClosureHour`,
+	`z`.`hour` AS `zoneHour`,
+	`sv`.`volume` AS `volume`,
+	`al`.`hasToRecalcPrice` AS `hasToRecalcPrice`,
+	`lhp`.`m3` AS `m3`,
+	`dl`.`minSpeed` AS `minSpeed`
+FROM (
+		(
+			(
+				(
+					(
+						(
+							(
+								(
+									(
+										(
+											`vn`.`ticket` `t`
+											JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
+										)
+										JOIN `vn`.`state` `s` ON(`s`.`id` = `tst`.`state`)
+									)
+									JOIN `vn`.`saleVolume` `sv` ON(`sv`.`ticketFk` = `t`.`id`)
+								)
+								LEFT JOIN `vn`.`lastHourProduction` `lhp` ON(`lhp`.`warehouseFk` = `t`.`warehouseFk`)
+							)
+							JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`)
+						)
+						JOIN `vn`.`warehouseAlias` `wa` ON(`wa`.`id` = `w`.`aliasFk`)
+					) STRAIGHT_JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
+				)
+				LEFT JOIN `vn`.`zoneClosure` `zc` ON(
+					`zc`.`zoneFk` = `t`.`zoneFk`
+					AND `zc`.`dated` = `util`.`VN_CURDATE`()
+				)
+			)
+			LEFT JOIN `cache`.`departure_limit` `dl` ON(
+				`dl`.`warehouse_id` = `t`.`warehouseFk`
+				AND `dl`.`fecha` = `util`.`VN_CURDATE`()
+			)
+		)
+		JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `s`.`alertLevel`)
+	)
+WHERE `w`.`hasProduction` <> 0
+	AND cast(`t`.`shipped` AS date) = `util`.`VN_CURDATE`()

db/routines/vn2008/procedures/recobro_credito.sql

@@ -42,4 +42,4 @@ BEGIN
 	DROP TEMPORARY TABLE clientes_credit;
 	COMMIT;
 END$$
-DELIMITER ;
+DELIMITER ;

db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql

@@ -27,7 +27,7 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT !@@in_transaction;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
@@ -41,8 +41,8 @@ BEGIN
 		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-
-	CALL util.tx_start(vTx);
+   
+    CALL util.tx_start(vTx);  
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk

gulpfile.js

@@ -256,7 +256,7 @@ async function dockerStart() {
     await myt.run(Start);
     await myt.deinit();
 }
-dockerStart.description = `Starts the salix-db container`;
+dockerStart.description = `Starts the DB container`;
 
 async function docker() {
     const myt = new Myt();
@@ -264,7 +264,7 @@ async function docker() {
     await myt.run(Run);
     await myt.deinit();
 }
-docker.description = `Runs the salix-db container`;
+docker.description = `Builds and starts the DB container`;
 
 module.exports = {
     default: defaultTask,

loopback/locale/en.json

@@ -1,211 +1,213 @@
 {
-	"State cannot be blank": "State cannot be blank",
-	"Cannot be blank": "Cannot be blank",
-	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
-	"The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
-	"Invalid email": "Invalid email",
-	"Name cannot be blank": "Name cannot be blank",
-	"Phone cannot be blank": "Phone cannot be blank",
-	"Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
-	"Period cannot be blank": "Period cannot be blank",
-	"Sample type cannot be blank": "Sample type cannot be blank",
-	"That payment method requires an IBAN": "That payment method requires an IBAN",
-	"That payment method requires a BIC": "That payment method requires a BIC",
-	"The default consignee can not be unchecked": "The default consignee can not be unchecked",
-	"Enter an integer different to zero": "Enter an integer different to zero",
-	"Package cannot be blank": "Package cannot be blank",
-	"The price of the item changed": "The price of the item changed",
-	"The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
-	"Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
-	"You can't create an order for a frozen client": "You can't create an order for a frozen client",
-	"This address doesn't exist": "This address doesn't exist",
-	"Warehouse cannot be blank": "Warehouse cannot be blank",
-	"Agency cannot be blank": "Agency cannot be blank",
-	"The IBAN does not have the correct format": "The IBAN does not have the correct format",
-	"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
-	"You can't create a ticket for an inactive client": "You can't create a ticket for an inactive client",
-	"Worker cannot be blank": "Worker cannot be blank",
-	"You must delete the claim id %d first": "You must delete the claim id %d first",
-	"You don't have enough privileges": "You don't have enough privileges",
-	"Tag value cannot be blank": "Tag value cannot be blank",
-	"A client with that Web User name already exists": "A client with that Web User name already exists",
-	"The warehouse can't be repeated": "The warehouse can't be repeated",
-	"Barcode must be unique": "Barcode must be unique",
-	"You don't have enough privileges to do that": "You don't have enough privileges to do that",
-	"You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
-	"can't be blank": "can't be blank",
-	"Street cannot be empty": "Street cannot be empty",
-	"City cannot be empty": "City cannot be empty",
-	"EXTENSION_INVALID_FORMAT": "Invalid extension",
-	"The secret can't be blank": "The secret can't be blank",
-	"Invalid TIN": "Invalid Tax number",
-	"This ticket can't be invoiced": "This ticket can't be invoiced",
-	"The value should be a number": "The value should be a number",
-	"The current ticket can't be modified": "The current ticket can't be modified",
-	"Extension format is invalid": "Extension format is invalid",
-	"NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
-	"This client can't be invoiced": "This client can't be invoiced",
-	"You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
-	"The introduced hour already exists": "The introduced hour already exists",
-	"Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
-	"Concept cannot be blank": "Concept cannot be blank",
-	"Ticket id cannot be blank": "Ticket id cannot be blank",
-	"Weekday cannot be blank": "Weekday cannot be blank",
-	"This ticket can not be modified": "This ticket can not be modified",
-	"You can't delete a confirmed order": "You can't delete a confirmed order",
-	"Value has an invalid format": "Value has an invalid format",
-	"The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
-	"Swift / BIC can't be empty": "Swift / BIC can't be empty",
-	"Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
-	"Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
-	"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
-	"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
-	"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-	"Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
-	"Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
-	"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
-	"Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
-	"Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
-	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
-	"Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
-	"Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
-	"I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
-	"I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
-	"Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"The grade must be similar to the last one": "The grade must be similar to the last one",
-	"agencyModeFk": "Agency",
-	"clientFk": "Client",
-	"zoneFk": "Zone",
-	"warehouseFk": "Warehouse",
-	"shipped": "Shipped",
-	"landed": "Landed",
-	"addressFk": "Address",
-	"companyFk": "Company",
-	"You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
-	"The social name cannot be empty": "The social name cannot be empty",
-	"The nif cannot be empty": "The nif cannot be empty",
-	"Amount cannot be zero": "Amount cannot be zero",
-	"Company has to be official": "Company has to be official",
-	"Unable to clone this travel": "Unable to clone this travel",
-	"The observation type can't be repeated": "The observation type can't be repeated",
-	"New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
-	"New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
-	"There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
-	"Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
-	"Role name must be written in camelCase": "Role name must be written in camelCase",
-	"Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
-	"None": "None",
-	"error densidad = 0": "error densidad = 0",
-	"This document already exists on this ticket": "This document already exists on this ticket",
-	"serial non editable": "This serial doesn't allow to set a reference",
-	"nickname": "nickname",
-	"State": "State",
-	"regular": "regular",
-	"reserved": "reserved",
-	"Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
-	"A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
-	"This client is not invoiceable": "This client is not invoiceable",
-	"INACTIVE_PROVIDER": "Inactive provider",
-	"reference duplicated": "reference duplicated",
-	"The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
-	"This item is not available": "This item is not available",
-	"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
-	"The type of business must be filled in basic data": "The type of business must be filled in basic data",
-	"The worker has hours recorded that day": "The worker has hours recorded that day",
-	"isWithoutNegatives": "isWithoutNegatives",
-	"routeFk": "routeFk",
-	"Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
-	"Can't change the password of another worker": "Can't change the password of another worker",
-	"No hay un contrato en vigor": "There is no existing contract",
-	"No está permitido trabajar": "Not allowed to work",
-	"Dirección incorrecta": "Wrong direction",
-	"No se permite fichar a futuro": "It is not allowed to sign in the future",
-	"Descanso diario 12h.": "Daily rest 12h.",
-	"Fichadas impares": "Odd signs",
-	"Descanso diario 9h.": "Daily rest 9h.",
-	"Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
-	"Verify email": "Verify email",
-	"Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
-	"Password does not meet requirements": "Password does not meet requirements",
-	"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
-	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
-	"Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
-	"You don't have grant privilege": "You don't have grant privilege",
-	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
-	"Email verify": "Email verify",
-	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-	"App locked": "App locked by user {{userId}}",
-	"The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
-	"Receipt's bank was not found": "Receipt's bank was not found",
-	"This receipt was not compensated": "This receipt was not compensated",
-	"Client's email was not found": "Client's email was not found",
-	"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
-	"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
-	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
-	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
-	"Warehouse inventory not set": "Almacén inventario no está establecido",
-	"Component cost not set": "Componente coste no está estabecido",
-	"Description cannot be blank": "Description cannot be blank",
-	"company": "Company",
-	"country": "Country",
-	"clientId": "Id client",
-	"clientSocialName": "Client",
-	"amount": "Amount",
-	"taxableBase": "Taxable base",
-	"ticketFk": "Id ticket",
-	"isActive": "Active",
-	"hasToInvoice": "Invoice",
-	"isTaxDataChecked": "Data checked",
-	"comercialId": "Id Comercial",
-	"comercialName": "Comercial",
-	"Added observation": "Added observation",
-	"Comment added to client": "Comment added to client",
-	"This ticket is already a refund": "This ticket is already a refund",
-	"A claim with that sale already exists": "A claim with that sale already exists",
-	"Pass expired": "The password has expired, change it from Salix",
-	"Can't transfer claimed sales": "Can't transfer claimed sales",
-	"Invalid quantity": "Invalid quantity",
-	"Failed to upload delivery note": "Error to upload delivery note {{id}}",
-	"Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
-	"The renew period has not been exceeded": "The renew period has not been exceeded",
-	"You can not use the same password": "You can not use the same password",
-	"Valid priorities": "Valid priorities: %d",
-	"hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
-	"hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
-	"This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
-	"Social name should be uppercase": "Social name should be uppercase",
-	"Street should be uppercase": "Street should be uppercase",
-	"You don't have enough privileges.": "You don't have enough privileges.",
-	"This ticket is locked": "This ticket is locked",
-	"This ticket is not editable.": "This ticket is not editable.",
-	"The ticket doesn't exist.": "The ticket doesn't exist.",
-	"The sales do not exists": "The sales do not exists",
-	"Ticket without Route": "Ticket without route",
-	"Select a different client": "Select a different client",
-	"Fill all the fields": "Fill all the fields",
-	"Error while generating PDF": "Error while generating PDF",
-	"Can't invoice to future": "Can't invoice to future",
-	"This ticket is already invoiced": "This ticket is already invoiced",
-	"Negative basis of tickets: 23": "Negative basis of tickets: 23",
-	"Booking completed": "Booking complete",
-	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
-	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
-	"Bank entity must be specified": "Bank entity must be specified",
-	"Try again": "Try again",
-	"keepPrice": "keepPrice",
-	"Cannot past travels with entries": "Cannot past travels with entries",
-	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
-	"Incorrect pin": "Incorrect pin.",
-	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
-	"Name should be uppercase": "Name should be uppercase",
-	"You cannot update these fields": "You cannot update these fields",
-	"CountryFK cannot be empty": "Country cannot be empty"
-}
+    "State cannot be blank": "State cannot be blank",
+    "Cannot be blank": "Cannot be blank",
+    "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+    "The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
+    "Invalid email": "Invalid email",
+    "Name cannot be blank": "Name cannot be blank",
+    "Phone cannot be blank": "Phone cannot be blank",
+    "Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
+    "Period cannot be blank": "Period cannot be blank",
+    "Sample type cannot be blank": "Sample type cannot be blank",
+    "That payment method requires an IBAN": "That payment method requires an IBAN",
+    "That payment method requires a BIC": "That payment method requires a BIC",
+    "The default consignee can not be unchecked": "The default consignee can not be unchecked",
+    "Enter an integer different to zero": "Enter an integer different to zero",
+    "Package cannot be blank": "Package cannot be blank",
+    "The price of the item changed": "The price of the item changed",
+    "The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
+    "Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
+    "You can't create an order for a frozen client": "You can't create an order for a frozen client",
+    "This address doesn't exist": "This address doesn't exist",
+    "Warehouse cannot be blank": "Warehouse cannot be blank",
+    "Agency cannot be blank": "Agency cannot be blank",
+    "The IBAN does not have the correct format": "The IBAN does not have the correct format",
+    "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
+    "You can't create a ticket for an inactive client": "You can't create a ticket for an inactive client",
+    "Worker cannot be blank": "Worker cannot be blank",
+    "You must delete the claim id %d first": "You must delete the claim id %d first",
+    "You don't have enough privileges": "You don't have enough privileges",
+    "Tag value cannot be blank": "Tag value cannot be blank",
+    "A client with that Web User name already exists": "A client with that Web User name already exists",
+    "The warehouse can't be repeated": "The warehouse can't be repeated",
+    "Barcode must be unique": "Barcode must be unique",
+    "You don't have enough privileges to do that": "You don't have enough privileges to do that",
+    "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
+    "can't be blank": "can't be blank",
+    "Street cannot be empty": "Street cannot be empty",
+    "City cannot be empty": "City cannot be empty",
+    "EXTENSION_INVALID_FORMAT": "Invalid extension",
+    "The secret can't be blank": "The secret can't be blank",
+    "Invalid TIN": "Invalid Tax number",
+    "This ticket can't be invoiced": "This ticket can't be invoiced",
+    "The value should be a number": "The value should be a number",
+    "The current ticket can't be modified": "The current ticket can't be modified",
+    "Extension format is invalid": "Extension format is invalid",
+    "NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
+    "This client can't be invoiced": "This client can't be invoiced",
+    "You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
+    "The introduced hour already exists": "The introduced hour already exists",
+    "Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
+    "Concept cannot be blank": "Concept cannot be blank",
+    "Ticket id cannot be blank": "Ticket id cannot be blank",
+    "Weekday cannot be blank": "Weekday cannot be blank",
+    "This ticket can not be modified": "This ticket can not be modified",
+    "You can't delete a confirmed order": "You can't delete a confirmed order",
+    "Value has an invalid format": "Value has an invalid format",
+    "The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
+    "Swift / BIC can't be empty": "Swift / BIC can't be empty",
+    "Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+    "Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+    "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
+    "MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
+    "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
+    "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+    "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
+    "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
+    "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
+    "Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
+    "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+    "NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
+    "Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
+    "Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
+    "I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
+    "I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
+    "Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "The grade must be similar to the last one": "The grade must be similar to the last one",
+    "agencyModeFk": "Agency",
+    "clientFk": "Client",
+    "zoneFk": "Zone",
+    "warehouseFk": "Warehouse",
+    "shipped": "Shipped",
+    "landed": "Landed",
+    "addressFk": "Address",
+    "companyFk": "Company",
+    "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
+    "The social name cannot be empty": "The social name cannot be empty",
+    "The nif cannot be empty": "The nif cannot be empty",
+    "Amount cannot be zero": "Amount cannot be zero",
+    "Company has to be official": "Company has to be official",
+    "Unable to clone this travel": "Unable to clone this travel",
+    "The observation type can't be repeated": "The observation type can't be repeated",
+    "New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
+    "New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
+    "There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
+    "Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
+    "Role name must be written in camelCase": "Role name must be written in camelCase",
+    "Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
+    "None": "None",
+    "error densidad = 0": "error densidad = 0",
+    "This document already exists on this ticket": "This document already exists on this ticket",
+    "serial non editable": "This serial doesn't allow to set a reference",
+    "nickname": "nickname",
+    "State": "State",
+    "regular": "regular",
+    "reserved": "reserved",
+    "Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
+    "A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
+    "This client is not invoiceable": "This client is not invoiceable",
+    "INACTIVE_PROVIDER": "Inactive provider",
+    "reference duplicated": "reference duplicated",
+    "The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
+    "This item is not available": "This item is not available",
+    "Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
+    "The type of business must be filled in basic data": "The type of business must be filled in basic data",
+    "The worker has hours recorded that day": "The worker has hours recorded that day",
+    "isWithoutNegatives": "isWithoutNegatives",
+    "routeFk": "routeFk",
+    "Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
+    "Can't change the password of another worker": "Can't change the password of another worker",
+    "No hay un contrato en vigor": "There is no existing contract",
+    "No está permitido trabajar": "Not allowed to work",
+    "Dirección incorrecta": "Wrong direction",
+    "No se permite fichar a futuro": "It is not allowed to sign in the future",
+    "Descanso diario 12h.": "Daily rest 12h.",
+    "Fichadas impares": "Odd signs",
+    "Descanso diario 9h.": "Daily rest 9h.",
+    "Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
+    "Verify email": "Verify email",
+    "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
+    "Password does not meet requirements": "Password does not meet requirements",
+    "You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
+    "Not enough privileges to edit a client": "Not enough privileges to edit a client",
+    "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+    "You don't have grant privilege": "You don't have grant privilege",
+    "You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
+    "Email verify": "Email verify",
+    "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+    "App locked": "App locked by user {{userId}}",
+    "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+    "Receipt's bank was not found": "Receipt's bank was not found",
+    "This receipt was not compensated": "This receipt was not compensated",
+    "Client's email was not found": "Client's email was not found",
+    "Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
+    "It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
+    "It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
+    "It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
+    "Warehouse inventory not set": "Almacén inventario no está establecido",
+    "Component cost not set": "Componente coste no está estabecido",
+    "Description cannot be blank": "Description cannot be blank",
+    "company": "Company",
+    "country": "Country",
+    "clientId": "Id client",
+    "clientSocialName": "Client",
+    "amount": "Amount",
+    "taxableBase": "Taxable base",
+    "ticketFk": "Id ticket",
+    "isActive": "Active",
+    "hasToInvoice": "Invoice",
+    "isTaxDataChecked": "Data checked",
+    "comercialId": "Id Comercial",
+    "comercialName": "Comercial",
+    "Added observation": "Added observation",
+    "Comment added to client": "Comment added to client",
+    "This ticket is already a refund": "This ticket is already a refund",
+    "A claim with that sale already exists": "A claim with that sale already exists",
+    "Pass expired": "The password has expired, change it from Salix",
+    "Can't transfer claimed sales": "Can't transfer claimed sales",
+    "Invalid quantity": "Invalid quantity",
+    "Failed to upload delivery note": "Error to upload delivery note {{id}}",
+    "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
+    "The renew period has not been exceeded": "The renew period has not been exceeded",
+    "You can not use the same password": "You can not use the same password",
+    "Valid priorities": "Valid priorities: %d",
+    "hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
+    "hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
+    "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
+    "Social name should be uppercase": "Social name should be uppercase",
+    "Street should be uppercase": "Street should be uppercase",
+    "You don't have enough privileges.": "You don't have enough privileges.",
+    "This ticket is locked": "This ticket is locked",
+    "This ticket is not editable.": "This ticket is not editable.",
+    "The ticket doesn't exist.": "The ticket doesn't exist.",
+    "The sales do not exists": "The sales do not exists",
+    "Ticket without Route": "Ticket without route",
+    "Select a different client": "Select a different client",
+    "Fill all the fields": "Fill all the fields",
+    "Error while generating PDF": "Error while generating PDF",
+    "Can't invoice to future": "Can't invoice to future",
+    "This ticket is already invoiced": "This ticket is already invoiced",
+    "Negative basis of tickets: 23": "Negative basis of tickets: 23",
+    "Booking completed": "Booking complete",
+    "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+    "You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+    "Bank entity must be specified": "Bank entity must be specified",
+    "Try again": "Try again",
+    "keepPrice": "keepPrice",
+    "Cannot past travels with entries": "Cannot past travels with entries",
+    "It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
+    "Incorrect pin": "Incorrect pin.",
+    "The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
+    "Name should be uppercase": "Name should be uppercase",
+    "You cannot update these fields": "You cannot update these fields",
+    "CountryFK cannot be empty": "Country cannot be empty",
+    "You are not allowed to modify the alias": "You are not allowed to modify the alias",
+    "You already have the mailAlias": "You already have the mailAlias"
+}

loopback/locale/es.json

@@ -1,347 +1,348 @@
 {
-	"Phone format is invalid": "El formato del teléfono no es correcto",
-	"You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
-	"Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
-	"The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
-	"Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
-	"Can't be blank": "No puede estar en blanco",
-	"Invalid TIN": "NIF/CIF inválido",
-	"TIN must be unique": "El NIF/CIF debe ser único",
-	"A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
-	"Is invalid": "Es inválido",
-	"Quantity cannot be zero": "La cantidad no puede ser cero",
-	"Enter an integer different to zero": "Introduce un entero distinto de cero",
-	"Package cannot be blank": "El embalaje no puede estar en blanco",
-	"The company name must be unique": "La razón social debe ser única",
-	"Invalid email": "Correo electrónico inválido",
-	"The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
-	"That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
-	"That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
-	"State cannot be blank": "El estado no puede estar en blanco",
-	"Worker cannot be blank": "El trabajador no puede estar en blanco",
-	"Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
-	"can't be blank": "El campo no puede estar vacío",
-	"Observation type must be unique": "El tipo de observación no puede repetirse",
-	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
-	"The grade must be similar to the last one": "El grade debe ser similar al último",
-	"Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
-	"Name cannot be blank": "El nombre no puede estar en blanco",
-	"Phone cannot be blank": "El teléfono no puede estar en blanco",
-	"Period cannot be blank": "El periodo no puede estar en blanco",
-	"Choose a company": "Selecciona una empresa",
-	"Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
-	"Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
-	"Cannot be blank": "El campo no puede estar en blanco",
-	"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
-	"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
-	"Description cannot be blank": "Se debe rellenar el campo de texto",
-	"The price of the item changed": "El precio del artículo cambió",
-	"The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
-	"The value should be a number": "El valor debe ser un numero",
-	"This order is not editable": "Esta orden no se puede modificar",
-	"You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
-	"You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
-	"is not a valid date": "No es una fecha valida",
-	"Barcode must be unique": "El código de barras debe ser único",
-	"The warehouse can't be repeated": "El almacén no puede repetirse",
-	"The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
-	"The observation type can't be repeated": "El tipo de observación no puede repetirse",
-	"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
-	"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
-	"Warehouse cannot be blank": "El almacén no puede quedar en blanco",
-	"Agency cannot be blank": "La agencia no puede quedar en blanco",
-	"Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
-	"This address doesn't exist": "Este consignatario no existe",
-	"You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
-	"You don't have enough privileges": "No tienes suficientes permisos",
-	"Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
-	"You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
-	"INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
-	"You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
-	"You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
-	"Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
-	"ORDER_EMPTY": "Cesta vacía",
-	"You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
-	"NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
-	"Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
-	"Street cannot be empty": "Dirección no puede estar en blanco",
-	"City cannot be empty": "Ciudad no puede estar en blanco",
-	"Code cannot be blank": "Código no puede estar en blanco",
-	"You cannot remove this department": "No puedes eliminar este departamento",
-	"The extension must be unique": "La extensión debe ser unica",
-	"The secret can't be blank": "La contraseña no puede estar en blanco",
-	"We weren't able to send this SMS": "No hemos podido enviar el SMS",
-	"This client can't be invoiced": "Este cliente no puede ser facturado",
-	"You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
-	"This ticket can't be invoiced": "Este ticket no puede ser facturado",
-	"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
-	"This ticket can not be modified": "Este ticket no puede ser modificado",
-	"The introduced hour already exists": "Esta hora ya ha sido introducida",
-	"INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
-	"The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
-	"NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
-	"ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
-	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
-	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
-	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-	"The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
-	"Please select at least one sale": "Por favor selecciona al menos una linea",
-	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
-	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"This item doesn't exists": "El artículo no existe",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"Extension format is invalid": "El formato de la extensión es inválido",
-	"Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
-	"This item is not available": "Este artículo no está disponible",
-	"This postcode already exists": "Este código postal ya existe",
-	"Concept cannot be blank": "El concepto no puede quedar en blanco",
-	"File doesn't exists": "El archivo no existe",
-	"You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
-	"This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
-	"Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
-	"Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
-	"You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
-	"The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
-	"Invalid quantity": "Cantidad invalida",
-	"This postal code is not valid": "Este código postal no es válido",
-	"is invalid": "es inválido",
-	"The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
-	"The department name can't be repeated": "El nombre del departamento no puede repetirse",
-	"This phone already exists": "Este teléfono ya existe",
-	"You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
-	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
-	"You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
-	"You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
-	"You should specify a date": "Debes especificar una fecha",
-	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
-	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
-	"You should mark at least one week day": "Debes marcar al menos un día de la semana",
-	"Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
-	"Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
-	"Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
-	"Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
-	"Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"State": "Estado",
-	"regular": "normal",
-	"reserved": "reservado",
-	"Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
-	"Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
-	"MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
-	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
-	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
-	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
-	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
-	"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
-	"This ticket is deleted": "Este ticket está eliminado",
-	"Unable to clone this travel": "No ha sido posible clonar este travel",
-	"This thermograph id already exists": "La id del termógrafo ya existe",
-	"Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
-	"ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
-	"Invalid password": "Invalid password",
-	"Password does not meet requirements": "La contraseña no cumple los requisitos",
-	"Role already assigned": "Rol ya asignado",
-	"Invalid role name": "Nombre de rol no válido",
-	"Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
-	"Email already exists": "El correo ya existe",
-	"User already exists": "El/La usuario/a ya existe",
-	"Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
-	"Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
-	"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
-	"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
-	"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
-	"I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
-	"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
-	"Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"agencyModeFk": "Agencia",
-	"clientFk": "Cliente",
-	"zoneFk": "Zona",
-	"warehouseFk": "Almacén",
-	"shipped": "F. envío",
-	"landed": "F. entrega",
-	"addressFk": "Consignatario",
-	"companyFk": "Empresa",
-	"The social name cannot be empty": "La razón social no puede quedar en blanco",
-	"The nif cannot be empty": "El NIF no puede quedar en blanco",
-	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
-	"ASSIGN_ZONE_FIRST": "Asigna una zona primero",
-	"Amount cannot be zero": "El importe no puede ser cero",
-	"Company has to be official": "Empresa inválida",
-	"You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
-	"Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
-	"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
-	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
-	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
-	"Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
-	"This BIC already exist.": "Este BIC ya existe.",
-	"That item doesn't exists": "Ese artículo no existe",
-	"There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
-	"Invalid account": "Cuenta inválida",
-	"Compensation account is empty": "La cuenta para compensar está vacia",
-	"This genus already exist": "Este genus ya existe",
-	"This specie already exist": "Esta especie ya existe",
-	"Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"None": "Ninguno",
-	"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
-	"Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
-	"This document already exists on this ticket": "Este documento ya existe en el ticket",
-	"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
-	"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
-	"nickname": "nickname",
-	"INACTIVE_PROVIDER": "Proveedor inactivo",
-	"This client is not invoiceable": "Este cliente no es facturable",
-	"serial non editable": "Esta serie no permite asignar la referencia",
-	"Max shipped required": "La fecha límite es requerida",
-	"Can't invoice to future": "No se puede facturar a futuro",
-	"Can't invoice to past": "No se puede facturar a pasado",
-	"This ticket is already invoiced": "Este ticket ya está facturado",
-	"A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
-	"A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
-	"Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
-	"Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
-	"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
-	"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
-	"You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
-	"Amounts do not match": "Las cantidades no coinciden",
-	"The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
-	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
-	"You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
-	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
-	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
-	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
-	"The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
-	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
-	"You don't have privileges to create refund": "No tienes permisos para crear un abono",
-	"The item is required": "El artículo es requerido",
-	"The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
-	"date in the future": "Fecha en el futuro",
-	"reference duplicated": "Referencia duplicada",
-	"This ticket is already a refund": "Este ticket ya es un abono",
-	"isWithoutNegatives": "Sin negativos",
-	"routeFk": "routeFk",
-	"Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
-	"No hay un contrato en vigor": "No hay un contrato en vigor",
-	"No se permite fichar a futuro": "No se permite fichar a futuro",
-	"No está permitido trabajar": "No está permitido trabajar",
-	"Fichadas impares": "Fichadas impares",
-	"Descanso diario 12h.": "Descanso diario 12h.",
-	"Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
-	"Dirección incorrecta": "Dirección incorrecta",
-	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
-	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
-	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
-	"This route does not exists": "Esta ruta no existe",
-	"Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
-	"You don't have grant privilege": "No tienes privilegios para dar privilegios",
-	"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
-	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-	"Already has this status": "Ya tiene este estado",
-	"There aren't records for this week": "No existen registros para esta semana",
-	"Empty data source": "Origen de datos vacio",
-	"App locked": "Aplicación bloqueada por el usuario {{userId}}",
-	"Email verify": "Correo de verificación",
-	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"Receipt's bank was not found": "No se encontró el banco del recibo",
-	"This receipt was not compensated": "Este recibo no ha sido compensado",
-	"Client's email was not found": "No se encontró el email del cliente",
-	"Negative basis": "Base negativa",
-	"This worker code already exists": "Este codigo de trabajador ya existe",
-	"This personal mail already exists": "Este correo personal ya existe",
-	"This worker already exists": "Este trabajador ya existe",
-	"App name does not exist": "El nombre de aplicación no es válido",
-	"Try again": "Vuelve a intentarlo",
-	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
-	"Failed to upload delivery note": "Error al subir albarán {{id}}",
-	"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
-	"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
-	"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
-	"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
-	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
-	"There is no assigned email for this client": "No hay correo asignado para este cliente",
-	"Exists an invoice with a future date": "Existe una factura con fecha posterior",
-	"Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
-	"Warehouse inventory not set": "El almacén inventario no está establecido",
-	"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
-	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
-	"Not exist this branch": "La rama no existe",
-	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
-	"Collection does not exist": "La colección no existe",
-	"Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
-	"Insert a date range": "Inserte un rango de fechas",
-	"Added observation": "{{user}} añadió esta observacion: {{text}}",
-	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
-	"Invalid auth code": "Código de verificación incorrecto",
-	"Invalid or expired verification code": "Código de verificación incorrecto o expirado",
-	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
-	"company": "Compañía",
-	"country": "País",
-	"clientId": "Id cliente",
-	"clientSocialName": "Cliente",
-	"amount": "Importe",
-	"taxableBase": "Base",
-	"ticketFk": "Id ticket",
-	"isActive": "Activo",
-	"hasToInvoice": "Facturar",
-	"isTaxDataChecked": "Datos comprobados",
-	"comercialId": "Id comercial",
-	"comercialName": "Comercial",
-	"Pass expired": "La contraseña ha caducado, cambiela desde Salix",
-	"Invalid NIF for VIES": "Invalid NIF for VIES",
-	"Ticket does not exist": "Este ticket no existe",
-	"Ticket is already signed": "Este ticket ya ha sido firmado",
-	"Authentication failed": "Autenticación fallida",
-	"You can't use the same password": "No puedes usar la misma contraseña",
-	"You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
-	"Fecha fuera de rango": "Fecha fuera de rango",
-	"Error while generating PDF": "Error al generar PDF",
-	"Error when sending mail to client": "Error al enviar el correo al cliente",
-	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
-	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
-	"Valid priorities": "Prioridades válidas: %d",
-	"hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
-	"hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
-	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
-	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
-	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
-	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
-	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
-	"You don't have enough privileges.": "No tienes suficientes permisos.",
-	"This ticket is locked": "Este ticket está bloqueado.",
-	"This ticket is not editable.": "Este ticket no es editable.",
-	"The ticket doesn't exist.": "No existe el ticket.",
-	"Social name should be uppercase": "La razón social debe ir en mayúscula",
-	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
-	"Ticket without Route": "Ticket sin ruta",
-	"Select a different client": "Seleccione un cliente distinto",
-	"Fill all the fields": "Rellene todos los campos",
-	"The response is not a PDF": "La respuesta no es un PDF",
-	"Booking completed": "Reserva completada",
-	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-	"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
-	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
-	"User disabled": "Usuario desactivado",
-	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
-	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-	"This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
-	"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
-	"Incorrect pin": "Pin incorrecto",
-	"You already have the mailAlias": "Ya tienes este alias de correo",
-	"The alias cant be modified": "Este alias de correo no puede ser modificado",
-	"No tickets to invoice": "No hay tickets para facturar",
-	"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
-	"Name should be uppercase": "El nombre debe ir en mayúscula",
-	"Bank entity must be specified": "La entidad bancaria es obligatoria",
-	"An email is necessary": "Es necesario un email",
-	"You cannot update these fields": "No puedes actualizar estos campos",
-	"CountryFK cannot be empty": "El país no puede estar vacío",
-	"Cmr file does not exist": "El archivo del cmr no existe"
-}
+    "Phone format is invalid": "El formato del teléfono no es correcto",
+    "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
+    "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
+    "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
+    "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
+    "Can't be blank": "No puede estar en blanco",
+    "Invalid TIN": "NIF/CIF inválido",
+    "TIN must be unique": "El NIF/CIF debe ser único",
+    "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
+    "Is invalid": "Es inválido",
+    "Quantity cannot be zero": "La cantidad no puede ser cero",
+    "Enter an integer different to zero": "Introduce un entero distinto de cero",
+    "Package cannot be blank": "El embalaje no puede estar en blanco",
+    "The company name must be unique": "La razón social debe ser única",
+    "Invalid email": "Correo electrónico inválido",
+    "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
+    "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
+    "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
+    "State cannot be blank": "El estado no puede estar en blanco",
+    "Worker cannot be blank": "El trabajador no puede estar en blanco",
+    "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
+    "can't be blank": "El campo no puede estar vacío",
+    "Observation type must be unique": "El tipo de observación no puede repetirse",
+    "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+    "The grade must be similar to the last one": "El grade debe ser similar al último",
+    "Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
+    "Name cannot be blank": "El nombre no puede estar en blanco",
+    "Phone cannot be blank": "El teléfono no puede estar en blanco",
+    "Period cannot be blank": "El periodo no puede estar en blanco",
+    "Choose a company": "Selecciona una empresa",
+    "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
+    "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
+    "Cannot be blank": "El campo no puede estar en blanco",
+    "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
+    "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
+    "Description cannot be blank": "Se debe rellenar el campo de texto",
+    "The price of the item changed": "El precio del artículo cambió",
+    "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
+    "The value should be a number": "El valor debe ser un numero",
+    "This order is not editable": "Esta orden no se puede modificar",
+    "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
+    "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
+    "is not a valid date": "No es una fecha valida",
+    "Barcode must be unique": "El código de barras debe ser único",
+    "The warehouse can't be repeated": "El almacén no puede repetirse",
+    "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
+    "The observation type can't be repeated": "El tipo de observación no puede repetirse",
+    "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
+    "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
+    "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
+    "Agency cannot be blank": "La agencia no puede quedar en blanco",
+    "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
+    "This address doesn't exist": "Este consignatario no existe",
+    "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
+    "You don't have enough privileges": "No tienes suficientes permisos",
+    "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
+    "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
+    "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
+    "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
+    "You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
+    "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
+    "ORDER_EMPTY": "Cesta vacía",
+    "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
+    "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
+    "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
+    "Street cannot be empty": "Dirección no puede estar en blanco",
+    "City cannot be empty": "Ciudad no puede estar en blanco",
+    "Code cannot be blank": "Código no puede estar en blanco",
+    "You cannot remove this department": "No puedes eliminar este departamento",
+    "The extension must be unique": "La extensión debe ser unica",
+    "The secret can't be blank": "La contraseña no puede estar en blanco",
+    "We weren't able to send this SMS": "No hemos podido enviar el SMS",
+    "This client can't be invoiced": "Este cliente no puede ser facturado",
+    "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
+    "This ticket can't be invoiced": "Este ticket no puede ser facturado",
+    "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
+    "This ticket can not be modified": "Este ticket no puede ser modificado",
+    "The introduced hour already exists": "Esta hora ya ha sido introducida",
+    "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
+    "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
+    "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
+    "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
+    "The current ticket can't be modified": "El ticket actual no puede ser modificado",
+    "The current claim can't be modified": "La reclamación actual no puede ser modificada",
+    "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+    "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
+    "Please select at least one sale": "Por favor selecciona al menos una linea",
+    "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
+    "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+    "This item doesn't exists": "El artículo no existe",
+    "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+    "Extension format is invalid": "El formato de la extensión es inválido",
+    "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
+    "This item is not available": "Este artículo no está disponible",
+    "This postcode already exists": "Este código postal ya existe",
+    "Concept cannot be blank": "El concepto no puede quedar en blanco",
+    "File doesn't exists": "El archivo no existe",
+    "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
+    "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
+    "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
+    "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
+    "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
+    "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
+    "Invalid quantity": "Cantidad invalida",
+    "This postal code is not valid": "Este código postal no es válido",
+    "is invalid": "es inválido",
+    "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
+    "The department name can't be repeated": "El nombre del departamento no puede repetirse",
+    "This phone already exists": "Este teléfono ya existe",
+    "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
+    "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
+    "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
+    "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
+    "You should specify a date": "Debes especificar una fecha",
+    "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
+    "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
+    "You should mark at least one week day": "Debes marcar al menos un día de la semana",
+    "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
+    "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
+    "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
+    "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+    "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+    "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "State": "Estado",
+    "regular": "normal",
+    "reserved": "reservado",
+    "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
+    "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
+    "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
+    "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+    "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
+    "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
+    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+    "Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
+    "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
+    "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
+    "Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
+    "This ticket is deleted": "Este ticket está eliminado",
+    "Unable to clone this travel": "No ha sido posible clonar este travel",
+    "This thermograph id already exists": "La id del termógrafo ya existe",
+    "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
+    "ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
+    "Invalid password": "Invalid password",
+    "Password does not meet requirements": "La contraseña no cumple los requisitos",
+    "Role already assigned": "Rol ya asignado",
+    "Invalid role name": "Nombre de rol no válido",
+    "Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
+    "Email already exists": "El correo ya existe",
+    "User already exists": "El/La usuario/a ya existe",
+    "Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
+    "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
+    "Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
+    "Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
+    "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
+    "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
+    "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
+    "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+    "agencyModeFk": "Agencia",
+    "clientFk": "Cliente",
+    "zoneFk": "Zona",
+    "warehouseFk": "Almacén",
+    "shipped": "F. envío",
+    "landed": "F. entrega",
+    "addressFk": "Consignatario",
+    "companyFk": "Empresa",
+    "The social name cannot be empty": "La razón social no puede quedar en blanco",
+    "The nif cannot be empty": "El NIF no puede quedar en blanco",
+    "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
+    "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
+    "Amount cannot be zero": "El importe no puede ser cero",
+    "Company has to be official": "Empresa inválida",
+    "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
+    "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
+    "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
+    "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
+    "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
+    "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
+    "This BIC already exist.": "Este BIC ya existe.",
+    "That item doesn't exists": "Ese artículo no existe",
+    "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
+    "Invalid account": "Cuenta inválida",
+    "Compensation account is empty": "La cuenta para compensar está vacia",
+    "This genus already exist": "Este genus ya existe",
+    "This specie already exist": "Esta especie ya existe",
+    "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+    "None": "Ninguno",
+    "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
+    "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
+    "This document already exists on this ticket": "Este documento ya existe en el ticket",
+    "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
+    "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
+    "nickname": "nickname",
+    "INACTIVE_PROVIDER": "Proveedor inactivo",
+    "This client is not invoiceable": "Este cliente no es facturable",
+    "serial non editable": "Esta serie no permite asignar la referencia",
+    "Max shipped required": "La fecha límite es requerida",
+    "Can't invoice to future": "No se puede facturar a futuro",
+    "Can't invoice to past": "No se puede facturar a pasado",
+    "This ticket is already invoiced": "Este ticket ya está facturado",
+    "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
+    "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
+    "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
+    "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
+    "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
+    "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
+    "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
+    "Amounts do not match": "Las cantidades no coinciden",
+    "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
+    "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
+    "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
+    "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
+    "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
+    "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+    "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
+    "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
+    "You don't have privileges to create refund": "No tienes permisos para crear un abono",
+    "The item is required": "El artículo es requerido",
+    "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
+    "date in the future": "Fecha en el futuro",
+    "reference duplicated": "Referencia duplicada",
+    "This ticket is already a refund": "Este ticket ya es un abono",
+    "isWithoutNegatives": "Sin negativos",
+    "routeFk": "routeFk",
+    "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
+    "No hay un contrato en vigor": "No hay un contrato en vigor",
+    "No se permite fichar a futuro": "No se permite fichar a futuro",
+    "No está permitido trabajar": "No está permitido trabajar",
+    "Fichadas impares": "Fichadas impares",
+    "Descanso diario 12h.": "Descanso diario 12h.",
+    "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
+    "Dirección incorrecta": "Dirección incorrecta",
+    "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
+    "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
+    "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+    "This route does not exists": "Esta ruta no existe",
+    "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
+    "You don't have grant privilege": "No tienes privilegios para dar privilegios",
+    "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+    "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+    "Already has this status": "Ya tiene este estado",
+    "There aren't records for this week": "No existen registros para esta semana",
+    "Empty data source": "Origen de datos vacio",
+    "App locked": "Aplicación bloqueada por el usuario {{userId}}",
+    "Email verify": "Correo de verificación",
+    "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+    "Receipt's bank was not found": "No se encontró el banco del recibo",
+    "This receipt was not compensated": "Este recibo no ha sido compensado",
+    "Client's email was not found": "No se encontró el email del cliente",
+    "Negative basis": "Base negativa",
+    "This worker code already exists": "Este codigo de trabajador ya existe",
+    "This personal mail already exists": "Este correo personal ya existe",
+    "This worker already exists": "Este trabajador ya existe",
+    "App name does not exist": "El nombre de aplicación no es válido",
+    "Try again": "Vuelve a intentarlo",
+    "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
+    "Failed to upload delivery note": "Error al subir albarán {{id}}",
+    "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+    "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+    "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+    "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+    "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
+    "There is no assigned email for this client": "No hay correo asignado para este cliente",
+    "Exists an invoice with a future date": "Existe una factura con fecha posterior",
+    "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+    "Warehouse inventory not set": "El almacén inventario no está establecido",
+    "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
+    "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
+    "Not exist this branch": "La rama no existe",
+    "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
+    "Collection does not exist": "La colección no existe",
+    "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
+    "Insert a date range": "Inserte un rango de fechas",
+    "Added observation": "{{user}} añadió esta observacion: {{text}}",
+    "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+    "Invalid auth code": "Código de verificación incorrecto",
+    "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
+    "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
+    "company": "Compañía",
+    "country": "País",
+    "clientId": "Id cliente",
+    "clientSocialName": "Cliente",
+    "amount": "Importe",
+    "taxableBase": "Base",
+    "ticketFk": "Id ticket",
+    "isActive": "Activo",
+    "hasToInvoice": "Facturar",
+    "isTaxDataChecked": "Datos comprobados",
+    "comercialId": "Id comercial",
+    "comercialName": "Comercial",
+    "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
+    "Invalid NIF for VIES": "Invalid NIF for VIES",
+    "Ticket does not exist": "Este ticket no existe",
+    "Ticket is already signed": "Este ticket ya ha sido firmado",
+    "Authentication failed": "Autenticación fallida",
+    "You can't use the same password": "No puedes usar la misma contraseña",
+    "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
+    "Fecha fuera de rango": "Fecha fuera de rango",
+    "Error while generating PDF": "Error al generar PDF",
+    "Error when sending mail to client": "Error al enviar el correo al cliente",
+    "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+    "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+    "Valid priorities": "Prioridades válidas: %d",
+    "hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+    "hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
+    "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
+    "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
+    "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+    "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+    "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
+    "You don't have enough privileges.": "No tienes suficientes permisos.",
+    "This ticket is locked": "Este ticket está bloqueado.",
+    "This ticket is not editable.": "Este ticket no es editable.",
+    "The ticket doesn't exist.": "No existe el ticket.",
+    "Social name should be uppercase": "La razón social debe ir en mayúscula",
+    "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+    "Ticket without Route": "Ticket sin ruta",
+    "Select a different client": "Seleccione un cliente distinto",
+    "Fill all the fields": "Rellene todos los campos",
+    "The response is not a PDF": "La respuesta no es un PDF",
+    "Booking completed": "Reserva completada",
+    "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+    "Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
+    "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+    "User disabled": "Usuario desactivado",
+    "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+    "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+    "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
+    "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
+    "Incorrect pin": "Pin incorrecto",
+    "You already have the mailAlias": "Ya tienes este alias de correo",
+    "The alias cant be modified": "Este alias de correo no puede ser modificado",
+    "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
+    "Name should be uppercase": "El nombre debe ir en mayúscula",
+    "Bank entity must be specified": "La entidad bancaria es obligatoria",
+    "An email is necessary": "Es necesario un email",
+    "You cannot update these fields": "No puedes actualizar estos campos",
+    "CountryFK cannot be empty": "El país no puede estar vacío",
+    "Cmr file does not exist": "El archivo del cmr no existe",
+    "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
+    "No tickets to invoice": "No hay tickets para facturar"
+}

modules/account/back/models/mail-alias-account.js

@@ -1,5 +1,5 @@
 
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
 
 module.exports = Self => {
     Self.rewriteDbError(function(err) {
@@ -8,38 +8,38 @@ module.exports = Self => {
         return err;
     });
 
-    Self.observe('before save', async ctx => {
-        const changes = ctx.currentInstance || ctx.instance;
-
-        await checkModifyPermission(ctx, changes.mailAlias);
+    Self.beforeRemote('create', async function(ctx) {
+        const mailAlias = ctx.args.data?.mailAlias;
+        if (!mailAlias) return;
+        await checkModifyPermission(ctx, mailAlias);
     });
-
-    Self.observe('before delete', async ctx => {
-        const mailAliasAccount = await Self.findById(ctx.where.id);
-
-        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
+    Self.beforeRemote('deleteById', async function(ctx) {
+        const instance = await Self.findById(ctx.args.id,
+            {fields: ['mailAlias']}
+        );
+        await checkModifyPermission(ctx, instance.mailAlias);
     });
 
     async function checkModifyPermission(ctx, mailAliasFk) {
-        const userId = ctx.options.accessToken.userId;
         const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
 
-        const roles = await models.RoleMapping.find({
-            fields: ['roleId'],
-            where: {principalId: userId}
+        const canEditAlias = await models.ACL.checkAccessAcl(ctx,
+            'MailAliasAccount', 'canEditAlias', 'WRITE');
+        if (canEditAlias) return;
+
+        const allowedRoles = await models.MailAliasAcl.find({
+            fields: ['roleFk'],
+            where: {mailAliasFk}
         });
+        const nRoles = allowedRoles.length &&
+            await models.RoleMapping.count({
+                principalId: userId,
+                principalType: 'USER',
+                roleId: {inq: allowedRoles.map(x => x.roleFk)}
+            });
 
-        const availableMailAlias = await models.MailAliasAcl.findOne({
-            fields: ['mailAliasFk'],
-            include: {relation: 'mailAlias'},
-            where: {
-                roleFk: {
-                    inq: roles.map(role => role.roleId),
-                },
-                mailAliasFk
-            }
-        });
-
-        if (!availableMailAlias) throw new UserError('The alias cant be modified');
+        if (!nRoles)
+            throw new ForbiddenError('You are not allowed to modify the alias');
     }
 };

modules/account/front/descriptor/index.js

@@ -71,7 +71,7 @@ class Controller extends Descriptor {
         const params = {newPassword: this.newPassword};
 
         if (this.askOldPass) {
-            method = 'changePassword';
+            method = 'change-password';
             params.oldPassword = this.oldPassword;
         } else
             method = 'setPassword';

modules/route/back/models/route.js

@@ -22,16 +22,16 @@ module.exports = Self => {
     require('../methods/route/getByWorker')(Self);
 
     Self.validate('kmStart', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
     });
 
     Self.validate('kmEnd', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
     });
 
     function validateDistance(err) {
         const routeTotalKm = this.kmEnd - this.kmStart;
-        const routeMaxKm = 1000;
+        const routeMaxKm = 4000;
         if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
             err();
     }

modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js

@@ -27,7 +27,10 @@ describe('Travel cloneWithEntries()', () => {
             expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
             expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
             expect(travelEntries.length).toBeGreaterThan(0);
-
+            await models.Entry.destroyAll({
+                travelFk: newTravelId
+            }, options);
+            await models.Travel.destroyById(newTravelId, options);
             await tx.rollback();
             const travelRemoved = await models.Travel.findById(newTravelId, options);
 

package.json

@@ -42,7 +42,8 @@
         "mysql": "2.18.1",
         "node-ssh": "^11.0.0",
         "object.pick": "^1.3.0",
-        "puppeteer": "^21.10.0",
+        "puppeteer": "^21.11.0",
+        "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
         "smbhash": "0.0.1",
         "strong-error-handler": "^2.3.2",

print/core/cluster.js

@@ -6,7 +6,7 @@ module.exports = {
     init() {
         if (this.pool) return;
         Cluster.launch({
-            concurrency: Cluster.CONCURRENCY_CONTEXT,
+            concurrency: Cluster.CONCURRENCY_PAGE,
             maxConcurrency: cpus().length,
             puppeteerOptions: {
                 headless: 'new',

print/templates/reports/driver-route/assets/css/style.css

@@ -46,6 +46,9 @@ section.text-area {
     padding-left: 1em;
     padding-right: 1em;
     background-color: #e5e5e5;
+    & > p {
+        word-break: break-all;
+    }
 }
 
 .route-block {

print/templates/reports/driver-route/driver-route.js

@@ -5,7 +5,6 @@ module.exports = {
     mixins: [vnReport],
     async serverPrefetch() {
         let ids = this.id;
-
         const hasMultipleRoutes = String(this.id).includes(',');
         if (hasMultipleRoutes)
             ids = this.id.split(',');
@@ -30,7 +29,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: Number,
+            type: String,
             required: true,
             description: 'The route id'
         }