summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-17 12:09:58 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-17 12:09:58 +0200
commitfbdda5437a8ecb575ffbcac7961aad44c9cf4ff8 (patch)
tree239d86ce417811cb4a0d8cbc3b278c81131f22b5 /addons/mass_mailing/static/src
parentf4332118d3156e2ba2408c1d31ab92ee2066ef73 (diff)
parentcbca27d0052430743fe2c996964d7aca0ca682c9 (diff)
[MERGE] forward port branch 10.0 up to cbca27d0052
Diffstat (limited to 'addons/mass_mailing/static/src')
-rw-r--r--addons/mass_mailing/static/src/js/mass_mailing_editor.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
index 5d475808589..cc0b9d2dd08 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -402,4 +402,15 @@ odoo_top[callback+"_updown"] = function (value, fields_values, field_name) {
if ($editable_area.html().indexOf('on_change_model_and_list') !== -1) {
$editable_area.empty();
}
+// Adding compatibility for the outlook compliance of mailings.
+// Commit of such compatibility : a14f89c8663c9cafecb1cc26918055e023ecbe42
+options.registry.background.include({
+ start: function() {
+ this._super();
+ var $table_target = this.$target.find('table:first');
+ if ($table_target) {
+ this.$target = $table_target;
+ }
+ }
+});
});