Fix: finish merge
Merge pull request #875 from grandoc/3.3

fix undefined offset
[ bug #849 ] BUG PGSQL
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Merge pull request #878 from FHenry/3.3

[ bug #849 ] BUG PGSQL
fix [ bug #850 ] Dolibarr PGSQL
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Fix: broken features with multicompany
Fix: use $conf->entity if defined
Merge pull request #880 from FHenry/3.3

fix [ bug #850 ] Dolibarr PGSQL
fix : Unterminated comment, Undefined property and syntax error