From 481c300cc5b98ffca245fa59573063513074a0d8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Sep 2012 11:17:08 +0200
Subject: [IMP] note: add button and search filters on kanban view for
 active/inactive notes. Add note.tag. Html field on form view.

bzr revid: chm@openerp.com-20120907091708-z9x8g9tzdu6e7oad
---
 addons/note/note_view.xml | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 73636ce1a9a..640b6ce010e 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -54,29 +54,37 @@
           <field name="stage_id"/>
           <field name="active"/>
           <field name="note"/>
-          <field name="follower_ids"/>
+          <field name="date_done"/>
+          <field name="message_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 oe_semantic_html_override">
-                <!-- 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 t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override ">
+                <div class="oe_dropdown_kanban">
+                  <span>
+                    <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">D</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">C</a>
+                  </span>
+
+                  <!-- dropdown menu -->
+                  <div class="oe_dropdown_toggle">
+                    <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>
 
                 <!-- kanban note -->
-                <div class="oe_kanban_content">
+                <div t-attf-class="oe_kanban_content #{record.active.raw_value ? '' : 'note_text_line_through'}">
                   <!-- 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"/>
+                <div class="oe_right">
+                  <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
                   </t>
                 </div>
               </div>
@@ -96,7 +104,8 @@
           <header>
               <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field name="note"/>
+          <field name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
+          <field name="tag_ids" widget="many2many_tags" group="group_note_tags" string="Tags"/>
           <field name="note_pad_url" invisible="1"/>
           <div class="oe_chatter">
               <field name="message_ids" widget="mail_thread"/>
@@ -113,6 +122,8 @@
         <search string="Notes">
           <field name="note" string="Note"/>
           <field name="stage_id"/>
+          <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
+          <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
           <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'}"/>
@@ -128,9 +139,10 @@
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
+      <field name="context">{'search_default_active_true':True}</field>
     </record>
 
     <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From b49b72f00ec2d818338aa8af008ac8337ba990df Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Sep 2012 13:56:04 +0200
Subject: [IMP] note : split of note module : note module & note_pad module

bzr revid: chm@openerp.com-20120907115604-wmp8rxec0fk9508r
---
 addons/note/note_view.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 640b6ce010e..b7e76c5fe5e 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -106,7 +106,6 @@
           </header>
           <field name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
           <field name="tag_ids" widget="many2many_tags" group="group_note_tags" string="Tags"/>
-          <field name="note_pad_url" invisible="1"/>
           <div class="oe_chatter">
               <field name="message_ids" widget="mail_thread"/>
           </div>
-- 
cgit v1.2.3


From 7dd65a0f9ba6ca0c59addc22f2b3fed6e9f56504 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Sep 2012 14:25:06 +0200
Subject: note : constraint for note min len

bzr revid: chm@openerp.com-20120907122506-fs6d3vvqowr2m6yk
---
 addons/note/note_view.xml | 6 ++++--
 1 file changed, 4 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 b7e76c5fe5e..63dd8afcd1b 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -104,8 +104,10 @@
           <header>
               <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
-          <field name="tag_ids" widget="many2many_tags" group="group_note_tags" string="Tags"/>
+          <field colspan="4" name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
+          <group>
+            <field name="tag_ids" widget="many2many_tags" group="group_note_tags"/>
+          </group>
           <div class="oe_chatter">
               <field name="message_ids" widget="mail_thread"/>
           </div>
-- 
cgit v1.2.3


From 22d1ff0c82585beb6ac999cc7b10d98d6107a8cd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Sep 2012 09:24:59 +0200
Subject: note : add comments and change name in 'Memo'

bzr revid: chm@openerp.com-20120910072459-tlue035os3ci1pbz
---
 addons/note/note_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 63dd8afcd1b..2a2d7d8af8a 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -9,7 +9,7 @@
       <field name="name">note.stage.form</field>
       <field name="model">note.stage</field>
       <field name="arch" type="xml">
-        <form string="Stage of Notes" version="7.0">
+        <form string="Stage of memos" version="7.0">
           <group>
             <field name="name"/>
           </group>
@@ -23,7 +23,7 @@
       <field name="model">note.stage</field>
       <field name="field_parent"></field>
       <field name="arch" type="xml">
-        <tree string="Stages of notes" editable="bottom">
+        <tree string="Stages of memos" editable="bottom">
               <field name="sequence" widget="handle"/>
               <field name="name"/>
               <field name="fold"/>
@@ -100,7 +100,7 @@
       <field name="name">note.note.form</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <form string="Note" version="7.0">
+        <form string="Memo" version="7.0">
           <header>
               <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
@@ -120,8 +120,8 @@
       <field name="name">note.note.search</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <search string="Notes">
-          <field name="note" string="Note"/>
+        <search string="Memos">
+          <field name="note" string="Memo"/>
           <field name="stage_id"/>
           <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
           <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
-- 
cgit v1.2.3


From 5ea9342dc52e82fc492d84ea3837c58767b95eba Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 11 Sep 2012 11:49:48 +0200
Subject: [IMP] note : tags on kanban

bzr revid: chm@openerp.com-20120911094948-hr4odql5k1dmief4
---
 addons/note/note_view.xml | 91 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 23 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 2a2d7d8af8a..763489b0fd7 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -4,7 +4,7 @@
 
     <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
 
-    <!-- Note Stage Form View -->
+    <!-- memo 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>
@@ -17,7 +17,7 @@
       </field>
     </record>
 
-    <!-- Note Stage Tree View -->
+    <!-- memo 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>
@@ -31,7 +31,7 @@
       </field>
     </record>
 
-    <!-- Note Stage Action -->
+    <!-- memo Stage Action -->
     <record model="ir.actions.act_window" id="action_note_stage">
       <field name="name">Stages</field>
       <field name="res_model">note.stage</field>
@@ -42,7 +42,7 @@
     <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 -->
+    <!-- New memo 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>
@@ -53,49 +53,58 @@
           <field name="name"/>
           <field name="stage_id"/>
           <field name="active"/>
-          <field name="note"/>
+          <field name="memo"/>
           <field name="date_done"/>
+          <field name="current_partner_id"/>
           <field name="message_follower_ids"/>
+          <field name="tag_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 oe_semantic_html_override ">
+
+              <t t-set="record.group_fancy" t-value="1"  groups="note.group_note_fancy"/>
+
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
                 <div class="oe_dropdown_kanban">
                   <span>
-                    <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">D</a>
-                    <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">C</a>
+                    <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">W</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">è</a>
                   </span>
 
                   <!-- dropdown menu -->
                   <div class="oe_dropdown_toggle">
                     <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>
 
-                <!-- kanban note -->
+                <!-- kanban memo -->
                 <div t-attf-class="oe_kanban_content #{record.active.raw_value ? '' : 'note_text_line_through'}">
                   <!-- title -->
                   <field name="name"/>
                 </div>
 
+                <div class="oe_left oe_kanban_list_many2many" data-model="note.tag" groups="note.group_note_tags">
+                  <t t-foreach="record.tag_ids.raw_value" t-as="tag">
+                    <span class="oe_tag" t-att-data-list_id="tag"/>
+                  </t>
+                </div>
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
-                    <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
+                    <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
                   </t>
                 </div>
+                <div class="oe_clear"></div>
               </div>
-              <div class="oe_clear"></div>
             </t>
           </templates>
         </kanban>
       </field>
     </record>
 
-    <!-- New Note Form View -->
+    <!-- New memo 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>
@@ -104,38 +113,74 @@
           <header>
               <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field colspan="4" name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
-          <group>
-            <field name="tag_ids" widget="many2many_tags" group="group_note_tags"/>
+          <field colspan="4" name="memo" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
+          <group groups="note.group_note_tags" col="2">
+            <field name="tag_ids" widget="many2many_tags"/>
           </group>
-          <div class="oe_chatter">
+          <div class="oe_chatter" groups="note.group_note_thread">
               <field name="message_ids" widget="mail_thread"/>
+              <field name="message_follower_ids" widget="mail_followers"/>
           </div>
         </form>
       </field>
     </record>
 
-    <!-- Search Note  -->
+    <!-- Search memo  -->
     <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="arch" type="xml">
         <search string="Memos">
-          <field name="note" string="Memo"/>
+          <field name="name" string="Title"/>
+          <field name="memo" string="Memo"/>
           <field name="stage_id"/>
+          <field name="tag_ids" groups="note.group_note_tags"/>
           <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
           <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
           <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'}"/>
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By memo Category" context="{'group_by':'stage_id'}"/>
           </group>
         </search>
       </field>
     </record>
 
-    <!-- Note Action -->
+
+    <!-- general settings -->
+    <record model="ir.ui.view" id="view_general_settings_note_form">
+      <field name="name">note.view.general_settings.form</field>
+      <field name="model">base.config.settings</field>
+      <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+      <field name="arch" type="xml">
+        <xpath expr="//label[@string='Authentication']/.." position="after">
+          <group>
+              <label for="id" string="Memos"/>
+              <div>
+                  <div>
+                      <field name="module_note_pad" class="oe_inline"/>
+                      <label for="module_note_pad"/>
+                  </div>
+                  <div>
+                      <field name="group_note_fancy" class="oe_inline"/>
+                      <label for="group_note_fancy"/>
+                  </div>
+                  <div>
+                      <field name="group_note_tags" class="oe_inline"/>
+                      <label for="group_note_tags"/>
+                  </div>
+                  <div>
+                      <field name="group_note_thread" class="oe_inline"/>
+                      <label for="group_note_thread"/>
+                  </div>
+              </div>
+          </group>
+        </xpath>
+      </field>
+    </record>
+
+    <!-- memo Action -->
     <record model="ir.actions.act_window" id="action_note_note">
-      <field name="name">Notes</field>
+      <field name="name">note</field>
       <field name="res_model">note.note</field>
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
@@ -143,7 +188,7 @@
       <field name="context">{'search_default_active_true':True}</field>
     </record>
 
-    <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
+    <menuitem name="Memos" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
   </data>
 </openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 576d664f883bce3744903b081a9e25f4d35644ce Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Sep 2012 19:19:38 +0200
Subject: [IMP] note: stage by user, group by stage, access rules

bzr revid: chm@openerp.com-20120913171938-0zmtm2ds5mjdgttj
---
 addons/note/note_view.xml | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 763489b0fd7..9381489a8d9 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -24,9 +24,9 @@
       <field name="field_parent"></field>
       <field name="arch" type="xml">
         <tree string="Stages of memos" editable="bottom">
-              <field name="sequence" widget="handle"/>
-              <field name="name"/>
-              <field name="fold"/>
+            <field name="sequence" widget="handle"/>
+            <field name="name"/>
+            <field name="fold"/>
         </tree>
       </field>
     </record>
@@ -39,8 +39,7 @@
       <field name="domain">[('user_id','=',uid)]</field>
     </record>
 
-    <menuitem name="Categories"
-      id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
+    <menuitem name="Categories" id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
 
     <!-- New memo Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
@@ -86,11 +85,8 @@
                   <field name="name"/>
                 </div>
 
-                <div class="oe_left oe_kanban_list_many2many" data-model="note.tag" groups="note.group_note_tags">
-                  <t t-foreach="record.tag_ids.raw_value" t-as="tag">
-                    <span class="oe_tag" t-att-data-list_id="tag"/>
-                  </t>
-                </div>
+                <div widget="many2many_tags" t-att-data="record.tag_ids.raw_value" model="note.tag"/>
+                
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
                     <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
@@ -104,6 +100,20 @@
       </field>
     </record>
 
+    <!-- New memo Form 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="arch" type="xml">
+        <tree string="Stages">
+          <field name="name"/>
+          <field name="active"/>
+          <field name="stage_id"/>
+          <field name="tag_ids" widget="many2many_tags" groups="note.group_note_tags"/>
+        </tree>
+      </field>
+    </record>
+
     <!-- New memo Form View -->
     <record model="ir.ui.view" id="view_note_note_form">
       <field name="name">note.note.form</field>
@@ -111,16 +121,16 @@
       <field name="arch" type="xml">
         <form string="Memo" version="7.0">
           <header>
-              <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+              <field name="stage_id" domain="[('user_id','=',uid)]"/><!-- widget="statusbar" clickable="1"/-->
           </header>
-          <field colspan="4" name="memo" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
+          <field colspan="4" name="memo" widget="html" editor_width="100%%" editor_height="100%%" nolabel="1"/>
           <group groups="note.group_note_tags" col="2">
             <field name="tag_ids" widget="many2many_tags"/>
           </group>
-          <div class="oe_chatter" groups="note.group_note_thread">
-              <field name="message_ids" widget="mail_thread"/>
-              <field name="message_follower_ids" widget="mail_followers"/>
-          </div>
+            <div class="oe_chatter" groups="note.group_note_thread">
+                <field name="message_ids" widget="mail_thread"/>
+            </div>
+            <field name="message_follower_ids" widget="mail_followers"/>
         </form>
       </field>
     </record>
@@ -180,7 +190,7 @@
 
     <!-- memo Action -->
     <record model="ir.actions.act_window" id="action_note_note">
-      <field name="name">note</field>
+      <field name="name">Memos</field>
       <field name="res_model">note.note</field>
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
-- 
cgit v1.2.3


From 4a48e74c72694180e3c15bc293350582b1488582 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Sep 2012 10:15:15 +0200
Subject: [IMP] note: read_group for unknown stage and with empty stage_ids ;
 statusbar widget

bzr revid: chm@openerp.com-20120914081515-sew3sq23151ghqsr
---
 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 9381489a8d9..62cf4444d91 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -121,7 +121,7 @@
       <field name="arch" type="xml">
         <form string="Memo" version="7.0">
           <header>
-              <field name="stage_id" domain="[('user_id','=',uid)]"/><!-- widget="statusbar" clickable="1"/-->
+              <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
           <field colspan="4" name="memo" widget="html" editor_width="100%%" editor_height="100%%" nolabel="1"/>
           <group groups="note.group_note_tags" col="2">
-- 
cgit v1.2.3


From a15456ba0f3ff40bcf5bd95167880a9f856d05a6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Sep 2012 12:14:18 +0200
Subject: [FIX] note: access rules

bzr revid: chm@openerp.com-20120914101418-7bpc4aecprfz1vvt
---
 addons/note/note_view.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 62cf4444d91..46c326279e8 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -119,7 +119,7 @@
       <field name="name">note.note.form</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <form string="Memo" version="7.0">
+        <form string="Sticky note" version="7.0">
           <header>
               <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
@@ -127,10 +127,8 @@
           <group groups="note.group_note_tags" col="2">
             <field name="tag_ids" widget="many2many_tags"/>
           </group>
-            <div class="oe_chatter" groups="note.group_note_thread">
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
-            <field name="message_follower_ids" widget="mail_followers"/>
+          <field name="message_follower_ids" widget="mail_followers"/>
+          <field class="oe_chatter" name="message_ids" widget="mail_thread" groups="note.group_note_thread"/>
         </form>
       </field>
     </record>
@@ -140,9 +138,9 @@
       <field name="name">note.note.search</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <search string="Memos">
+        <search string="Sticky notes">
           <field name="name" string="Title"/>
-          <field name="memo" string="Memo"/>
+          <field name="memo" string="Sticky note"/>
           <field name="stage_id"/>
           <field name="tag_ids" groups="note.group_note_tags"/>
           <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
@@ -164,7 +162,7 @@
       <field name="arch" type="xml">
         <xpath expr="//label[@string='Authentication']/.." position="after">
           <group>
-              <label for="id" string="Memos"/>
+              <label for="id" string="Sticky notes"/>
               <div>
                   <div>
                       <field name="module_note_pad" class="oe_inline"/>
-- 
cgit v1.2.3


From efae13456dfcf3601c60bce0e0028a64f6af3577 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Sep 2012 17:08:54 +0200
Subject: [IMP] cleaning notes, name_create

bzr revid: chm@openerp.com-20120914150854-1eh3nlzf2badxawr
---
 addons/note/note_view.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 46c326279e8..872cae12c11 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -46,7 +46,7 @@
       <field name="name">note.note.kanban</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <kanban default_group_by="stage_id" class="oe_notes" version="7.0">
+        <kanban default_group_by="stage_id" class="oe_notes oe_kanban_quickcreate_textarea" version="7.0">
           <field name="color"/>
           <field name="sequence"/>
           <field name="name"/>
@@ -114,26 +114,28 @@
       </field>
     </record>
 
-    <!-- New memo Form View -->
+    <!-- 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="arch" type="xml">
         <form string="Sticky note" version="7.0">
           <header>
-              <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+            <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field colspan="4" name="memo" widget="html" editor_width="100%%" editor_height="100%%" nolabel="1"/>
+          <field colspan="4" name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" -->
           <group groups="note.group_note_tags" col="2">
             <field name="tag_ids" widget="many2many_tags"/>
           </group>
           <field name="message_follower_ids" widget="mail_followers"/>
-          <field class="oe_chatter" name="message_ids" widget="mail_thread" groups="note.group_note_thread"/>
+          <span groups="note.group_note_thread">
+            <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
+          </span>
         </form>
       </field>
     </record>
 
-    <!-- Search memo  -->
+    <!-- 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>
@@ -146,8 +148,7 @@
           <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
           <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
           <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 memo Category" context="{'group_by':'stage_id'}"/>
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
           </group>
         </search>
       </field>
@@ -186,9 +187,9 @@
       </field>
     </record>
 
-    <!-- memo Action -->
+    <!-- Action -->
     <record model="ir.actions.act_window" id="action_note_note">
-      <field name="name">Memos</field>
+      <field name="name">Sticky notes</field>
       <field name="res_model">note.note</field>
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
@@ -196,7 +197,7 @@
       <field name="context">{'search_default_active_true':True}</field>
     </record>
 
-    <menuitem name="Memos" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
+    <menuitem name="Sticky notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
   </data>
 </openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 378b77a5e4e79ac761e6c072591fd84a295eb1bf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Sep 2012 17:11:24 +0200
Subject: [IMP] note: delete option thread

bzr revid: chm@openerp.com-20120914151124-sus4kh34cwslk9ly
---
 addons/note/note_view.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 872cae12c11..232b96f643a 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -128,9 +128,7 @@
             <field name="tag_ids" widget="many2many_tags"/>
           </group>
           <field name="message_follower_ids" widget="mail_followers"/>
-          <span groups="note.group_note_thread">
-            <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
-          </span>
+          <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
         </form>
       </field>
     </record>
@@ -177,10 +175,6 @@
                       <field name="group_note_tags" class="oe_inline"/>
                       <label for="group_note_tags"/>
                   </div>
-                  <div>
-                      <field name="group_note_thread" class="oe_inline"/>
-                      <label for="group_note_thread"/>
-                  </div>
               </div>
           </group>
         </xpath>
-- 
cgit v1.2.3