Merge branch '18.0' of https://github.com/Dolibarr/dolibarr into 18.0…

Merge branch '18.0' of https://github.com/Dolibarr/dolibarr into 18.0… #497