From 131cdca0c770b7574c3f7e63f4d2f8daca676f58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 31 Jan 2007 10:04:56 +0000
Subject: [PATCH] Fix: Erreur sur mysql 5

---
 htdocs/contrat/fiche.php | 4 ++--
 htdocs/contrat/index.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 0b6eee5c676..51c5dc9fd41 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -709,12 +709,12 @@ else
                         print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
                         print img_object($langs->trans("ShowService"),"service").' '.$objp->ref.'</a>';
                         print $objp->label?' - '.$objp->label:'';
-                        if ($objp->description) print '<br />'.stripslashes(nl2br($objp->description));
+                        if ($objp->description) print '<br />'.nl2br($objp->description);
                         print '</td>';
                     }
                     else
                     {
-                        print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
+                        print "<td>".nl2br($objp->description)."</td>\n";
                     }
                     // TVA
                     print '<td align="center">'.$objp->tva_tx.'%</td>';
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 1a981407f05..7bd5d418a4b 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,8 +107,9 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.d
 $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.statut, s.nom, s.idp as sidp";
 if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+$sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.idp ";
 if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;