[MERGE] from master

[odoo/odoo.git] / addons / website_blog / data / website_blog_data.xml

diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index bd5478a..c291ee5 100644 (file)
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -29,29 +29,13 @@
             <field name="state">open</field>
         </record>
 
-        <!-- Post-related subtypes for messaging / Chatter -->
-        <record id="mt_blog_post_new" model="mail.message.subtype">
-            <field name="name">New Post</field>
-            <field name="res_model">blog.post</field>
-            <field name="default" eval="True"/>
-            <field name="description">New Post</field>
-        </record>
-        <record id="mt_blog_post_published" model="mail.message.subtype">
-            <field name="name">Post Published</field>
-            <field name="res_model">blog.post</field>
-            <field name="default" eval="False"/>
-            <field name="description">Post Published</field>
-        </record>
-
-        <!-- Project-related subtypes for messaging / Chatter -->
-        <record id="mt_blog_blog_post_new" model="mail.message.subtype">
-            <field name="name">New Post</field>
+        <!-- Blog-related subtypes for messaging / Chatter -->
+        <record id="mt_blog_blog_published" model="mail.message.subtype">
+            <field name="name">Published Post</field>
             <field name="res_model">blog.blog</field>
             <field name="default" eval="True"/>
-            <field name="parent_id" eval="ref('mt_blog_post_new')"/>
-            <field name="relation_field">blog_id</field>
+            <field name="description">Published Post</field>
         </record>
 
-
     </data>
 </openerp>