diff --git a/sao/src/window.js b/sao/src/window.js index c70ac4de0d..7b3119565c 100644 --- a/sao/src/window.js +++ b/sao/src/window.js @@ -2727,15 +2727,16 @@ }, _fill_with: function(template) { var prm; + let context = this.record.get_context(); if (template) { prm = Sao.rpc({ 'method': 'model.ir.email.template.get', - 'params': [template, this.record.id, {}], + 'params': [template, this.record.id, context], }, this.record.model.session); } else { prm = Sao.rpc({ 'method': 'model.ir.email.template.get_default', - 'params': [this.record.model.name, this.record.id, {}], + 'params': [this.record.model.name, this.record.id, context], }, this.record.model.session); } prm.then(values => { diff --git a/tryton/tryton/gui/window/email_.py b/tryton/tryton/gui/window/email_.py index c7a8c93577..dd0a9d4c8b 100644 --- a/tryton/tryton/gui/window/email_.py +++ b/tryton/tryton/gui/window/email_.py @@ -291,14 +291,16 @@ class Email(NoModal): def _fill_with(self, template=None): try: + context = self.record.get_context() if template: values = RPCExecute( 'model', 'ir.email.template', 'get', - template, self.record.id) + template, self.record.id, context=context) else: values = RPCExecute( 'model', 'ir.email.template', 'get_default', - self.record.model_name, self.record.id) + self.record.model_name, self.record.id, + context=context) except RPCException: return self.to.set_text(', '.join(values.get('to', [])))