From 75cbdedc2ccb9fb7f19dc3f1fec4542a5ed2c3ef Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 26 May 2006 07:31:09 +0000
Subject: [PATCH] Fix: la modification de la note se fait dans l'onglet "note"

---
 htdocs/compta/commande/fiche.php | 14 +-------------
 htdocs/expedition/commande.php   | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 6a098f722b3..2a75ee5f789 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -178,19 +178,7 @@ if ($_GET["id"] > 0)
 			}
 			print '</td>';
 			print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
-			if ($commande->brouillon == 1 && $user->rights->commande->creer)
-			{
-				print '<form action="fiche.php?id='.$id.'" method="post">';
-				print '<input type="hidden" name="action" value="setnote">';
-				print '<textarea name="note" rows="4" style="width:95%;">'.$commande->note_public.'</textarea><br>';
-				print '<center><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
-				print '</form>';
-			}
-			else
-			{
-				print nl2br($commande->note);
-			}
-			
+      print nl2br($commande->note_public);			
 			print '</td>';
 			print '</tr>';
 			
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index 73106dc6227..082256d0643 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -178,19 +178,7 @@ if ($_GET["id"] > 0)
 			}
 			print '</td>';
 			print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
-			if ($commande->brouillon == 1 && $user->rights->commande->creer)
-			{
-				print '<form action="fiche.php?id='.$id.'" method="post">';
-				print '<input type="hidden" name="action" value="setnote">';
-				print '<textarea name="note" rows="4" style="width:95%;">'.$commande->note_public.'</textarea><br>';
-				print '<center><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
-				print '</form>';
-			}
-			else
-			{
-				print nl2br($commande->note);
-			}
-			
+			print nl2br($commande->note_public);			
 			print '</td>';
 			print '</tr>';