Add PR manually because of conflict "#1678 & #1677 Untranslatable token"
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7