Merge pull request #1092 from atm-maxime/mko862

htdocs/admin/commande.php

htdocs/admin/expedition.php

htdocs/core/class/html.formfile.class.php

...dules/expedition/doc/doc_generic_shipment_odt.modules.php

htdocs/core/modules/expedition/doc/pdf_merou.modules.php

htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

htdocs/core/modules/expedition/modules_expedition.php

htdocs/core/modules/modExpedition.class.php

htdocs/expedition/fiche.php

htdocs/install/doctemplates/shipment/template_shipment.odt