Uniformize code to prepare mass update
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop