From abf9946c680abd04ead6cdcd9a22482f4fd300a5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 26 Dec 2005 15:29:19 +0000
Subject: [PATCH] Fix: code incorrect

---
 htdocs/fourn/commande/fiche.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 96a9aae3642..3f810bf8892 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -239,15 +239,10 @@ $html = new Form($db);
 
 if ($_GET["id"] > 0)
 {
-<<<<<<< fiche.php
     if ($mesg) print $mesg;
+    $commande = new CommandeFournisseur($db);
     
-    $commande = new CommandeFournisseur($db);
     if ( $commande->fetch($_GET["id"]) == 0)
-=======
-    $commande = new CommandeFournisseur($db);
-    if ( $commande->fetch($_GET["id"]) == 0)
->>>>>>> 1.29.2.1
     {	  
       $soc = new Societe($db);
       $soc->fetch($commande->soc_id);