fixes: refs #7760 collection problems

@@ -0,0 +2,4 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
+BEGIN
+	DECLARE vDone BOOL;
+	-- Fetch variables

@@ -0,0 +5,4 @@
+	-- Fetch variables
+	DECLARE vTicketFk INT;
+
+	DECLARE cCur CURSOR FOR

@@ -0,0 +7,4 @@
+
+	DECLARE cCur CURSOR FOR
+		SELECT ticketFk
+			FROM vn.ticketCollection

@@ -0,0 +23,4 @@
+			LEAVE l;
+		END IF;
+
+		CALL vn.ticket_mergeSales(vTicketFk);

@@ -196,4 +157,1 @@
 				OR LENGTH(pb.problem) > 0
-				OR (pb.lines > vLinesLimit AND vLinesLimit IS NOT NULL)
-				OR (pb.m3 > vVolumeLimit AND vVolumeLimit IS NOT NULL)
-				OR ((sub.maxSize > vSizeLimit OR sub.maxSize IS NOT NULL) AND vSizeLimit IS NOT NULL);

@@ -10,3 +13,3 @@
 	DECLARE vWagons INT;
 	DECLARE vTrainFk INT;
-	DECLARE vLinesLimit INT;
+	DECLARE vLinesLimit INT DEFAULT NULL;

@@ -13,2 +15,3 @@
+	DECLARE vLinesLimit INT DEFAULT NULL;
 	DECLARE vTicketLines INT;
-	DECLARE vVolumeLimit DECIMAL;
+	DECLARE vVolumeLimit DECIMAL DEFAULT NULL;

@@ -15,4 +18,3 @@
 	DECLARE vTicketVolume DECIMAL;
-	DECLARE vSizeLimit INT;
 	DECLARE vMaxTickets INT;
 	DECLARE vStateFk VARCHAR(45);

@@ -99,1 +52,3 @@
-				FETCH vSaleGroup INTO vItemPackingTypeFk;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vItemPackingTypes INTO vitemPackingTypeFk;

@@ -164,0 +124,4 @@
+	-- Si hay tickets asignados, nos centramos exclusivamente en esos tickets 
+	-- y los sacamos independientemente de problemas o tamaños
+
+	SELECT EXISTS (

@@ -194,71 +166,64 @@ BEGIN
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem) > 0

@@ -289,0 +246,4 @@
+				SELECT wagon INTO vFreeWagonFk
+					FROM tTrain
+					GROUP BY wagon
+					HAVING SUM(IFNULL(ticketFk, 0)) = 0

@@ -347,3 +307,3 @@
-				JOIN (
+				JOIN(
 					SELECT COUNT(*) saleTotalCount,
 							SUM(s.isPicked <> 0) salePickedCount

@@ -27,3 +27,3 @@
 		END IF;
 		
-		CALL vn.sales_merge(vTicketFk);
+		CALL vn.ticket_mergeSales(vTicketFk);

@@ -0,0 +26,4 @@
+			WHERE s.ticketFk = vSelf
+				AND it.isMergeable
+			GROUP BY s.itemFk, s.price, s.discount
+			HAVING COUNT(*) > 1;

@@ -74,3 +36,1 @@
-		WHERE itemPackingTypeFk IS NOT NULL;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+	CREATE OR REPLACE TEMPORARY TABLE tmp.salesToMove (