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

Reviewed-on: #2811
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

db/routines/vn/procedures/itemShelvingSale_reallocate.sql

@@ -1,55 +1,55 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
-	vItemShelvingFk INT(10),
-	vItemFk INT(10),
-	vSectorFk INT
-)
-BEGIN
-/**
- * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
- * 
- * @param vItemShelvingFk Id itemShelving
- * @param vItemFk Id del artículo
- * @param vSectorFk Id del sector
- */
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-		BEGIN
-			ROLLBACK;
-			RESIGNAL;
-		END;
-
-	START TRANSACTION;
-	
-	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
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
-
-	DELETE iss
-		FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
-	COMMIT;
-
-	CALL itemShelvingSale_doReserve();
-END$$
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
+	vItemShelvingFk INT(10),
+	vItemFk INT(10),
+	vSectorFk INT
+)
+BEGIN
+/**
+ * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
+ * 
+ * @param vItemShelvingFk Id itemShelving
+ * @param vItemFk Id del artículo
+ * @param vSectorFk Id del sector
+ */
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+		BEGIN
+			ROLLBACK;
+			RESIGNAL;
+		END;
+
+	START TRANSACTION;
+	
+	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 ish.itemFk = vItemFk
+				AND NOT iss.isPicked
+			FOR UPDATE;
+
+	INSERT INTO itemShelvingSaleReserve (saleFk, sectorFk)
+		SELECT DISTINCT iss.saleFk, vSectorFk
+			FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND ish.itemFk = vItemFk
+				AND NOT iss.isPicked;
+
+	DELETE iss
+		FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND ish.itemFk = vItemFk
+				AND NOT iss.isPicked;
+	COMMIT;
+
+	CALL itemShelvingSale_doReserve();
+END$$
 DELIMITER ;

db/versions/11177-crimsonPaniculata/00-firstScript.sql

@@ -0,0 +1,6 @@
+-- Place your SQL code here
+
+ALTER TABLE vn.itemShelvingSaleReserve DROP FOREIGN KEY IF EXISTS  itemShelvingSaleReserve_sector_FK;
+
+ALTER TABLE vn.itemShelvingSaleReserve ADD CONSTRAINT  itemShelvingSaleReserve_sector_FK 
+	FOREIGN KEY IF NOT EXISTS (sectorFk) REFERENCES vn.sector(id) ON DELETE RESTRICT ON UPDATE CASCADE;