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: [PATCH] [IMP] note: delete option thread

bzr revid: chm@openerp.com-20120914151124-sus4kh34cwslk9ly
---
 addons/note/note.py                 | 1 -
 addons/note/note_view.xml           | 8 +-------
 addons/note/security/res.groups.csv | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 88167fceeb1..429c16eed6d 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -216,5 +216,4 @@ class note_base_config_settings(osv.osv_memory):
         #auto group user => automatic with "group_"
         'group_note_fancy': fields.boolean('Use fancy render', implied_group='note.group_note_fancy'),
         'group_note_tags': fields.boolean('Use tags for sticky note', implied_group='note.group_note_tags'),
-        'group_note_thread': fields.boolean('Use mail thread', implied_group='note.group_note_thread'),
     }
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>
diff --git a/addons/note/security/res.groups.csv b/addons/note/security/res.groups.csv
index 5ce1df4106c..61c54c964ff 100644
--- a/addons/note/security/res.groups.csv
+++ b/addons/note/security/res.groups.csv
@@ -1,4 +1,3 @@
 id,name,implied_ids/id
 group_note_tags,Memo / Display tags,
 group_note_fancy,Memo / Fancy mode,
-group_note_thread,Memo / Mail thread,