diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index db6f4a0069c..baf5df2eb6e 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -704,7 +704,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
 			}
 
 			$desc = $prod->description;
-			$desc.= ($prod->description && $_POST['np_desc']) ? "\n" : "";
+			$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
 			$desc.= $_POST['np_desc'];
 			$type = $prod->type;
 		}
@@ -1112,7 +1112,7 @@ if ($id > 0 || ! empty($ref))
 	print '</td>';
 	print '</tr>';
 
-	$rowspan=10;
+	$rowspan=9;
 
 	// Company
 	print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
@@ -1504,11 +1504,11 @@ if ($id > 0 || ! empty($ref))
 
 		if ($_GET['action'] != 'statut' && $_GET['action'] <> 'editline')
 		{
-			// Valid
-			if ($object->statut == 0 && $user->rights->propale->valider && sizeof($object->lines) > 0)
+			// Validate
+			if ($object->statut == 0 && $user->rights->propale->valider)
 			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate"';
-				print '>'.$langs->trans('Validate').'</a>';
+			    if (sizeof($object->lines) > 0) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
+			    else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
 			}
 
 			// Edit
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 82bb0075fe9..86e6cd8fa01 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -522,7 +522,7 @@ if ($_POST['action'] == 'addline' && $user->rights->commande->creer)
             }
 
             $desc = $prod->description;
-            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>":"\n") : "";
+            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
             $desc.= $_POST['np_desc'];
             $type = $prod->type;
         }
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 4e20d3d95a0..35b8e32a677 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -878,7 +878,7 @@ if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $
 			}
 
 			$desc = $prod->description;
-			$desc.= ($prod->description && $_POST['np_desc']) ? "\n" : "";
+            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
 			$desc.= $_POST['np_desc'];
             if (! empty($prod->customcode) || ! empty($prod->country_code))
             {
@@ -887,7 +887,7 @@ if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $
                 if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
                 if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
                 $tmptxt.=')';
-                $desc.="\n".$tmptxt;
+                $desc.= (dol_textishtml($desc)?"<br />\n":"\n").$tmptxt;
             }
 			$type = $prod->type;
 		}