Some cleaning

htdocs/commande/class/commande.class.php

@@ -1331,7 +1331,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='')
         $sql.= ', c.fk_account';
         $sql.= ', c.date_commande';
         $sql.= ', c.date_livraison';
-        $sql.= ", c.fk_shipping_method";
+        $sql.= ', c.fk_shipping_method';
         $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
         $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';

htdocs/commande/fiche.php

@@ -52,6 +52,7 @@
 $langs->load('bills');
 $langs->load('propal');
 $langs->load('deliveries');
+$langs->load('sendings');
 $langs->load('products');
 if (! empty($conf->margin->enabled))
 	$langs->load('margins');

htdocs/core/class/html.form.class.php

@@ -2429,7 +2429,7 @@ function load_PriceBaseType($selected='',$htmlname='price_base_type')
      *  @param  string	$moreattrib        To add more attribute on select
      * 	@return	void
      */
-    function selectShippingMethod($selected='',$htmlname='fk_shipping_method',$filtre='',$useempty=0,$moreattrib='')
+    function selectShippingMethod($selected='',$htmlname='shipping_method_id',$filtre='',$useempty=0,$moreattrib='')
     {
         global $langs, $conf, $user;
 
@@ -2482,7 +2482,7 @@ function selectShippingMethod($selected='',$htmlname='fk_shipping_method',$filtr
      *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
      *    @return	void
      */
-    function formSelectShippingMethod($page, $selected='', $htmlname='fk_shipping_method', $addempty=0)
+    function formSelectShippingMethod($page, $selected='', $htmlname='shipping_method_id', $addempty=0)
     {
         global $langs, $db;