From d936c69aaa410c970245a377cd906337ce2f5354 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 21 Nov 2012 15:21:40 +0530
Subject: [PATCH] [IMP] remove the cancelled subtype in project

bzr revid: rma@tinyerp.com-20121121095140-qkjkvyqfqpoa9i50
---
 addons/project/project.py       |  4 ----
 addons/project/project_data.xml | 24 +-----------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 978399a1bd1..79828a53d34 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -311,7 +311,6 @@ class project(osv.osv):
         task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
         task_obj.case_cancel(cr, uid, task_ids, context=context)
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
-        self.set_cancel_send_note(cr, uid, ids, context=context)
         return True
 
     def set_pending(self, cr, uid, ids, context=None):
@@ -556,9 +555,6 @@ def Project():
     def set_pending_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Project is now <b>pending</b>."), context=context)
 
-    def set_cancel_send_note(self, cr, uid, ids, context=None):
-        return self.message_post(cr, uid, ids, body=_("Project has been <b>canceled</b>."), context=context)
-
     def set_close_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Project has been <b>closed</b>."), context=context)
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 1afcf5c938a..b4b9a98686b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -86,28 +86,11 @@
 
         <!-- mail: subtypes -->
         <record id="mt_project_new" model="mail.message.subtype">
-            <field name="name">New</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mt_project_closed" model="mail.message.subtype">
-            <field name="name">Closed</field>
-            <field name="res_model">project.project</field>
-        </record>
-        <record id="mt_project_canceled" model="mail.message.subtype">
-            <field name="name">Canceled</field>
-            <field name="res_model">project.project</field>
-        </record>
-        <record id="mt_project_stage" model="mail.message.subtype">
-            <field name="name">Stage Changed</field>
-            <field name="res_model">project.project</field>
-        </record>
-        <record id="mt_t_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
         </record>
-        <record id="mt_t_closed" model="mail.message.subtype">
+        <record id="mt_project_closed" model="mail.message.subtype">
             <field name="name">Task Done</field>
             <field name="res_model">project.project</field>
         </record>
@@ -115,11 +98,6 @@
             <field name="name">Task Started</field>
             <field name="res_model">project.project</field>
         </record>
-       <record id="mt_t_blocked" model="mail.message.subtype">
-            <field name="name">Tasks Blocked</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-        </record>
         <record id="mt_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>