Uniformization and simplification of code.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop