diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index cd0159088a9..8d7ab7e8ef8 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -105,7 +105,8 @@ if ($_POST["action"] == 'create_delivery' && $conf->livraison->enabled && $user-
 {
   $expedition = new Expedition($db);
   $expedition->fetch($_GET["id"]);
-  $expedition->create_delivery($user);
+  $result = $expedition->create_delivery($user);
+  Header("Location: ".DOL_URL_ROOT.'/livraison/fiche.php?id='.$result->id);
 }
 
 if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->rights->expedition->valider)
@@ -510,7 +511,7 @@ else
                 
                 if ($conf->livraison->enabled && $expedition->statut == 1 && $user->rights->expedition->livraison->creer)
                 {
-                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/livraison/fiche.php?expid='.$expedition->id.'&amp;action=create_delivery">'.$langs->trans("DeliveryOrder").'</a>';
+                    print '<a class="butAction" href="fiche.php?id='.$expedition->id.'&amp;action=create_delivery">'.$langs->trans("DeliveryOrder").'</a>';
                 }
     
                 print '<a class="butAction" href="fiche.php?id='.$expedition->id.'&amp;action=builddoc">'.$langs->trans('BuildPDF').'</a>';
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index b03ad503a93..19d761a8cf0 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -141,16 +141,6 @@ if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
     }    
 }
 
-/*
- * Génère un bon de livraison
- */
-if ($_POST["action"] == 'create_delivery' && $user->rights->expedition->livraison->creer)
-{
-  $expedition = new Expedition($db);
-  $expedition->fetch($_GET["expid"]);
-  $expedition->create_delivery($user);
-}
-
 
 /*
  *