db/.pullinfo.json

@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "06613719475fcdba8309607c38cc78efc2e348cca7bc96b48dc3ae3c12426f54"
+        "expeditionPallet_Print": "ced2b84a114fcb99fce05f0c34f4fc03f3fa387bef92621be1bc306608a84345"
       }
     }
   }

db/routines/bi/procedures/claim_ratio_routine.sql

@@ -65,11 +65,12 @@ BEGIN
 				JOIN vn.ticketLastState ts ON ts.ticketFk = t.id
 				JOIN vn.ticketTracking tt ON tt.id = ts.ticketTrackingFk
 				JOIN vn.state st ON st.id = tt.stateFk
+				JOIN vn.alertLevel al ON al.code = 'DELIVERED'
 			WHERE sc.componentFk = 17
 				AND sc.isGreuge = 0
 				AND t.shipped >= '2016-10-01'
 				AND t.shipped < util.VN_CURDATE()
-				AND st.alertLevel >= 3;
+				AND st.alertLevel >= al.id;
 
 	DELETE g.*
 			FROM vn.greuge g

db/routines/hedera/procedures/item_getVisible.sql

@@ -74,9 +74,10 @@ BEGIN
 					FROM vn.sale m
 						JOIN vn.ticket t ON t.id = m.ticketFk
 						JOIN vn.ticketState s ON s.ticketFk = t.id
+						JOIN vn.alertLevel al ON al.code = 'DELIVERED'
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseFk = vWarehouse
-						AND s.alertLevel = 3
+						AND s.alertLevel = al.id
 			) t
 			GROUP BY itemFk
 				HAVING quantity > 0;

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -121,6 +121,7 @@ BEGIN
 			)
 		SELECT t.id INTO vTicket
 			FROM vn.ticket t
+				JOIN vn.alertLevel al ON al.code = 'FREE'
 				LEFT JOIN tPrevia tp ON tp.ticketFk = t.id
 				LEFT JOIN vn.ticketState tls on tls.ticketFk = t.id
 				JOIN hedera.`order` o
@@ -131,7 +132,7 @@ BEGIN
 			WHERE o.id = vSelf
 				AND t.refFk IS NULL
 				AND tp.ticketFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0				
+				AND (tls.alertLevel IS NULL OR tls.alertLevel = al.id)
 			LIMIT 1;
 
 		-- Crea el ticket en el caso de no existir uno adecuado

db/routines/stock/procedures/log_refreshSale.sql

@@ -16,12 +16,13 @@ BEGIN
 				m.created,
 				TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
 				m.quantity < 0 isIn,
-				m.isPicked OR s.alertLevel > 1 isPicked
+				m.isPicked OR s.alertLevel > al.id isPicked
 			FROM vn.sale m
 				JOIN vn.ticket t ON t.id = m.ticketFk
 				JOIN vn.ticketState s ON s.ticketFk = t.id
 				JOIN vn.item i ON i.id = m.itemFk
 				JOIN vn.itemType tp ON tp.id = i.typeFk
+				JOIN vn.alertLevel al ON al.code = 'ON_PREPARATION'
 			WHERE (
 					vTableId IS NULL
 					OR (vTableName = 'ticket' AND t.id = vTableId)

db/routines/vn/procedures/entry_updateComission.sql

@@ -23,7 +23,8 @@ BEGIN
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
 			WHERE t.shipped >= util.VN_CURDATE()
-				AND e.currencyFk = vCurrency;
+				AND e.currencyFk = vCurrency
+				AND NOT e.isBooked;
 
 	SET vComission = currency_getCommission(vCurrency);
 

db/routines/vn/procedures/invoiceOut_new.sql

@@ -153,7 +153,9 @@ BEGIN
 				FROM tmp.ticketToInvoice ti
 					LEFT JOIN ticketState ts ON ti.id = ts.ticketFk
 					JOIN state s
-				WHERE IFNULL(ts.alertLevel, 0) < 3 and s.`code` = getAlert3State(ti.id);
+					JOIN alertLevel al ON al.code = 'DELIVERED'
+				WHERE (ts.alertLevel IS NULL OR ts.alertLevel < al.id)
+					AND s.`code` = getAlert3State(ti.id);
 
 		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT * FROM tmp.updateInter;

db/routines/vn/procedures/itemShelvingRadar.sql

@@ -49,7 +49,7 @@ BEGIN
 							ish.isChecked,
 							sub.isAllChecked
 						FROM itemShelvingStock iss
-							JOIN itemShelving ish ON ish.shelvingFk = iss.shelvingFk
+							JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
 							LEFT JOIN (
 								SELECT itemFk,
 										IF(

db/routines/vn/procedures/prepareTicketList.sql

@@ -6,14 +6,16 @@ BEGIN
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, t.clientFk
-			FROM vn.ticket t
-				LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-				JOIN vn.client c ON c.id = t.clientFk
+			FROM ticket t
+				JOIN alertLevel al ON al.code = 'DELIVERED'
+				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+				JOIN client c ON c.id = t.clientFk
+
 			WHERE c.typeFk IN ('normal','handMaking','internalUse')
 				AND (
 					t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate
 					OR (
-						ts.alertLevel < 3
+						ts.alertLevel < al.id
 						AND t.shipped >= vStartingDate
 						AND t.shipped < util.VN_CURDATE()
 					)

db/routines/vn/procedures/productionControl.sql

@@ -67,7 +67,7 @@ proc: BEGIN
 				wk.code salesPersonCode,
 				p.id provinceFk,
 				tls.productionOrder,
-				IFNULL(tls.alertLevel, 0) alertLevel,
+				IFNULL(tls.alertLevel, al.id) alertLevel,
 				t.isBoxed palletized,
 				IF(rm.isPickingAllowed, rm.bufferFk, NULL) ubicacion,
 				tlu.lastUpdated,
@@ -81,6 +81,7 @@ proc: BEGIN
 				rm.bufferFk
 			FROM tmp.productionTicket tt
 				JOIN ticket t ON tt.ticketFk = t.id
+				JOIN alertLevel al ON al.code = 'FREE'
 				LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
 				LEFT JOIN `state` st ON st.id = tst.state
 				LEFT JOIN client c ON c.id = t.clientFk

db/routines/vn/procedures/ticketGetVisibleAvailable.sql

@@ -7,13 +7,16 @@ BEGIN
     DECLARE vShipped DATE;
     DECLARE vWarehouse TINYINT;
     DECLARE vAlertLevel INT;
+	DECLARE vAlertLevelFree INT;
 
-    SELECT t.warehouseFk, t.shipped, ts.alertLevel INTO vWarehouse, vShipped, vAlertLevel
+    SELECT t.warehouseFk, t.shipped, ts.alertLevel, al.id
+			INTO vWarehouse, vShipped, vAlertLevel, vAlertLevelFree
         FROM ticket t
+			JOIN alertLevel al ON al.code = 'FREE'
             LEFT JOIN ticketState ts ON ts.ticketFk = vTicket
        WHERE t.id = vTicket;
 
-    IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN
+    IF vAlertLevel IS NULL OR vAlertLevel = vAlertLevelFree THEN
         IF vShipped >= util.VN_CURDATE() THEN
             CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped);
         END IF;

db/routines/vn/procedures/ticketMissed_List.sql

@@ -1,49 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketMissed_List`(vTicketFk INT)
-BEGIN
-
-    DECLARE vParkingFk INT;
-    DECLARE vParked DATETIME;
-    DECLARE vLevel INT;
-    DECLARE vCollectionFk INT;
-    
-    SELECT IFNULL(`level`,0), IFNULL(collectionFk,0) 
-		INTO vLevel, vCollectionFk
-		FROM vn.ticketCollection
-        WHERE ticketFk = vTicketFk
-        LIMIT 1;
-        
-	SELECT created, parkingFk 
-		INTO vParked, vParkingFk
-		FROM vn.ticketParking
-        WHERE ticketFk = vTicketFk;
-        
-    SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
-		FROM vn.ticketParking tp
-        JOIN vn.parking p ON p.id = tp.parkingFk
-        JOIN vn.sector sc ON sc.id = p.sectorFk
-        LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
-        JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
-        JOIN vn.ticket t ON t.id = tp.ticketFk
-        JOIN vn.zone z ON z.id = t.zoneFk
-        JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-        JOIN vn.state s ON s.id = tst.state
-        WHERE (s.alertLevel < 2
-			AND tp.parkingFk = vParkingFk
-            AND sc.isPackagingArea
-            AND (
-					(
-						( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
-					OR
-						( tc.collectionFk = vCollectionFk AND LEFT(tc.level,1) < LEFT(vLevel,1) )
-					)
-                )) -- Etiquetas que no se han escaneado y ya estamos con una posterior
-			OR
-            (s.alertLevel > 1
-				AND tp.parkingFk = vParkingFk
-                AND sc.isPackagingArea
-                AND tp.created < vParked
-                AND t.packages <=> 0);
-        
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticketParking_findSkipped.sql

@@ -34,15 +34,17 @@ BEGIN
 
     SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
 		FROM vn.ticketParking tp
-        JOIN vn.parking p ON p.id = tp.parkingFk
-        JOIN vn.sector sc ON sc.id = p.sectorFk
-        LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
-        JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
-        JOIN vn.ticket t ON t.id = tp.ticketFk
-        JOIN vn.zone z ON z.id = t.zoneFk
-        JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-        JOIN vn.state s ON s.id = tst.state
-        WHERE (s.alertLevel < 2
+			JOIN vn.parking p ON p.id = tp.parkingFk
+			JOIN vn.sector sc ON sc.id = p.sectorFk
+			LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
+			JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
+			JOIN vn.ticket t ON t.id = tp.ticketFk
+			JOIN vn.zone z ON z.id = t.zoneFk
+			JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+			JOIN vn.state s ON s.id = tst.state
+			JOIN vn.alertLevel alPacked ON alPacked.code = 'PACKED'
+			JOIN vn.alertLevel alOnPreparation ON alOnPreparation.code = 'ON_PREPARATION'
+        WHERE (s.alertLevel < alPacked.id
 				AND tp.parkingFk = vParkingFk
 	            AND sc.isPackagingArea
 	            AND 	(
@@ -55,7 +57,7 @@ BEGIN
 					)
 				) -- Etiquetas que no se han escaneado y ya estamos con una posterior
 				OR
-	            (s.alertLevel > 1
+	            (s.alertLevel > alOnPreparation.id
 					AND tp.parkingFk = vParkingFk
 	                AND sc.isPackagingArea
 	                AND tp.created < vParked

db/routines/vn/procedures/ticketStateToday_setState.sql

@@ -10,14 +10,17 @@ BEGIN
 	 */
 
 	DECLARE vAlertLevel INT;
+	DECLARE vAlertLevelPacked INT;
 
-	SELECT s.alertLevel INTO vAlertLevel 
+	SELECT s.alertLevel, al.id
+			INTO vAlertLevel, vAlertLevelPacked
 		FROM state s
 			JOIN ticketStateToday tst ON tst.state = s.id
+			JOIN alertLevel al ON al.code = 'PACKED'
 		WHERE tst.ticketFk = vTicketFk
 		LIMIT 1;
 
-	IF vAlertLevel < 2 THEN
+	IF vAlertLevel < vAlertLevelPacked THEN
 
 		CALL vn.ticket_setState(vTicketFk, vStateCode);
 

db/routines/vn/procedures/ticketStateUpdate.sql

@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
-BEGIN
-	
-	/*
-	 * @deprecated:utilizar ticket_setState
-	 */
-	
-	DECLARE vAlertLevel INT;
-
-	SELECT s.alertLevel INTO vAlertLevel 
-		FROM vn.state s
-			JOIN vn.ticketState ts ON ts.stateFk = s.id
-			WHERE ts.ticketFk = vTicketFk;
-	
-	IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN 
-	
-		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
-			SELECT id, vTicketFk, account.myUser_getId()
-				FROM vn.state 
-			WHERE `code` = vStateCode collate utf8_unicode_ci;
-
-	END IF;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -13,10 +13,11 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticket
 		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 = 0;
+			AND alertLevel = al.id;
 
 	OPEN cur1;
 

db/routines/vn/triggers/expedition_beforeInsert.sql

@@ -3,8 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeInse
 	BEFORE INSERT ON `expedition`
 	FOR EACH ROW
 BEGIN
-	DECLARE intcounter INT;
-	DECLARE vShipFk INT;
+	DECLARE vMaxCounter INT;
 
 	SET NEW.editorFk = account.myUser_getId();
 
@@ -12,16 +11,17 @@ BEGIN
 
 		UPDATE ticket SET packages = IFNULL(packages, 0) + 1 WHERE id = NEW.ticketFk;
 
-		SELECT IFNULL(MAX(counter),0) +1 INTO intcounter 
+		SELECT IFNULL(MAX(counter),0) + 1 INTO vMaxCounter
 			FROM expedition e
-				INNER JOIN ticket t1 ON e.ticketFk = t1.id 
+				JOIN alertLevel al ON al.code = 'DELIVERED'
+				JOIN ticket t1 ON e.ticketFk = t1.id
 				LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
-				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) 
+				JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
 					AND t1.warehouseFk = t2.warehouseFk
-			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk 
+			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < al.id AND t1.companyFk = t2.companyFk
 				AND t1.agencyModeFk = t2.agencyModeFk;
 
-		SET NEW.`counter` = intcounter;
+		SET NEW.`counter` = vMaxCounter;
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/ticket_afterUpdate.sql

@@ -8,7 +8,9 @@ BEGIN
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 		
-		CALL ticket_doCmr(NEW.id);
+		IF NEW.cmrFk THEN 
+			CALL ticket_doCmr(NEW.id);
+		END IF;	
 	END IF;
 END$$
 DELIMITER ;

modules/account/back/models/role-inherit.json

@@ -1,6 +1,9 @@
 {
 	"name": "RoleInherit",
 	"base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
 	"options": {
 		"mysql": {
 			"table": "account.roleInherit"

modules/ticket/back/methods/ticket/saveSign.js

@@ -140,14 +140,7 @@ module.exports = Self => {
                     await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
-                const deliveryState = await models.State.findOne({
-                    where: {code: 'DELIVERED'}
-                }, myOptions);
-
-                await models.Ticket.state(ctx, {
-                    ticketFk: ticketId,
-                    stateFk: deliveryState.id
-                }, myOptions);
+                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions);
 
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.cmrFk) {
                     await models.Ticket.saveCmr(ctx, [ticketId], myOptions);