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 %s has been created.") % (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 @@
-
-
-
-
-
-
- Status Change
- account.analytic.account
-
-
-
-
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 canceled.")
- 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 @@
Contract Renewed
account.analytic.account
-
- Canceled
- account.analytic.account
-
Contract to Renew
crm.case.section