diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 14ffc024487..7c8d4dcf9e6 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -409,7 +409,7 @@ class Commande
 		
 		if ($conf->global->CHANGE_PROD_DESC)
      {
-		   $sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . nl2br(addslashes($product_desc)) . "',$fk_product,".price2num($price).", '$qty', $txtva, $remise_percent,'".price2num($subprice)."','".price2num( $remise)."') ;";
+		   $sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . addslashes($product_desc) . "',$fk_product,".price2num($price).", '$qty', $txtva, $remise_percent,'".price2num($subprice)."','".price2num( $remise)."') ;";
 	   }
 	  else
 	  {
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index f5fdc4b0b4f..d78adbc800c 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -723,7 +723,7 @@ else
 							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