Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/core/actions_massactions.inc.php
This commit is contained in:
Laurent Destailleur 2019-01-29 19:13:57 +01:00
commit cedf1bb269
2 changed files with 1138 additions and 1138 deletions

File diff suppressed because it is too large Load Diff

View File

@ -209,7 +209,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
// must also not be output for most entities (proposal, intervention, ...)
//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
echo $line->qty;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
} else echo ' '; ?>
</td>