Update odt2pdf.sh

Fix odt2pdf.sh
Update codesniffer to remove travis errors.
Update codesniffer to remove travis errors.
PHPCS
Merge pull request #2162 from FHenry/3.6

Update odt2pdf.sh
Fixed: Translation
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Translation error
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
Fix merge changelog
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
Fixed string not translated in linked objects of a project
Corrected confusing table header in task list
Spanish translation
 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
Merge pull request #2169 from marcosgdf/bug-1736

Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
Merge branch '3.6' into translation
Merge branch '3.6' into bug-1649

Conflicts:
	ChangeLog
Merge pull request #2168 from frederic34/patch-5

Translation error