From 0ee33966d913e1989ee60f8ee9703090e232380a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 30 May 2006 14:03:23 +0000
Subject: [PATCH] bugfix

---
 htdocs/expedition/expedition.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index 464174c04ec..6969dfa1503 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -198,7 +198,7 @@ class Expedition
     
         $result = $this->db->query($sql) ;
     
-        if ( $result )
+        if ($result)
         {
             $obj = $this->db->fetch_object($result);
     
@@ -210,7 +210,7 @@ class Expedition
             $this->date                 = $obj->date_expedition;
             $this->entrepot_id          = $obj->fk_entrepot;
             $this->adresse_livraison_id = $obj->fk_adresse_livraison;
-            $this->db->free();
+            $this->db->free($result);
     
             if ($this->statut == 0) $this->brouillon = 1;
             
@@ -225,16 +225,16 @@ class Expedition
 			      $sql .= " AND e.fk_commande_ligne = c.rowid";
 			      $sql .= " AND c.fk_product = p.rowid";
 			      
-			      $result = $this->db->query($sql);
+			      $resultp = $this->db->query($sql);
             
-            if ($result)
+            if ($resultp)
             {
-                    $num = $this->db->num_rows($result);
+                    $num = $this->db->num_rows($resultp);
                     $i = 0;
     
                     while ($i < $num)
                     {
-                        $objp                  = $this->db->fetch_object($result);
+                        $objp                  = $this->db->fetch_object($resultp);
     
                         $ligne                 = new ExpeditionLigne();
 
@@ -248,7 +248,7 @@ class Expedition
                         $this->lignes[$i]      = $ligne;
                         $i++;
                     }
-                    $this->db->free($result);
+                    $this->db->free($resultp);
                 }
                 else
                 {