forked from Wavyzz/dolibarr
into develop Conflicts: htdocs/user/index.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php
into develop Conflicts: htdocs/user/index.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php