From 87c4a3a3b7406cd8bba071846e230f48d7c03da8 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Mon, 13 Aug 2012 19:04:29 +0200
Subject: initial note push

bzr revid: acl@openerp.com-20120813170429-91dibb1dpe32j6w2
---
 addons/note/note_view.xml | 158 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 addons/note/note_view.xml

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..9f8c91e9c62
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <!-- Note Stage Form View -->
+    <record model="ir.ui.view" id="view_note_stage_form">
+      <field name="name">note.stage.form</field>
+      <field name="model">note.stage</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Stage of Notes" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+
+
+    <!-- Note Stage Tree View -->
+    <record model="ir.ui.view" id="view_note_stage_tree">
+      <field name="name">note.stage.tree</field>
+      <field name="model">note.stage</field>
+      <field name="type">tree</field>
+      <field name="field_parent"></field>
+
+      <field name="arch" type="xml">
+        <tree string="Stages of notes" editable="top">
+	  <field name="sequence" invisible="1" />
+          <field name="name" />
+	  <field name="fold" />
+        </tree>
+      </field>
+    </record>
+
+    <!-- Note Stage Action -->
+    <record model="ir.actions.act_window" id="action_note_stage">
+      <field name="name">Stages</field>
+      <field name="res_model">note.stage</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
+
+    <menuitem name="Categories" parent="menu_notes"
+    	      id="menu_notes_stage" action="action_note_stage" sequence="2" />
+
+    <!-- New Note Kanban View -->
+    <record model="ir.ui.view" id="view_note_note_kanban">
+      <field name="name">note.note.kanban</field>
+      <field name="model">note.note</field>
+      <field name="type">kanban</field>
+      <field name="arch" type="xml">
+        <kanban default_group_by="stage_id" >
+	  <field name="color" />
+	  <field name="sequence" />
+	  <field name="name" />
+	  <field name="stage_id" />
+	  <field name="active" />
+	  <field name="note" />
+	  <field name="follower_ids" />
+	  <templates>
+	    <t t-name="kanban-box">
+	      <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+		<!-- dropdown menu -->
+		<div class="oe_dropdown_toggle oe_dropdown_kanban">
+		  <span class="oe_e">í</span>
+		  <ul class="oe_dropdown_menu">
+		    <li><a type="edit" >Edit...</a></li>
+                    <li><a type="delete">Delete</a></li>
+                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+		  </ul>
+		</div>
+
+		<!-- kanban note -->
+		<div class="oe_kanban_content">
+
+		  <!-- title -->
+		  <field name="name" />
+		  
+		</div>
+		
+		<div class="oe_kanban_project_avatars">
+                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                  </t>
+		</div>
+		
+	      </div>
+	      <div class="oe_clear"></div>
+	    </t>
+	  </templates>
+	</kanban>
+      </field>
+    </record>
+
+
+    
+    <!-- New Note Form View -->
+    <record model="ir.ui.view" id="view_note_note_form">
+      <field name="name">note.note.form</field>
+      <field name="model">note.note</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Note" version="7.0">
+	  <header>
+	    <!-- todo: remove domain -->
+	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
+	  </header>
+          <field name="note" widget="pad" />
+          <div class="oe_chatter">
+            <field name="message_ids" widget="mail_thread"/>
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Search Note  -->
+    <record model="ir.ui.view" id="view_note_note_filter">
+      <field name="name">note.note.search</field>
+      <field name="model">note.note</field>
+      <field name="type">search</field>
+      <field name="arch" type="xml">
+        <search string="Notes">
+          <field name="note" string="Note"/>
+          <field name="stage_id"/>
+          <group expand="0" string="Group By...">
+            <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By Note Category" context="{'group_by':'stage_id'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
+
+
+    <!-- New Note Tree View -->    
+    <record model="ir.ui.view" id="view_note_note_tree">
+      <field name="name">note.note.tree</field>
+      <field name="model">note.note</field>
+      <field name="type">tree</field>
+    </record>
+
+
+    <record model="ir.actions.act_window" id="action_note_note">
+      <field name="name">Notes</field>
+      <field name="res_model">note.note</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">kanban,tree,form</field>
+      <field name="search_view_id" ref="view_note_note_filter"/>
+    </record>
+    
+    <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
+
+  </data>
+</openerp>
-- 
cgit v1.2.3


From 876dc272424e78cf45db33dddd23ce994da1ba5e Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 14 Aug 2012 16:21:51 +0200
Subject: wip

bzr revid: acl@openerp.com-20120814142151-uwi6xkdamv623pos
---
 addons/note/note_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 9f8c91e9c62..ded45474f2f 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -84,9 +84,11 @@
 		</div>
 		
 		<div class="oe_kanban_project_avatars">
-                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                  <!-- 
+			<t t-foreach="record.follower_ids.raw_value" t-as="follower">
                     <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
                   </t>
+-->
 		</div>
 		
 	      </div>
-- 
cgit v1.2.3


From 56666953b38e7ea2c6e8e8bc8391bd6da9b64276 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 14 Aug 2012 17:18:00 +0200
Subject: Some fixes

bzr revid: acl@openerp.com-20120814151800-e0adyvny6v17c3qr
---
 addons/note/note_view.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index ded45474f2f..39dca553c39 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -16,8 +16,6 @@
       </field>
     </record>
 
-
-
     <!-- Note Stage Tree View -->
     <record model="ir.ui.view" id="view_note_stage_tree">
       <field name="name">note.stage.tree</field>
@@ -77,18 +75,14 @@
 
 		<!-- kanban note -->
 		<div class="oe_kanban_content">
-
 		  <!-- title -->
 		  <field name="name" />
-		  
 		</div>
 		
 		<div class="oe_kanban_project_avatars">
-                  <!-- 
-			<t t-foreach="record.follower_ids.raw_value" t-as="follower">
+		  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
                     <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-                  </t>
--->
+		  </t>
 		</div>
 		
 	      </div>
@@ -99,8 +93,6 @@
       </field>
     </record>
 
-
-    
     <!-- New Note Form View -->
     <record model="ir.ui.view" id="view_note_note_form">
       <field name="name">note.note.form</field>
@@ -112,7 +104,7 @@
 	    <!-- todo: remove domain -->
 	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
 	  </header>
-          <field name="note" widget="pad" />
+          <field name="note_pad" widget="pad" />
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>
@@ -137,7 +129,6 @@
       </field>
     </record>
 
-
     <!-- New Note Tree View -->    
     <record model="ir.ui.view" id="view_note_note_tree">
       <field name="name">note.note.tree</field>
@@ -145,7 +136,6 @@
       <field name="type">tree</field>
     </record>
 
-
     <record model="ir.actions.act_window" id="action_note_note">
       <field name="name">Notes</field>
       <field name="res_model">note.note</field>
-- 
cgit v1.2.3


From 9a2f884e1c8efe85ed29f02b11e0e03aa9d6fdf2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 13:14:17 +0200
Subject: [IMP] indentation

bzr revid: abo@openerp.com-20120820111417-2spnfk02v2t2zarc
---
 addons/note/note_view.xml | 114 ++++++++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 49 deletions(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 39dca553c39..1c4cc2f58c2 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,6 +2,22 @@
 <openerp>
   <data>
 
+    <record id="action_dummy" model="ir.actions.client">
+        <field name="name">News Feed</field>
+        <field name="tag">mail.wall</field>
+        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+    </record>
+
+    <!-- Rename the 'Feeds' main menu into 'Home' -->
+    <!-- Top menu item -->
+    <menuitem name="Home"
+      id="mail.mail_feeds_main"/>
+
+      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
+        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
+        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
+
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
       <field name="name">note.stage.form</field>
@@ -25,9 +41,9 @@
 
       <field name="arch" type="xml">
         <tree string="Stages of notes" editable="top">
-	  <field name="sequence" invisible="1" />
-          <field name="name" />
-	  <field name="fold" />
+          <field name="sequence" invisible="1"/>
+                <field name="name"/>
+          <field name="fold"/>
         </tree>
       </field>
     </record>
@@ -44,7 +60,7 @@
     <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
 
     <menuitem name="Categories" parent="menu_notes"
-    	      id="menu_notes_stage" action="action_note_stage" sequence="2" />
+            id="menu_notes_stage" action="action_note_stage" sequence="2"/>
 
     <!-- New Note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
@@ -52,44 +68,44 @@
       <field name="model">note.note</field>
       <field name="type">kanban</field>
       <field name="arch" type="xml">
-        <kanban default_group_by="stage_id" >
-	  <field name="color" />
-	  <field name="sequence" />
-	  <field name="name" />
-	  <field name="stage_id" />
-	  <field name="active" />
-	  <field name="note" />
-	  <field name="follower_ids" />
-	  <templates>
-	    <t t-name="kanban-box">
-	      <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-		<!-- dropdown menu -->
-		<div class="oe_dropdown_toggle oe_dropdown_kanban">
-		  <span class="oe_e">í</span>
-		  <ul class="oe_dropdown_menu">
-		    <li><a type="edit" >Edit...</a></li>
-                    <li><a type="delete">Delete</a></li>
-                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-		  </ul>
-		</div>
-
-		<!-- kanban note -->
-		<div class="oe_kanban_content">
-		  <!-- title -->
-		  <field name="name" />
-		</div>
-		
-		<div class="oe_kanban_project_avatars">
-		  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
-                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-		  </t>
-		</div>
-		
-	      </div>
-	      <div class="oe_clear"></div>
-	    </t>
-	  </templates>
-	</kanban>
+        <kanban default_group_by="stage_id">
+          <field name="color"/>
+          <field name="sequence"/>
+          <field name="name"/>
+          <field name="stage_id"/>
+          <field name="active"/>
+          <field name="note"/>
+          <field name="follower_ids"/>
+          <templates>
+            <t t-name="kanban-box">
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+              <!-- dropdown menu -->
+              <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                <span class="oe_e">í</span>
+                <ul class="oe_dropdown_menu">
+                  <li><a type="edit" >Edit...</a></li>
+                  <li><a type="delete">Delete</a></li>
+                  <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                </ul>
+              </div>
+
+              <!-- kanban note -->
+              <div class="oe_kanban_content">
+                <!-- title -->
+                <field name="name"/>
+              </div>
+
+              <div class="oe_kanban_project_avatars">
+                <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                  <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                </t>
+              </div>
+
+              </div>
+              <div class="oe_clear"></div>
+            </t>
+          </templates>
+        </kanban>
       </field>
     </record>
 
@@ -100,11 +116,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Note" version="7.0">
-	  <header>
-	    <!-- todo: remove domain -->
-	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
-	  </header>
-          <field name="note_pad" widget="pad" />
+          <header>
+            <!-- todo: remove domain -->
+            <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+          </header>
+          <field name="note_pad" widget="pad"/>
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>
@@ -129,7 +145,7 @@
       </field>
     </record>
 
-    <!-- New Note Tree View -->    
+    <!-- New Note Tree View -->
     <record model="ir.ui.view" id="view_note_note_tree">
       <field name="name">note.note.tree</field>
       <field name="model">note.note</field>
@@ -143,7 +159,7 @@
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
     </record>
-    
+
     <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
 
   </data>
-- 
cgit v1.2.3


From ad16f2e48cc98cd6ea52bb5f7b7f91aa096e56ba Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 16:12:21 +0200
Subject: [IMP] note: add proper actions to Calendar, Notes and Contacts menu
 items

bzr revid: abo@openerp.com-20120820141221-si82z13n05h5lkt1
---
 addons/note/note_view.xml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 1c4cc2f58c2..21d67309492 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,21 +2,9 @@
 <openerp>
   <data>
 
-    <record id="action_dummy" model="ir.actions.client">
-        <field name="name">News Feed</field>
-        <field name="tag">mail.wall</field>
-        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
-    </record>
-
-    <!-- Rename the 'Feeds' main menu into 'Home' -->
-    <!-- Top menu item -->
-    <menuitem name="Home"
-      id="mail.mail_feeds_main"/>
-
-      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
-        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
-        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
+    <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+      <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
+      <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
 
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
@@ -38,7 +26,6 @@
       <field name="model">note.stage</field>
       <field name="type">tree</field>
       <field name="field_parent"></field>
-
       <field name="arch" type="xml">
         <tree string="Stages of notes" editable="top">
           <field name="sequence" invisible="1"/>
@@ -47,7 +34,6 @@
         </tree>
       </field>
     </record>
-
     <!-- Note Stage Action -->
     <record model="ir.actions.act_window" id="action_note_stage">
       <field name="name">Stages</field>
@@ -57,10 +43,8 @@
       <field name="domain">[('user_id','=',uid)]</field>
     </record>
 
-    <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
-
-    <menuitem name="Categories" parent="menu_notes"
-            id="menu_notes_stage" action="action_note_stage" sequence="2"/>
+    <menuitem name="Categories"
+      id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
 
     <!-- New Note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
@@ -160,7 +144,7 @@
       <field name="search_view_id" ref="view_note_note_filter"/>
     </record>
 
-    <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
+    <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
   </data>
 </openerp>
-- 
cgit v1.2.3


From aa5a055c6d10d60b70abdd365eb6e52f51764555 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 16:51:38 +0200
Subject: [IMP] note: reorganize code

bzr revid: abo@openerp.com-20120820145138-l7a4985im5nua3xq
---
 addons/note/note_view.xml | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 21d67309492..fd35e32de42 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -34,6 +34,7 @@
         </tree>
       </field>
     </record>
+
     <!-- Note Stage Action -->
     <record model="ir.actions.act_window" id="action_note_stage">
       <field name="name">Stages</field>
@@ -63,28 +64,27 @@
           <templates>
             <t t-name="kanban-box">
               <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-              <!-- dropdown menu -->
-              <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                <span class="oe_e">í</span>
-                <ul class="oe_dropdown_menu">
-                  <li><a type="edit" >Edit...</a></li>
-                  <li><a type="delete">Delete</a></li>
-                  <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                </ul>
-              </div>
-
-              <!-- kanban note -->
-              <div class="oe_kanban_content">
-                <!-- title -->
-                <field name="name"/>
-              </div>
+                <!-- dropdown menu -->
+                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                  <span class="oe_e">í</span>
+                  <ul class="oe_dropdown_menu">
+                    <li><a type="edit">Edit...</a></li>
+                    <li><a type="delete">Delete</a></li>
+                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                  </ul>
+                </div>
 
-              <div class="oe_kanban_project_avatars">
-                <t t-foreach="record.follower_ids.raw_value" t-as="follower">
-                  <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-                </t>
-              </div>
+                <!-- kanban note -->
+                <div class="oe_kanban_content">
+                  <!-- title -->
+                  <field name="name"/>
+                </div>
 
+                <div class="oe_kanban_project_avatars">
+                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                  </t>
+                </div>
               </div>
               <div class="oe_clear"></div>
             </t>
@@ -136,6 +136,7 @@
       <field name="type">tree</field>
     </record>
 
+    <!-- Note Action -->
     <record model="ir.actions.act_window" id="action_note_note">
       <field name="name">Notes</field>
       <field name="res_model">note.note</field>
-- 
cgit v1.2.3


From 6de8c4b8e4f037f5297741e08ab643eada09728d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 18:27:48 +0200
Subject: [IMP] note: rename the field 'note_pad' into 'note_pad_url'

bzr revid: abo@openerp.com-20120820162748-f92eq99kywwq7vz7
---
 addons/note/note_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index fd35e32de42..4a025a45b23 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -104,7 +104,8 @@
             <!-- todo: remove domain -->
             <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field name="note_pad" widget="pad"/>
+          <field name="note"/>
+          <field name="note_pad_url"/>
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>
-- 
cgit v1.2.3


From 39421ebddbd61343ec2d404b57ef4213d12aa251 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:24:21 +0200
Subject: [IMP] notes data and demo data

bzr revid: abo@openerp.com-20120820172421-5eh0fe1bw2pl5gxb
---
 addons/note/note_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 4a025a45b23..2086794bb04 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data>
 
-    <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
       <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
       <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
 
-- 
cgit v1.2.3


From 5fd1c3f9f213bf09c483322063a90e454af5f055 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:33:27 +0200
Subject: [IMP] override original actions to modify their name and/or context

bzr revid: abo@openerp.com-20120820173327-zb3o37yrid3khf7k
---
 addons/note/note_view.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

(limited to 'addons/note/note_view.xml')

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 2086794bb04..c31850d1a65 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -3,8 +3,46 @@
   <data>
 
     <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-      <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
-      <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
+
+    <!-- Override original action to modify its name -->
+    <record id="action_crm_meeting" model="ir.actions.act_window">
+        <field name="name">Calendar</field>
+        <field name="res_model">crm.meeting</field>
+        <field name="view_mode">calendar,tree,form,gantt</field>
+        <field name="view_id" ref="base_calendar.view_crm_meeting_calendar"/>
+        <field name="search_view_id" ref="base_calendar.view_crm_meeting_search"/>
+        <field name="context">{"calendar_default_user_id": uid}</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to schedule a new meeting.
+          </p><p>
+            The agenda is shared between employees and fully integrated with
+            other applications such as the employee holidays or the business
+            opportunities.
+          </p>
+        </field>
+    </record>
+    <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="action_crm_meeting" sequence="10"/>
+
+    <!-- Override original action to modify its name and context -->
+    <record id="action_partner_form" model="ir.actions.act_window">
+        <field name="name">Contacts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="base.view_res_partner_filter"/>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a contact in your address book.
+          </p><p>
+            OpenERP helps you easily track all activities related to
+            a customer; discussions, history of business opportunities,
+            documents, etc.
+          </p>
+        </field>
+    </record>
+    <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="action_partner_form" sequence="30"/>
 
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
-- 
cgit v1.2.3