[IMP] improve demo data of crm and add demo data in project

bzr revid: fka@tinyerp.com-20120829131532-vpvaaq0mbwdfktyk

4 files changed, 76 insertions, 27 deletions

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index ce9951defc6..6f6562657ce 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -155,37 +155,32 @@
         </record>
 
         <!--  mail subtype -->
-        <record id="mail_subtype_lead_new" model="mail.message.subtype">
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
             <field name="name">new</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail_subtype_lead_won" model="mail.message.subtype">
+        <record id="mail_subtype_won" model="mail.message.subtype">
             <field name="name">won</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
         </record>
-        <record id="mail_subtype_lead_lost" model="mail.message.subtype">
+        <record id="mail_subtype_lost" model="mail.message.subtype">
             <field name="name">lost</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
+            <field name="model_ids" eval="[(4, ref('crm.model_crm_lead'))]"/>
         </record>
-        <record id="mail_subtype_lead_stage_change" model="mail.message.subtype">
+        <record id="mail.mail_subtype_stage_change" model="mail.message.subtype">
             <field name="name">stage change</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail_subtype_lead_other" model="mail.message.subtype">
-            <field name="name">other</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
-            <field name="default" eval="False"/>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
         </record>
-        <record id="mail_subtype_lead_email" model="mail.message.subtype">
-            <field name="name">email</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
         </record>
-        <record id="mail_subtype_lead_comment" model="mail.message.subtype">
-            <field name="name">comment</field>
-            <field name="model_ids" eval="[(6, 0, [ref('crm.model_crm_lead')])]"/>
-            <field name="default" eval="False"/>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('crm.model_crm_lead'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index c8e8b1a488e..b241cb095de 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -12,5 +12,16 @@
             <field eval="'process_email_queue'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
+        
+        <record id="mail_subtype_other" model="mail.message.subtype">
+            <field name="name">other</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail_subtype_email" model="mail.message.subtype">
+            <field name="name">email</field>
+        </record>
+        <record id="mail_subtype_comment" model="mail.message.subtype">
+            <field name="name">comment</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project/project.py b/addons/project/project.py
index 4a6311b7f56..4f23cbbdc49 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -536,23 +536,23 @@ def Project():
         return project_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
+        return self.message_append_note(cr, uid, ids, body=_("Project has been <b>created</b>."), subtype="new", context=context)
 
     def set_open_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>opened</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype="open", context=context)
 
     def set_pending_send_note(self, cr, uid, ids, context=None):
         message = _("Project is now <b>pending</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype="pending", context=context)
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>cancelled</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype="cancel", context=context)
 
     def set_close_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>closed</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype="close", context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # if alias_model has been changed, update alias_model_id accordingly
@@ -1210,14 +1210,14 @@ class task(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype="stage change", context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
+        return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), subtype="new", context=context)
 
     def case_draft_send_note(self, cr, uid, ids, context=None):
         msg = _('Task has been set as <b>draft</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_append_note(cr, uid, ids, body=msg, subtype="draft", context=context)
 
     def do_delegation_send_note(self, cr, uid, ids, context=None):
         for task in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c2d37f7943d..77eb203e66b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -83,6 +83,49 @@
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
+        
+        <!-- SUBTYPE -->
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="name">new</field>
+            <field name="model_ids" eval="[(4,ref('project.model_project_project')),(4,ref('project.model_project_task'))]"/>
+            <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('project.model_project_project'))]"/>
+        </record>
+        <record id="mail.mail_subtype_pending" model="mail.message.subtype">
+            <field name="name">pending</field>
+            <field name="model_ids" eval="[(4,ref('project.model_project_project'))]"/>
+            <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('project.model_project_project'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="name">cancel</field>
+            <field name="model_ids" eval="[(4,ref('project.model_project_project'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_stage_change" model="mail.message.subtype">
+            <field name="name">stage change</field>
+            <field name="model_ids" eval="[(4,ref('project.model_project_task'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_draft" model="mail.message.subtype">
+            <field name="name">draft</field>
+            <field name="model_ids" eval="[(4,ref('project.model_project_task'))]"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('project.model_project_project')),(4,ref('project.model_project_task'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('project.model_project_project')),(4,ref('project.model_project_task'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('project.model_project_project')),(4,ref('project.model_project_task'))]"/>
+        </record>
 
         <!-- notify all employees of module installation -->
         <function model="mail.group" name="message_append_note">