diff --git a/db/routines/vn/procedures/item_getAtp.sql b/db/routines/vn/procedures/item_getAtp.sql
index d02d7cc90e..0cbb8ab06d 100644
--- a/db/routines/vn/procedures/item_getAtp.sql
+++ b/db/routines/vn/procedures/item_getAtp.sql
@@ -20,11 +20,13 @@ BEGIN
 				SELECT itemFk, warehouseFk, vDated, 0
 					FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
 			) t1
-			GROUP BY itemFk, warehouseFk, dated;
+			GROUP BY itemFk, warehouseFk, dated
+			HAVING warehouseFk
+			ORDER BY itemFk, warehouseFk, dated;
 
-	SET @lastItemFk = 0;
-	SET @lastWareHouseFk = 0;
-	SET @lastQuantity = 0;
+	SET @lastItemFk := 0;
+	SET @lastWareHouseFk := 0;
+	SET @lastQuantity := 0;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp
 		(INDEX (itemFk, wareHouseFk))
@@ -32,15 +34,13 @@ BEGIN
 			FROM (
 				SELECT
 					itemFk,
-					IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk OR wareHouseFk IS NULL,
+					IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
 						@lastQuantity := quantity,
 						@lastQuantity := @lastQuantity + quantity) quantityAccumulated,
 					wareHouseFk,
 					@lastItemFk := itemFk,
 					@lastWareHouseFk := wareHouseFk
 				FROM tItemOrdered
-				ORDER BY itemFk, warehouseFk, dated
-				LIMIT 10000000000000000000
 			)sub
 			GROUP BY itemFk, wareHouseFk;
 
diff --git a/db/routines/vn/procedures/item_getMinacum.sql b/db/routines/vn/procedures/item_getMinacum.sql
index ed987637cd..7573759f74 100644
--- a/db/routines/vn/procedures/item_getMinacum.sql
+++ b/db/routines/vn/procedures/item_getMinacum.sql
@@ -30,6 +30,7 @@ BEGIN
 					FROM sale s
 						JOIN ticket t ON t.id = s.ticketFk
 					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+						AND t.warehouseFk
 						AND s.quantity != 0
 						AND (vItemFk IS NULL OR s.itemFk = vItemFk)
 						AND (vWarehouseFk IS NULL OR t.warehouseFk = vWarehouseFk)
@@ -40,7 +41,7 @@ BEGIN
 						t.warehouseInFk
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
-						LEFT JOIN travel t ON t.id = e.travelFk
+						JOIN travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDatedFrom AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 						AND !e.isExcludedFromAvailable
@@ -53,7 +54,7 @@ BEGIN
 						t.warehouseOutFk
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
-						LEFT JOIN travel t ON t.id = e.travelFk
+						JOIN travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk)
 						AND !e.isExcludedFromAvailable