From 45e516ff7db838c7b08b8e6c6c4fb7e6bceb51d7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 26 May 2006 07:18:31 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20affichait=20la=20note=20priv=E9e=20au=20?=
 =?UTF-8?q?lieu=20de=20la=20note=20public?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/commande/fiche.php        | 2 +-
 htdocs/commande/info.php         | 4 ++++
 htdocs/compta/commande/fiche.php | 2 +-
 htdocs/expedition/commande.php   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 0b34db86dc8..9d752bef6de 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -895,7 +895,7 @@ else
 			}
 			print '</td>';
 			print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
-			print nl2br($commande->note);
+			print nl2br($commande->note_public);
 			print '</td>';
 			print '</tr>';
 
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index ca7e5793e16..7b08c45e258 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -35,6 +35,10 @@ require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 $langs->load("orders");
 $langs->load("sendings");
 
+$user->getrights('commande');
+if (!$user->rights->commande->lire)
+	accessforbidden();
+
 
 /*
  * Visualisation de la fiche
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 73548222616..6a098f722b3 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -182,7 +182,7 @@ if ($_GET["id"] > 0)
 			{
 				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.'</textarea><br>';
+				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>';
 			}
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index d1b7b6eda5e..73106dc6227 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -182,7 +182,7 @@ if ($_GET["id"] > 0)
 			{
 				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.'</textarea><br>';
+				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>';
 			}