git push origin developMerge branch 'atm-florian-dev_add_color_on_select_product' into develop

This commit is contained in:
Laurent Destailleur 2016-08-05 00:44:35 +02:00
commit d72d6de9f1

View File

@ -2032,7 +2032,12 @@ class Form
if (! empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0) if (! empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0)
{ {
$opt.= ' - '.$langs->trans("Stock").':'.$objp->stock; $opt.= ' - '.$langs->trans("Stock").':'.$objp->stock;
$outval.=' - '.$langs->transnoentities("Stock").':'.$objp->stock;
if ($objp->stock > 0) {
$outval.= ' - <span class="product_line_stock_ok">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
}elseif ($objp->stock <= 0) {
$outval.= ' - <span class="product_line_stock_too_low">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
}
} }
if ($outdurationvalue && $outdurationunit) if ($outdurationvalue && $outdurationunit)