Merge pull request #850 from atm-maxime/develop

htdocs/admin/carrier.php

htdocs/admin/confexped.php

htdocs/admin/dict.php

htdocs/admin/expedition.php

htdocs/admin/livraison.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

htdocs/expedition/class/expedition.class.php

htdocs/fourn/class/fournisseur.facture.class.php

htdocs/fourn/facture/fiche.php

htdocs/societe/consumption.php