fix
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Conflicts:
	ChangeLog
Merge pull request #1869 from FHenry/3.6

Extrafield feature select from table should try to translate multiple column when not needed