From f725d5e6794432307d92d36f69a0f58b33035e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 7 Aug 2012 18:09:24 +0200 Subject: [PATCH 1/2] [FIX] email_template: fixed an issue where no destination partner could be found. bzr revid: tde@openerp.com-20120807160924-hdnqudnwowkbmsem --- addons/email_template/email_template.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index bf57342f14f..b43b7d19b85 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -317,6 +317,7 @@ class email_template(osv.osv): 'message_id': False, 'state': 'outgoing', 'content_subtype': 'plain', + 'partner_ids': [], } if not template_id: return values From 68ef2ca6a887a372b80010b5c539c08f1d26e9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 8 Aug 2012 09:56:00 +0200 Subject: [PATCH 2/2] [IMP] mail Chatter: hack of 'send by mail': do not try to redirect to the chatter when in create mode. bzr revid: tde@openerp.com-20120808075600-wo2w2ojb0wjozsuy --- addons/mail/static/src/js/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 47908ab3223..da6816d3441 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -16,7 +16,7 @@ openerp.mail = function(session) { session.web.FormView = session.web.FormView.extend({ do_action: function(action, on_close) { - if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids) { + if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') { var record_thread = this.fields.message_ids; var thread = record_thread.thread; thread.instantiate_composition_form('comment', true, false, 0, action.context);