Merge pull request #1859 from FHenry/3.6

Fix SQL syntax
Fix: list event view lost type event filter
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6