diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 590260a7c99..817ec5cbf7a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -478,21 +478,21 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			$stock = $prod->stock_reel;
 		}
 		
-		$ordered = $prod->stats_commande_fournisseur['qty'];
+		$ordered = $prod->stats_commande_fournisseur['qty']-$prod->stats_reception['qty'];
 		
 		$warning='';
-
-		if ($objp->seuil_stock_alerte && ($stock < $objp->seuil_stock_alerte))
+		if ($objp->alertstock && ($stock < $objp->alertstock))
 		{
 			$warning = img_warning($langs->trans('StockTooLow')) . ' ';
 		}
+
 		//depending on conf, use either physical stock or
 		//virtual stock to compute the stock to buy value
-		//echo $objp->desiredstock." * ".$stock." * ".$ordered."<br>";
-		$stocktobuy = max($objp->desiredstock - $stock - $ordered, 0);
+		$stocktobuy = max(max($objp->desiredstock, $objp->alertstock) - $stock - $ordered, 0);
 		$disabled = '';
 		if($ordered > 0) {
-			if($stock + $ordered >= $objp->desiredstock) {
+			$compare = $usevirtualstock ? $stock : $stock + $ordered;
+			if($compare >= $objp->desiredstock) {
 				$picto = img_picto('', './img/yes', '', 1);
 				$disabled = 'disabled="disabled"';
 			}