Fix: checkstyle
Fix: uniformize code
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Merge remote-tracking branch 'Upstream/develop' into develop-loan