diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py index f9902859795..047e1eaf83c 100644 --- a/addons/email_template/wizard/email_compose_message.py +++ b/addons/email_template/wizard/email_compose_message.py @@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory): def on_change_template(self, cr, uid, ids, model, resource_id, template_id, context=None): if context is None: context = {} + if context.get('mail') == 'reply': + return {'value':{}} email_temp_previ_pool = self.pool.get('email_template.preview') result = self.on_change_referred_doc(cr, uid, [], model, resource_id, context=context) vals = result.get('value',{}) diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml index 0daf7680d86..22ec87952f0 100644 --- a/addons/email_template/wizard/email_compose_message_view.xml +++ b/addons/email_template/wizard/email_compose_message_view.xml @@ -10,10 +10,10 @@ + on_change="on_change_template(model, res_id, template_id, context)"/> + colspan="4" on_change="on_change_template(model, res_id, template_id, context)"/> diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/emails/wizard/email_compose_message_view.xml index 52860e15c67..9cb9a6d43fc 100644 --- a/addons/emails/wizard/email_compose_message_view.xml +++ b/addons/emails/wizard/email_compose_message_view.xml @@ -11,7 +11,7 @@ + colspan="4" on_change="on_change_referred_doc(model, res_id, context)"/> diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py index 9dc5f959a71..1b72fff3f2e 100644 --- a/addons/hr_evaluation/wizard/email_compose_message.py +++ b/addons/hr_evaluation/wizard/email_compose_message.py @@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory): def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None): if context is None: context = {} + if context.get('mail') == 'reply': + return {'value':{}} result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context) value = {} if not result.get('value'):