From db0fa0afd0ab803122f13b8172a72b552d18feea Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 3 Jul 2014 18:17:34 +0200 Subject: [PATCH] Revert "Fix : ordered should display qty in supplier order not yet send" This reverts commit f2248d5bc887b66b9254f315992d5c8eadc19952. --- htdocs/product/stock/replenish.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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."
"; - $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"'; }