Merge pull request 'master' (!2761) from master into test

Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

db/routines/vn/procedures/itemShelvingSale_reallocate.sql

@@ -20,17 +20,20 @@ BEGIN
 
 	START TRANSACTION;
 	
-	SELECT id INTO vItemShelvingFk
-		FROM itemShelving 
-		WHERE id = vItemShelvingFk 
-		FOR UPDATE;
-
 	UPDATE itemShelving
 		SET visible = 0,
 			available = 0
 		WHERE id = vItemShelvingFk 
 			AND itemFk = vItemFk;	
 
+	SELECT iss.id
+			FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND iss.itemFk = vItemFk
+				AND NOT iss.isPicked
+			FOR UPDATE;
+
 	INSERT INTO itemShelvingSaleReserve (saleFk, vSectorFk)
 		SELECT DISTINCT iss.saleFk
 			FROM itemShelvingSale iss

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -31,6 +31,12 @@ BEGIN
 			RESIGNAL;
 		END;
 
+	IF vQuantity > vReservedQuantity 
+		OR (vQuantity < vReservedQuantity AND NOT vIsItemShelvingSaleEmpty)
+		OR (vQuantity = vReservedQuantity AND vIsItemShelvingSaleEmpty) THEN
+		CALL util.throw('The quantity cannot be different from the reserved');
+	END IF;
+
 	IF (SELECT isPicked FROM itemShelvingSale WHERE id = vItemShelvingSaleFk) THEN
 		CALL util.throw('Reservation completed');
 	END IF;
@@ -52,9 +58,8 @@ BEGIN
 			AND NOT iss.isPicked;
 
 	IF vQuantity > vReservedQuantity 
-		OR (vQuantity < vReservedQuantity AND 
+		OR (vQuantity < vReservedQuantity AND NOT vIsItemShelvingSaleEmpty)
-			(NOT vIsItemShelvingSaleEmpty OR vIsItemShelvingSaleEmpty IS NULL))
+		OR (vQuantity = vReservedQuantity AND vIsItemShelvingSaleEmpty) THEN
-		OR (vIsItemShelvingSaleEmpty IS NOT NULL AND vQuantity = vReservedQuantity) THEN
 		CALL util.throw('The quantity cannot be different from the reserved');
 	END IF;
 
@@ -99,7 +104,7 @@ BEGIN
 	
 	IF vIsItemShelvingSaleEmpty AND vQuantity <> vReservedQuantity THEN
 		INSERT INTO itemShelvingSaleReserve (saleFk, vSectorFk)
-			SELECT vSaleFk;
+			SELECT vSaleFk, vSectorFk;
 		CALL itemShelvingSale_reallocate(vItemShelvingFk, vItemFk, vSectorFk);
 	END IF;
 END$$

db/versions/11159-redIvy/00-firstScript.sql

@@ -0,0 +1,3 @@
+
+
+ALTER TABLE vn.itemShelvingSale MODIFY COLUMN IF EXISTS isPicked tinyint(1) DEFAULT 1 NOT NULL;