From c07eb9cd2add5706a35a5dbb0beea13bc1b2d47a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 30 May 2006 14:49:17 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20bon=20de=20livraison?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/expedition/fiche.php | 2 +-
 htdocs/livraison/fiche.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 8742e1daeda..cd0159088a9 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -510,7 +510,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?id='.$expedition->id.'&amp;action=create_delivery">'.$langs->trans("DeliveryOrder").'</a>';
+                    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=builddoc">'.$langs->trans('BuildPDF').'</a>';
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 8170cbdc3cb..b03ad503a93 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -147,7 +147,7 @@ if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 if ($_POST["action"] == 'create_delivery' && $user->rights->expedition->livraison->creer)
 {
   $expedition = new Expedition($db);
-  $expedition->fetch($_GET["id"]);
+  $expedition->fetch($_GET["expid"]);
   $expedition->create_delivery($user);
 }