Merge pull request '6358-boxPicking_blueMammut' (!2230) from 6358-boxPicking_blueMammut into dev

Reviewed-on: #2230
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

db/routines/vn/procedures/sale_boxPickingPrint.sql

@@ -1,12 +1,12 @@
 DELIMITER $$
 $$
-CREATE OR REPLACE PROCEDURE vn.sale_boxPickingPrint(
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE vn.sale_boxPickingPrint(
 	IN vPrinterFk INT,
 	IN vSaleFk INT,
 	IN vPacking INT,
 	IN vSectorFk INT,
 	IN vUserFk INT,
-	IN vPackagingFk INT,
+	IN vPackagingFk VARCHAR(10),
 	IN vPackingSiteFk INT)
 BEGIN
 /** Splits a line of sale to a different ticket and prints the transport sticker
@@ -61,6 +61,8 @@ BEGIN
 
 w1:	WHILE vQuantity >= vPacking DO
 
+		SET vQuantity = vQuantity - vPacking;
+
 		SET vItemShelvingFk = NULL;
 
 		SELECT sub.id
@@ -191,7 +193,7 @@ w1:	WHILE vQuantity >= vPacking DO
 			ELSE
 				UPDATE itemShelvingSale
 					SET saleFk = vNewSaleFk
-					WHERE id = vItemShelvingSaleFk;
+					WHERE id = vItemShelvingSaleFk; 
 			END IF;
 		ELSE
 			INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
@@ -209,6 +211,7 @@ w1:	WHILE vQuantity >= vPacking DO
 			UPDATE itemShelvingSale 
 				SET saleFk = vNewSaleFk
 				WHERE id = vItemShelvingSaleFk;
+
 		END IF;
 
 		INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)
@@ -235,7 +238,7 @@ w1:	WHILE vQuantity >= vPacking DO
 								)
 			SELECT	vAgencyModeFk,
 					vNewTicketFk,
-					i.id,
+					pc.defaultFreightItemFk,
 					vUserFk, 
 					vPackagingFk,
 					ps.code,
@@ -246,9 +249,8 @@ w1:	WHILE vQuantity >= vPacking DO
 					NOW()
 				FROM packingSite ps
 					JOIN host h ON h.id = ps.hostFk
-					JOIN item i ON i.name = 'Shipping cost'
+					JOIN productionConfig pc
-				WHERE ps.id = vPackingSiteFk
+				WHERE ps.id = vPackingSiteFk;
-				LIMIT 1;
 
 		SET vExpeditionFk = LAST_INSERT_ID();
 
@@ -277,6 +279,7 @@ w1:	WHILE vQuantity >= vPacking DO
 		DELETE FROM sale
 			WHERE quantity = 0
 				AND id = vSaleFk;
+
 	END WHILE;
 
 END$$

db/versions/10973-purpleAsparagus/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig ADD defaultFreightItemFk INT UNSIGNED DEFAULT 71 NOT NULL COMMENT 'Default value for expedition table';