db/routines/vn/procedures/collection_addWithReservation.sql

@@ -75,7 +75,7 @@ BEGIN
 	END IF;
 
 	IF vHasThrow THEN
-		CALL util.throw("No hay disponibilidad para el artículo seleccionado");
+		CALL util.throw("There is no available for the selected item");
 	END IF;
 	
 	IF vSaleGroupFk THEN 

db/routines/vn/procedures/collection_getAssigned.sql

@@ -40,7 +40,7 @@ BEGIN
 	DROP TEMPORARY TABLE tCollection;
 
 	IF vHasTooMuchCollections THEN
-		CALL util.throw('Hay colecciones pendientes');
+		CALL util.throw('There are pending collections');
 	END IF;
 
 	SELECT warehouseFk, itemPackingTypeFk

db/routines/vn/procedures/collection_getTickets.sql

@@ -7,7 +7,7 @@ BEGIN
  * @return Retorna ticketFk, level, agencyName, warehouseFk, salesPersonFk, observation
  */	
 	DECLARE vItemPackingTypeFk VARCHAR(1);
-	DECLARE vDated DATE;
+	DECLARE vYesterday DATE;
 
 	-- Si los sacadores son los de pruebas, pinta los colores
 	SELECT itemPackingTypeFk
@@ -15,7 +15,7 @@ BEGIN
 		FROM collection 
 		WHERE id = vParamFk;
 	
-	SET  vDated = util.yesterday();
+	SET vYesterday = util.yesterday();
 
 	WITH observation AS (
 		SELECT tob.ticketFk, tob.description 
@@ -45,7 +45,7 @@ BEGIN
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 		WHERE t.id = vParamFk 
-			AND t.shipped >= vDated
+			AND t.shipped >= vYesterday
 	UNION ALL
 	SELECT t.id ticketFk, 
 			IF(NOT(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
@@ -84,6 +84,6 @@ BEGIN
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk	
 		WHERE sc.id = vParamFk
-			AND t.shipped >= vDated;
+			AND t.shipped >= vYesterday;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -29,7 +29,7 @@ BEGIN
 		END;
 
 	IF (SELECT isPicked FROM itemShelvingSale WHERE id = vItemShelvingSaleFk) THEN
-		CALL util.throw('Reserva completada');
+		CALL util.throw('Reservation completed');
 	END IF;
 
 	SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk, SUM(IFNULL(iss.quantity,0))
@@ -43,7 +43,7 @@ BEGIN
 		OR (vQuantity < vReservedQuantity AND 
 			(NOT vIsItemShelvingSaleEmpty OR vIsItemShelvingSaleEmpty IS NULL))
 		OR (vIsItemShelvingSaleEmpty IS NOT NULL AND vQuantity = vReservedQuantity) THEN
-		CALL util.throw('La cantidad no puede distinta a la reserva');
+		CALL util.throw('The quantity cannot be different from the reserved');
 	END IF;
 
 	START TRANSACTION;
@@ -89,7 +89,7 @@ BEGIN
 	COMMIT;
 	
 	IF vIsItemShelvingSaleEmpty AND vQuantity <> vReservedQuantity THEN
-		CALL itemShelvingSale_moveReserv(vItemShelvingFk, vQuantity);
+		CALL itemShelving_moveReserv(vItemShelvingFk, vQuantity);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelving_moveReserv.sql

@@ -1,11 +1,11 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_moveReserv`(
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_moveReserv`(
 	vItemShelvingFk INT(10),
 	vItemFk INT(10)
 )
 BEGIN
 /**
- * Elimina reservas de un itemShelvingSale e intenta reservar en otra ubicación 
+ * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
  * 
  * @param vItemShelvingFk Id itemShelving
  */
@@ -20,7 +20,6 @@ BEGIN
 	SELECT id INTO vItemShelvingFk
 		FROM itemShelving 
 		WHERE id = vItemShelvingFk 
-			AND FALSE 
 		FOR UPDATE;
 
 	UPDATE itemShelving

db/routines/vn/procedures/sectorCollection_getMyPartial.sql

@@ -12,8 +12,7 @@ BEGIN
 			LEFT JOIN vn.sale sl ON sl.id = sgd.saleFk
 			LEFT JOIN itemShelvingSale iss ON iss.saleFk = sl.id
 		WHERE sc.userFk =  account.myUser_getId()
-			AND (ISNULL(scsg.sectorCollectionFk)
+			AND (scsg.sectorCollectionFk IS NULL OR NOT iss.isPicked)	
-				OR (NOT iss.isPicked))
 			AND sc.created > util.VN_CURDATE() - INTERVAL 1 DAY;
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemShelvingSale_afterInsert.sql

@@ -5,8 +5,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelvingSale_afte
 BEGIN 	
 	
 	UPDATE sale s
-		JOIN operator o ON o.workerFk = account.myUser_getId()
+			JOIN operator o ON o.workerFk = account.myUser_getId()
-		SET isPicked = IF(o.isOnReservationMode,  isPicked, TRUE)		
+		SET s.isPicked = IF(o.isOnReservationMode, isPicked, TRUE)		
-        WHERE id = NEW.saleFk;
+		WHERE id = NEW.saleFk;
 END$$
 DELIMITER ;