diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index 80ee34caf59..e2e212e1936 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -768,9 +768,9 @@ class Expedition extends CommonObject
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
-	  {
-	  	$this->meths[$obj->rowid] = $obj->libelle;
-	  }
+			{
+				$this->meths[$obj->rowid] = $obj->libelle;
+			}
 		}
 	}
 	/*
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index a4eead58460..ad2c18d9b61 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -119,7 +119,7 @@ if ($_POST["action"] == 'add')
 }
 
 /*
- * G�n�re un bon de livraison
+ * Genere un bon de livraison
  */
 if ($_GET["action"] == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
 {
@@ -338,7 +338,7 @@ if ($_GET["action"] == 'create')
 			//$lignes = $object->fetch_lines(1);
 			$numAsked = sizeof($object->lignes);
 
-			/* Lecture des expeditions d�j� effectu�es */
+			/* Lecture des expeditions deja effectuees */
 			$object->loadExpeditions();
 
 			if ($numAsked)
@@ -402,7 +402,7 @@ if ($_GET["action"] == 'create')
 					if ($_GET["entrepot_id"])
 					{
 						$stock = $product->stock_entrepot[$_GET["entrepot_id"]];
-						$stock+=0;  // Convertit en num�rique
+						$stock+=0;  // Convertit en numerique
 						$defaultqty=min($quantityToBeDelivered, $stock);
 						if ($defaultqty < 0) $defaultqty=0;
 					}
@@ -737,7 +737,7 @@ else
 					print "<td>".nl2br($lignes[$i]->description)."</td>\n";
 				}
 
-				// Qte command�
+				// Qte commande
 				print '<td align="center">'.$lignes[$i]->qty_asked.'</td>';
 
 				// Qte a expedier ou expedier
@@ -834,7 +834,7 @@ else
 	}
 	else
 	{
-		print "Expedition inexistante ou acc�s refus�";
+		print "Expedition inexistante ou acces refuse";
 	}
 }
 
diff --git a/mysql/migration/2.4.0-2.5.0.sql b/mysql/migration/2.4.0-2.5.0.sql
index ac242889753..d8d9d7ba970 100644
--- a/mysql/migration/2.4.0-2.5.0.sql
+++ b/mysql/migration/2.4.0-2.5.0.sql
@@ -59,3 +59,6 @@ alter table llx_expedition add size_units integer;
 alter table llx_expedition add size integer;
 alter table llx_expedition add weight_units integer;
 alter table llx_expedition add weight integer;
+
+update llx_expedition_methode set code='ENL', libelle='Enlevement' where code='enlevement';
+update llx_expedition_methode set code='TRANS', libelle='Transporteur' where code='transporteur';