Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -48,7 +48,7 @@ BEGIN
 			iss.itemShelvingFk, 
 			SUM(IFNULL(iss.quantity,0)), 
 			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
-			ish.shelvingFk
+			sh.code
 		INTO vItemFk, 
 			vSaleFk, 
 			vItemShelvingFk, 
@@ -58,7 +58,8 @@ BEGIN
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
 			JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;
 

db/routines/vn/procedures/itemShelving_get.sql

@@ -21,7 +21,8 @@ BEGIN
 			ish.isChecked,
 			ic.url,
 			ish.available,
-			ish.buyFk
+			ish.buyFk,
+			sh.shelvingFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
 			JOIN shelving s ON s.id = ish.shelvingFk