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: security problem with multicompany
Fix: big security problem with multicompany
Fix: avoid error
Fix: bypass the second test if the first is ok
Corrected translation key
Merge pull request #888 from FHenry/3.3

Fix bug Pgsql
Merge pull request #889 from marcosgdf/translations

Corrected translation key
Fix: remove warning
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
Corrected incorrect lang trans key
Expedition class name was not being translated when creating invoice from it
Fixed incorrect translations in holidays module
Modified traslation keys to reflect expected translation
Fixed typos
Merge pull request #892 from marcosgdf/expedition-translations

Corrected incorrect lang trans key
Merge pull request #891 from marcosgdf/bug-857

Fix: [ bug #857 ] Invoice created from shipment does not have the order ...