From 71db67ef583595dd7fc891210afb0273cad4682d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:37:34 +0200
Subject: [PATCH] [IMP] notes

bzr revid: fp@tinyerp.com-20121026163734-ior9n3hz2dolabdx
---
 addons/base_calendar/crm_meeting_view.xml |  3 ---
 addons/note/note_view.xml                 | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 659145e7c16..5292ef3c3ed 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -328,9 +328,6 @@
         <field name="view_id" ref="view_crm_meeting_gantt"/>
     </record>
 
-    <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Calendar" action="action_crm_meeting"/>
-
     <menuitem name="Calendar"
         id="mail_menu_calendar" parent="mail.mail_my_stuff"
         sequence="10" action="action_crm_meeting"/>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index f99a028c4ab..68fd36669cc 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -176,6 +176,20 @@
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
       <field name="context">{'search_default_open_true':True}</field>
+      <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a personnal note.
+          </p><p>
+            Use notes to organize personnal tasks or notes. All
+            notes are private; no one else will be able to see them.  But
+            you can share some notes to other people by inviting followers
+            on the note. (very usefull for meeting minutes, especially if
+            you activate the pad feature for collaborative writings).
+          </p><p>
+            You can customize how you process your notes/tasks by adding,
+            removing or modifying columns.
+          </p>
+        </field>
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>