lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix : ordered should display qty in supplier order not yet send"

Browse Source 
This reverts commit f2248d5bc8.
This commit is contained in:
Maxime Kohlhaas 2014-07-03 18:17:34 +02:00
parent 8eb8f33f28
commit db0fa0afd0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/product/stock/replenish.php
View File

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