Merge branch 'dev' into 7648_dev_customerEntries

db/routines/vn/procedures/setParking.sql

@@ -23,6 +23,7 @@ proc: BEGIN
 		LEAVE proc;
 	END IF;
 	
+	IF  vParam REGEXP '^[0-9]+$' THEN
 		-- Se comprueba si es una preparación previa
 		SELECT COUNT(*) INTO vIsSaleGroup
 			FROM vn.saleGroup sg
@@ -54,8 +55,9 @@ proc: BEGIN
 			CALL vn.collection_setParking(vParam, vParkingFk);
 			LEAVE proc;
 		END IF;
-
+	ELSE
 		-- Por descarte, se considera una matrícula
 		CALL vn.shelving_setParking(vParam, vParkingFk);
+	END IF;
 END$$
 DELIMITER ;

modules/worker/back/models/operator.json

@@ -26,6 +26,10 @@
 		},
 		"labelerFk": {
 			"type": "number"
+		},
+		"isOnReservationMode": {
+			"type": "boolean",
+			"required": true
 		}
 	},
 	"relations": {