[MERGE] forward port branch saas-16 up to c3a48da767b

1 files changed, 12 insertions, 2 deletions

diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index 3af10dbb930..a142ab0738a 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -2040,8 +2040,9 @@ var FieldDomain = AbstractField.extend({
         "click .o_field_domain_dialog_button": "_onDialogEditButtonClick",
     }),
     custom_events: _.extend({}, AbstractField.prototype.custom_events, {
-        "domain_changed": "_onDomainSelectorValueChange",
-        "domain_selected": "_onDomainSelectorDialogValueChange",
+        domain_changed: "_onDomainSelectorValueChange",
+        domain_selected: "_onDomainSelectorDialogValueChange",
+        open_record: "_onOpenRecord",
     }),
     /**
      * @constructor
@@ -2222,6 +2223,15 @@ var FieldDomain = AbstractField.extend({
     _onDomainSelectorDialogValueChange: function (e) {
         this._setValue(Domain.prototype.arrayToString(e.data.domain));
     },
+    /**
+     * Stops the propagation of the 'open_record' event, as we don't want the
+     * user to be able to open records from the list opened in a dialog.
+     *
+     * @param {OdooEvent} event
+     */
+    _onOpenRecord: function (event) {
+        event.stopPropagation();
+    },
 });
 
 /**