Merge branch 'master' into Hotfix-RecoveryDescriptor

db/routines/vn/procedures/item_getSimilar.sql

@@ -18,9 +18,11 @@ BEGIN
 * @param vDaysInForward Días de alcance para las ventas
 */
 	DECLARE vAvailableCalcFk INT;
+	DECLARE vVisibleCalcFk INT;
 	DECLARE vPriority INT DEFAULT 1;
 
 	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
+	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
 
 	WITH itemTags AS (
 		SELECT i.id,
@@ -41,12 +43,6 @@ BEGIN
 				LEFT JOIN vn.tag t ON t.id = it.tagFk
 			WHERE i.id = vSelf
 	),
-	stock AS (
-		SELECT itemFk, SUM(visible) stock
-			FROM vn.itemShelvingStock
-			WHERE warehouseFk = vWarehouseFk
-			GROUP BY itemFk
-	),
 	sold AS (
 		SELECT SUM(s.quantity) quantity, s.itemFk
 			FROM vn.sale s
@@ -58,7 +54,7 @@ BEGIN
 			GROUP BY s.itemFk
 	)
 	SELECT i.id itemFk,
-			LEAST(CAST(sd.quantity AS INT), sk.stock) advanceable,
+			LEAST(CAST(sd.quantity AS INT), v.visible) advanceable,
 			i.longName,
 			i.subName,
 			i.tag5,
@@ -80,13 +76,14 @@ BEGIN
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END minQuantity,
-			sk.stock located,
+			v.visible located,
 			b.price2
 		FROM vn.item i
 			LEFT JOIN sold sd ON sd.itemFk = i.id
 			JOIN cache.available a ON a.item_id = i.id
 				AND a.calc_id = vAvailableCalcFk
-			LEFT JOIN stock sk ON sk.itemFk = i.id
+			LEFT JOIN cache.visible v ON v.item_id = i.id
+				AND v.calc_id = vVisibleCalcFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
 				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
@@ -96,7 +93,7 @@ BEGIN
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = lb.buy_id
 			JOIN itemTags its
-		WHERE (a.available > 0 OR sd.quantity < sk.stock)
+		WHERE (a.available > 0 OR sd.quantity < v.visible)
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
 		ORDER BY (a.available > 0) DESC,