diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index a71e3ff47a5..a2438b3ae97 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -392,11 +392,11 @@ else
 			$rownb=9;
 			print '<td rowspan="'.$rownb.'" valign="top">';
 			print '<textarea name="note" wrap="soft" cols="60" rows="'.ROWS_8.'">';
-			print stripslashes($fac->note);
+			print $fac->note;
 			print '</textarea></td></tr>';
 
 			print '<tr><td valign="top">'.$langs->trans('Label').'</td><td>';
-			print '<input size="30" name="libelle" type="text" value="'.stripslashes($fac->libelle).'"></td></tr>';
+			print '<input size="30" name="libelle" type="text" value="'.$fac->libelle.'"></td></tr>';
 
 			print '<tr><td>'.$langs->trans('DateInvoice').'</td><td nowrap="nowrap">';
 			$html->select_date($fac->datep,'','','','',"update");
@@ -404,6 +404,7 @@ else
 
 			print '<tr><td>'.$langs->trans('DateEcheance').'</td><td nowrap="nowrap">';
 			$html->select_date($fac->date_echeance,'ech','','','',"update");
+	        if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning");
 			print '</td></tr>';
 
 			print '<tr><td>'.$langs->trans('AmountHT').'</td>';
@@ -561,7 +562,9 @@ else
 
 			print '<tr>';
 			print '<td>'.$langs->trans('DateEcheance').'</td><td colspan="3">';
-			print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y').'</td></tr>';
+			print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y');
+	        if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning");
+			print '</td></tr>';
 
 			print '<tr><td>'.$langs->trans('Status').'</td><td colspan="3">'.$fac->LibStatut($fac->paye,$fac->statut,4).'</td></tr>';
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 4314e112a07..f7afd8ec376 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -195,9 +195,9 @@ if ($resql)
         print "<tr $bc[$var]>";
         print '<td nowrap><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->facid.'" title="'.$obj->facnumber.'">'.img_object($langs->trans("ShowBill"),"bill").' '.dolibarr_trunc($obj->facnumber,12)."</a></td>\n";
         print '<td align="center" nowrap>'.dolibarr_print_date($obj->date_echeance);
-        if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->datefin < (time() - $conf->facture->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
+        if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning");
         print '</td>';
-        print '<td>'.dolibarr_trunc(stripslashes("$obj->libelle"),36).'</td>';
+        print '<td>'.dolibarr_trunc($obj->libelle,36).'</td>';
         print '<td>';
         print '<a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").' '.$obj->nom.'</a</td>';
         print '<td align="right">'.price($obj->total_ht).'</td>';