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

Merge branch 'test' into dev
Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3227 ) from 7920-itemShelvingLog into test
2024-11-20 15:34:04 +01:00 · 2024-11-20 14:08:42 +01:00 · 2024-11-20 13:07:51 +00:00 · 2024-11-20 14:03:23 +01:00
2 changed files with 5 additions and 3 deletions
--- a/db/routines/vn/procedures/itemShelvingSale_setQuantity.sql
+++ b/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;

--- a/db/routines/vn/procedures/itemShelving_get.sql
+++ b/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
Author	SHA1	Message	Date
Jorge Penadés	940bc8caed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile gitea/salix/pipeline/pr-dev This commit looks good Details	2024-11-20 15:34:04 +01:00
Guillermo Bonet	69bdf8efb2	Merge branch 'test' into dev gitea/salix/pipeline/head This commit looks good Details	2024-11-20 14:08:42 +01:00
Sergio De la torre	a8dea64bc1	Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3227 ) from 7920-itemShelvingLog into test gitea/salix/pipeline/head This commit looks good Details gitea/salix/pipeline/pr-dev This commit looks good Details Reviewed-on: #3227 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-20 13:07:51 +00:00
Sergio De la torre	9fbffe8a6b	fix: refs #7920 refs#7920 itemShelvingLog gitea/salix/pipeline/pr-test This commit looks good Details	2024-11-20 14:03:23 +01:00