forked from Wavyzz/dolibarr
Conflicts: htdocs/langs/en_US/stocks.lang htdocs/product/stats/card.php htdocs/projet/element.php htdocs/salaries/card.php
Conflicts: htdocs/langs/en_US/stocks.lang htdocs/product/stats/card.php htdocs/projet/element.php htdocs/salaries/card.php