[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831103243-cyk1ujall4akan8s

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index e2e5ec5..a20ddf5 100644 (file)
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -67,21 +67,21 @@ class idea_idea(osv.osv):
 
     def idea_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'cancel' })
-        self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea canceled.'), subtype="cancel", context=context)
         return True
 
     def idea_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'open'})
-        self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea accepted.'), subtype="open", context=context)
         return True
 
     def idea_close(self, cr, uid, ids, context={}):
-        self.message_post(cr, uid, ids, body=_('Idea done.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea done.'), subtype="close", context=context)
         self.write(cr, uid, ids, { 'state': 'close' })
         return True
 
     def idea_draft(self, cr, uid, ids, context={}):
-        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), subtype="new", context=context)
         self.write(cr, uid, ids, { 'state': 'draft' })
         return True
 idea_idea()

diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
index d63eb90..a4cd497 100644 (file)
--- a/addons/idea/idea_data.xml
+++ b/addons/idea/idea_data.xml
@@ -15,6 +15,35 @@
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/>
         </record>
+
+        <!-- SUBTYPE -->
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="name">new</field>
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_open" model="mail.message.subtype">
+            <field name="name">open</field>
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="name">cancel</field>
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_close" model="mail.message.subtype">
+            <field name="name">close</field>
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('idea.model_idea_idea'))]"/>
+        </record>
     </data>
 </openerp>