From d90d78171bb257cc4c65ca935d3f43814e31de67 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 4 Sep 2012 18:34:23 +0530
Subject: [PATCH] [IMP] make changes into the subtype data for project module

bzr revid: rma@tinyerp.com-20120904130423-928mhaatxuxfbwi4
---
 addons/base_status/base_stage.py            | 6 +++---
 addons/project_issue/project_issue.py       | 2 +-
 addons/project_issue/project_issue_data.xml | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 26afe548217..fdbc41cd8ac 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -401,13 +401,13 @@ class base_stage(object):
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, subtype="closed", context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
-            msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
+            msg = _('%s has been <b>cancelled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
+            self.message_post(cr, uid, [id], body=msg, subtype="cancelled", context=context)
         return True
 
     def case_pending_send_note(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 52bb2d2d687..833c7dbb460 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -508,7 +508,7 @@ class project_issue(base_stage, osv.osv):
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
         message = _("Project issue <b>converted</b> to task.")
-        return self.message_post(cr, uid, ids, body=message, subtype="converted", context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Project issue <b>created</b>.")
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 2501bd821d2..6ee704c6b39 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -42,11 +42,15 @@
             <field name="model_ids" eval="[(4,ref('project_issue.model_project_issue'))]"/>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail.mail_subtype_converted" model="mail.message.subtype">
-            <field name="name">converted</field>
+        <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
+            <field name="name">cancelled</field>
             <field name="model_ids" eval="[(4,ref('project_issue.model_project_issue'))]"/>
             <field name="default" eval="False"/>
         </record>
+        <record id="mail.mail_subtype_closed" model="mail.message.subtype">
+            <field name="name">closed</field>
+            <field name="model_ids" eval="[(4,ref('project_issue.model_project_issue'))]"/>
+        </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('project_issue.model_project_issue'))]"/>
         </record>