diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index abb19b2cc91..94e8fadf3bf 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -504,22 +504,6 @@ else
print $form->selectarray('priv',$selectarray,(isset($_POST["priv"])?$_POST["priv"]:$object->priv),0);
print '';
- // Note Public
- print '| '.$langs->trans("NotePublic").' | ';
- print '';
- $doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
- print $doleditor->Create(1);
- //print '';
- print ' |
';
-
- // Note Private
- print '| '.$langs->trans("NotePrivate").' | ';
- print '';
- $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
- print $doleditor->Create(1);
- //print '';
- print ' |
';
-
// Other attributes
$parameters=array('colspan' => ' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -721,24 +705,6 @@ else
print $form->selectarray('priv',$selectarray,$object->priv,0);
print '';
- // Note Public
- print '| '.$langs->trans("NotePublic").' | ';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
- print $doleditor->Create(1);
- // print ' |
';
- print '';
-
- // Note Private
- print '| '.$langs->trans("NotePrivate").' | ';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
- print $doleditor->Create(1);
- // print ' |
';
- print '';
-
// Other attributes
$parameters=array('colspan' => ' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -938,16 +904,6 @@ else
print $object->LibPubPriv($object->priv);
print '';
- // Note Public
- print '| '.$langs->trans("NotePublic").' | ';
- print nl2br($object->note_public);
- print ' |
';
-
- // Note Private
- print '| '.$langs->trans("NotePrivate").' | ';
- print nl2br($object->note_private);
- print ' |
';
-
// Other attributes
$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
new file mode 100644
index 00000000000..c876c67fe01
--- /dev/null
+++ b/htdocs/contact/note.php
@@ -0,0 +1,169 @@
+
+ * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2013 Florian Henry
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/contact/note.php
+ * \brief Tab for notes on contact
+ * \ingroup societe
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+
+$action = GETPOST('action');
+
+$langs->load("companies");
+
+// Security check
+$id = GETPOST('id','int');
+if ($user->societe_id) $id=$user->societe_id;
+$result = restrictedArea($user, 'societe', $id, '&societe');
+
+$object = new Contact($db);
+if ($id > 0) $object->fetch($id);
+
+/*
+ * Actions
+ */
+
+/******************************************************************************/
+/* Actions */
+/******************************************************************************/
+if ($action == 'setnote_public' && $user->rights->societe->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES),'_public');
+ if ($result < 0) setEventMessage($object->error,'errors');
+}
+
+else if ($action == 'setnote_private' && $user->rights->societe->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private');
+ if ($result < 0) setEventMessage($object->error,'errors');
+}
+
+/*
+ * View
+ */
+
+$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+
+$form = new Form($db);
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
+if ($id > 0)
+{
+ /*
+ * Affichage onglets
+ */
+ if (! empty($conf->notification->enabled)) $langs->load("mails");
+
+ $head = contact_prepare_head($object);
+
+ dol_fiche_head($head, 'note', $title,0,'contact');
+
+
+ print '