"or" into if instead of ||
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Merge pull request #1585 from FHenry/3.5

 	"or" into if instead of ||