Merge branch 'test' into 7404-fix-remove-tickets-volume

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171 ) from hotFix-remove-notOwn-agency-collection-advantage into master
2024-11-12 06:24:06 +00:00 · 2024-11-11 14:09:03 +01:00 · 2024-11-11 10:02:42 +00:00 · 2024-11-11 09:02:04 +01:00
1 changed files with 1 additions and 3 deletions
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@ -146,8 +146,6 @@ BEGIN
 		DELETE pb
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
-				JOIN agencyMode am ON am.id = pb.agencyModeFk
-				JOIN agency a ON a.id = am.agencyFk
 				LEFT JOIN (
 					SELECT pb.ticketFk, MAX(i.`size`) maxSize
 						FROM tmp.productionBuffer pb
@ -158,7 +156,7 @@ BEGIN
 				) sub ON sub.ticketFk = pb.ticketFk
 				JOIN productionConfig pc
 			WHERE pb.shipped <> util.VN_CURDATE()
-				OR (pb.ubicacion IS NULL AND a.isOwn)
+				OR pb.ubicacion IS NULL
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
Author	SHA1	Message	Date
Pablo Natek	3d3bc0dbaa	Merge branch 'test' into 7404-fix-remove-tickets-volume gitea/salix/pipeline/pr-test This commit looks good Details	2024-11-12 06:24:06 +00:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test gitea/salix/pipeline/head This commit looks good Details gitea/salix/pipeline/pr-master This commit looks good Details	2024-11-11 14:09:03 +01:00
Pako Natek	b62b33d175	Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171 ) from hotFix-remove-notOwn-agency-collection-advantage into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #3171 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-11 10:02:42 +00:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets gitea/salix/pipeline/pr-master This commit looks good Details Refs: #0000	2024-11-11 09:02:04 +01:00