forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/core/class/html.form.class.php htdocs/projet/tasks/time.php
Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/core/class/html.form.class.php htdocs/projet/tasks/time.php