Merge pull request 'tickets deleted excluded' (!2601) from 7420-supplierPackaging_ReportSource into dev

Reviewed-on: #2601 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-19 05:17:58 +00:00 · 2024-06-19 05:17:58 +00:00 · cccc87d211
parent 116ec6bba9 841f8e9cac
commit cccc87d211
1 changed files with 2 additions and 0 deletions
--- a/db/routines/vn/procedures/supplierPackaging_ReportSource.sql
+++ b/db/routines/vn/procedures/supplierPackaging_ReportSource.sql
@ -99,6 +99,7 @@ BEGIN
 					WHERE su.id = vSupplierFk
 						AND t.shipped < vFromDated
 						AND p.isPackageReturnable
+						AND NOT t.isDeleted
 					GROUP BY s.itemFk
 				UNION ALL
 				SELECT vSupplierFk,
@ -140,6 +141,7 @@ BEGIN
 					WHERE su.id = vSupplierFk
 						AND t.shipped >= vFromDated
 						AND p.isPackageReturnable
+						AND NOT t.isDeleted
 					GROUP BY p.itemFk
 					ORDER BY itemFk, landed, entryFk
 				) sub