From f94f396d0420accd08d9fa1720f21da8fd36732e Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 23 Nov 2012 17:11:57 +0530
Subject: [PATCH] [IMP] remove subtype canceled & stage change

bzr revid: fka@tinyerp.com-20121123114157-ckoygs2ul6hrutqv
---
 addons/analytic/__openerp__.py                       |  3 +--
 addons/analytic/analytic.py                          |  2 +-
 addons/analytic/analytic_data.xml                    | 12 ------------
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py  |  2 +-
 .../hr_timesheet_invoice_data.xml                    |  4 ----
 5 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 addons/analytic/analytic_data.xml

diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 6227cd369d3..417d2b29b20 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -38,8 +38,7 @@ that have no counterpart in the general financial accounts.
         'security/analytic_security.xml',
         'security/ir.model.access.csv',
         'analytic_sequence.xml',
-        'analytic_view.xml',
-        'analytic_data.xml'
+        'analytic_view.xml'
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 708f9b3b196..c18b86a9b25 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -313,7 +313,7 @@ class account_analytic_account(osv.osv):
             if obj.partner_id:
                 message = _("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name,)
             self.message_post(cr, uid, [obj.id], body=message,
-                subtype="analytic.mt_account_status", context=context)
+                context=context)
 
 account_analytic_account()
 
diff --git a/addons/analytic/analytic_data.xml b/addons/analytic/analytic_data.xml
deleted file mode 100644
index 67940fb2063..00000000000
--- a/addons/analytic/analytic_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- mail: subtypes -->
-        <record id="mt_account_status" model="mail.message.subtype">
-            <field name="name">Status Change</field>
-            <field name="res_model">account.analytic.account</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 679455e3864..63ff17fa6c1 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -101,7 +101,7 @@ class account_analytic_account(osv.osv):
     def set_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
         message = _("Contract has been <b>canceled</b>.")
-        self.message_post(cr, uid, ids, body=message, subtype="hr_timesheet_invoice.mt_account_canceled", context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_open(self, cr, uid, ids, context=None):
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index fc083300fed..a57f0c6078a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -35,10 +35,6 @@
             <field name="name">Contract Renewed</field>
             <field name="res_model">account.analytic.account</field>
         </record>
-        <record id="mt_account_canceled" model="mail.message.subtype">
-            <field name="name">Canceled</field>
-            <field name="res_model">account.analytic.account</field>
-        </record>
         <record id="mt_salesteam_renew" model="mail.message.subtype">
             <field name="name">Contract to Renew</field>
             <field name="res_model">crm.case.section</field>