Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter

db/routines/vn/procedures/collection_addWithReservation.sql

@@ -37,23 +37,23 @@ BEGIN
 		WHERE t.id = vTicketFk;
 
 	CALL cache.available_refresh(
-		vCacheAvailableFk, 
+		vCacheAvailableFk,
 		FALSE, 
-		vWarehouseFk, 
+		vWarehouseFk,
 		util.VN_CURDATE());
 
 	SELECT available INTO vAvailable
 		FROM cache.available 
-		WHERE calc_id = vCacheAvailableFk 
+		WHERE calc_id = vCacheAvailableFk
 			AND item_id = vItemFk;
-	
+
 	IF vAvailable < vQuantity THEN
 		SET vHasThrow = TRUE;
 	ELSE
 		SELECT `name`,
-				CONCAT(getUser(), ' ', DATE_FORMAT(util.VN_NOW(), '%H:%i'), ' ', name) 
+				CONCAT(getUser(), ' ', DATE_FORMAT(util.VN_NOW(), '%H:%i'), ' ', name)
 				INTO vItemName, vConcept
-			FROM item 
+			FROM item
 			WHERE id = vItemFk;
 
 		START TRANSACTION;
@@ -69,7 +69,7 @@ BEGIN
 
 		CALL sale_calculateComponent(vSaleFk, NULL);
 		CALL itemShelvingSale_addBySale(vSaleFk, vSectorFk);
-	
+
 		IF NOT EXISTS (SELECT TRUE FROM itemShelvingSale WHERE saleFk = vSaleFk LIMIT 1) THEN
 			SET vHasThrow = TRUE;
 		END IF;
@@ -78,13 +78,13 @@ BEGIN
 	IF vHasThrow THEN
 		CALL util.throw("There is no available for the selected item");
 	END IF;
-	
+
 	IF vSaleGroupFk THEN 
 		INSERT INTO saleGroupDetail
 			SET saleFk = vSaleFk, 
 				saleGroupFk = vSaleGroupFk;
 	END IF;
-		
+
 	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -18,8 +18,9 @@ proc: BEGIN
 	DECLARE vReservedQuantity INT;
 	DECLARE vOutStanding INT;
 	DECLARE vUserFk INT; 
-    DECLARE vTotalReservedQuantity INT; 
+    DECLARE vTotalReservedQuantity INT;
 	DECLARE vSaleQuantity INT;
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 
 	DECLARE vItemShelvingAvailable CURSOR FOR 
 		SELECT ish.id itemShelvingFk,
@@ -29,7 +30,7 @@ proc: BEGIN
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
-				JOIN productionConfig pc	
+				JOIN productionConfig pc
 			WHERE s.id = vSaleFk
 				AND NOT sc.isHideForPickers
 				AND (sc.id = vSectorFk OR vSectorFk IS NULL)
@@ -44,15 +45,15 @@ proc: BEGIN
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
-			ROLLBACK;
+			CALL util.tx_rollback(vIsRequiredTx);
 			RESIGNAL;
 		END;
-	
+
-	START TRANSACTION;
+	CALL util.tx_start(vIsRequiredTx);
-	
+
 	SELECT id INTO vSaleFk
 		FROM sale
-		WHERE id = vSaleFk 
+		WHERE id = vSaleFk
 		FOR UPDATE;
 
 	SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0)), s.quantity
@@ -65,7 +66,7 @@ proc: BEGIN
 		WHERE s.id = vSaleFk;
 		
 	IF vOutStanding <= 0 THEN
-		COMMIT;
+		CALL util.tx_commit(vIsRequiredTx);
 		LEAVE proc;
 	END IF;
 
@@ -85,7 +86,7 @@ proc: BEGIN
 			IF vTotalReservedQuantity <> vSaleQuantity THEN
 			CALL util.debugAdd('itemShelvingSale_addBySale',
 				CONCAT(vSaleFk, ' - ', vSaleQuantity,' - ', vTotalReservedQuantity,'-', vOutStanding,'-', account.myUser_getId()));
-	
+
 				UPDATE sale 
 					SET quantity = vTotalReservedQuantity
 					WHERE id = vSaleFk;
@@ -93,7 +94,7 @@ proc: BEGIN
 			LEAVE l;
 		END IF;
 	
-	SELECT id INTO vItemShelvingFk 
+		SELECT id INTO vItemShelvingFk 
 			FROM itemShelving 
 			WHERE id = vItemShelvingFk 
 			FOR UPDATE;
@@ -102,19 +103,19 @@ proc: BEGIN
 		SET vOutStanding = vOutStanding - vReservedQuantity;
 		
 		IF vReservedQuantity > 0 THEN 
-	CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
+			CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
-				CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
+						CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
-			INSERT INTO itemShelvingSale(
+					INSERT INTO itemShelvingSale(
-					itemShelvingFk,
+							itemShelvingFk,
-					saleFk,
+							saleFk,
-					quantity,
+							quantity,
-					userFk,
+							userFk,
-					isPicked)
+							isPicked)
-				SELECT vItemShelvingFk, 
+						SELECT vItemShelvingFk, 
-					vSaleFk, 
+							vSaleFk, 
-					vReservedQuantity, 
+							vReservedQuantity, 
-					vUserFk,
+							vUserFk,
-					FALSE;
+							FALSE;
 			
 			UPDATE itemShelving 
 				SET available = available - vReservedQuantity
@@ -123,6 +124,6 @@ proc: BEGIN
 		END IF;
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;