From 2ebbefd5a505069b6819fdd3b92459b8d5e98e34 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 12 Feb 2006 10:59:11 +0000
Subject: [PATCH] modification de la description produit

---
 htdocs/comm/addpropal.php        | 3 ++-
 htdocs/comm/propal.php           | 3 ++-
 htdocs/compta/commande/fiche.php | 2 +-
 htdocs/compta/facture.php        | 2 +-
 htdocs/propal.class.php          | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 74878aae2c6..3451072b26c 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -1,7 +1,8 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006 Andre Cianfarani  <acianfa@free.fr>
+ * Copyright (C) 2005-2006 Regis Houssin        <regis.houssin@cap-networks.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index de8b8b04b15..b64562dc6e3 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -3,7 +3,8 @@
  * Copyright (C) 2004-2005 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2006 Andre Cianfarani  <acianfa@free.fr>
+ * Copyright (C) 2005-2006 Regis Houssin         <regis.houssin@cap-networks.com>
+ * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 5d5a677243f..567f62e835f 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -280,7 +280,7 @@ if ($_GET["id"] > 0)
                     if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
                     else print img_object($langs->trans('ShowProduct'),'product');
                     print ' '.$objp->ref.'</a> - '.stripslashes(nl2br($objp->product));
-                    print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:'';
+                    print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';
                     print '</td>';
                 }
                 else
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8af6fdacc9e..8d27ad38a3e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1418,7 +1418,7 @@ else
 							print ' '.$objp->ref.'</a>';
 							print ' - '.nl2br(stripslashes($objp->product));
 							print_date_range($objp->date_start,$objp->date_end);
-							print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:'';
+							print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';
 							
 							if ($conf->global->FAC_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                             {
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index e84a8c10792..8dca46e2b28 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004      Éric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2005 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2006 Regis Houssin         <regis.houssin@cap-networks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify