diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 8e4d86dc150..72d75459311 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -732,7 +732,6 @@ if ($_GET['propalid'] > 0)
                             else print img_object($langs->trans('ShowProduct'),'product');
                             print ' '.$objp->ref.'</a>';
 							              print ' - '.nl2br(stripslashes($objp->product));
-							              print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';
 							              
 							              if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                             {
@@ -751,7 +750,7 @@ if ($_GET['propalid'] > 0)
                             {
                                 print " (Jusqu'au ".dolibarr_print_date($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)):'';
                             print '</td>';
                         }
                         else
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 7bfa8b6e4d2..196fbb69bb7 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -685,7 +685,6 @@ else
 			$sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,';
 			$sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid';
 			
-			//if ($conf->global->COM_ADD_PROD_DESC)
 			if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                         {
                         	$sql.= ', p.description as product_desc';