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

ChangeLog

htdocs/admin/carrier.php

htdocs/admin/compta.php

htdocs/admin/confexped.php

htdocs/admin/dict.php

htdocs/admin/expedition.php

htdocs/admin/livraison.php

htdocs/admin/modules.php

htdocs/compta/facture.php

htdocs/compta/journal/purchasesjournal.php

htdocs/compta/journal/sellsjournal.php

htdocs/core/lib/functions.lib.php

...re/modules/commande/doc/doc_generic_order_odt.modules.php

...cs/core/modules/expedition/methode_expedition.modules.php

.../modules/expedition/methode_expedition_colsui.modules.php

...ore/modules/expedition/methode_expedition_enl.modules.php

...dules/expedition/methode_expedition_lettremax.modules.php

...e/modules/expedition/methode_expedition_trans.modules.php

...e/modules/facture/doc/doc_generic_invoice_odt.modules.php

...e/modules/project/pdf/doc_generic_project_odt.modules.php