diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-11-15 13:49:31 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-11-15 13:49:31 +0100 |
| commit | da9951baf9e8631e97ae0b8bde69eb03e6f34fdf (patch) | |
| tree | 843ed227fbb4b2bb0548615a36d37528c48f7510 | |
| parent | 81d4467c8fb4e15129d5dd6b8242fa1a8d4e5562 (diff) | |
[CLEAN] removed a commented statement, fixed a var name in js.é
bzr revid: tde@openerp.com-20121115124931-w20igi8qk66uvnj0
| -rw-r--r-- | addons/email_template/wizard/mail_compose_message.py | 1 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index ba4cef83bdb..9a995985687 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -154,7 +154,6 @@ class mail_compose_message(osv.TransientModel): 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])] } template_id = email_template.create(cr, uid, values, context=context) - # record.write({'template_id': template_id, 'use_template': True}) record.write(record.onchange_template_id(True, template_id, record.composition_mode, record.model, record.res_id)['value']) return _reopen(self, record.id, record.model) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 37090543b8c..dc265a343d5 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -599,7 +599,7 @@ openerp.mail = function (session) { ]).done(function (record) { var thread = self.parent_thread; if (self.options.display_indented_thread < self.thread_level && thread.parent_message) { - var hread = thread.parent_message.parent_thread; + var thread = thread.parent_message.parent_thread; } var root = thread == self.options.root_thread; // create object and attach to the thread object |