From 6813592da8981eeb7b1f76503bc341c57a2317fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:29:04 +0100
Subject: [PATCH] [IMP] mail: subtype model: cleaning + improved form view to
 add the new fields

bzr revid: tde@openerp.com-20140221112904-ijgkqy5zhco5a9i4
---
 addons/mail/mail_message_subtype.py  |  4 +++-
 addons/mail/mail_message_subtype.xml | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index 941011934e8..bae4d941a52 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -29,6 +29,8 @@ class mail_message_subtype(osv.osv):
         on the Wall. """
     _name = 'mail.message.subtype'
     _description = 'Message subtypes'
+    _order = 'sequence, id'
+
     _columns = {
         'name': fields.char('Message Type', required=True, translate=True,
             help='Message subtype gives a more precise type on the message, '\
@@ -53,7 +55,7 @@ class mail_message_subtype(osv.osv):
         'sequence': fields.integer('Sequence', help="Used to order subtypes."),
         'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options")
     }
-    _order = 'sequence'
+
     _defaults = {
         'default': True,
         'sequence': 1,
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index a79f5815bd1..efcb81b5794 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <tree string="Subtype">
                     <field name="name"/>
+                    <field name="sequence"/>
                     <field name="res_model"/>
                     <field name="default"/>
                 </tree>
@@ -22,12 +23,18 @@
                 <form string="Email message" version="7.0">
                     <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="res_model"/>
-                            <field name="default"/>
-                            <field name="description"/>
-                            <field name="parent_id"/>
-                            <field name="relation_field"/>
+                            <group string='Description'>
+                                <field name="name"/>
+                                <field name="sequence"/>
+                                <field name="res_model"/>
+                                <field name="description"/>
+                                <field name="default"/>
+                                <field name="hidden"/>
+                            </group>
+                            <group string='Auto subscription'>
+                                <field name="parent_id"/>
+                                <field name="relation_field"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>