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 '';
print '';
- // Ajout produit produits/services personalisé
- $var=!$var;
-
+ // Ajout produit produits/services personalisés
+ $var=true;
print "
\n";
print " | \n";
print " ";
@@ -532,28 +531,11 @@ if ($_GET["propalid"])
print " |
";
// 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 = "";
- $num = $db->num_rows(); $i = 0;
- while ($i < $num)
- {
- $objp = $db->fetch_object($result);
- $opt .= "\n";
- $i++;
- }
- $db->free();
- }
- else
- {
- dolibarr_print_error($db);
- }
-
$var=!$var;
print "";
- print " | ";
+ print "";
+ $html->select_produits('','idprod','',20);
+ print " | ";
print ' | ';
print ' | ';
print ' % | ';
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 "$obj->code | ";
print "
\n";
$i++;
- $tag = !$tag;
}
}
else
@@ -483,5 +484,6 @@ else
$db->close();
-llxFooter("Dernière modification $Date$ révision $Revision$");
+llxFooter('$Date$ - $Revision$');
+
?>