forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/index.php htdocs/commande/list.php htdocs/langs/en_US/errors.lang htdocs/projet/class/task.class.php
Conflicts: htdocs/accountancy/index.php htdocs/commande/list.php htdocs/langs/en_US/errors.lang htdocs/projet/class/task.class.php