From 3157c28cb0377a561fb3b4449fa65c294995b841 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 11 Jun 2005 11:32:12 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tiques=20mineures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php   | 32 +++++++-------------------------
 htdocs/contact/fiche.php |  8 +++++---
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 1ab3349d4bc..aad40d9000f 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -48,7 +48,7 @@ if($conf->commande->enabled) {
 require("./propal_model_pdf.class.php");
 require("../propal.class.php");
 require("../actioncomm.class.php");
-require("../lib/CMailFile.class.php");
+require(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
 
 /*
  *  Sécurité accés client
@@ -491,7 +491,7 @@ if ($_GET["propalid"])
 		  $i++;
 		}
 
-	      $db->free();
+	      $db->free($result);
 	    } 
 	  else
 	    {
@@ -518,9 +518,8 @@ if ($_GET["propalid"])
 	      print '<input type="hidden" name="propid" value="'.$propal->id.'">';
 	      print '<input type="hidden" name="action" value="addligne">';
 
-          // Ajout produit produits/services personalisé
-	      $var=!$var;
-
+          // Ajout produit produits/services personalisés
+	      $var=true;
 	      print "<tr ".$bc[$var].">\n";
 	      print "  <td><textarea cols=\"50\" name=\"np_desc\"></textarea></td>\n";
 	      print "  <td align=\"center\">";
@@ -532,28 +531,11 @@ if ($_GET["propalid"])
 	      print "</tr>";
 
 	      // Ajout de produits/services prédéfinis
-	      $sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p WHERE p.envente=1 ORDER BY p.nbvente DESC LIMIT 20";
-	      $result = $db->query($sql);
-		  if ($result)
-		    {
-    		  $opt = "<option value=\"0\" selected></option>";
-		      $num = $db->num_rows();	$i = 0;	
-		      while ($i < $num)
-			    {
-			  $objp = $db->fetch_object($result);
-			  $opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
-			  $i++;
-			    }
-		      $db->free();
-    		}
-   	      else
-    		{
-    		  dolibarr_print_error($db);
-    		}
-
 	      $var=!$var;
 	      print "<tr $bc[$var]>";
-	      print "<td colspan=\"2\"><select name=\"idprod\">".$opt."</select></td>";
+	      print "<td colspan=\"2\">";
+	      $html->select_produits('','idprod','',20);
+	      print "</td>";
 	      print '<td>&nbsp;</td>';
 	      print '<td align="right"><input type="text" size="3" name="qty" value="1"></td>';
 	      print '<td align="right"><input type="text" size="3" name="remise" value="'.$societe->remise_client.'"> %</td>';
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 5eb49c7527d..3a1d6b6749a 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -450,7 +450,9 @@ else
     
   if ( $db->query($sql) ) 
     {
-      $i = 0 ; $num = $db->num_rows(); $tag = True;
+      $i = 0 ;
+      $num = $db->num_rows();
+      $var=true;
       while ($i < $num) 
         {
           $obj = $db->fetch_object();
@@ -470,7 +472,6 @@ else
           print "<td>$obj->code&nbsp;</td>";
           print "</tr>\n";
           $i++;
-          $tag = !$tag;
         }
     }
   else 
@@ -483,5 +484,6 @@ else
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter('$Date$ - $Revision$');
+
 ?>