From da9951baf9e8631e97ae0b8bde69eb03e6f34fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 15 Nov 2012 13:49:31 +0100 Subject: [PATCH] =?UTF-8?q?[CLEAN]=20removed=20a=20commented=20statement,?= =?UTF-8?q?=20fixed=20a=20var=20name=20in=20js.=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: tde@openerp.com-20121115124931-w20igi8qk66uvnj0 --- addons/email_template/wizard/mail_compose_message.py | 1 - addons/mail/static/src/js/mail.js | 2 +- 2 files changed, 1 insertion(+), 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