diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 98043757c31..1c16d1e337c 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -124,7 +124,7 @@ if ($id > 0 || ! empty($ref))
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
-		print '<textarea name="note_public" cols="80" rows="8">'.$commande->note_public."</textarea><br>";
+		print '<textarea name="note_public" cols="80" rows="'.ROWS_4.'">'.$commande->note_public."</textarea><br>";
 	}
 	else
 	{
@@ -132,14 +132,14 @@ if ($id > 0 || ! empty($ref))
 	}
 	print "</td></tr>";
 
-	// Note priv�e
+	// Note private
 	if (! $user->societe_id)
 	{
 		print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
 		print '<td valign="top" colspan="3">';
 		if ($_GET["action"] == 'edit')
 		{
-			print '<textarea name="note" cols="80" rows="8">'.$commande->note."</textarea><br>";
+			print '<textarea name="note" cols="80" rows="'.ROWS_8.'">'.$commande->note."</textarea><br>";
 		}
 		else
 		{
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 6abcae8d6bc..7f264d4f09b 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -72,7 +72,7 @@ $html = new Form($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-$now=gmmktime();
+$now=dol_now();
 
 $id = $_GET['id'];
 $ref= $_GET['ref'];
@@ -154,7 +154,7 @@ if ($id > 0 || ! empty($ref))
 		{
 			print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
 			print '<td colspan="2">';
-			if ($user->rights->fournisseur->commande->creer) print '<textarea cols="90" rows="'.ROWS_6.'" name="note">';
+			if ($user->rights->fournisseur->commande->creer) print '<textarea cols="90" rows="'.ROWS_8.'" name="note">';
 			print $commande->note;
 			if ($user->rights->fournisseur->commande->creer) print '</textarea>';
 			print '</td></tr>';
@@ -171,8 +171,9 @@ if ($id > 0 || ! empty($ref))
 	}
 	else
 	{
-		/* Commande non trouv�e */
-		print "Commande inexistante";
+		/* Order not found */
+		$langs->load("errors");
+	    print $langs->trans("ErrorRecordNotFound");
 	}
 }