Merge branch 'master' into 8169-itemTextureTag

Reviewed-on: #3193
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

db/routines/vn/procedures/sale_getProblems.sql

@@ -127,7 +127,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) < s.quantity
+							AND IFNULL(av.available, 0) < 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND NOT s.isPicked
 							AND NOT s.reserved
@@ -190,7 +190,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) >= s.quantity
+							AND IFNULL(av.available, 0) >= 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -14,7 +14,7 @@ proc:BEGIN
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk INT;
+	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
 	DECLARE vNewTicketFk INT;
 
 	DECLARE vItemPackingTypes CURSOR FOR 
@@ -36,14 +36,10 @@ proc:BEGIN
 	) ENGINE=MEMORY
 		SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
 
-	IF NOT vHasItemPackingType THEN
-		LEAVE proc;
-	END IF;
-
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
 		ticketFk INT,
 		saleFk INT,
-		itemPackingTypeFk INT
+		itemPackingTypeFk VARCHAR(1)
 	) ENGINE=MEMORY;
 
 	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
@@ -55,7 +51,6 @@ proc:BEGIN
 				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
 
 	OPEN vItemPackingTypes;
-
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
@@ -71,7 +66,6 @@ proc:BEGIN
 			WHERE itemPackingTypeFk = vItemPackingTypeFk;
 
 	END LOOP;
-
 	CLOSE vItemPackingTypes;
 
 	UPDATE sale s

db/versions/11251-navyChrysanthemum/01-firstScript.sql

@@ -1 +1 @@
--- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';
+ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';