From c57028fdd33aa0b228b62d347d46249efa7b4528 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 21 Nov 2012 16:08:20 +0530
Subject: [PATCH] [IMP] remove the cancelled subtype in project task and issue

bzr revid: rma@tinyerp.com-20121121103820-ieoqpx0g0rghbav7
---
 addons/project/project.py                   |  8 -----
 addons/project/project_data.xml             | 37 ++++++++-------------
 addons/project_issue/project_issue.py       | 10 ------
 addons/project_issue/project_issue_data.xml | 25 +++++++-------
 4 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 79828a53d34..7b759e58483 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1008,7 +1008,6 @@ class task(base_stage, osv.osv):
         self._check_child_task(cr, uid, ids, context=context)
         for task in tasks:
             self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
-            self.case_cancel_send_note(cr, uid, [task.id], context=context)
         return True
 
     def do_open(self, cr, uid, ids, context=None):
@@ -1176,7 +1175,6 @@ class task(base_stage, osv.osv):
                     #raise osv.except_osv(_('Warning!'), _('Stage is not defined in the project.'))
                 write_vals = vals_reset_kstate if t.stage_id != new_stage else vals
                 super(task, self).write(cr, uid, [t.id], write_vals, context=context)
-                self.stage_set_send_note(cr, uid, [t.id], new_stage, context=context)
             result = True
         else:
             result = super(task, self).write(cr, uid, ids, vals, context=context)
@@ -1286,12 +1284,6 @@ class task(base_stage, osv.osv):
         res = super(task, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
         return res + ['user_id', 'manager_id']
 
-    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_post(cr, uid, ids, body=_("Stage changed to <b>%s</b>.") % (stage_name),
-            context=context)
-
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Task has been <b>created</b>."), subtype="project.mt_task_new", context=context)
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index b4b9a98686b..76c8c5341db 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -90,42 +90,33 @@
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
         </record>
+        <record id="mt_project_started" model="mail.message.subtype">
+            <field name="name">Task Started</field>
+            <field name="res_model">project.project</field>
+        </record>
         <record id="mt_project_closed" model="mail.message.subtype">
             <field name="name">Task Done</field>
             <field name="res_model">project.project</field>
         </record>
-        <record id="mt_t_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
-            <field name="res_model">project.project</field>
-        </record>
+        
         <record id="mt_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
         </record>
+        <record id="mt_task_started" model="mail.message.subtype">
+            <field name="name">Task Started</field>
+            <field name="res_model">project.task</field>
+        </record>
+        <record id="mt_task_blocked" model="mail.message.subtype">
+            <field name="name">Tasks Blocked</field>
+            <field name="res_model">project.task</field>
+            <field name="default" eval="False"/>
+        </record>
         <record id="mt_task_closed" model="mail.message.subtype">
             <field name="name">Task Done</field>
             <field name="res_model">project.task</field>
         </record>
-        <record id="mt_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
-            <field name="res_model">project.task</field>
-        </record>
-       <record id="mt_task_blocked" model="mail.message.subtype">
-            <field name="name">Tasks Blocked</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mt_task_canceled" model="mail.message.subtype">
-            <field name="name">Canceled</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mt_task_change" model="mail.message.subtype">
-            <field name="name">Stage Changed</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-        </record>
 
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5f53e1db496..7a055c343fd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -387,10 +387,6 @@ class project_issue(base_stage, osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         #Update last action date every time the user change the stage, the state or send a new email
         logged_fields = ['stage_id', 'state', 'message_ids']
-        if 'stage_id' in vals:
-            for t in self.browse(cr, uid, ids, context=context):
-                new_stage = vals.get('stage_id')
-                self.stage_set_send_note(cr, uid, [t.id], new_stage, context=context)
         if any([field in vals for field in logged_fields]):
             vals['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
 
@@ -461,7 +457,6 @@ class project_issue(base_stage, osv.osv):
     def case_cancel(self, cr, uid, ids, context=None):
         """ Cancels case """
         self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context)
-        self.case_cancel_send_note(cr, uid, ids, context=context)
         return True
 
     def case_escalate(self, cr, uid, ids, context=None):
@@ -540,11 +535,6 @@ class project_issue(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    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_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype="mt_issue_new", context=context)
-
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ Override of default prefix for notifications. """
         return 'Project issue'
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 77d4bff648a..226884e9b83 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -48,27 +48,23 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="name">Issue Created</field>
             <field name="res_model">project.issue</field>
         </record>
+        <record id="mail.mt_issue_started" model="mail.message.subtype">
+            <field name="name">Issue Started</field>
+            <field name="res_model">project.issue</field>
+        </record>
+        <record id="mail.mt_issue_blocked" model="mail.message.subtype">
+            <field name="name">Issue Blocked</field>
+            <field name="res_model">project.issue</field>
+        </record>
         <record id="mail.mt_issue_closed" model="mail.message.subtype">
             <field name="name">Issue Closed</field>
             <field name="res_model">project.issue</field>
         </record>
-        <record id="mail.mt_issue_canceled" model="mail.message.subtype">
-            <field name="name">Canceled</field>
-            <field name="res_model">project.issue</field>
-        </record>
-        <record id="mail.mt_issue_change" model="mail.message.subtype">
-            <field name="name">Stage Changed</field>
-            <field name="res_model">project.issue</field>
-        </record>
 
         <record id="mail.mt_prj_issue_new" model="mail.message.subtype">
             <field name="name">Issue Created</field>
             <field name="res_model">project.project</field>
         </record>
-        <record id="mail.mt_prj_issue_closed" model="mail.message.subtype">
-            <field name="name">Issue Closed</field>
-            <field name="res_model">project.project</field>
-        </record>
         <record id="mail.mt_prj_issue_started" model="mail.message.subtype">
             <field name="name">Issue Started</field>
             <field name="res_model">project.project</field>
@@ -78,5 +74,10 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
         </record>
+        <record id="mail.mt_prj_issue_closed" model="mail.message.subtype">
+            <field name="name">Issue Closed</field>
+            <field name="res_model">project.project</field>
+        </record>
+        
     </data>
 </openerp>