Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets

db/dump/fixtures.before.sql

@@ -750,17 +750,15 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
 
 INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
 
-INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`, `dated`)
+INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `dated`)
     VALUES
-        (1, '1899-12-30 12:15:00', 133, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1,  util.VN_CURDATE()),
-        (2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route',  0.2,   20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9,  util.VN_CURDATE()),
-        (3, '1899-12-30 14:30:00', 56, util.VN_CURDATE(), 2, 3, 'third route',   0.5,   30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 10, util.VN_CURDATE()),
-        (4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route',  0,     40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 12, util.VN_CURDATE()),
-        (5, '1899-12-30 16:00:00', 56, util.VN_CURDATE(), 4, 5, 'fifth route',   0.1,   50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 13, util.VN_CURDATE()),
-        (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3,  util.VN_CURDATE()),
-        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5,  util.VN_CURDATE()),
-		(8, NULL,                  133, util.VN_CURDATE(), 1, 1, 'eighth route', 1.8, 10.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1, util.VN_CURDATE()),
-    	(9, NULL,                  133, util.VN_CURDATE(), 1, 2, 'ninth route', 0.2, 20.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9, util.VN_CURDATE());
+        (1, '1899-12-30 12:15:00', 133, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route',  0.2,   20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (3, '1899-12-30 14:30:00', 133, util.VN_CURDATE(), 2, 3, 'third route',   0.5,   30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route',  0,     40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (5, '1899-12-30 16:00:00', 133, util.VN_CURDATE(), 4, 5, 'fifth route',   0.1,   50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
     VALUES
@@ -2756,13 +2754,13 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
         (3),
         (4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `eta`, `observations`, `editorFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY),                           'this is test observation', 1, 15, 'Batman'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 5 DAY),                           'test observation',         1, 20, 'Robin'),
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), DATE_ADD(util.VN_NOW(), INTERVAL 6 DAY), 'observations...',          2, 25, 'Driverman');
 
-INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `addressFk`, `eta`, `description`, `userFk`)
+INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `description`, `editorFk`)
     VALUES
         (1, 1, 1, DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY),          'Best truck in fleet',      1),
         (2, 1, 2, DATE_ADD(util.VN_NOW(), INTERVAL '1 2' DAY_HOUR), 'Second truck in fleet',    1),
@@ -2926,7 +2924,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (7, 'zone-included','An email to notify zoneCollisions'),
         (8, 'backup-printer-selected','A backup printer has been selected'),
         (9, 'mrw-deadline','The MRW deadline has passed'),
-        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
+        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process'),
+        (11,'misallocation-warehouse','Misallocation of items in the warehouse.');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2940,7 +2939,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (6, 9),
         (7, 9),
         (8, 66),
-        (9, 56);
+        (9, 56),
+		(11, 9);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)

db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql

@@ -65,7 +65,7 @@ BEGIN
 								JOIN vn.ticketState ts ON ts.ticketFk = t.id
 								JOIN vn.alertLevel al ON al.id = ts.alertLevel
 							WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-								AND s.isPicked = FALSE
+								AND NOT s.isPicked
 								AND al.code = 'FREE'
 								AND  t.warehouseFk = vWarehouseFk
 							GROUP BY s.itemFk
@@ -73,7 +73,6 @@ BEGIN
 					) s ON s.itemFk = v.item_id
 				WHERE v.calc_id = vCalc
 					AND NOT v.visible <=> tv.totalVisible;
-
 	END LOOP;
 	CLOSE cWarehouses;
 

db/routines/vn/functions/getTimeBetweenRoadmapAddresses.sql

@@ -0,0 +1,62 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`getTimeBetweenRoadmapAddresses`(
+	vRoadmapAddressFrom INT,
+	vRoadmapAddressTo INT
+)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Retorna el tiempo en segundos que se suele tardar en ir
+ * de un punto de distribución a otro en una ruta troncal.
+ *
+ * @param vRoadmapAddressFrom Punto de distribución de origen
+ * @param vRoadmapAddressTo Punto de distribución de destino
+ * @return Tiempo en segundos
+ */
+	DECLARE vSeconds INT;
+
+	WITH wRoadmapStop AS (
+		SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
+				roadmapFk,
+				roadmapAddressFk,
+				eta
+			FROM vn.roadmapStop
+			WHERE roadmapFk IS NOT NULL
+				AND roadmapAddressFk IS NOT NULL
+				AND eta IS NOT NULL
+	)
+	SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rsFrom.eta))) INTO vSeconds
+		FROM wRoadmapStop rsFrom
+			JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rsFrom.roadmapFk
+		WHERE rsFrom.roadmapAddressFk = vRoadmapAddressFrom
+			AND rsTo.roadmapAddressFk = vRoadmapAddressTo
+			AND rsFrom.`sequence` + 1 = rsTo.`sequence`;
+	
+	IF NOT IFNULL(vSeconds, 0) THEN
+		WITH wRoadmap AS (
+			SELECT id,
+					roadmapAddressFk,
+					etd
+				FROM vn.roadmap
+				WHERE roadmapAddressFk = vRoadmapAddressFrom
+					AND etd IS NOT NULL
+		), wRoadmapStop AS (
+			SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
+					roadmapFk,
+					roadmapAddressFk,
+					eta
+				FROM vn.roadmapStop
+				WHERE roadmapFk IS NOT NULL
+					AND roadmapAddressFk = vRoadmapAddressTo
+					AND eta IS NOT NULL
+		)
+		SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rFrom.etd))) INTO vSeconds
+			FROM wRoadmap rFrom
+				JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rFrom.id
+					AND rsTo.`sequence` = 1;
+	END IF;
+
+	RETURN vSeconds;
+END$$
+DELIMITER ;

db/routines/vn/procedures/itemShelvingRadar.sql

@@ -1,207 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
-	vSectorFk INT
-)
-BEGIN
-/**
- * Calcula la información detallada respecto un sector.
- *
- * @param vSectorFk Id de sector
- */
-	DECLARE vCalcVisibleFk INT;
-	DECLARE vCalcAvailableFk INT;
-	DECLARE hasFatherSector BOOLEAN;
-	DECLARE vBuyerFk INT DEFAULT 0;
-	DECLARE vWarehouseFk INT DEFAULT 0;
-	DECLARE vSonSectorFk INT;
-	DECLARE vWorkerFk INT;
-
-	SELECT s.workerFk INTO vWorkerFk 
-		FROM sector s
-		WHERE s.id = vSectorFk;
-
-	SELECT COUNT(*) INTO hasFatherSector
-		FROM sector
-		WHERE sonFk = vSectorFk;
-
-	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
-		FROM sector
-		WHERE id = vSectorFk;
-
-	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
-	CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
-	IF hasFatherSector THEN
-		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
-			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY 
-			SELECT * 
-				FROM (
-					SELECT iss.itemFk,
-							i.longName,
-							i.size,
-							i.subName producer,
-							IFNULL(a.available, 0) available,
-							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible, 0), 0)) upstairs,
-							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible, 0), 0)) downstairs,
-							IF(it.isPackaging, NULL, IFNULL(v.visible, 0)) visible,
-							vSectorFk sectorFk,
-							ish.isChecked,
-							sub.isAllChecked
-						FROM itemShelvingStock iss
-							JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-							LEFT JOIN (
-								SELECT itemFk,
-										IF(
-											COUNT(*) = SUM(IF(isChecked >= 0, 1, 0)),
-											TRUE,
-											FALSE
-										) isAllChecked
-									FROM itemShelving is2
-									GROUP BY itemFk
-							) sub ON sub.itemFk = ish.itemFk
-							JOIN sector s ON s.id = iss.sectorFk
-							JOIN item i ON i.id = iss.itemFk
-							JOIN itemType it ON it.id = i.typeFk
-							LEFT JOIN cache.available a ON a.item_id = iss.itemFk
-								AND a.calc_id = vCalcAvailableFk
-							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
-								AND v.calc_id = vCalcVisibleFk
-							WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
-							GROUP BY iss.itemFk
-					UNION ALL
-					SELECT v.item_id,
-							i.longName,
-							i.size,
-							i.subName,
-							IFNULL(a.available, 0),
-							0,
-							0,
-							IF(it.isPackaging, NULL, v.visible),
-							vSectorFk,
-							NULL,
-							NULL
-						FROM cache.visible v  
-							JOIN item i ON i.id = v.item_id
-							JOIN itemType it ON it.id = i.typeFk
-							LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id
-								AND iss.warehouseFk = vWarehouseFk
-							LEFT JOIN cache.available a ON a.item_id = v.item_id
-								AND a.calc_id = vCalcAvailableFk
-						WHERE v.calc_id = vCalcVisibleFk
-							AND iss.itemFk IS NULL
-							AND it.isInventory
-				) sub
-				GROUP BY itemFk;
-					
-		SELECT ishr.*, 
-				CAST(visible - upstairs - downstairs AS DECIMAL(10, 0)) nicho,
-				CAST(downstairs - IFNULL(notPickedYed, 0) AS DECIMAL(10, 0)) pendiente
-			FROM tItemShelvingRadar ishr
-				JOIN item i ON i.id = ishr.itemFk
-				LEFT JOIN (
-					SELECT s.itemFk, SUM(s.quantity) notPickedYed
-							FROM ticket t
-								JOIN ticketStateToday tst ON tst.ticketFk = t.id
-								JOIN alertLevel al ON al.id = tst.alertLevel
-								JOIN sale s ON s.ticketFk = t.id
-							WHERE t.warehouseFk = vWarehouseFk
-								AND al.code = 'FREE'
-							GROUP BY s.itemFk
-				) sub ON sub.itemFk = ishr.itemFk
-			ORDER BY i.typeFk, i.longName;
-	ELSE
-		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
-			(PRIMARY KEY (itemFk))
-			ENGINE = MEMORY 
-			SELECT iss.itemFk,
-					0 `hour`,
-					0 `minute`,
-					'--' itemPlacementCode,
-					i.longName,
-					i.size,
-					i.subName producer,
-					i.upToDown,
-					IFNULL(a.available, 0) available,
-					IFNULL(v.visible - iss.visible, 0) dayEndVisible,
-					IFNULL(v.visible - iss.visible, 0) firstNegative,
-					IFNULL(v.visible - iss.visible, 0) itemPlacementVisible, 
-					IFNULL(i.minimum * b.packing, 0) itemPlacementSize,
-					ips.onTheWay,
-					iss.visible itemShelvingStock,
-					IFNULL(v.visible, 0) visible,
-					b.isPickedOff,
-					iss.sectorFk
-				FROM itemShelvingStock iss
-					JOIN item i ON i.id = iss.itemFk
-					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk
-						AND lb.warehouse_id = vWarehouseFk
-						LEFT JOIN buy b ON b.id = lb.buy_id
-					LEFT JOIN cache.available a ON a.item_id = iss.itemFk
-						AND a.calc_id = vCalcAvailableFk
-					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
-						AND v.calc_id = vCalcVisibleFk
-					LEFT JOIN (
-						SELECT itemFk, SUM(saldo) onTheWay
-							FROM itemPlacementSupplyList 
-							WHERE saldo > 0 
-							GROUP BY itemFk
-					) ips ON ips.itemFk = i.id
-					WHERE iss.sectorFk = vSectorFk
-						OR iss.sectorFk IS NULL;            
-
-		CREATE OR REPLACE TEMPORARY TABLE tmp.itemOutTime
-			SELECT *, SUM(amount) quantity
-				FROM (
-					SELECT io.itemFk,
-							io.quantity amount, 
-							IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) `hours`, 
-							IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) `minutes`
-						FROM itemTicketOut `io`
-							JOIN tItemShelvingRadar isr ON isr.itemFk = io.itemFk
-							JOIN ticket t ON t.id= io.ticketFk
-							JOIN ticketState ts ON ts.ticketFk = io.ticketFk
-							JOIN `state` s ON s.id = ts.stateFk
-							LEFT JOIN `zone` z ON z.id = t.zoneFk
-							LEFT JOIN (
-								SELECT DISTINCT saleFk 
-									FROM saleTracking st 
-									WHERE st.created > util.VN_CURDATE() 
-										AND st.isChecked
-							) stPrevious ON stPrevious.saleFk = io.saleFk
-						WHERE t.warehouseFk = vWarehouseFk
-							AND NOT s.isPicked
-							AND NOT io.reserved 
-							AND stPrevious.saleFk IS NULL
-							AND io.shipped >= util.VN_CURDATE() 
-							AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
-				) sub
-				GROUP BY itemFk, `hours`, `minutes`;
-	
-		INSERT INTO tItemShelvingRadar (itemFk)
-			SELECT itemFk FROM tmp.itemOutTime
-				ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, 
-					firstNegative = IF(firstNegative < 0, firstNegative, firstNegative + quantity),
-					`hour` = IFNULL(IF(firstNegative > 0 , `hour`, `hours`), 0),
-					`minute` = IFNULL(IF(firstNegative > 0, `minute`, `minutes`), 0);
-
-		UPDATE tItemShelvingRadar isr
-				JOIN (
-					SELECT s.itemFk, SUM(s.quantity) amount
-						FROM sale s
-							JOIN ticket t ON t.id = s.ticketFk
-							JOIN ticketState ts ON ts.ticketFk = t.id
-						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-							AND ts.code = 'COOLER_PREPARATION'
-						GROUP BY s.itemFk
-				) sub ON sub.itemFk = isr.itemFk
-			SET isr.dayEndVisible = dayEndVisible + sub.amount,
-				firstNegative = firstNegative + sub.amount;
-
-		SELECT * FROM tItemShelvingRadar;
-	END IF;
-
-	DROP TEMPORARY TABLE tItemShelvingRadar;
-	
-END$$
-DELIMITER ;

db/routines/vn/procedures/roadmap_cloneDay.sql

@@ -0,0 +1,72 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`roadmap_cloneDay`(
+	vDateToCopy DATE,
+	vDateToPaste DATE
+)
+BEGIN
+/**
+ * Clona roadmaps de un día a otro, incluyendo las paradas y sin algunos
+ * campos de la tabla principal, como matrículas, conductores...
+ *
+ * @param vDateToCopy Fecha para copiar
+ * @param vDateToPaste Fecha para pegar
+ */
+	DECLARE vDaysDiff INT;
+	DECLARE vRoadmapFk INT;
+	DECLARE vNewRoadmapFk INT;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vRoadmaps CURSOR FOR
+		SELECT id
+			FROM roadmap
+			WHERE etd BETWEEN vDateToCopy AND util.dayEnd(vDateToCopy);
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SET vDaysDiff = DATEDIFF(vDateToPaste, vDateToCopy);
+
+	IF vDaysDiff IS NULL THEN
+		CALL util.throw("No valid dates");
+	END IF;
+
+	START TRANSACTION;
+
+	OPEN vRoadmaps;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vRoadmaps INTO vRoadmapFk;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+	INSERT INTO roadmap (`name`, roadmapAddressFk, etd, eta, observations, price)
+		SELECT `name`,
+				roadmapAddressFk,
+				etd + INTERVAL vDaysDiff DAY,
+				eta + INTERVAL vDaysDiff DAY,
+				observations,
+				price
+			FROM roadmap
+			WHERE id = vRoadmapFk;
+
+	SET vNewRoadmapFk = LAST_INSERT_ID();
+
+	INSERT INTO roadmapStop (roadmapFk, roadmapAddressFk, eta, `description`, bufferFk)
+		SELECT vNewRoadmapFk,
+				roadmapAddressFk,
+				eta + INTERVAL vDaysDiff DAY,
+				`description`,
+				bufferFk
+			FROM roadmapStop
+			WHERE roadmapFk = vRoadmapFk;
+	END LOOP;
+	CLOSE vRoadmaps;
+
+	COMMIT;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruck`(vWarehouserFk INT, vHour INT, vMinute INT)
-BEGIN
-	DECLARE done INT DEFAULT FALSE;
-	DECLARE vTicketFk INT;
-	DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tTicket;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
-	CALL vn.productionControl(vWarehouserFk,0) ;
-
-	DROP TEMPORARY TABLE IF EXISTS tTicket;
-	CREATE TEMPORARY TABLE tTicket
-		SELECT ticketFk
-		FROM tmp.productionBuffer
-			JOIN alertLevel al ON al.code = 'FREE'
-		WHERE shipped = util.VN_CURDATE()
-			AND problem LIKE '%I:%'
-			AND (HH <= vHour OR HH = vHour AND mm < vMinute)
-			AND alertLevel = al.id;
-
-	OPEN cur1;
-
-	read_loop: LOOP
-		FETCH cur1 INTO vTicketFk;
-		IF done THEN
-			LEAVE read_loop;
-		END IF;
-
-		CALL vn.ticket_DelayTruckSplit(vTicketFk);
-	END LOOP;
-
-	CLOSE cur1;
-	DROP TEMPORARY TABLE tTicket, tmp.productionBuffer;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruckSplit.sql

@@ -1,59 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruckSplit`(
-	vTicketFk INT
-)
-BEGIN
-/**
- * Splita las lineas de ticket que no estan ubicadas
- *
- * @param vTicketFk Id ticket
- */
-	DECLARE vNewTicketFk INT;
-	DECLARE vTotalLines INT;
-	DECLARE vLinesToSplit INT;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
-	
-	SELECT COUNT(*) INTO vTotalLines
-		FROM sale 
-		WHERE ticketFk = vTicketFk;
-			
-	CREATE TEMPORARY TABLE tmp.SalesToSplit
-		SELECT s.id saleFk
-			FROM ticket t
-				JOIN sale s ON t.id = s.ticketFk 
-				LEFT JOIN (
-					SELECT ish.itemFk itemFk,
-							SUM(ish.visible) visible,
-							s.warehouseFk warehouseFk
-						FROM itemShelving ish
-							JOIN shelving sh ON sh.id = ish.shelvingFk
-							JOIN parking p ON p.id = sh.parkingFk
-							JOIN sector s ON s.id = p.sectorFk
-						GROUP BY ish.itemFk,
-							s.warehouseFk
-				) issw ON issw.itemFk = s.itemFk
-					AND issw.warehouseFk = t.warehouseFk 
-			WHERE s.quantity > IFNULL(issw.visible, 0)
-				AND s.quantity > 0
-				AND NOT s.isPicked
-				AND NOT s.reserved
-				AND t.id = vTicketFk;
-
-	SELECT COUNT(*) INTO vLinesToSplit
-		FROM tmp.SalesToSplit;
-
-	IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
-		SET vNewTicketFk = vTicketFk;
-	ELSE
-		CALL ticket_Clone(vTicketFk, vNewTicketFk);
-		UPDATE sale s 
-			JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id 
-			SET s.ticketFk = vNewTicketFk;
-	END IF;
-
-	CALL ticket_setState(vNewTicketFk, 'FIXING');
-
-	DROP TEMPORARY TABLE tmp.SalesToSplit;
-END$$
-DELIMITER ;

db/routines/vn/procedures/vehicle_checkNumberPlate.sql

@@ -1,14 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(vNumberPlate VARCHAR(10), vCountryCodeFk VARCHAR(2))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(
+	vNumberPlate VARCHAR(10),
+	vCountryCodeFk VARCHAR(2)
+)
 BEGIN
 /**
- * Comprueba si la matricula pasada tiene el formato correcto dependiendo del pais del vehiculo
+ * Comprueba si la matricula pasada tiene el formato
+ * correcto dependiendo del pais del vehiculo.
+ *
+ * @param vNumberPlate Número de matricula
+ * @param vCountryCodeFk Código de pais
  */
 	DECLARE vRegex VARCHAR(45);
 
-	SELECT vp.regex INTO vRegex
-		FROM vehiclePlateRegex vp
-		WHERE vp.countryCodeFk = vCountryCodeFk;
+	SELECT regex INTO vRegex
+		FROM vehiclePlateRegex
+		WHERE countryCodeFk = vCountryCodeFk;
 	
 	IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
 		CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));

db/routines/vn/triggers/roadmapStop_beforeDelete.sql

@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeDelete`
+	BEFORE DELETE ON `roadmapStop`
+	FOR EACH ROW
+BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vRoadmapEta DATETIME;
+
+	IF OLD.roadmapFk IS NOT NULL THEN
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = OLD.roadmapFk
+				AND id <> OLD.id;
+
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = OLD.roadmapFk;
+
+		IF vMaxEta <> vRoadmapEta OR vMaxEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = OLD.roadmapFk;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,8 +3,30 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vRoadmapEta DATETIME;
 
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.description IS NOT NULL THEN
 		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF NEW.roadmapFk IS NOT NULL THEN
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
+
+	IF NEW.roadmapFk IS NOT NULL AND NEW.eta IS NOT NULL THEN
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF vRoadmapEta < NEW.eta OR vRoadmapEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = NEW.eta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,8 +3,40 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vCurrentEta DATETIME;
 
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT (NEW.description <=> OLD.description) THEN
 		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
+		OR (NOT (NEW.eta <=> OLD.eta)) THEN
+
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = NEW.roadmapFk
+				AND id <> OLD.id;
+
+		IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
+			SET vMaxEta = NEW.eta;
+		END IF;
+
+		SELECT eta INTO vCurrentEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_afterUpdate.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_afterUpdate`
+	AFTER UPDATE ON `roadmap`
+	FOR EACH ROW
+BEGIN
+	DECLARE vSeconds INT;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		IF vSeconds IS NOT NULL AND vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmap_beforeInsert.sql

@@ -3,10 +3,31 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.name IS NOT NULL THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NEW.trailerPlate IS NOT NULL OR NEW.tugPlate IS NOT NULL THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
 	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-	ELSE
-		SET NEW.driverName = NULL;
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,10 +3,39 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-	ELSE
-		SET NEW.driverName = NULL;
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT (NEW.name <=> OLD.name) THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NOT (NEW.trailerPlate <=> OLD.trailerPlate) OR NOT (NEW.tugPlate <=> OLD.tugPlate) THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
+	IF NOT (NEW.driverName <=> OLD.driverName) THEN
+		SET NEW.driver1Fk = NULL;
+	END IF;
+
+	IF NOT (NEW.driver1Fk <=> OLD.driver1Fk) AND NEW.driver1Fk IS NOT NULL THEN
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NOT (NEW.driverChangeName <=> OLD.driverChangeName) THEN
+		SET NEW.driverChangeFk = NULL;
+	END IF;
+
+	IF NOT (NEW.driverChangeFk <=> OLD.driverChangeFk) AND NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn2008/views/awb.sql

@@ -29,5 +29,6 @@ AS SELECT `a`.`id` AS `id`,
 	`a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`,
 	`a`.`observation` AS `observation`,
 	`a`.`hasFreightPrepaid` AS `hasFreightPrepaid`,
-	`a`.`propertyNumber` AS `propertyNumber`
+	`a`.`propertyNumber` AS `propertyNumber`,
+	`a`.`costPerKg` AS `costPerKg`
 FROM `vn`.`awb` `a`

db/versions/11202-limeRuscus/01-updateStateAlertLevel.sql

@@ -0,0 +1,14 @@
+UPDATE vn.state
+    SET alertLevel = 1 -- ON_PREVIOUS
+    WHERE id IN (
+        36, -- Previa Revisando
+        37, -- Previa Revisado
+        26, -- Prep Previa
+        28, -- Previa OK
+        29, -- Previa Impreso
+        31, -- Polizon Impreso
+        32, -- Polizon OK
+        20, -- Asignado
+        23, -- URGENTE
+        33  -- Auto_Impreso
+    );

db/versions/11416-goldenTulip/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.roadmap
+	DROP FOREIGN KEY roadmap_worker_FK_2,
+	DROP FOREIGN KEY roadmap_worker_FK,
+	DROP FOREIGN KEY roadmap_ibfk_2;

db/versions/11416-goldenTulip/01-firstScript.sql

@@ -0,0 +1,20 @@
+ALTER TABLE vn.roadmap
+	COMMENT='Rutas troncales (trailers)',
+	MODIFY COLUMN m3 int(10) unsigned DEFAULT NULL NULL COMMENT 'Capacidad máxima del remolque',
+	MODIFY COLUMN trailerPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL,
+	MODIFY COLUMN etd datetime NOT NULL COMMENT 'Tiempo estimado de salida',
+	MODIFY COLUMN `name` varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL,
+	MODIFY COLUMN driver1Fk int(10) unsigned DEFAULT NULL NULL AFTER driverName,
+	MODIFY COLUMN driver2Fk int(10) unsigned DEFAULT NULL NULL AFTER driver1Fk,
+	ADD eta datetime DEFAULT NULL NULL COMMENT 'Tiempo estimado de llegada' AFTER etd,
+	ADD roadmapAddressFk int(11) DEFAULT NULL NULL AFTER `name`,
+	ADD dollyPlate varchar(10) DEFAULT NULL AFTER trailerPlate,
+	ADD tugPlate varchar(10) DEFAULT NULL AFTER dollyPlate,
+	ADD driverChangeName varchar(45) DEFAULT NULL AFTER driver2Fk,
+	ADD driverChangeFk int(10) unsigned DEFAULT NULL NULL AFTER driverChangeName;
+
+-- Separamos los CHANGE por que si no arriba no se aplican
+ALTER TABLE vn.roadmap
+	CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER m3;
+
+CREATE INDEX roadmap_etd_IDX USING BTREE ON vn.roadmap (etd);

db/versions/11416-goldenTulip/02-firstScript.sql

@@ -0,0 +1,15 @@
+UPDATE vn.roadmap
+	SET roadmapAddressFk = (SELECT MIN(addressFk) FROM vn.roadmapAddress),
+		eta = etd + INTERVAL 1 DAY;
+
+ALTER TABLE vn.roadmap
+	ADD CONSTRAINT roadmap_roadmapAddress_FK FOREIGN KEY (roadmapAddressFk)
+		REFERENCES vn.roadmapAddress(addressFk) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driver_FK FOREIGN KEY (driver1Fk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driver_FK2 FOREIGN KEY (driver2Fk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_driverChange_FK FOREIGN KEY (driverChangeFk)
+		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	ADD CONSTRAINT roadmap_user_Fk FOREIGN KEY (editorFk)
+		REFERENCES account.user(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11416-goldenTulip/03-firstScript.sql

@@ -0,0 +1,7 @@
+ALTER TABLE vn.roadmapStop
+    CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL,
+    CHANGE addressFk roadmapAddressFk int(11) DEFAULT NULL NULL,
+    DROP FOREIGN KEY expeditionTruck_FK_2;
+
+ALTER TABLE vn.roadmapStop ADD CONSTRAINT roadmapStop_roadmap_FK
+    FOREIGN KEY (roadmapFk) REFERENCES vn.roadmap(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/11416-goldenTulip/04-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.route
+	ADD roadmapStopFk int(11) NULL,
+	ADD CONSTRAINT route_roadmapStop_FK FOREIGN KEY (roadmapStopFk) REFERENCES vn.roadmapStop(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+	CHANGE editorFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER roadmapStopFk;

db/versions/11416-goldenTulip/05-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.roadmapAddress 
+	COMMENT='Direcciones de los troncales o también llamados puntos de distribución';

db/versions/11416-goldenTulip/06-firstScript.sql

@@ -0,0 +1,11 @@
+GRANT SELECT ON TABLE vn.roadmap TO 'delivery';
+GRANT SELECT ON TABLE vn.roadmapStop TO 'delivery';
+GRANT SELECT ON TABLE vn.roadmapAddress TO 'delivery';
+
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmap TO 'deliveryBoss';
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapStop TO 'deliveryBoss';
+GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapAddress TO 'deliveryBoss';
+
+-- Comentado debido a que da error porque ejecuta primero el script de la versión
+-- GRANT EXECUTE ON PROCEDURE vn.roadmap_cloneDay TO 'deliveryBoss';
+-- GRANT EXECUTE ON FUNCTION vn.getTimeBetweenRoadmapAddresses TO 'deliveryBoss';

db/versions/11416-goldenTulip/07-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.route DROP FOREIGN KEY fk_route_1;
+ALTER TABLE vn.route DROP COLUMN zoneFk;

db/versions/11416-goldenTulip/08-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.vehicle
+    ADD typeFk enum('car','van','truck','trailer','tug', 'tugDolly','dolly') DEFAULT 'van' NOT NULL;

db/versions/11416-goldenTulip/09-firstScript.sql

@@ -0,0 +1 @@
+CREATE INDEX route_dated_IDX USING BTREE ON vn.route (dated);

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

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

db/versions/11430-salmonRaphis/00-firstScript.sql

@@ -0,0 +1,5 @@
+
+
+INSERT IGNORE INTO util.notification
+    SET name = 'misallocation-warehouse',
+        description = 'Misallocation in warehouse';

loopback/locale/es.json

@@ -395,8 +395,6 @@
     "All tickets have a route order": "Todos los tickets tienen orden de ruta",
     "There are tickets to be invoiced": "La zona tiene tickets por facturar",
     "Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
-	"Price cannot be blank": "El precio no puede estar en blanco",
-	"negativeReplaced": "(Negativos) Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"price retrieval failed": "price retrieval failed"
+    "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
+    "Price cannot be blank": "El precio no puede estar en blanco"
 }

modules/mdb/back/methods/mdbVersion/upload.js

@@ -146,7 +146,7 @@ module.exports = Self => {
                     await fs.symlink(rootRelative, destinationRoot);
                 }
             }
-            if (description) {
+            if (description && branch == 'master') {
                 let formatDesc;
                 const mainBranches = new Set(['master', 'test', 'dev']);
                 if (mainBranches.has(branch))

modules/route/back/methods/agency-term/specs/filter.spec.js

@@ -18,7 +18,7 @@ describe('AgencyTerm filter()', () => {
             const firstAgencyTerm = agencyTerms[0];
 
             expect(firstAgencyTerm.routeFk).toEqual(1);
-            expect(agencyTerms.length).toEqual(7);
+            expect(agencyTerms.length).toEqual(5);
 
             await tx.rollback();
         } catch (e) {
@@ -49,7 +49,7 @@ describe('AgencyTerm filter()', () => {
 
         let result = await app.models.AgencyTerm.filter(ctx);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(2);
     });
 
     it('should return results matching "from" and "to"', async() => {
@@ -72,7 +72,7 @@ describe('AgencyTerm filter()', () => {
 
             const results = await models.AgencyTerm.filter(ctx, options);
 
-            expect(results.length).toBe(7);
+            expect(results.length).toBe(5);
 
             await tx.rollback();
         } catch (e) {
@@ -90,7 +90,7 @@ describe('AgencyTerm filter()', () => {
 
         let result = await app.models.AgencyTerm.filter(ctx);
 
-        expect(result.length).toEqual(2);
+        expect(result.length).toEqual(1);
         expect(result[0].routeFk).toEqual(1);
     });
 
@@ -103,7 +103,7 @@ describe('AgencyTerm filter()', () => {
 
         let result = await app.models.AgencyTerm.filter(ctx);
 
-        expect(result.length).toEqual(2);
+        expect(result.length).toEqual(1);
         expect(result[0].routeFk).toEqual(2);
     });
 });

modules/route/back/methods/route/specs/filter.spec.js

@@ -59,7 +59,7 @@ describe('Route filter()', () => {
             };
             const results = await models.Route.filter(ctx, options);
 
-            expect(results.length).toBe(9);
+            expect(results.length).toBe(7);
 
             await tx.rollback();
         } catch (e) {
@@ -115,7 +115,7 @@ describe('Route filter()', () => {
         };
         const result = await app.models.Route.filter(ctx);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(2);
     });
 
     it('should return the routes matching "warehouseFk"', async() => {
@@ -132,7 +132,7 @@ describe('Route filter()', () => {
 
         let result = await app.models.Route.filter(ctx);
 
-        expect(result.length).toEqual(9);
+        expect(result.length).toEqual(7);
 
         ctx.args.warehouseFk = 2;
 

modules/route/back/models/route.json

@@ -75,11 +75,6 @@
 			"type": "hasMany",
 			"model": "Ticket",
 			"foreignKey": "routeFk"
-		},
-		"zone": {
-            "type": "belongsTo",
-            "model": "Zone",
-            "foreignKey": "zoneFk"
 		}
     }
 }

modules/ticket/back/locale/sale/es.yml

@@ -15,4 +15,4 @@ columns:
     priceFixed: precio fijado
     isPriceFixed: tiene precio fijado
     isAdded: añadida
-    total: total
+    total: importe

modules/ticket/back/methods/state/isEditable.js

@@ -34,8 +34,8 @@ module.exports = Self => {
                  state.code == 'PICKER_DESIGNED' || state.code == 'PRINTED'
              )
         );
-
-        const isAllowed = isAllEditable || isSomeEditable || state.alertLevel == 0;
+        const alertLevel = await models.AlertLevel.findOne({where: {code: 'FREE'}}, myOptions);
+        const isAllowed = isAllEditable || isSomeEditable || state.alertLevel == alertLevel.id;
         return isAllowed;
     };
 };

modules/ticket/back/methods/state/specs/editableState.spec.js

@@ -35,9 +35,9 @@ describe('ticket editableStates()', () => {
 
             const editableStates = await models.State.editableStates(ctx, filter, options);
 
-            const pickerDesignedState = editableStates.some(state => state.code == 'PICKER_DESIGNED');
+            const okState = editableStates.some(state => state.code == 'OK');
 
-            expect(pickerDesignedState).toBeTruthy();
+            expect(okState).toBeTruthy();
 
             await tx.rollback();
         } catch (e) {
@@ -54,11 +54,11 @@ describe('ticket editableStates()', () => {
 
             const employeeRole = 1;
             const ctx = {req: {accessToken: {userId: employeeRole}}};
-            const filter = {where: {name: {like: '%Previa OK%'}}};
+            const filter = {where: {name: {like: '%Bloqueado%'}}};
 
             const [editableStates] = await models.State.editableStates(ctx, filter, options);
 
-            expect(editableStates.name).toBe('Previa OK');
+            expect(editableStates.name).toBe('Bloqueado');
 
             await tx.rollback();
         } catch (e) {

print/templates/email/misallocation-warehouse/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/misallocation-warehouse/locale/en.yml

@@ -0,0 +1,3 @@
+subject: Misallocation of articles
+title: Misallocation of articles
+body: Misallocated articles have been placed in the warehouse that do not correspond to the entry location.

print/templates/email/misallocation-warehouse/locale/es.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal ubicados
+title: Artículos mal ubicados
+body: Artículos mal ubicados han sido colocados en el almacén que no corresponden a la ubicación de la entrada.

print/templates/email/misallocation-warehouse/locale/fr.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal placés
+title: Artículos mal placés
+body: Artículos mal placés ont été stockés dans l’entrepôt qui ne correspond pas à l’emplacement de l’entrée.

print/templates/email/misallocation-warehouse/locale/pt.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal colocados
+title: Artículos mal colocados
+body: Artículos mal colocados foram armazenados no armazém que não corresponde à localização da entrada.

print/templates/email/misallocation-warehouse/misallocation-warehouse.html

@@ -0,0 +1,9 @@
+<email-body>
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p>{{$t('body')}}</p>
+            <p>{{action}}</p>
+        </div>
+    </div>
+</email-body>

print/templates/email/misallocation-warehouse/misallocation-warehouse.js

@@ -0,0 +1,15 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'misallocation-warehouse',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        action: {
+            type: String,
+            required: true
+        }
+    }
+};

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

@@ -90,8 +90,7 @@
                                 <td class="number">{{ticket.id}}</td>
                                 <td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
                                 <td v-if="ticket.addressFk" class="number">
-                                    {{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}}
-                                    <span class="black-container"> {{ticket.addressFk.toString().substr(-3, 3)}} </span>
+                                    <span class="black-container"> {{ticket.addressFk.toString()}} </span>
                                 </td>
                                 <td class="number">{{ticket.packages}}</td>
                                 <td>{{ticket.itemPackingTypes}}</td>