summaryrefslogtreecommitdiff
path: root/addons/analytic
diff options
context:
space:
mode:
authorRajesh Prajapati (OpenERP) <rpr@tinyerp.com>2012-10-05 17:35:03 +0530
committerRajesh Prajapati (OpenERP) <rpr@tinyerp.com>2012-10-05 17:35:03 +0530
commitcdff4611b0a588546afb9b706bbd2d0fbda7bf2f (patch)
tree0a0a99b33e52547987ab69b2a29f3ec23c188142 /addons/analytic
parent7202b8f7efbc76e2a40b1a4a8d7a95ed0d2ce573 (diff)
parentba97319054728490e4d8a601382dd6fd2ab4f970 (diff)
[MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s
Diffstat (limited to 'addons/analytic')
-rw-r--r--addons/analytic/__openerp__.py3
-rw-r--r--addons/analytic/analytic.py3
-rw-r--r--addons/analytic/analytic_data.xml12
3 files changed, 16 insertions, 2 deletions
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 417d2b29b20..6227cd369d3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -38,7 +38,8 @@ 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_view.xml',
+ 'analytic_data.xml'
],
'demo': [],
'installable': True,
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 269bf24ed61..ff09349b8a2 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -284,7 +284,8 @@ class account_analytic_account(osv.osv):
def create_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
- self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+ self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name),
+ subtype="analytic.mt_account_status", context=context)
account_analytic_account()
diff --git a/addons/analytic/analytic_data.xml b/addons/analytic/analytic_data.xml
new file mode 100644
index 00000000000..67940fb2063
--- /dev/null
+++ b/addons/analytic/analytic_data.xml
@@ -0,0 +1,12 @@
+<?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>