From c02e4316bb4d05adc4ce8645ad28cdc0b809f99d Mon Sep 17 00:00:00 2001
From: "Michael (mcm)" <mcm@odoo.com>
Date: Tue, 13 Sep 2022 13:41:52 +0000
Subject: [PATCH 1/4] [IMP] web: open m2o record in target current

This commit adds an option to many2one field to open the record either
in target new (dialog) or target current (replace view) which is now
the default.

task id: 2822553

X-original-commit: abe26f6eebb450512b35c25094329f85b98c15d9
Part-of: odoo/odoo#101118
---
 .../views/fields/many2one/many2one_field.js   |  9 ++-
 .../views/fields/many2one/many2one_field.xml  |  3 +-
 .../views/fields/many2one_field_tests.js      | 63 +++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/views/fields/many2one/many2one_field.js b/addons/web/static/src/views/fields/many2one/many2one_field.js
index eec6ccd950b..4a7a6e97d10 100644
--- a/addons/web/static/src/views/fields/many2one/many2one_field.js
+++ b/addons/web/static/src/views/fields/many2one/many2one_field.js
@@ -188,7 +188,11 @@ export class Many2OneField extends Component {
         }
     }
     onExternalBtnClick() {
-        this.openDialog(this.resId);
+        if (this.props.openTarget === "current") {
+            this.openAction();
+        } else {
+            this.openDialog(this.resId);
+        }
     }
     async onBarcodeBtnClick() {
         const barcode = await BarcodeScanner.scanBarcode();
@@ -259,6 +263,7 @@ Many2OneField.props = {
     relation: { type: String, optional: true },
     string: { type: String, optional: true },
     canScanBarcode: { type: Boolean, optional: true },
+    openTarget: { type: String, validate: (v) => ["current", "new"].includes(v), optional: true },
 };
 Many2OneField.defaultProps = {
     canOpen: true,
@@ -270,6 +275,7 @@ Many2OneField.defaultProps = {
     searchLimit: 7,
     string: "",
     canScanBarcode: false,
+    openTarget: "current",
 };
 
 Many2OneField.displayName = _lt("Many2one");
@@ -295,6 +301,7 @@ Many2OneField.extractProps = ({ attrs, field }) => {
         string: attrs.string || field.string,
         createNameField: attrs.options.create_name_field,
         canScanBarcode: canScanBarcode,
+        openTarget: attrs.open_target,
     };
 };
 
diff --git a/addons/web/static/src/views/fields/many2one/many2one_field.xml b/addons/web/static/src/views/fields/many2one/many2one_field.xml
index bb596bf9e01..beb27606cdb 100644
--- a/addons/web/static/src/views/fields/many2one/many2one_field.xml
+++ b/addons/web/static/src/views/fields/many2one/many2one_field.xml
@@ -45,7 +45,8 @@
                 <t t-if="hasExternalButton">
                     <button
                         type="button"
-                        class="btn btn-secondary fa fa-external-link o_external_button"
+                        class="btn btn-secondary fa o_external_button"
+                        t-att-class="props.openTarget === 'current' ? 'fa-arrow-right' : 'fa-external-link'"
                         tabindex="-1"
                         draggable="false"
                         aria-label="External link"
diff --git a/addons/web/static/tests/views/fields/many2one_field_tests.js b/addons/web/static/tests/views/fields/many2one_field_tests.js
index 01f68ad3fbf..bc1163f45c0 100644
--- a/addons/web/static/tests/views/fields/many2one_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2one_field_tests.js
@@ -4209,4 +4209,67 @@ QUnit.module("Fields", (hooks) => {
             "Placeholder"
         );
     });
+
+    QUnit.test("open_target prop = current", async function (assert) {
+        serverData.views = {
+            "partner,false,form": '<form><field name="trululu" open_target="current"/></form>',
+            "partner,false,search": "<search></search>",
+        };
+        serverData.actions = {
+            1: {
+                name: "Partner",
+                res_model: "partner",
+                res_id: 1,
+                type: "ir.actions.act_window",
+                views: [[false, "form"]],
+            },
+        };
+        const webClient = await createWebClient({
+            serverData,
+            mockRPC(route, { method }) {
+                if (method === "get_formview_action") {
+                    assert.step("get_formview_action");
+                    return {
+                        type: "ir.actions.act_window",
+                        res_model: "partner",
+                        view_type: "form",
+                        view_mode: "form",
+                        views: [[false, "form"]],
+                        target: "current",
+                        res_id: false,
+                    };
+                }
+            },
+        });
+        await doAction(webClient, 1);
+
+        await selectDropdownItem(target, "trululu", "first record");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-arrow-right");
+        await click(target, ".o_field_widget .o_external_button");
+
+        assert.verifySteps(["get_formview_action"]);
+        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "first recordNew");
+    });
+
+    QUnit.test("open_target prop = new", async function (assert) {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            serverData,
+            arch: '<form><field name="trululu" open_target="new" /></form>',
+            mockRPC(route, { method }) {
+                if (method === "get_formview_id") {
+                    assert.step("get_formview_id");
+                    return false;
+                }
+            },
+        });
+
+        await selectDropdownItem(target, "trululu", "first record");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-external-link");
+        await click(target, ".o_field_widget .o_external_button");
+
+        assert.verifySteps(["get_formview_id"]);
+        assert.containsOnce(target, ".modal");
+    });
 });

From 305fbc0e1042736c330974d14b11a3c1fed2d201 Mon Sep 17 00:00:00 2001
From: "Michael (mcm)" <mcm@odoo.com>
Date: Tue, 13 Sep 2022 13:49:27 +0000
Subject: [PATCH 2/4] [IMP] web, mail: change layout of form view

This commit changes the layout of the form view to move the
control panel next to the chatter instead of being on top.
The chatter now takes all the place on the right side of the view.

task id: 2822553

X-original-commit: 7f36dd05b3238c3d27aab6e5af12233df27067e4
Part-of: odoo/odoo#101118
---
 addons/mail/__manifest__.py                   |   1 +
 .../static/src/views/form/form_compiler.js    | 114 +++++++++++++-----
 .../static/src/views/form/form_controller.js  |  79 ++++++++++++
 .../static/src/views/form/form_controller.xml |  15 +++
 .../static/src/views/form/form_renderer.js    |   7 ++
 .../widgets/form_renderer/form_renderer.scss  |   1 -
 .../src/views/form/form_controller.scss       |   8 ++
 .../static/src/views/form/form_controller.xml |  81 ++++++++-----
 .../static/src/views/form/form_renderer.js    |   4 +
 addons/web/static/src/views/view_compiler.js  |   3 +-
 .../settings_form_renderer.js                 |  10 +-
 .../src/webclient/webclient_layout.scss       |   4 +-
 12 files changed, 256 insertions(+), 71 deletions(-)
 create mode 100644 addons/mail/static/src/views/form/form_controller.js
 create mode 100644 addons/mail/static/src/views/form/form_controller.xml

diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 2bbb0b657a5..ce912d8d49d 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -193,6 +193,7 @@ For more specific needs, you may also assign custom-defined actions
             'mail/static/src/components/*/*.js',
             'mail/static/src/components/*/*.scss',
             'mail/static/src/components/*/*.xml',
+            'mail/static/src/views/*/*.xml',
             ('include', 'mail.assets_messaging'),
             'mail/static/src/services/*.js',
             'mail/static/src/views/**/*.js',
diff --git a/addons/mail/static/src/views/form/form_compiler.js b/addons/mail/static/src/views/form/form_compiler.js
index 74feeed4915..d6503c8741d 100644
--- a/addons/mail/static/src/views/form/form_compiler.js
+++ b/addons/mail/static/src/views/form/form_compiler.js
@@ -5,9 +5,9 @@ import { registry } from "@web/core/registry";
 import { SIZES } from "@web/core/ui/ui_service";
 import { patch } from "@web/core/utils/patch";
 import { append, createElement, setAttributes } from "@web/core/utils/xml";
+import { ViewCompiler, getModifier } from "@web/views/view_compiler";
 import { FormCompiler } from "@web/views/form/form_compiler";
 
-
 function compileChatter(node, params) {
     let hasActivities = false;
     let hasFollowers = false;
@@ -44,9 +44,9 @@ function compileChatter(node, params) {
         "hasParentReloadOnFollowersUpdate": hasParentReloadOnFollowersUpdate,
         "hasParentReloadOnMessagePosted": hasParentReloadOnMessagePosted,
         "isAttachmentBoxVisibleInitially": isAttachmentBoxVisibleInitially,
-        "threadId": "props.record.resId or undefined",
-        "threadModel": "props.record.resModel",
-        "webRecord": "props.record",
+        "threadId": params.threadId,
+        "threadModel": params.threadModel,
+        "webRecord": params.webRecord,
     });
     const chatterContainerHookXml = createElement("div");
     chatterContainerHookXml.classList.add("o_FormRenderer_chatterContainer");
@@ -59,27 +59,94 @@ function compileAttachmentPreview(node, params) {
     webClientViewAttachmentViewContainerHookXml.classList.add('o_attachment_preview');
     const webClientViewAttachmentViewContainerXml = createElement("WebClientViewAttachmentViewContainer");
     setAttributes(webClientViewAttachmentViewContainerXml, {
-        "threadId": "props.record.resId or undefined",
-        "threadModel": "props.record.resModel",
+        "threadId": params.threadId,
+        "threadModel": params.threadModel,
     });
     append(webClientViewAttachmentViewContainerHookXml, webClientViewAttachmentViewContainerXml);
     return webClientViewAttachmentViewContainerHookXml;
 }
 
+export class MailFormCompiler extends ViewCompiler {
+    setup() {
+        this.compilers.push({ selector: "t", fn: this.compileT });
+        this.compilers.push({ selector: "div.oe_chatter", fn: this.compileChatter });
+        this.compilers.push({
+            selector: "div.o_attachment_preview",
+            fn: this.compileAttachmentPreview,
+        });
+    }
+
+    compile(node, params) {
+        const res = super.compile(node, params).children[0];
+        const chatterContainerHookXml = res.querySelector(".o_FormRenderer_chatterContainer");
+        if (chatterContainerHookXml) {
+            setAttributes(chatterContainerHookXml, {
+                "t-if": `!hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}`,
+                "t-attf-class": `{{ uiService.size >= ${SIZES.XXL} ? "o-aside" : "" }}`,
+            });
+        }
+        const attachmentViewHookXml = res.querySelector(".o_attachment_preview");
+        if (attachmentViewHookXml) {
+            setAttributes(attachmentViewHookXml, {
+                "t-if": `hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}`,
+            });
+        }
+        return res;
+    }
+
+    compileT(node, params) {
+        const compiledRoot = createElement("t");
+        for (const child of node.childNodes) {
+            const invisible = getModifier(child, "invisible");
+            let compiledChild = this.compileNode(child, params, false);
+            compiledChild = this.applyInvisible(invisible, compiledChild, {
+                ...params,
+                recordExpr: "model.root",
+            });
+            append(compiledRoot, compiledChild);
+        }
+        return compiledRoot;
+    }
+
+    compileChatter(node) {
+        return compileChatter(node, {
+            threadId: "model.root.resId or undefined",
+            threadModel: "model.root.resModel",
+            webRecord: "model.root",
+        });
+    }
+
+    compileAttachmentPreview(node) {
+        return compileAttachmentPreview(node, {
+            threadId: "model.root.resId or undefined",
+            threadModel: "model.root.resModel",
+        });
+    }
+}
+
 registry.category("form_compilers").add("chatter_compiler", {
     selector: "div.oe_chatter",
-    fn: compileChatter,
+    fn: (node) =>
+        compileChatter(node, {
+            threadId: "props.record.resId or undefined",
+            threadModel: "props.record.resModel",
+            webRecord: "props.record",
+        }),
 });
 
 registry.category("form_compilers").add("attachment_preview_compiler", {
     selector: "div.o_attachment_preview",
-    fn: compileAttachmentPreview,
+    fn: (node) =>
+        compileAttachmentPreview(node, {
+            threadId: "props.record.resId or undefined",
+            threadModel: "props.record.resModel",
+        }),
 });
 
 patch(FormCompiler.prototype, 'mail', {
-    compile() {
+    compile(node, params) {
         // TODO no chatter if in dialog?
-        const res = this._super(...arguments);
+        const res = this._super(node, params);
         const chatterContainerHookXml = res.querySelector('.o_FormRenderer_chatterContainer');
         if (!chatterContainerHookXml) {
             return res; // no chatter, keep the result as it is
@@ -97,17 +164,12 @@ patch(FormCompiler.prototype, 'mail', {
         if (!parentXml) {
             return res; // miss-config: a sheet-bg is required for the rest
         }
-        const webClientViewAttachmentViewHookXml = res.querySelector('.o_attachment_preview');
-        // TODO hasAttachmentViewer should also depend on the groups= and/or invisible modifier on o_attachment_preview (see invoice form)
-        if (webClientViewAttachmentViewHookXml) {
+        if (params.hasAttachmentViewer) {
             // in sheet bg (attachment viewer present)
-            setAttributes(webClientViewAttachmentViewHookXml, {
-                't-if': `hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}`,
-            });
-            const sheetBgChatterContainerHookXml = chatterContainerHookXml.cloneNode(true);
+            const sheetBgChatterContainerHookXml = chatterContainerHookXml;
             sheetBgChatterContainerHookXml.classList.add('o-isInFormSheetBg');
             setAttributes(sheetBgChatterContainerHookXml, {
-                't-if': `hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}`,
+                't-if': `uiService.size < ${SIZES.XXL} or hasAttachmentViewer()`,
             });
             append(formSheetBgXml, sheetBgChatterContainerHookXml);
             const sheetBgChatterContainerXml = sheetBgChatterContainerHookXml.querySelector('ChatterContainer');
@@ -116,29 +178,19 @@ patch(FormCompiler.prototype, 'mail', {
                 "hasExternalBorder": "true",
                 "hasMessageListScrollAdjust": "false",
             });
-        }
-        // after sheet bg (standard position, either aside or below)
-        if (webClientViewAttachmentViewHookXml) {
-            setAttributes(chatterContainerHookXml, {
-                't-if': `!(hasAttachmentViewer() and uiService.size >= ${SIZES.XXL})`,
-                't-attf-class': `{{ uiService.size >= ${SIZES.XXL} and !(hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}) ? "o-aside" : "" }}`,
-            });
-            setAttributes(chatterContainerXml, {
-                "isInFormSheetBg": "hasAttachmentViewer()",
-                "hasExternalBorder": `!(uiService.size >= ${SIZES.XXL} and !(hasAttachmentViewer() and uiService.size >= ${SIZES.XXL}))`,
-                "hasMessageListScrollAdjust": `uiService.size >= ${SIZES.XXL} and !(hasAttachmentViewer() and uiService.size >= ${SIZES.XXL})`,
-            });
         } else {
+            // after sheet bg (standard position, either aside or below)
             setAttributes(chatterContainerXml, {
                 "isInFormSheetBg": "false",
                 "hasExternalBorder": `uiService.size < ${SIZES.XXL}`,
                 "hasMessageListScrollAdjust": `uiService.size >= ${SIZES.XXL}`,
             });
             setAttributes(chatterContainerHookXml, {
+                't-if': `uiService.size < ${SIZES.XXL}`,
                 't-attf-class': `{{ uiService.size >= ${SIZES.XXL} ? "o-aside" : "" }}`,
             });
+            append(parentXml, chatterContainerHookXml);
         }
-        append(parentXml, chatterContainerHookXml);
         return res;
     },
 });
diff --git a/addons/mail/static/src/views/form/form_controller.js b/addons/mail/static/src/views/form/form_controller.js
new file mode 100644
index 00000000000..0920be0f0af
--- /dev/null
+++ b/addons/mail/static/src/views/form/form_controller.js
@@ -0,0 +1,79 @@
+/** @odoo-module */
+
+import { useModels } from "@mail/component_hooks/use_models";
+import { ChatterContainer } from "@mail/components/chatter_container/chatter_container";
+import { WebClientViewAttachmentViewContainer } from "@mail/components/web_client_view_attachment_view_container/web_client_view_attachment_view_container";
+
+import { browser } from "@web/core/browser/browser";
+import { useService } from "@web/core/utils/hooks";
+import { patch } from "@web/core/utils/patch";
+import { useDebounced } from "@web/core/utils/timing";
+import { FormController } from "@web/views/form/form_controller";
+import { useViewCompiler } from "@web/views/view_compiler";
+import { evalDomain } from "@web/views/utils";
+
+import { MailFormCompiler } from "./form_compiler";
+
+const { onMounted, onWillUnmount } = owl;
+
+patch(FormController.prototype, "mail", {
+    setup() {
+        this._super();
+        this.uiService = useService("ui");
+        this.hasAttachmentViewerInArch = false;
+
+        if (this.env.services.messaging) {
+            useModels();
+        }
+
+        const { archInfo } = this.props;
+        const { arch, xmlDoc } = archInfo;
+
+        const template = document.createElement("t");
+        const xmlDocAttachmentPreview = xmlDoc.querySelector("div.o_attachment_preview");
+        if (xmlDocAttachmentPreview && xmlDocAttachmentPreview.parentNode.nodeName === "form") {
+            // TODO hasAttachmentViewer should also depend on the groups= and/or invisible modifier on o_attachment_preview (see invoice form)
+            template.appendChild(xmlDocAttachmentPreview);
+            this.hasAttachmentViewerInArch = true;
+        }
+
+        const xmlDocChatter = xmlDoc.querySelector("div.oe_chatter");
+        if (xmlDocChatter && xmlDocChatter.parentNode.nodeName === "form") {
+            template.appendChild(xmlDocChatter.cloneNode(true));
+        }
+
+        const mailTemplates = useViewCompiler(MailFormCompiler, arch, { Mail: template }, {});
+        this.mailTemplate = mailTemplates.Mail;
+
+        this.onResize = useDebounced(this.render, 200);
+        onMounted(() => browser.addEventListener("resize", this.onResize));
+        onWillUnmount(() => browser.removeEventListener("resize", this.onResize));
+    },
+    /**
+     * @returns {Messaging|undefined}
+     */
+    getMessaging() {
+        return this.env.services.messaging && this.env.services.messaging.modelManager.messaging;
+    },
+    /**
+     * @returns {boolean}
+     */
+    hasAttachmentViewer() {
+        if (!this.getMessaging() || !this.model.root.resId) {
+            return false;
+        }
+        const thread = this.getMessaging().models['Thread'].insert({
+            id: this.model.root.resId,
+            model: this.model.root.resModel,
+        });
+        return thread.attachmentsInWebClientView.length > 0;
+    },
+    evalDomainFromRecord(record, expr) {
+        return evalDomain(expr, record.evalContext);
+    },
+});
+
+Object.assign(FormController.components, {
+    ChatterContainer,
+    WebClientViewAttachmentViewContainer,
+});
diff --git a/addons/mail/static/src/views/form/form_controller.xml b/addons/mail/static/src/views/form/form_controller.xml
new file mode 100644
index 00000000000..b15f4d7e4fd
--- /dev/null
+++ b/addons/mail/static/src/views/form/form_controller.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-inherit="web.FormView" t-inherit-mode="extension">
+        <xpath expr="//div[hasclass('o_form_view_container')]" position="after">
+            <t t-if="mailTemplate">
+                <t t-call="{{ mailTemplate }}" />
+            </t>
+        </xpath>
+        <xpath expr="//Layout/t[@t-component='props.Renderer']" position="attributes">
+            <attribute name="hasAttachmentViewer">hasAttachmentViewerInArch</attribute>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/addons/mail/static/src/views/form/form_renderer.js b/addons/mail/static/src/views/form/form_renderer.js
index 40237e82aa6..82d84e74721 100644
--- a/addons/mail/static/src/views/form/form_renderer.js
+++ b/addons/mail/static/src/views/form/form_renderer.js
@@ -15,6 +15,13 @@ patch(FormRenderer.prototype, 'mail', {
         }
     },
 
+    get compileParams() {
+        return {
+            ...this._super(),
+            hasAttachmentViewer: this.props.hasAttachmentViewer,
+        };
+    },
+
     //--------------------------------------------------------------------------
     // Mail Methods
     //--------------------------------------------------------------------------
diff --git a/addons/mail/static/src/widgets/form_renderer/form_renderer.scss b/addons/mail/static/src/widgets/form_renderer/form_renderer.scss
index 7ff19adfab6..aef5bcd2c61 100644
--- a/addons/mail/static/src/widgets/form_renderer/form_renderer.scss
+++ b/addons/mail/static/src/widgets/form_renderer/form_renderer.scss
@@ -34,7 +34,6 @@
 
 .o_FormRenderer_chatterContainer {
     display: flex;
-    flex: 1 1 auto;
     margin: 0 auto;
     max-width: $o-form-view-sheet-max-width;
     padding: map-get($spacers, 3) map-get($spacers, 3) map-get($spacers, 5);
diff --git a/addons/web/static/src/views/form/form_controller.scss b/addons/web/static/src/views/form/form_controller.scss
index d075bb3e586..6a44a81253e 100644
--- a/addons/web/static/src/views/form/form_controller.scss
+++ b/addons/web/static/src/views/form/form_controller.scss
@@ -224,6 +224,13 @@
         }
     }
 
+    .o_form_view_container {
+        display: flex;
+        flex-flow: column nowrap;
+        height: 100%;
+        flex: 1 1 auto;
+    }
+
     // No sheet
     &.o_form_nosheet, .o_form_nosheet {
         @include o-webclient-padding($top: $o-sheet-vpadding, $bottom: $o-sheet-vpadding);
@@ -1150,6 +1157,7 @@
 }
 
 .o_form_view.o_xxl_form_view {
+    flex-flow: row nowrap !important;
 
     .o_form_sheet_bg {
         flex: 1 1 auto; // Side chatter is disabled if this has to shrink but this was added for safety
diff --git a/addons/web/static/src/views/form/form_controller.xml b/addons/web/static/src/views/form/form_controller.xml
index 20a3e726a42..89541836651 100644
--- a/addons/web/static/src/views/form/form_controller.xml
+++ b/addons/web/static/src/views/form/form_controller.xml
@@ -3,43 +3,58 @@
 
     <t t-name="web.FormView" owl="1">
         <div t-att-class="className" t-ref="root">
-            <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-set-slot="layout-buttons">
-                    <t t-if="footerArchInfo and env.inDialog">
-                        <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo"/>
+            <div class="o_form_view_container">
+                <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
+                    <t t-set-slot="layout-buttons">
+                        <t t-if="footerArchInfo and env.inDialog">
+                            <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo"/>
+                        </t>
+                        <t t-else="">
+                            <t t-call="{{ props.buttonTemplate }}"/>
+                        </t>
                     </t>
-                    <t t-else="">
-                        <t t-call="{{ props.buttonTemplate }}"/>
+                    <t t-set-slot="control-panel-bottom-left">
+                        <t t-if="props.info.actionMenus and !model.root.isVirtual">
+                            <ActionMenus
+                                activeIds="[model.root.resId]"
+                                context="props.context"
+                                items="getActionMenuItems()"
+                                isDomainSelected="model.root.isDomainSelected"
+                                resModel="model.root.resModel"
+                                domain="props.domain"
+                                onActionExecuted="() => model.load()"
+                            />
+                        </t>
                     </t>
-                </t>
-                <t t-set-slot="control-panel-bottom-left">
-                    <t t-if="!env.isSmall and props.info.actionMenus and !model.root.isVirtual">
-                        <ActionMenus
-                            activeIds="[model.root.resId]"
-                            context="props.context"
-                            items="getActionMenuItems()"
-                            isDomainSelected="model.root.isDomainSelected"
-                            resModel="model.root.resModel"
-                            domain="props.domain"
-                            onActionExecuted="() => model.load()"
-                        />
+                    <t t-set-slot="control-panel-bottom-left">
+                        <t t-if="!env.isSmall and props.info.actionMenus and !model.root.isVirtual">
+                            <ActionMenus
+                                activeIds="[model.root.resId]"
+                                context="props.context"
+                                items="getActionMenuItems()"
+                                isDomainSelected="model.root.isDomainSelected"
+                                resModel="model.root.resModel"
+                                domain="props.domain"
+                                onActionExecuted="() => model.load()"
+                            />
+                        </t>
                     </t>
-                </t>
-                <t t-set-slot="control-panel-bottom-right">
-                    <t t-if="env.isSmall and props.info.actionMenus and !model.root.isVirtual">
-                        <ActionMenus
-                            activeIds="[model.root.resId]"
-                            context="props.context"
-                            items="getActionMenuItems()"
-                            isDomainSelected="model.root.isDomainSelected"
-                            resModel="model.root.resModel"
-                            domain="props.domain"
-                            onActionExecuted="() => model.load()"
-                        />
+                    <t t-set-slot="control-panel-bottom-right">
+                        <t t-if="env.isSmall and props.info.actionMenus and !model.root.isVirtual">
+                            <ActionMenus
+                                activeIds="[model.root.resId]"
+                                context="props.context"
+                                items="getActionMenuItems()"
+                                isDomainSelected="model.root.isDomainSelected"
+                                resModel="model.root.resModel"
+                                domain="props.domain"
+                                onActionExecuted="() => model.load()"
+                            />
+                        </t>
                     </t>
-                </t>
-                <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" translateAlert="translateAlert"/>
-            </Layout>
+                    <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" translateAlert="translateAlert"/>
+                </Layout>
+            </div>
         </div>
     </t>
 
diff --git a/addons/web/static/src/views/form/form_renderer.js b/addons/web/static/src/views/form/form_renderer.js
index 9034eac12dc..8725b330733 100644
--- a/addons/web/static/src/views/form/form_renderer.js
+++ b/addons/web/static/src/views/form/form_renderer.js
@@ -65,6 +65,10 @@ export class FormRenderer extends Component {
     evalDomainFromRecord(record, expr) {
         return evalDomain(expr, record.evalContext);
     }
+
+    get compileParams() {
+        return {};
+    }
 }
 
 FormRenderer.template = xml`<t t-call="{{ templates.FormRenderer }}" />`;
diff --git a/addons/web/static/src/views/view_compiler.js b/addons/web/static/src/views/view_compiler.js
index c34815ac0d8..0cc5e426e39 100644
--- a/addons/web/static/src/views/view_compiler.js
+++ b/addons/web/static/src/views/view_compiler.js
@@ -254,7 +254,8 @@ export class ViewCompiler {
             return;
         }
         if (!params.enableInvisible) {
-            let isVisileExpr = `!evalDomainFromRecord(props.record,${JSON.stringify(invisible)})`;
+            const recordExpr = params.recordExpr || "props.record";
+            let isVisileExpr = `!evalDomainFromRecord(${recordExpr},${JSON.stringify(invisible)})`;
             if (compiled.hasAttribute("t-if")) {
                 const formerTif = compiled.getAttribute("t-if");
                 isVisileExpr = `( ${formerTif} ) and ${isVisileExpr}`;
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_renderer.js b/addons/web/static/src/webclient/settings_form_view/settings_form_renderer.js
index 30552a9d0e6..9a7c4f19ed5 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_renderer.js
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_renderer.js
@@ -20,13 +20,17 @@ export class SettingsFormRenderer extends FormRenderer {
         if (!labels[this.props.archInfo.arch]) {
             labels[this.props.archInfo.arch] = [];
         }
-        this.compileParams = {
+        super.setup();
+        this.searchState = useState(this.env.searchState);
+    }
+
+    get compileParams() {
+        return {
+            ...super.compileParams,
             labels: labels[this.props.archInfo.arch],
             getFieldExpr: this.getFieldExpr,
             record: this.props.record,
         };
-        super.setup();
-        this.searchState = useState(this.env.searchState);
     }
 
     getFieldExpr(fieldName, fieldWidget) {
diff --git a/addons/web/static/src/webclient/webclient_layout.scss b/addons/web/static/src/webclient/webclient_layout.scss
index 4d35d4f298e..c225285ff2f 100644
--- a/addons/web/static/src/webclient/webclient_layout.scss
+++ b/addons/web/static/src/webclient/webclient_layout.scss
@@ -34,7 +34,7 @@ html {
         > .o_control_panel {
           flex: 0 0 auto;
         }
-        > .o_content {
+        .o_content {
           flex: 1 1 auto;
           position: relative; // Allow to redistribute the 100% height to its child
           overflow: auto;
@@ -47,7 +47,7 @@ html {
           &:not(.o_action_delegate_scroll) {
             overflow: auto;
 
-            > .o_content {
+            .o_content {
               overflow: initial;
             }
           }

From 710271240f8af09a09421d7c5e4afe20147d58f3 Mon Sep 17 00:00:00 2001
From: "Michael (mcm)" <mcm@odoo.com>
Date: Tue, 13 Sep 2022 13:52:22 +0000
Subject: [PATCH 3/4] [IMP] web: remove readonly mode of form view

This commit does multiple things:
- The readonly mode of form view is removed but not for the fields.
  it means that the fields in the view are always in edit mode except
  if we force them to be readonly.
- The control panel is revamped to take less vertical space and shows now
  the record editing (dirtiness)/validity status after editing the record.
- The record is saved only when leaving the view or by clicking the save
  button when hovering the record status in the control panel.
- The record can still be discarded by clicking the discard button when
  hovering the status text in control panel.

task id: 2822553

X-original-commit: 77824ad44b6945a9811120380747f87ef6362ae2
Part-of: odoo/odoo#101118
Co-authored-by: luvi <luvi@odoo.com>
---
 addons/account/static/src/js/tours/account.js |    2 +-
 .../static/tests/tours/tax_group_tests.js     |    5 -
 .../tests/analytic_distribution_tests.js      |    3 -
 .../static/src/tests/iban_widget_test.js      |    8 +-
 .../crm/static/tests/crm_rainbowman_tests.js  |    8 +-
 .../tours/crm_email_and_phone_propagation.js  |   22 +-
 .../static/tests/tours/crm_forecast_tour.js   |    4 -
 .../crm/static/tests/tours/crm_rainbowman.js  |    8 +-
 .../static/tests/m2x_avatar_employee_tests.js |    2 +-
 .../radio_image_field_tests.js                |   11 +-
 .../static/tests/tours/skills_tour.js         |    5 +-
 .../views/filterable_selection_field_tests.js |    5 +-
 .../tests/qunit_suite_tests/chatter_tests.js  |    4 +-
 .../components/field_text_emojis_tests.js     |   10 +-
 .../m2x_avatar_user_tests.js                  |   10 +-
 .../widgets/form_renderer_tests.js            |   39 +-
 .../src/js/tours/mass_mailing_editor_tour.js  |    8 +-
 .../static/tests/mass_mailing_html_tests.js   |   11 +-
 addons/project/static/src/js/tours/project.js |    2 +-
 .../tours/purchase_product_matrix_tour.js     |    2 +-
 .../section_one2many_field_tests.js           |    9 +-
 .../static/tests/sale_order_many2one_tests.js |    3 +-
 .../description_page_field_tests.js           |    3 +-
 .../question_page_one2many_field_tests.js     |   16 +-
 ...event_sale_with_product_configurator_ui.js |    2 +-
 .../static/src/core/datepicker/datepicker.js  |    4 +-
 .../src/search/action_menus/action_menus.js   |    5 +-
 .../src/views/basic_relational_model.js       |   13 +-
 .../web/static/src/views/fields/fields.scss   |   42 +
 .../many2many_tags/many2many_tags_field.scss  |    4 +
 .../many2many_tags_avatar_field.scss          |    4 +
 .../fields/progress_bar/progress_bar_field.js |   18 +-
 .../progress_bar/progress_bar_field.xml       |    3 -
 .../src/views/fields/relational_utils.js      |    4 +-
 .../src/views/fields/x2many/x2many_field.js   |   19 -
 .../form/control_panel/form_control_panel.js  |    6 +
 .../control_panel/form_control_panel.scss     |    6 +
 .../form/control_panel/form_control_panel.xml |   31 +
 .../static/src/views/form/form_compiler.js    |   21 +-
 .../static/src/views/form/form_controller.js  |   83 +-
 .../src/views/form/form_controller.scss       |   11 +-
 .../static/src/views/form/form_controller.xml |   48 +-
 .../form_error_dialog/form_error_dialog.js    |   66 ++
 .../form_error_dialog/form_error_dialog.scss  |   10 +
 .../form_error_dialog/form_error_dialog.xml   |   17 +
 .../web/static/src/views/form/form_label.js   |    5 +-
 .../static/src/views/form/form_renderer.js    |    8 +-
 .../form_status_indicator.js                  |   35 +
 .../form_status_indicator.scss                |   15 +
 .../form_status_indicator.xml                 |   21 +
 addons/web/static/src/views/form/form_view.js |    3 +-
 .../status_bar_buttons/status_bar_buttons.js  |    5 +-
 .../static/src/views/list/list_renderer.js    |    7 -
 .../src/views/view_button/view_button.js      |    6 +
 .../src/views/view_button/view_button_hook.js |   22 +-
 .../settings_form_view/settings_form_view.js  |    2 +
 addons/web/static/tests/helpers/utils.js      |   14 +-
 .../tests/mobile/mobile_form_view_tests.js    |   44 -
 .../mobile/mobile_statusbar_field_tests.js    |    4 +-
 .../views/fields/ace_editor_field_tests.js    |    3 +-
 .../tests/views/fields/binary_field_tests.js  |  113 +-
 .../fields/boolean_favorite_field_tests.js    |    8 +-
 .../tests/views/fields/boolean_field_tests.js |   27 +-
 .../fields/boolean_toggle_field_tests.js      |   11 +-
 .../tests/views/fields/char_field_tests.js    |   98 +-
 .../tests/views/fields/color_field_tests.js   |    3 +-
 .../views/fields/color_picker_field_tests.js  |    6 -
 .../tests/views/fields/date_field_tests.js    |   62 +-
 .../views/fields/daterange_field_tests.js     |   71 +-
 .../views/fields/datetime_field_tests.js      |   33 +-
 .../tests/views/fields/domain_field_tests.js  |   50 +-
 .../tests/views/fields/email_field_tests.js   |   33 +-
 .../views/fields/float_factor_field_tests.js  |   15 +-
 .../tests/views/fields/float_field_tests.js   |  101 +-
 .../views/fields/float_time_field_tests.js    |   24 +-
 .../views/fields/float_toggle_field_tests.js  |    5 +-
 .../tests/views/fields/handle_field_tests.js  |   20 +-
 .../tests/views/fields/html_field_tests.js    |   28 +-
 .../tests/views/fields/image_field_tests.js   |   38 +-
 .../views/fields/image_url_field_tests.js     |    2 +-
 .../tests/views/fields/integer_field_tests.js |   52 +-
 .../fields/label_selection_field_tests.js     |   46 -
 .../fields/many2many_binary_field_tests.js    |   25 +-
 .../many2many_checkboxes_field_tests.js       |   45 +-
 .../views/fields/many2many_field_tests.js     |   72 +-
 .../many2many_tags_avatar_field_tests.js      |   21 +-
 .../fields/many2many_tags_field_tests.js      |   35 +-
 .../fields/many2one_avatar_field_tests.js     |   10 +-
 .../views/fields/many2one_field_tests.js      |  172 ++-
 .../views/fields/monetary_field_tests.js      |  138 +--
 .../views/fields/numeric_fields_tests.js      |    3 -
 .../views/fields/one2many_field_tests.js      |  356 +-----
 .../views/fields/pdf_viewer_field_tests.js    |   11 +-
 .../views/fields/percent_pie_field_tests.js   |   10 +-
 .../views/fields/percentage_field_tests.js    |   16 +-
 .../tests/views/fields/phone_field_tests.js   |   28 +-
 .../views/fields/priority_field_tests.js      |   10 +-
 .../views/fields/progress_bar_field_tests.js  |  111 +-
 .../views/fields/properties_field_tests.js    |   36 +-
 .../tests/views/fields/radio_field_tests.js   |   27 +-
 .../views/fields/reference_field_tests.js     |   51 +-
 .../fields/remaining_days_field_tests.js      |   65 +-
 .../views/fields/selection_field_tests.js     |   57 +-
 .../views/fields/signature_field_tests.js     |    5 +-
 .../views/fields/stat_info_field_tests.js     |  110 +-
 .../fields/state_selection_field_tests.js     |    2 -
 .../views/fields/statusbar_field_tests.js     |    5 -
 .../tests/views/fields/text_field_tests.js    |   49 +-
 .../tests/views/fields/url_field_tests.js     |  102 +-
 .../tests/views/form/form_compiler_tests.js   |   15 +-
 .../tests/views/form/form_view_tests.js       | 1039 +++++------------
 .../web/static/tests/views/list_view_tests.js |   46 +-
 .../view_dialogs/form_view_dialog_tests.js    |    3 +-
 .../select_create_dialog_tests.js             |    1 -
 .../views/widgets/attach_document_tests.js    |    3 +-
 .../tests/views/widgets/week_days_tests.js    |   12 +-
 .../webclient/actions/concurrency_tests.js    |    4 +-
 .../webclient/actions/window_action_tests.js  |  115 +-
 .../web_tour/static/src/js/tour_step_utils.js |   27 +-
 .../slide_category_one2many_field_tests.js    |    7 +-
 .../static/tests/tours/main_flow.js           |   73 +-
 .../static/tests/tours/constraint.js          |    2 +-
 .../test_new_api/static/tests/tours/x2many.js |   40 +-
 odoo/tests/common.py                          |    2 +-
 124 files changed, 1549 insertions(+), 3069 deletions(-)
 create mode 100644 addons/web/static/src/views/form/control_panel/form_control_panel.js
 create mode 100644 addons/web/static/src/views/form/control_panel/form_control_panel.scss
 create mode 100644 addons/web/static/src/views/form/control_panel/form_control_panel.xml
 create mode 100644 addons/web/static/src/views/form/form_error_dialog/form_error_dialog.js
 create mode 100644 addons/web/static/src/views/form/form_error_dialog/form_error_dialog.scss
 create mode 100644 addons/web/static/src/views/form/form_error_dialog/form_error_dialog.xml
 create mode 100644 addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
 create mode 100644 addons/web/static/src/views/form/form_status_indicator/form_status_indicator.scss
 create mode 100644 addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml

diff --git a/addons/account/static/src/js/tours/account.js b/addons/account/static/src/js/tours/account.js
index 010a156432a..b2b2f1ca97d 100644
--- a/addons/account/static/src/js/tours/account.js
+++ b/addons/account/static/src/js/tours/account.js
@@ -86,7 +86,7 @@ tour.register('account_tour', {
     ...tour.stepUtils.saveForm(),
     {
         trigger: "button[name=action_post]",
-        extra_trigger: "button.o_form_button_edit",
+        extra_trigger: "button.o_form_button_create",
         content: _t("Once your invoice is ready, press CONFIRM."),
     }, {
         trigger: "button[name=action_invoice_sent]",
diff --git a/addons/account/static/tests/tours/tax_group_tests.js b/addons/account/static/tests/tours/tax_group_tests.js
index 7d7d0b33329..4133825b607 100644
--- a/addons/account/static/tests/tours/tax_group_tests.js
+++ b/addons/account/static/tests/tours/tax_group_tests.js
@@ -63,11 +63,6 @@ tour.register('account_tax_group', {
         content: "Save the account move",
         trigger: '.o_form_button_save',
     },
-    // Edit account.move
-    {
-        content: "Edit the account move",
-        trigger: '.o_form_button_edit',
-    },
     // Edit tax group amount
     {
         content: "Edit tax group amount",
diff --git a/addons/analytic/static/tests/analytic_distribution_tests.js b/addons/analytic/static/tests/analytic_distribution_tests.js
index 1ef871906e8..8924c1f42b2 100644
--- a/addons/analytic/static/tests/analytic_distribution_tests.js
+++ b/addons/analytic/static/tests/analytic_distribution_tests.js
@@ -2,7 +2,6 @@
 
 import {
     click,
-    clickEdit,
     getFixture,
 } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
@@ -139,8 +138,6 @@ QUnit.module("Analytic", (hooks) => {
             "should have rendered 'FI 69.7%'"
         );
 
-        await clickEdit(target);
-
         assert.containsN(
             target,
             ".o_delete",
diff --git a/addons/base_iban/static/src/tests/iban_widget_test.js b/addons/base_iban/static/src/tests/iban_widget_test.js
index b3848d2d27f..769fae6159c 100644
--- a/addons/base_iban/static/src/tests/iban_widget_test.js
+++ b/addons/base_iban/static/src/tests/iban_widget_test.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 import { start, startServer } from '@mail/../tests/helpers/test_utils';
-import { click, clickEdit, clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { DELAY } from "@base_iban/components/iban_widget/iban_widget";
 
 
@@ -55,8 +55,6 @@ QUnit.module('Fields', {}, function () {
     QUnit.test('Iban Widget full flow', async assert => {
         const { target, advanceTime, afterNextRender } = await openPreparedView(assert, [validIban], "");
 
-        assert.containsNone(target, ".o_iban", "Shouldn't display any validation icon while not editing");
-        await clickEdit(target);
         assert.containsNone(target, ".o_iban",
             "Shouldn't display any validation icon while not editing a specific line");
 
@@ -73,10 +71,6 @@ QUnit.module('Fields', {}, function () {
         await clickSave(target);
         assert.containsNone(target, ".o_iban", "Shouldn't display any validation while not editing");
 
-        await clickEdit(target);
-        assert.containsNone(target, ".o_iban",
-            "Shouldn't display any validation icon while not editing a specific line");
-
         await click(target, "td.o_iban_cell");
         await afterNextRender(() => advanceTime(DELAY));
         assert.containsOnce(target, "i.fa.fa-times.o_iban_fail", "The validation icon should be present while clicking on an already filled IBAN");
diff --git a/addons/crm/static/tests/crm_rainbowman_tests.js b/addons/crm/static/tests/crm_rainbowman_tests.js
index 15d6836ed3d..82723d2223d 100644
--- a/addons/crm/static/tests/crm_rainbowman_tests.js
+++ b/addons/crm/static/tests/crm_rainbowman_tests.js
@@ -4,7 +4,6 @@ import "@crm/../tests/mock_server";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import {
     click,
-    clickEdit,
     clickSave,
     dragAndDrop,
     getFixture,
@@ -125,6 +124,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 6,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
@@ -139,7 +139,6 @@ QUnit.module('Crm Rainbowman Triggers', {
             resId: 6,
             mockRPC: getMockRpc(assert),
         });
-        await clickEdit(target);
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
         assert.verifySteps([]); // no message displayed yet
@@ -155,6 +154,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 2,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
@@ -168,6 +168,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 1,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
@@ -181,6 +182,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 8,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
@@ -194,6 +196,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 10,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='3']"));
@@ -207,6 +210,7 @@ QUnit.module('Crm Rainbowman Triggers', {
             ...this.testFormView,
             resId: 1,
             mockRPC: getMockRpc(assert),
+            mode: "readonly",
         });
 
         await click(target.querySelector(".o_statusbar_status button[data-value='2']"));
diff --git a/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js b/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js
index 3ccb30554e7..0e132f105c4 100644
--- a/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js
+++ b/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js
@@ -15,18 +15,11 @@ odoo.define('crm.crm_email_and_phone_propagation', function (require) {
             trigger: '.o_kanban_record .o_kanban_record_title span:contains(Test Lead Propagation)',
             content: 'Open the first lead',
             run: 'click',
-        }, {
-            trigger: '.o_form_button_edit',
-            extra_trigger: '.o_lead_opportunity_form.o_form_readonly',
-            content: 'Edit the lead',
-            run: 'click',
         }, {
             trigger: '.o_form_button_save',
             extra_trigger: '.o_form_editable .o_field_widget[name=email_from] input',
             content: 'Save the lead',
             run: 'click',
-        }, {
-            trigger: '.o_form_readonly',
         },
     ]);
 
@@ -42,10 +35,6 @@ odoo.define('crm.crm_email_and_phone_propagation', function (require) {
             trigger: '.o_kanban_record .o_kanban_record_title span:contains(Test Lead Propagation)',
             content: 'Open the first lead',
             run: 'click',
-        }, {
-            trigger: '.o_form_button_edit',
-            content: 'Edit the lead',
-            run: 'click',
         }, {
             trigger: '.o_form_editable .o_field_widget[name=email_from] input',
             extra_trigger: '.o_form_editable .o_field_widget[name=phone] input',
@@ -55,14 +44,13 @@ odoo.define('crm.crm_email_and_phone_propagation', function (require) {
                 action.remove_text("", ".o_form_editable .o_field_widget[name=phone] input");
             },
         }, {
-            trigger: '.o_form_button_save',
+            trigger: '.o_back_button',
             // wait the the warning message to be visible
             extra_trigger: '.o_form_sheet_bg .fa-exclamation-triangle:not(.o_invisible_modifier)',
-            content: 'Save the lead',
+            content: 'Save the lead and exit to kanban',
             run: 'click',
-        }, {
-            trigger: '.o_form_readonly',
-        },
+        },{
+            trigger: '.o_kanban_renderer',
+        }
     ]);
-
 });
diff --git a/addons/crm/static/tests/tours/crm_forecast_tour.js b/addons/crm/static/tests/tours/crm_forecast_tour.js
index 742b2a54204..e5d99938e1f 100644
--- a/addons/crm/static/tests/tours/crm_forecast_tour.js
+++ b/addons/crm/static/tests/tours/crm_forecast_tour.js
@@ -64,10 +64,6 @@ tour.register('crm_forecast', {
         trigger: ".o_kanban_record .o_kanban_record_title:contains('Test Opportunity 1')",
         content: "edit lead",
         run: "click"
-    }, {
-        trigger: ".o_form_button_edit",
-        content: "edit datetime",
-        run: "click"
     }, {
         trigger: ".o_field_widget[name=date_deadline] input",
         content: "complete expected closing",
diff --git a/addons/crm/static/tests/tours/crm_rainbowman.js b/addons/crm/static/tests/tours/crm_rainbowman.js
index f56e3404220..3189d0d810c 100644
--- a/addons/crm/static/tests/tours/crm_rainbowman.js
+++ b/addons/crm/static/tests/tours/crm_rainbowman.js
@@ -60,14 +60,18 @@
         }, {
             trigger: ".o_statusbar_status button[data-value='4']",
             content: "move lead to won stage",
-        }, {
+        },
+        ...tour.stepUtils.saveForm(),
+        {
             trigger: ".o_statusbar_status button[data-value='1']",
             extra_trigger: ".o_reward_rainbow",
             content: "move lead to previous stage & rainbowman appears",
         }, {
             trigger: "button[name=action_set_won_rainbowman]",
             content: "click button mark won",
-        }, {
+        },
+        ...tour.stepUtils.saveForm(),
+        {
             trigger: ".o_menu_brand",
             extra_trigger: ".o_reward_rainbow",
             content: "last rainbowman appears",
diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js
index 03c7c049346..17d576427b6 100644
--- a/addons/hr/static/tests/m2x_avatar_employee_tests.js
+++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js
@@ -183,7 +183,7 @@ QUnit.module('hr', {}, function () {
             res_id: m2xHrAvatarUserId1,
             views: [[false, 'form']],
         });
-        assert.strictEqual(document.querySelector('.o_field_widget[name=employee_id]').innerText.trim(), 'Mario');
+        assert.strictEqual(document.querySelector('.o_field_widget[name=employee_id] input').value.trim(), 'Mario');
 
         await dom.click(document.querySelector('.o_m2o_avatar > img'));
 
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/radio_image_field_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/radio_image_field_tests.js
index 5669d0edc3a..a9be64ae707 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/radio_image_field_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/radio_image_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, clickEdit, clickSave, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -42,11 +42,6 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             arch: '<form><field name="product_id" widget="hr_holidays_radio_image"/></form>',
         });
-        assert.containsOnce(target, ".o_field_widget.o_field_hr_holidays_radio_image");
-        assert.containsNone(target, ".o_radio_input");
-        assert.containsNone(target, "img");
-
-        await clickEdit(target);
 
         assert.containsOnce(target, ".o_field_widget.o_field_hr_holidays_radio_image");
         assert.containsN(target, ".o_radio_input", 3);
@@ -58,7 +53,7 @@ QUnit.module("Fields", (hooks) => {
 
         await clickSave(target);
         assert.containsOnce(target, ".o_field_widget.o_field_hr_holidays_radio_image");
-        assert.containsNone(target, ".o_radio_input");
-        assert.containsOnce(target, "img", 1);
+        assert.containsN(target, ".o_radio_input", 3);
+        assert.containsN(target, "img", 3);
     });
 });
diff --git a/addons/hr_skills/static/tests/tours/skills_tour.js b/addons/hr_skills/static/tests/tours/skills_tour.js
index 85e26f1cdfd..b630ad37d4c 100644
--- a/addons/hr_skills/static/tests/tours/skills_tour.js
+++ b/addons/hr_skills/static/tests/tours/skills_tour.js
@@ -24,10 +24,6 @@ tour.register('hr_skills_tour', {
         content: "Save",
         trigger: ".o_form_button_save",
     },
-    {
-        content: "Switch to edit",
-        trigger: ".o_form_button_edit",
-    },
     {
         content: "Add a new Resume experience",
         trigger: ".o_field_resume_one2many tr.o_resume_group_header button.btn-secondary",
@@ -50,6 +46,7 @@ tour.register('hr_skills_tour', {
     {
         content: "Save it",
         trigger: ".o_form_button_save",
+        in_modal: true,
         run: "click",
     },
     {
diff --git a/addons/loyalty/static/tests/views/filterable_selection_field_tests.js b/addons/loyalty/static/tests/views/filterable_selection_field_tests.js
index 11a90ed71f5..300b035819d 100644
--- a/addons/loyalty/static/tests/views/filterable_selection_field_tests.js
+++ b/addons/loyalty/static/tests/views/filterable_selection_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editSelect, getFixture } from "@web/../tests/helpers/utils";
+import { editSelect, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -47,7 +47,6 @@ QUnit.module("Fields", (hooks) => {
                     <field name="program_type" widget="filterable_selection" options="{'whitelisted_values': ['coupon', 'promotion']}"/>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         assert.containsN(target, "select option", 3);
         assert.containsOnce(
@@ -71,7 +70,6 @@ QUnit.module("Fields", (hooks) => {
                     <field name="program_type" widget="filterable_selection" options="{'blacklisted_values': ['gift_card']}"/>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         assert.containsN(target, "select option", 3);
         assert.containsOnce(
@@ -96,7 +94,6 @@ QUnit.module("Fields", (hooks) => {
                     <field name="program_type" widget="filterable_selection" options="{'blacklisted_values': ['gift_card']}"/>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         assert.containsN(target, "select option", 4);
         assert.containsOnce(
diff --git a/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js b/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
index d7fdebec780..9cd0bff5026 100644
--- a/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
@@ -4,7 +4,7 @@ import { start, startServer } from '@mail/../tests/helpers/test_utils';
 import { ROUTES_TO_IGNORE } from '@mail/../tests/helpers/webclient_setup';
 
 import testUtils from 'web.test_utils';
-import { clickEdit, patchWithCleanup, selectDropdownItem } from '@web/../tests/helpers/utils';
+import { patchWithCleanup, selectDropdownItem } from '@web/../tests/helpers/utils';
 import { ListController } from "@web/views/list/list_controller";
 
 QUnit.module('mail', {}, function () {
@@ -489,8 +489,6 @@ QUnit.test('many2many_tags_email widget can load more than 40 records', async fu
 
     assert.strictEqual(document.querySelectorAll('.o_field_widget[name="partner_ids"] .badge').length, 100);
 
-    await clickEdit(document.body);
-
     assert.containsOnce(document.body, '.o_form_editable');
 
     // add a record to the relation
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/field_text_emojis_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/field_text_emojis_tests.js
index b48a21bf78f..ed9f43f7a63 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/field_text_emojis_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/field_text_emojis_tests.js
@@ -1,6 +1,6 @@
 /**@odoo-module **/
 
-import { clickEdit, clickSave, getFixture } from "@web/../tests/helpers/utils";
+import { getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 QUnit.module("Field text emojis", (hooks) => {
@@ -34,13 +34,7 @@ QUnit.module("Field text emojis", (hooks) => {
 
         assert.containsOnce(target, ".o_field_text_emojis");
         assert.containsOnce(target, ".o_field_text_emojis button");
-        assert.isNotVisible(target.querySelector(".o_field_text_emojis button"));
-
-        await clickEdit(target);
+        assert.isVisible(target.querySelector(".o_field_text_emojis button"));
         assert.isVisible(target, ".o_field_text_emojis button .fa-smile");
-
-        await clickSave(target);
-        assert.containsOnce(target, ".o_field_text_emojis button");
-        assert.isNotVisible(target.querySelector(".o_field_text_emojis button"));
     });
 });
diff --git a/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js b/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
index 5826d05e1cd..a72ae912db8 100644
--- a/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
@@ -143,7 +143,7 @@ QUnit.module('mail', {}, function () {
             'view_mode': 'form',
             'views': [[false, 'form']],
         });
-        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user > div > a").textContent, "Mario")
+        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user input").value, "Mario")
 
         triggerHotkey("control+k")
         await nextTick();
@@ -161,7 +161,7 @@ QUnit.module('mail', {}, function () {
           ])
         await click(target, "#o_command_3")
         await nextTick();
-        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user > div > a").textContent, "Luigi")
+        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user input").value, "Luigi")
     });
 
     QUnit.test('many2one_avatar_user widget edited by the smart action "Assign to me"', async function (assert) {
@@ -184,7 +184,7 @@ QUnit.module('mail', {}, function () {
             'view_mode': 'form',
             'views': [[false, 'form']],
         });
-        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user > div > a").textContent, "Mario")
+        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user input").value, "Mario")
         triggerHotkey("control+k")
         await nextTick();
         const idx = [...target.querySelectorAll(".o_command")].map(el => el.textContent).indexOf("Assign/Unassign to meALT + SHIFT + I")
@@ -193,14 +193,14 @@ QUnit.module('mail', {}, function () {
         // Assign me (Luigi)
         triggerHotkey("alt+shift+i")
         await nextTick();
-        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user > div > a").textContent, "Luigi")
+        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user input").value, "Luigi")
 
         // Unassign me
         triggerHotkey("control+k");
         await nextTick();
         await click([...target.querySelectorAll(".o_command")][idx])
         await nextTick();
-        assert.containsNone(target, ".o_field_many2one_avatar_user > div > a");
+        assert.strictEqual(target.querySelector(".o_field_many2one_avatar_user input").value, "")
     });
 
     QUnit.test('many2many_avatar_user widget edited by the smart action "Assign to..."', async function (assert) {
diff --git a/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js b/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
index 4263e194f71..4d63990a93c 100644
--- a/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
@@ -560,7 +560,7 @@ QUnit.test('chatter should become enabled when creation done', async function (a
 });
 
 QUnit.test('read more/less links are not duplicated when switching from read to edit mode', async function (assert) {
-    assert.expect(5);
+    assert.expect(3);
 
     const pyEnv = await startServer();
     const resPartnerId1 = pyEnv['res.partner'].create({});
@@ -622,33 +622,10 @@ QUnit.test('read more/less links are not duplicated when switching from read to
         '.o_Message_readMoreLess',
         "there should be only one read more"
     );
-    await afterNextRender(() => afterEvent({
-        eventName: 'o-component-message-read-more-less-inserted',
-        func: () => document.querySelector('.o_form_button_edit').click(),
-        message: "should wait until read more/less is inserted after clicking on edit",
-        predicate: ({ message }) => message.id === mailMessageId1,
-    }));
-    assert.containsOnce(
-        document.body,
-        '.o_Message_readMoreLess',
-        "there should still be only one read more after switching to edit mode"
-    );
-
-    await afterNextRender(() => afterEvent({
-        eventName: 'o-component-message-read-more-less-inserted',
-        func: () => document.querySelector('.o_form_button_cancel').click(),
-        message: "should wait until read more/less is inserted after canceling edit",
-        predicate: ({ message }) => message.id === mailMessageId1,
-    }));
-    assert.containsOnce(
-        document.body,
-        '.o_Message_readMoreLess',
-        "there should still be only one read more after switching back to read mode"
-    );
 });
 
 QUnit.test('read more links becomes read less after being clicked', async function (assert) {
-    assert.expect(6);
+    assert.expect(5);
 
     const pyEnv = await startServer();
     const resPartnerId1 = pyEnv['res.partner'].create({});
@@ -716,18 +693,6 @@ QUnit.test('read more links becomes read less after being clicked', async functi
         "Read More/Less link should contain 'Read More' as text"
     );
 
-    await afterNextRender(() => afterEvent({
-        eventName: 'o-component-message-read-more-less-inserted',
-        func: () => document.querySelector('.o_form_button_edit').click(),
-        message: "should wait until read more/less is inserted after clicking on edit",
-        predicate: ({ message }) => message.id === mailMessageId1,
-    }));
-    assert.strictEqual(
-        document.querySelector('.o_Message_readMoreLess').textContent,
-        'Read More',
-        "Read More/Less link should contain 'Read More' as text"
-    );
-
     document.querySelector('.o_Message_readMoreLess').click();
     assert.strictEqual(
         document.querySelector('.o_Message_readMoreLess').textContent,
diff --git a/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js b/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js
index ef194c00ad0..95ce87fbec8 100644
--- a/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js
+++ b/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js
@@ -47,9 +47,11 @@ odoo.define('mass_mailing.mass_mailing_editor_tour', function (require) {
         trigger: 'input[name="subject"]',
         run: 'text Test',
     }, {
-        trigger: 'button.o_form_button_save',
-    }, {
-        trigger: 'iframe.o_readonly',
+        trigger: '.o_form_view', // blur previous input
+    },
+    ...tour.stepUtils.saveForm(),
+    {
+        trigger: 'iframe .o_editable',
         run: () => {},
     }]);
 });
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js
index 6a7c37b1d02..920beb418eb 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js
@@ -69,7 +69,7 @@ QUnit.module('field html', (hooks) => {
     });
 
     QUnit.test('save arch and html', async function (assert) {
-        assert.expect(4);
+        assert.expect(2);
 
         await makeView({
             type: "form",
@@ -95,15 +95,6 @@ QUnit.module('field html', (hooks) => {
         let fieldReadonly = fixture.querySelector('.o_field_widget[name="body_html"]');
         let fieldEdit = fixture.querySelector('.o_field_widget[name="body_arch"]');
 
-        assert.strictEqual($(fieldReadonly).css('display'), 'block', "should display the readonly mode");
-        assert.strictEqual($(fieldEdit).css('display'), 'none', "should hide the edit mode");
-
-        await testUtils.clickEdit(fixture);
-        await testUtils.nextTick();
-
-        fieldReadonly = fixture.querySelector('.o_field_widget[name="body_html"]');
-        fieldEdit = fixture.querySelector('.o_field_widget[name="body_arch"]');
-
         assert.strictEqual($(fieldReadonly).css('display'), 'none', "should hide the readonly mode");
         assert.strictEqual($(fieldEdit).css('display'), 'block', "should display the edit mode");
     });
diff --git a/addons/project/static/src/js/tours/project.js b/addons/project/static/src/js/tours/project.js
index ab7289dd9a4..9f836dcc083 100644
--- a/addons/project/static/src/js/tours/project.js
+++ b/addons/project/static/src/js/tours/project.js
@@ -108,7 +108,7 @@ tour.register('project_tour', {
     run: "click",
 }, {
     trigger: ".breadcrumb-item:not(.active):last",
-    extra_trigger: '.o_form_project_tasks.o_form_readonly',
+    extra_trigger: '.o_form_project_tasks.o_form_saved',
     content: Markup(_t("Let's go back to the <b>kanban view</b> to have an overview of your next tasks.")),
     position: "right",
     run: 'click',
diff --git a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
index 9366face458..43dbd58d957 100644
--- a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
+++ b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
@@ -101,7 +101,7 @@ tour.register('purchase_matrix_tour', {
 }, {
     trigger: 'span:contains("Confirm")',
     run: 'click' // apply the matrix
-}, ...tour.stepUtils.saveForm('.o_field_cell.o_data_cell.o_list_number:contains("8.20")')
+}, ...tour.stepUtils.saveForm({ extra_trigger: '.o_field_cell.o_data_cell.o_list_number:contains("8.20")' })
 ]);
 
 
diff --git a/addons/resource/static/tests/components/section_one2many_field_tests.js b/addons/resource/static/tests/components/section_one2many_field_tests.js
index 94167d4f121..56cb49e773b 100644
--- a/addons/resource/static/tests/components/section_one2many_field_tests.js
+++ b/addons/resource/static/tests/components/section_one2many_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module */
 
-import { clickEdit, getFixture } from "@web/../tests/helpers/utils";
+import { getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 QUnit.module("SectionOneToManyField", (hooks) => {
@@ -73,13 +73,8 @@ QUnit.module("SectionOneToManyField", (hooks) => {
         assert.doesNotHaveClass(rows[1], "o_is_line_section fw-bold");
         assert.strictEqual(rows[0].textContent, "firstSectionTitle");
         assert.strictEqual(rows[1].textContent, "recordTitle5");
-        assert.strictEqual(rows[0].querySelector("td[name=title]").getAttribute("colspan"), "2");
+        assert.strictEqual(rows[0].querySelector("td[name=title]").getAttribute("colspan"), "3");
         assert.strictEqual(rows[1].querySelector("td[name=title]").getAttribute("colspan"), null);
-
-        assert.containsNone(target, ".o_list_record_remove");
-
-        await clickEdit(target);
-
         assert.containsOnce(target, ".o_list_record_remove");
         assert.containsNone(target, ".o_is_line_section .o_list_record_remove");
     });
diff --git a/addons/sale_expense/static/tests/sale_order_many2one_tests.js b/addons/sale_expense/static/tests/sale_order_many2one_tests.js
index 2e33a52b6ef..740fb2ae062 100644
--- a/addons/sale_expense/static/tests/sale_order_many2one_tests.js
+++ b/addons/sale_expense/static/tests/sale_order_many2one_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
-import { clickDropdown, clickEdit, getFixture } from "@web/../tests/helpers/utils";
+import { clickDropdown, getFixture } from "@web/../tests/helpers/utils";
 
 
 QUnit.module('sale_expense', {
@@ -67,7 +67,6 @@ QUnit.module('sale_expense', {
                 '<form><field name="sale_order_id" widget="sale_order_many2one"/></form>'
         });
 
-        await clickEdit(this.target);
         await clickDropdown(this.target, "sale_order_id");
 
         assert.containsN(this.target, 'li.o-autocomplete--dropdown-item', 9);
diff --git a/addons/survey/static/tests/components/description_page_field_tests.js b/addons/survey/static/tests/components/description_page_field_tests.js
index 9e8687be88d..dbc5cb6e4cb 100644
--- a/addons/survey/static/tests/components/description_page_field_tests.js
+++ b/addons/survey/static/tests/components/description_page_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module */
 
-import { click, clickEdit, getFixture } from "@web/../tests/helpers/utils";
+import { click, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 QUnit.module("DescriptionPageField", (hooks) => {
@@ -78,7 +78,6 @@ QUnit.module("DescriptionPageField", (hooks) => {
             assert.containsN(target, "td.o_survey_description_page_cell", 2);
             assert.containsNone(target, "button.o_icon_button");
 
-            await clickEdit(target);
             await click(target.querySelector(".o_data_cell"));
             assert.containsOnce(target.querySelector(".o_data_row"), "button.o_icon_button");
             assert.containsNone(target, ".modal .o_form_view");
diff --git a/addons/survey/static/tests/components/question_page_one2many_field_tests.js b/addons/survey/static/tests/components/question_page_one2many_field_tests.js
index d7c70bc3447..a1abe443f02 100644
--- a/addons/survey/static/tests/components/question_page_one2many_field_tests.js
+++ b/addons/survey/static/tests/components/question_page_one2many_field_tests.js
@@ -1,13 +1,6 @@
 /** @odoo-module */
 
-import {
-    click,
-    clickEdit,
-    editInput,
-    getFixture,
-    nextTick,
-    triggerHotkey,
-} from "@web/../tests/helpers/utils";
+import { click, editInput, getFixture, nextTick, triggerHotkey } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 QUnit.module("QuestionPageOneToManyField", (hooks) => {
@@ -108,7 +101,9 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
                     </field>
                 </form>
             `,
+            mode: "readonly",
         });
+
         await click(target.querySelector(".o_data_cell"));
         assert.containsNone(target, ".o_selected_row");
         assert.containsOnce(target, ".modal .o_form_view");
@@ -131,7 +126,6 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
                     </field>
                 </form>`,
         });
-        await clickEdit(target);
         await click(target.querySelector(".o_data_cell"));
         assert.hasClass(target.querySelector(".o_is_section"), "o_selected_row");
         assert.containsNone(target, ".modal .o_form_view");
@@ -155,7 +149,6 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
                 </form>
             `,
         });
-        await clickEdit(target);
         await click(target.querySelector(".o_data_row:nth-child(2) .o_data_cell"));
         assert.containsNone(target, ".o_selected_row");
         assert.containsOnce(target, ".modal .o_form_view");
@@ -184,7 +177,6 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
             `,
         });
 
-        await clickEdit(target);
         assert.containsNone(target, ".o_selected_row");
 
         await click(target.querySelectorAll(".o_field_x2many_list_row_add a")[1]);
@@ -215,7 +207,6 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
             `,
         });
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         assert.containsNone(target, ".o_selected_row");
         assert.containsOnce(target, ".modal .o_form_view");
@@ -241,7 +232,6 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
                 </form>
             `,
             });
-            await clickEdit(target);
             await click(target.querySelector(".o_data_row .o_data_cell"));
             assert.containsOnce(target, ".o_selected_row.o_is_section");
 
diff --git a/addons/test_sale_product_configurators/static/tests/tours/event_sale_with_product_configurator_ui.js b/addons/test_sale_product_configurators/static/tests/tours/event_sale_with_product_configurator_ui.js
index 97ab0359514..90d257762ad 100644
--- a/addons/test_sale_product_configurators/static/tests/tours/event_sale_with_product_configurator_ui.js
+++ b/addons/test_sale_product_configurators/static/tests/tours/event_sale_with_product_configurator_ui.js
@@ -113,5 +113,5 @@ tour.register('event_sale_with_product_configurator_tour', {
     in_modal: false,
 }, {
     trigger: '.o_event_sale_js_event_configurator_ok',
-}, ...tour.stepUtils.saveForm('.o_field_cell.o_data_cell.o_list_number:contains("60.00")'),
+}, ...tour.stepUtils.saveForm({ extra_trigger: '.o_field_cell.o_data_cell.o_list_number:contains("60.00")' }),
 ]);
diff --git a/addons/web/static/src/core/datepicker/datepicker.js b/addons/web/static/src/core/datepicker/datepicker.js
index 81ba4fdbfa0..599558b3e74 100644
--- a/addons/web/static/src/core/datepicker/datepicker.js
+++ b/addons/web/static/src/core/datepicker/datepicker.js
@@ -171,7 +171,7 @@ export class DatePicker extends Component {
      */
     updateInput({ useStatic } = {}) {
         const [formattedDate] = this.formatValue(this.date, this.getOptions(useStatic));
-        if (formattedDate) {
+        if (formattedDate !== null) {
             this.inputRef.el.value = formattedDate;
         }
     }
@@ -230,7 +230,7 @@ export class DatePicker extends Component {
             // Reset to default (= given) date.
             this.updateInput();
         }
-        if (!areDateEquals(this.date, parsedDate)) {
+        if (parsedDate !== null && !areDateEquals(this.date, parsedDate)) {
             this.props.onDateTimeChanged(parsedDate);
         }
     }
diff --git a/addons/web/static/src/search/action_menus/action_menus.js b/addons/web/static/src/search/action_menus/action_menus.js
index fdecb049424..224abd8f176 100644
--- a/addons/web/static/src/search/action_menus/action_menus.js
+++ b/addons/web/static/src/search/action_menus/action_menus.js
@@ -111,7 +111,8 @@ export class ActionMenus extends Component {
      * @private
      * @param {Object} item
      */
-    onItemSelected(item) {
+    async onItemSelected(item) {
+        await this.props.onBeforeAction(item);
         if (item.callback) {
             item.callback([item]);
         } else if (item.action) {
@@ -142,8 +143,10 @@ ActionMenus.props = {
         },
     },
     onActionExecuted: { type: Function, optional: true },
+    onBeforeAction: { type: Function, optional: true },
 };
 ActionMenus.defaultProps = {
     onActionExecuted: () => {},
+    onBeforeAction: () => {},
 };
 ActionMenus.template = "web.ActionMenus";
diff --git a/addons/web/static/src/views/basic_relational_model.js b/addons/web/static/src/views/basic_relational_model.js
index c7b0b01b4a4..719209b13f2 100644
--- a/addons/web/static/src/views/basic_relational_model.js
+++ b/addons/web/static/src/views/basic_relational_model.js
@@ -326,6 +326,10 @@ export class Record extends DataPoint {
         return !this.resId;
     }
 
+    get isValid() {
+        return !this._invalidFields.size;
+    }
+
     get resId() {
         if (this.__bm_handle__) {
             const resId = this.model.__bm__.localData[this.__bm_handle__].res_id;
@@ -349,6 +353,10 @@ export class Record extends DataPoint {
         return Promise.all([...proms, this._updatePromise]);
     }
 
+    // -------------------------------------------------------------------------
+    // Getters
+    // -------------------------------------------------------------------------
+
     async checkValidity(urgent) {
         if (!urgent) {
             await this.askChanges();
@@ -685,7 +693,7 @@ export class Record extends DataPoint {
      *  reloading after changes are applied, typically used to defer the load.
      * @returns {Promise<boolean>}
      */
-    async save(options = { stayInEdition: false, noReload: false, savePoint: false }) {
+    async save(options = { stayInEdition: true, noReload: false, savePoint: false }) {
         const shouldSwitchToReadonly = !options.stayInEdition && this.isInEdition;
         let resolveSavePromise;
         this._savePromise = new Promise((r) => {
@@ -810,9 +818,6 @@ export class Record extends DataPoint {
         this.model.__bm__.discardChanges(this.__bm_handle__);
         this._invalidFields = new Set();
         this.__syncData();
-        if (this.resId) {
-            this.switchMode("readonly");
-        }
         this.model.notify();
     }
 
diff --git a/addons/web/static/src/views/fields/fields.scss b/addons/web/static/src/views/fields/fields.scss
index d877330e9e6..579411fe1e0 100644
--- a/addons/web/static/src/views/fields/fields.scss
+++ b/addons/web/static/src/views/fields/fields.scss
@@ -1,3 +1,45 @@
 .o_field_cursor_disabled {
     cursor: not-allowed;
 }
+
+.o_field_widget:not(.o_legacy_field_widget) {
+    .o_input {
+        border: $input-border-width solid transparent;
+        padding: $o-input-padding-y $o-input-padding-x;
+
+        &:hover, &:focus {
+            border-color: var(--o-input-border-color);
+        }
+    }
+
+    .o_field_many2one_selection, .o_field_many2many_selection, .o_datepicker {
+        .o_dropdown_button, .o_datepicker_button {
+            display: none;
+        }
+
+        &:hover, &:focus-within {
+            .o_dropdown_button, .o_datepicker_button {
+                display: unset;
+            }
+        }
+    }
+
+    .o_field_many2one_selection {
+        display: flex;
+        width: 100%;
+
+        .o_external_button {
+            visibility: hidden;
+        }
+
+        &:hover, &:focus-within {
+            .o_external_button {
+                visibility: visible;
+            }
+        }
+    }
+}
+
+.o_kanban_quick_create .o_field_widget .o_input {
+    border-color: var(--o-input-border-color);
+}
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
index 8ba997bd7bf..4be3b641cf8 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
@@ -12,6 +12,10 @@
     .o_tags_input {
         padding: 1px 0;
 
+        &:hover, &:focus-within {
+            border-color: var(--o-input-border-color);
+        }
+
         .o_tag {
             padding-left: 0.6em;
             padding-right: 0.6em;
diff --git a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
index 490a1cd8307..21d169e6cfb 100644
--- a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
+++ b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
@@ -3,6 +3,10 @@
 
     .o_tags_input {
         padding: 1px 0;
+
+        &:hover, &:focus-within {
+            border-color: var(--o-input-border-color);
+        }
     }
 
     .o_field_many2many_selection {
diff --git a/addons/web/static/src/views/fields/progress_bar/progress_bar_field.js b/addons/web/static/src/views/fields/progress_bar/progress_bar_field.js
index bba216f92b9..0eb33fc45c8 100644
--- a/addons/web/static/src/views/fields/progress_bar/progress_bar_field.js
+++ b/addons/web/static/src/views/fields/progress_bar/progress_bar_field.js
@@ -3,12 +3,11 @@
 import { _lt } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { useAutofocus } from "@web/core/utils/hooks";
-import { useDebounced } from "@web/core/utils/timing";
 import { useNumpadDecimal } from "../numpad_decimal_hook";
 import { parseFloat } from "../parsers";
 import { standardFieldProps } from "../standard_field_props";
 
-const { Component, onWillUpdateProps, useRef, useState } = owl;
+const { Component, onWillUpdateProps, useRef, useState, useExternalListener } = owl;
 const formatters = registry.category("formatters");
 const parsers = registry.category("parsers");
 
@@ -17,13 +16,13 @@ export class ProgressBarField extends Component {
         useNumpadDecimal();
         useAutofocus({ refName: "maxValue", selectAll: true });
         useAutofocus({ refName: "currentValue", selectAll: true });
+        useExternalListener(document.body, "click", this.onClickAway, { capture: true });
         this.root = useRef("numpadDecimal");
         this.state = useState({
             currentValue: this.getCurrentValue(this.props),
             maxValue: this.getMaxValue(this.props),
             isEditing: false,
         });
-        this.onBlurDebounced = useDebounced(this.onBlur);
         onWillUpdateProps((nextProps) => {
             Object.assign(this.state, {
                 currentValue: this.getCurrentValue(nextProps),
@@ -113,14 +112,13 @@ export class ProgressBarField extends Component {
             this.state.isEditing = true;
         }
     }
-    // When both max and current value are editable, as one input is blurred when
-    // switching to the other, the state would revert to isEditing = false. We need
-    // to stay in edition mode if the focus is still in the field.
-    onBlur() {
-        if (this.root.el && this.root.el.contains(document.activeElement)) {
-            return;
+    /**
+     * @param {MouseEvent} ev
+     */
+    onClickAway(ev) {
+        if (this.root.el && !this.root.el.contains(ev.target)) {
+            this.state.isEditing = false;
         }
-        this.state.isEditing = false;
     }
 
     onCurrentValueInput(ev) {
diff --git a/addons/web/static/src/views/fields/progress_bar/progress_bar_field.xml b/addons/web/static/src/views/fields/progress_bar/progress_bar_field.xml
index 0c782b1a2f6..eb5107ec10b 100644
--- a/addons/web/static/src/views/fields/progress_bar/progress_bar_field.xml
+++ b/addons/web/static/src/views/fields/progress_bar/progress_bar_field.xml
@@ -33,7 +33,6 @@
                             t-att-required="props.required"
                             t-on-change="onCurrentValueChange"
                             t-on-input="onCurrentValueInput"
-                            t-on-blur="onBlur"
                         />
                         <span>%</span>
                     </div>
@@ -48,7 +47,6 @@
                         t-att-value="formatCurrentValue()"
                         t-on-change="onCurrentValueChange"
                         t-on-input="onCurrentValueInput"
-                        t-on-blur="onBlurDebounced"
                     />
                     <span t-if="props.isCurrentValueEditable and props.isMaxValueEditable" t-esc="'/'" />
                     <input
@@ -60,7 +58,6 @@
                         t-att-value="formatMaxValue()"
                         t-on-change="onMaxValueChange"
                         t-on-input="onMaxValueInput"
-                        t-on-blur="onBlurDebounced"
                     />
                 </t>
             </div>
diff --git a/addons/web/static/src/views/fields/relational_utils.js b/addons/web/static/src/views/fields/relational_utils.js
index f0f6b82b918..9ec84a605b9 100644
--- a/addons/web/static/src/views/fields/relational_utils.js
+++ b/addons/web/static/src/views/fields/relational_utils.js
@@ -437,9 +437,7 @@ export class X2ManyFieldDialog extends Component {
                                 this.modalRef.el.querySelector(`#${autofocusFieldId}`)) ||
                             this.modalRef.el.querySelector(".o_field_widget input");
                     } else {
-                        elementToFocus =
-                            this.modalRef.el.querySelector("button.btn-primary") ||
-                            this.modalRef.el.querySelector(".o_control_panel .o_form_button_edit");
+                        elementToFocus = this.modalRef.el.querySelector("button.btn-primary");
                     }
                     if (elementToFocus) {
                         elementToFocus.focus();
diff --git a/addons/web/static/src/views/fields/x2many/x2many_field.js b/addons/web/static/src/views/fields/x2many/x2many_field.js
index abb6a95284a..cecb17b0a59 100644
--- a/addons/web/static/src/views/fields/x2many/x2many_field.js
+++ b/addons/web/static/src/views/fields/x2many/x2many_field.js
@@ -151,7 +151,6 @@ export class X2ManyField extends Component {
             return props;
         }
 
-        const mode = this.props.record.mode;
         // handle column_invisible modifiers
         const columns = archInfo.columns
             .map((col) => {
@@ -172,24 +171,6 @@ export class X2ManyField extends Component {
                     return col.buttons.length > 0;
                 }
                 return true;
-            })
-            .filter((col) => {
-                // filter out oe_read_only/oe_edit_only columns
-                // note: remove this oe_read/edit_only logic when form view
-                // will always be in edit mode
-                if (col.type === "field") {
-                    if (mode === "readonly") {
-                        return !/\boe_edit_only\b/.test(col.className);
-                    } else {
-                        return !/\boe_read_only\b/.test(col.className);
-                    }
-                } else if (col.type === "button_group") {
-                    if (mode === "readonly") {
-                        return col.buttons.some((btn) => !/\boe_edit_only\b/.test(btn.className));
-                    } else {
-                        return col.buttons.some((btn) => !/\boe_read_only\b/.test(btn.className));
-                    }
-                }
             });
 
         const editable = archInfo.editable || this.props.editable;
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.js b/addons/web/static/src/views/form/control_panel/form_control_panel.js
new file mode 100644
index 00000000000..b4ec4b5ead3
--- /dev/null
+++ b/addons/web/static/src/views/form/control_panel/form_control_panel.js
@@ -0,0 +1,6 @@
+/** @odoo-module **/
+
+import { ControlPanel } from "@web/search/control_panel/control_panel";
+
+export class FormControlPanel extends ControlPanel {}
+FormControlPanel.template = "web.FormControlPanel";
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.scss b/addons/web/static/src/views/form/control_panel/form_control_panel.scss
new file mode 100644
index 00000000000..8800ecb22ef
--- /dev/null
+++ b/addons/web/static/src/views/form/control_panel/form_control_panel.scss
@@ -0,0 +1,6 @@
+
+.o_form_view .o_control_panel {
+    .o_cp_action_menus {
+        border-right: 1px solid $border-color;
+    }
+}
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.xml b/addons/web/static/src/views/form/control_panel/form_control_panel.xml
new file mode 100644
index 00000000000..165afc5c3c5
--- /dev/null
+++ b/addons/web/static/src/views/form/control_panel/form_control_panel.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.FormControlPanel" owl="1">
+        <div class="o_control_panel" t-ref="root">
+            <div t-if="display['top']" class="o_cp_top">
+                <div class="o_cp_top_left w-auto d-flex flex-grow-1">
+                    <t t-if="display['top-left']">
+                        <t t-slot="control-panel-breadcrumb">
+                            <t t-if="env.isSmall">
+                                <t t-call="web.Breadcrumbs.Small" t-if="!env.config.noBreadcrumbs"/>
+                            </t>
+                            <t t-else="">
+                                <t t-call="web.Breadcrumbs" t-if="!env.config.noBreadcrumbs"/>
+                            </t>
+                        </t>
+                        <t t-slot="control-panel-status-indicator" />
+                    </t>
+                </div>
+                <div class="o_cp_bottom_right w-auto flex-shrink-0 align-items-center">
+                    <t t-slot="control-panel-action-menu" t-if="display['bottom-left']"/>
+                    <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager" role="search">
+                        <Pager t-props="pagerProps"/>
+                    </div>
+                    <t t-slot="control-panel-create-button" />
+                </div>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/views/form/form_compiler.js b/addons/web/static/src/views/form/form_compiler.js
index 2709bcebfdc..92b80fa3d94 100644
--- a/addons/web/static/src/views/form/form_compiler.js
+++ b/addons/web/static/src/views/form/form_compiler.js
@@ -175,6 +175,13 @@ export class FormCompiler extends ViewCompiler {
         return hasContent ? buttonBox : null;
     }
 
+    compileButton(el, params) {
+        const compiled = super.compileButton(el, params);
+        compiled.setAttribute("disable", "props.disableViewButtons");
+        compiled.setAttribute("enable", "props.enableViewButtons");
+        return compiled;
+    }
+
     /**
      * @override
      */
@@ -218,9 +225,11 @@ export class FormCompiler extends ViewCompiler {
         const displayClasses = sheetNode
             ? `d-flex {{ uiService.size < ${SIZES.XXL} ? "flex-column" : "flex-nowrap h-100" }}`
             : "d-block";
+        const stateClasses =
+            "{{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}";
         const form = createElement("div", {
             "t-att-class": "props.class",
-            "t-attf-class": `{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} ${displayClasses}`,
+            "t-attf-class": `{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} ${displayClasses} ${stateClasses}`,
         });
         if (!sheetNode) {
             for (const child of el.childNodes) {
@@ -329,13 +338,6 @@ export class FormCompiler extends ViewCompiler {
                             : `props.record.fields.${fieldName}.string`,
                         fieldInfo: `props.archInfo.fieldNodes[${fieldId}]`,
                     };
-                    // note: remove this oe_read/edit_only logic when form view
-                    // will always be in edit mode
-                    if (child.classList.contains("oe_read_only")) {
-                        props.className = `'oe_read_only'`;
-                    } else if (child.classList.contains("oe_edit_only")) {
-                        props.className = `'oe_edit_only'`;
-                    }
                     mainSlot.setAttribute("props", objectToString(props));
                     mainSlot.setAttribute("Component", "constructor.components.FormLabel");
                     mainSlot.setAttribute("subType", "'item_component'");
@@ -422,9 +424,6 @@ export class FormCompiler extends ViewCompiler {
             const slot = createElement("t", {
                 "t-set-slot": `button_${slotId++}`,
                 isVisible: button.getAttribute("t-if") || true,
-                displayInReadOnly:
-                    button.hasAttribute("className") &&
-                    button.getAttribute("className").includes("oe_read_only"),
             });
             append(slot, button);
             append(statusBarButtons, slot);
diff --git a/addons/web/static/src/views/form/form_controller.js b/addons/web/static/src/views/form/form_controller.js
index 3e6a81c2360..c2e69a98dad 100644
--- a/addons/web/static/src/views/form/form_controller.js
+++ b/addons/web/static/src/views/form/form_controller.js
@@ -15,6 +15,8 @@ import { standardViewProps } from "@web/views/standard_view_props";
 import { isX2Many } from "@web/views/utils";
 import { useViewButtons } from "@web/views/view_button/view_button_hook";
 import { useSetupView } from "@web/views/view_hook";
+import { FormStatusIndicator } from "./form_status_indicator/form_status_indicator";
+import { useFormErrorDialog } from "./form_error_dialog/form_error_dialog";
 
 const { Component, onWillStart, useEffect, useRef, onRendered, useState, toRaw } = owl;
 
@@ -94,7 +96,14 @@ export class FormController extends Component {
         this.user = useService("user");
         this.viewService = useService("view");
         this.ui = useService("ui");
+        this.state = useState({
+            isDisabled: false,
+        });
         useBus(this.ui.bus, "resize", this.render);
+        useFormErrorDialog(async () => {
+            await this.discard();
+            this.env.config.historyBack();
+        });
 
         this.archInfo = this.props.archInfo;
         const activeFields = this.archInfo.activeFields;
@@ -103,6 +112,16 @@ export class FormController extends Component {
         const beforeLoadProm = new Promise((r) => {
             this.beforeLoadResolver = r;
         });
+
+        const { create, edit } = this.archInfo.activeActions;
+        this.canCreate = create && !this.props.preventCreate;
+        this.canEdit = edit && !this.props.preventEdit;
+
+        let mode = this.props.mode || "edit";
+        if (!this.canEdit) {
+            mode = "readonly";
+        }
+
         this.model = useModel(
             this.props.Model,
             {
@@ -113,17 +132,13 @@ export class FormController extends Component {
                 activeFields,
                 viewMode: "form",
                 rootType: "record",
-                mode: this.props.mode,
+                mode,
                 beforeLoadProm,
             },
             {
                 ignoreUseSampleModel: true,
             }
         );
-        const { create, edit } = this.archInfo.activeActions;
-
-        this.canCreate = create && !this.props.preventCreate;
-        this.canEdit = edit && !this.props.preventEdit;
 
         this.cpButtonsRef = useRef("cpButtons");
 
@@ -235,9 +250,9 @@ export class FormController extends Component {
                         !isInEdition &&
                         !rootRef.el.querySelector(".o_content").contains(document.activeElement)
                     ) {
-                        const elementToFocus =
-                            rootRef.el.querySelector(".o_content button.btn-primary") ||
-                            rootRef.el.querySelector(".o_control_panel .o_form_button_edit");
+                        const elementToFocus = rootRef.el.querySelector(
+                            ".o_content button.btn-primary"
+                        );
                         if (elementToFocus) {
                             elementToFocus.focus();
                         }
@@ -301,11 +316,18 @@ export class FormController extends Component {
                 key: "delete",
                 description: this.env._t("Delete"),
                 callback: () => this.deleteRecord(),
+                skipSave: true,
             });
         }
         return Object.assign({}, this.props.info.actionMenus, { other: otherActionItems });
     }
 
+    async beforeAction(item) {
+        if ((this.model.root.isDirty || this.model.root.isVirtual) && !item.skipSave) {
+            await this.model.root.save({ stayInEdition: true });
+        }
+    }
+
     async duplicateRecord() {
         await this.model.root.duplicate();
     }
@@ -325,16 +347,11 @@ export class FormController extends Component {
     }
 
     disableButtons() {
-        const btns = this.cpButtonsRef.el.querySelectorAll(".o_cp_buttons button");
-        for (const btn of btns) {
-            btn.setAttribute("disabled", "1");
-        }
-        return btns;
+        this.state.isDisabled = true;
     }
-    enableButtons(btns) {
-        for (const btn of btns) {
-            btn.removeAttribute("disabled");
-        }
+
+    enableButtons() {
+        this.state.isDisabled = false;
     }
 
     async edit() {
@@ -342,12 +359,20 @@ export class FormController extends Component {
     }
 
     async create() {
-        this.disableButtons();
-        await this.model.load({ resId: null });
+        await this.model.root.askChanges(); // ensures that isDirty is correct
+        let canProceed = true;
+        if (this.model.root.isDirty) {
+            canProceed = await this.model.root.save({ stayInEdition: true });
+        }
+        if (canProceed) {
+            this.disableButtons();
+            await this.model.load({ resId: null });
+            this.enableButtons();
+        }
     }
 
     async save(params = {}) {
-        const disabledButtons = this.disableButtons();
+        this.disableButtons();
         const record = this.model.root;
         let saved = false;
 
@@ -360,13 +385,17 @@ export class FormController extends Component {
                 ...record.dirtyTranslatableFields,
             ]);
         }
-
-        if (this.props.saveRecord) {
-            saved = await this.props.saveRecord(record, params);
-        } else {
-            saved = await record.save();
+        try {
+            if (this.props.saveRecord) {
+                saved = await this.props.saveRecord(record, params);
+            } else {
+                saved = await record.save();
+            }
+        } catch {
+            // if the save failed, we want to re-enable buttons
+            this.enableButtons();
         }
-        this.enableButtons(disabledButtons);
+        this.enableButtons();
         if (saved && this.props.onSave) {
             this.props.onSave(record);
         }
@@ -424,7 +453,7 @@ export class FormController extends Component {
 }
 
 FormController.template = `web.FormView`;
-FormController.components = { ActionMenus, Layout };
+FormController.components = { ActionMenus, FormStatusIndicator, Layout };
 FormController.props = {
     ...standardViewProps,
     discardRecord: { type: Function, optional: true },
diff --git a/addons/web/static/src/views/form/form_controller.scss b/addons/web/static/src/views/form/form_controller.scss
index 6a44a81253e..21a10b58558 100644
--- a/addons/web/static/src/views/form/form_controller.scss
+++ b/addons/web/static/src/views/form/form_controller.scss
@@ -201,7 +201,7 @@
         }
 
         .oe_title {
-            max-width: map-get($container-max-widths, md) - (2 * $o-horizontal-padding);
+            max-width: 75%;
         }
 
         .o_field_x2many .o_list_table .o_handle_cell .o_row_handle {
@@ -986,8 +986,15 @@
             max-width: 300px;
         }
     }
-
     @include media-breakpoint-down(md) {
+        .o_control_panel {
+            padding-right: 16px;
+
+            > div.o_cp_top {
+                display: grid;
+            }
+        }
+
         .o_cp_buttons {
             width: 100%;
             div, .o-kanban-button-new {
diff --git a/addons/web/static/src/views/form/form_controller.xml b/addons/web/static/src/views/form/form_controller.xml
index 89541836651..348f0c484ae 100644
--- a/addons/web/static/src/views/form/form_controller.xml
+++ b/addons/web/static/src/views/form/form_controller.xml
@@ -7,52 +7,37 @@
                 <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
                     <t t-set-slot="layout-buttons">
                         <t t-if="footerArchInfo and env.inDialog">
-                            <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo"/>
+                            <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo" enableViewButtons.bind="enableButtons" disableViewButtons.bind="disableButtons"/>
                         </t>
                         <t t-else="">
                             <t t-call="{{ props.buttonTemplate }}"/>
                         </t>
                     </t>
-                    <t t-set-slot="control-panel-bottom-left">
-                        <t t-if="props.info.actionMenus and !model.root.isVirtual">
+                    <t t-set-slot="control-panel-action-menu">
+                        <t t-if="props.info.actionMenus">
                             <ActionMenus
-                                activeIds="[model.root.resId]"
+                                activeIds="model.root.isVirtual ? [] : [model.root.resId]"
                                 context="props.context"
                                 items="getActionMenuItems()"
                                 isDomainSelected="model.root.isDomainSelected"
                                 resModel="model.root.resModel"
                                 domain="props.domain"
                                 onActionExecuted="() => model.load()"
-                            />
+                                onBeforeAction.bind="beforeAction"
+                        />
                         </t>
                     </t>
-                    <t t-set-slot="control-panel-bottom-left">
-                        <t t-if="!env.isSmall and props.info.actionMenus and !model.root.isVirtual">
-                            <ActionMenus
-                                activeIds="[model.root.resId]"
-                                context="props.context"
-                                items="getActionMenuItems()"
-                                isDomainSelected="model.root.isDomainSelected"
-                                resModel="model.root.resModel"
-                                domain="props.domain"
-                                onActionExecuted="() => model.load()"
-                            />
+                    <t t-set-slot="control-panel-status-indicator">
+                        <t t-if="canEdit">
+                            <FormStatusIndicator model="model" discard.bind="discard" save.bind="save" isDisabled="state.isDisabled" />
                         </t>
                     </t>
-                    <t t-set-slot="control-panel-bottom-right">
-                        <t t-if="env.isSmall and props.info.actionMenus and !model.root.isVirtual">
-                            <ActionMenus
-                                activeIds="[model.root.resId]"
-                                context="props.context"
-                                items="getActionMenuItems()"
-                                isDomainSelected="model.root.isDomainSelected"
-                                resModel="model.root.resModel"
-                                domain="props.domain"
-                                onActionExecuted="() => model.load()"
-                            />
+                    <t t-set-slot="control-panel-create-button">
+                        <t t-if="canCreate">
+                            <button type="button" class="btn btn-outline-primary o_form_button_create" data-hotkey="c" t-on-click.stop="create" t-att-disabled="state.isDisabled">Create</button>
                         </t>
                     </t>
-                    <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" translateAlert="translateAlert"/>
+                    <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" translateAlert="translateAlert" enableViewButtons.bind="enableButtons" disableViewButtons.bind="disableButtons"/>
                 </Layout>
             </div>
         </div>
@@ -68,11 +53,8 @@
                     Discard
                 </button>
             </div>
-            <div t-else="canEdit or canCreate" class="o_form_buttons_view">
-                <button t-if="canEdit" type="button" class="btn btn-primary o_form_button_edit" data-hotkey="a" data-bounce-button="" t-on-click.stop="edit">
-                    Edit
-                </button>
-                <button t-if="canCreate" type="button" class="btn btn-secondary o_form_button_create" data-hotkey="c" t-on-click.stop="create">
+            <div t-elif="canCreate" class="o_form_buttons_view">
+                <button type="button" class="btn btn-secondary o_form_button_create" data-hotkey="c" t-on-click.stop="create">
                     Create
                 </button>
             </div>
diff --git a/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.js b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.js
new file mode 100644
index 00000000000..c93447a2b30
--- /dev/null
+++ b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.js
@@ -0,0 +1,66 @@
+/** @odoo-module **/
+
+import { Dialog } from "@web/core/dialog/dialog";
+import { RPCError } from "@web/core/network/rpc_service";
+import { registry } from "@web/core/registry";
+
+const { Component, onWillDestroy } = owl;
+
+export class FormErrorDialog extends Component {
+    setup() {
+        const { data, message } = this.props;
+        if (data && data.arguments && data.arguments.length > 0) {
+            this.message = data.arguments[0];
+        } else {
+            this.message = message;
+        }
+    }
+
+    async discard() {
+        await this.props.onDiscard();
+        this.props.close();
+    }
+}
+FormErrorDialog.template = "web.FormErrorDialog";
+FormErrorDialog.components = { Dialog };
+
+function makeFormErrorHandler(onDiscard) {
+    return (env, error, originalError) => {
+        if (
+            originalError &&
+            originalError.legacy &&
+            originalError.message &&
+            originalError.message instanceof RPCError
+        ) {
+            const event = originalError.event;
+            originalError = originalError.message;
+            error.unhandledRejectionEvent.preventDefault();
+            if (event.isDefaultPrevented()) {
+                // in theory, here, event was already handled
+                return true;
+            }
+            event.preventDefault();
+
+            env.services.dialog.add(FormErrorDialog, {
+                message: originalError.message,
+                data: originalError.data,
+                onDiscard,
+            });
+
+            return true;
+        }
+        return false;
+    };
+}
+
+let formId = 0;
+
+export function useFormErrorDialog(onDiscard) {
+    const errorHandlerKey = `form_error_handler_${++formId}`;
+    registry
+        .category("error_handlers")
+        .add(errorHandlerKey, makeFormErrorHandler(onDiscard), { sequence: 0 });
+    onWillDestroy(() => {
+        registry.category("error_handlers").remove(errorHandlerKey);
+    });
+}
diff --git a/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.scss b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.scss
new file mode 100644
index 00000000000..dac7ad8b96d
--- /dev/null
+++ b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.scss
@@ -0,0 +1,10 @@
+.o_form_error_dialog {
+    border: none;
+    padding: 2rem;
+    top: 50%;
+    transform: translateY(-50%);
+
+    footer {
+        border: none;
+    }
+}
diff --git a/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.xml b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.xml
new file mode 100644
index 00000000000..d3cbbc549a5
--- /dev/null
+++ b/addons/web/static/src/views/form/form_error_dialog/form_error_dialog.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.FormErrorDialog" owl="1">
+        <Dialog header="false" size="'md'" contentClass="'o_form_error_dialog'">
+            <div role="alert" class="o_dialog_warning">
+                <h1 class="text-danger">Oh snap!</h1>
+                <p t-esc="message" style="white-space: pre-wrap;"/>
+            </div>
+            <t t-set-slot="footer">
+                <button class="btn btn-primary" t-on-click="props.close">Stay here</button>
+                <button class="btn btn-secondary" t-on-click="discard">Discard changes</button>
+            </t>
+        </Dialog>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/views/form/form_label.js b/addons/web/static/src/views/form/form_label.js
index 3c50689dabf..c4f386b2727 100644
--- a/addons/web/static/src/views/form/form_label.js
+++ b/addons/web/static/src/views/form/form_label.js
@@ -8,7 +8,7 @@ const { Component, xml } = owl;
 
 export class FormLabel extends Component {
     get className() {
-        const { invalid, empty } = fieldVisualFeedback(
+        const { invalid, empty, readonly } = fieldVisualFeedback(
             this.props.fieldInfo.FieldComponent,
             this.props.record,
             this.props.fieldName,
@@ -21,6 +21,9 @@ export class FormLabel extends Component {
         if (empty) {
             classes.push("o_form_label_empty");
         }
+        if (readonly) {
+            classes.push("o_form_label_readonly");
+        }
         return classes.join(" ");
     }
 
diff --git a/addons/web/static/src/views/form/form_renderer.js b/addons/web/static/src/views/form/form_renderer.js
index 8725b330733..eccf98f060f 100644
--- a/addons/web/static/src/views/form/form_renderer.js
+++ b/addons/web/static/src/views/form/form_renderer.js
@@ -43,21 +43,21 @@ export class FormRenderer extends Component {
         if (!disableAutofocus) {
             const rootRef = useRef("compiled_view_root");
             useEffect(
-                (isInEdition, rootEl) => {
+                (isVirtual, rootEl) => {
                     if (!rootEl) {
                         return;
                     }
                     let elementToFocus;
-                    if (isInEdition) {
+                    if (isVirtual) {
                         elementToFocus =
                             (autofocusFieldId && rootEl.querySelector(`#${autofocusFieldId}`)) ||
-                            rootEl.querySelector(`.o_content .o_field_widget input`);
+                            rootEl.querySelector(`.o_content .o_field_widget input[type="text"]`);
                     }
                     if (elementToFocus) {
                         elementToFocus.focus();
                     }
                 },
-                () => [this.props.record.isInEdition, rootRef.el]
+                () => [this.props.record.isVirtual, rootRef.el]
             );
         }
     }
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
new file mode 100644
index 00000000000..a3263ccc40e
--- /dev/null
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
@@ -0,0 +1,35 @@
+/** @odoo-module **/
+
+const { Component } = owl;
+
+export class FormStatusIndicator extends Component {
+    get displayButtons() {
+        return this.indicatorMode !== "saved";
+    }
+
+    get indicatorMode() {
+        if (this.props.model.root.isVirtual) {
+            return this.props.model.root.isValid ? "dirty" : "invalid";
+        } else if (!this.props.model.root.isValid) {
+            return "invalid";
+        } else if (this.props.model.root.isDirty) {
+            return "dirty";
+        } else {
+            return "saved";
+        }
+    }
+
+    async discard() {
+        await this.props.discard();
+    }
+    async save() {
+        await this.props.save();
+    }
+}
+FormStatusIndicator.template = "web.FormStatusIndicator";
+FormStatusIndicator.props = {
+    model: Object,
+    save: Function,
+    discard: Function,
+    isDisabled: Boolean,
+};
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.scss b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.scss
new file mode 100644
index 00000000000..c1ccb2e97ae
--- /dev/null
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.scss
@@ -0,0 +1,15 @@
+.o_form_status_indicator:not(.o_form_status_indicator_new_record) {
+    .o_form_status_indicator_buttons {
+        visibility: hidden;
+    }
+
+    &:hover {
+        span {
+            visibility: hidden;
+        }
+
+        .o_form_status_indicator_buttons:not(.o_form_status_indicator_buttons_hidden) {
+            visibility: visible;
+        }
+    }
+}
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
new file mode 100644
index 00000000000..ecfa52083b7
--- /dev/null
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.FormStatusIndicator" owl="1">
+        <div class="o_form_status_indicator d-flex align-self-center align-items-center ms-4 rounded-pill position-relative" t-att-class="{ o_form_status_indicator_new_record: props.model.root.isVirtual }">
+            <t t-if="!props.model.root.isVirtual">
+                <t t-if="indicatorMode === 'invalid'">
+                    <span class="position-absolute text-danger">Unable to save</span>
+                </t>
+                <t t-elif="indicatorMode === 'dirty'">
+                    <span class="position-absolute text-muted">Unsaved changes</span>
+                </t>
+            </t>
+            <div class="o_form_status_indicator_buttons d-flex" t-att-class="{ 'o_form_status_indicator_buttons_hidden': !(props.model.root.isVirtual or displayButtons) }">
+                <button type="button" class="o_form_button_save btn btn-secondary" t-att-disabled="props.isDisabled" data-tooltip="Click to save" data-hotkey="s" t-on-click.stop="save">Save</button>
+                <button type="button" class="o_form_button_cancel btn btn-secondary" t-att-disabled="props.isDisabled" data-tooltip="Click to discard" data-hotkey="j" t-on-click.stop="discard">Discard</button>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/views/form/form_view.js b/addons/web/static/src/views/form/form_view.js
index 8d24b6b19df..271add520b6 100644
--- a/addons/web/static/src/views/form/form_view.js
+++ b/addons/web/static/src/views/form/form_view.js
@@ -6,13 +6,14 @@ import { RelationalModel } from "../basic_relational_model";
 import { FormArchParser } from "./form_arch_parser";
 import { FormController } from "./form_controller";
 import { FormCompiler } from "./form_compiler";
+import { FormControlPanel } from "./control_panel/form_control_panel";
 
 export const formView = {
     type: "form",
     display_name: "Form",
     multiRecord: false,
-    display: { controlPanel: { ["top-right"]: false } },
     searchMenuTypes: [],
+    ControlPanel: FormControlPanel,
     Controller: FormController,
     Renderer: FormRenderer,
     ArchParser: FormArchParser,
diff --git a/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.js b/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.js
index d525216b306..7ac55d22731 100644
--- a/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.js
+++ b/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.js
@@ -11,10 +11,7 @@ export class StatusBarButtons extends Component {
             return [];
         }
         return Object.entries(this.props.slots)
-            .filter(
-                (entry) =>
-                    entry[1].isVisible && (entry[1].displayInReadOnly ? this.props.readonly : true)
-            )
+            .filter((entry) => entry[1].isVisible)
             .map((entry) => entry[0]);
     }
 }
diff --git a/addons/web/static/src/views/list/list_renderer.js b/addons/web/static/src/views/list/list_renderer.js
index 8233fc80f6a..113c995dfff 100644
--- a/addons/web/static/src/views/list/list_renderer.js
+++ b/addons/web/static/src/views/list/list_renderer.js
@@ -572,13 +572,6 @@ export class ListRenderer extends Component {
         if (column.type === "button_group") {
             classNames.push("o_list_button");
         }
-        // note: remove this oe_read/edit_only logic when form view
-        // will always be in edit mode
-        if (/\boe_edit_only\b/.test(column.className)) {
-            classNames.push("oe_edit_only");
-        } else if (/\boe_read_only\b/.test(column.className)) {
-            classNames.push("oe_read_only");
-        }
         if (column.widget) {
             classNames.push(`o_${column.widget}_cell`);
         }
diff --git a/addons/web/static/src/views/view_button/view_button.js b/addons/web/static/src/views/view_button/view_button.js
index afbd9b4cee6..e9c7222a764 100644
--- a/addons/web/static/src/views/view_button/view_button.js
+++ b/addons/web/static/src/views/view_button/view_button.js
@@ -92,6 +92,8 @@ export class ViewButton extends Component {
                     this.env[DROPDOWN].close();
                 }
             },
+            disableAction: this.props.disable,
+            enableAction: this.props.enable,
         });
     }
 
@@ -133,7 +135,9 @@ ViewButton.props = [
     "hotkey?",
     "icon?",
     "defaultRank?",
+    "disable?",
     "disabled?",
+    "enable?",
     "size?",
     "tabindex?",
     "title?",
@@ -145,4 +149,6 @@ ViewButton.defaultProps = {
     tag: "button",
     className: "",
     clickParams: {},
+    disable: () => {},
+    enable: () => {},
 };
diff --git a/addons/web/static/src/views/view_button/view_button_hook.js b/addons/web/static/src/views/view_button/view_button_hook.js
index c237325e7c7..955b34e5ec3 100644
--- a/addons/web/static/src/views/view_button/view_button_hook.js
+++ b/addons/web/static/src/views/view_button/view_button_hook.js
@@ -15,12 +15,15 @@ function disableButtons(el) {
     return btns;
 }
 
-function enableButtons(el, manuallyDisabledButtons) {
+function enableButtons(el, manuallyDisabledButtons, enableAction) {
     if (el) {
         for (const btn of manuallyDisabledButtons) {
             btn.removeAttribute("disabled");
         }
     }
+    if (enableAction) {
+        enableAction();
+    }
 }
 
 function undefinedAsTrue(val) {
@@ -37,8 +40,17 @@ export function useViewButtons(model, ref, options = {}) {
             return true;
         });
     useSubEnv({
-        async onClickViewButton({ clickParams, getResParams, beforeExecute }) {
+        async onClickViewButton({
+            clickParams,
+            getResParams,
+            beforeExecute,
+            disableAction,
+            enableAction,
+        }) {
             const manuallyDisabledButtons = disableButtons(getEl());
+            if (disableAction) {
+                disableAction();
+            }
 
             async function execute() {
                 let _continue = true;
@@ -48,7 +60,7 @@ export function useViewButtons(model, ref, options = {}) {
 
                 _continue = _continue && undefinedAsTrue(await beforeExecuteAction(clickParams));
                 if (!_continue) {
-                    enableButtons(getEl(), manuallyDisabledButtons);
+                    enableButtons(getEl(), manuallyDisabledButtons, enableAction);
                     return;
                 }
                 const params = getResParams();
@@ -85,7 +97,7 @@ export function useViewButtons(model, ref, options = {}) {
                     error = _e;
                     await doActionParams.onClose();
                 }
-                enableButtons(getEl(), manuallyDisabledButtons);
+                enableButtons(getEl(), manuallyDisabledButtons, enableAction);
                 if (error) {
                     return Promise.reject(error);
                 }
@@ -100,7 +112,7 @@ export function useViewButtons(model, ref, options = {}) {
                     };
                     dialog.add(ConfirmationDialog, dialogProps, { onClose: resolve });
                 });
-                enableButtons(getEl(), manuallyDisabledButtons);
+                enableButtons(getEl(), manuallyDisabledButtons, enableAction);
             } else {
                 return execute();
             }
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_view.js b/addons/web/static/src/webclient/settings_form_view/settings_form_view.js
index 46bad63fee1..795138af49a 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_view.js
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_view.js
@@ -1,6 +1,7 @@
 /** @odoo-module **/
 
 import { registry } from "@web/core/registry";
+import { ControlPanel } from "@web/search/control_panel/control_panel";
 import { formView } from "@web/views/form/form_view";
 import { SettingsFormController } from "./settings_form_controller";
 import { SettingsFormRenderer } from "./settings_form_renderer";
@@ -10,6 +11,7 @@ export const settingsFormView = {
     ...formView,
     display: {},
     buttonTemplate: "web.SettingsFormView.Buttons",
+    ControlPanel: ControlPanel,
     Controller: SettingsFormController,
     Compiler: SettingsFormCompiler,
     Renderer: SettingsFormRenderer,
diff --git a/addons/web/static/tests/helpers/utils.js b/addons/web/static/tests/helpers/utils.js
index 5d32f1e4450..e48dc2f256e 100644
--- a/addons/web/static/tests/helpers/utils.js
+++ b/addons/web/static/tests/helpers/utils.js
@@ -385,16 +385,17 @@ export function clickCreate(htmlElement) {
 }
 
 export function clickEdit(htmlElement) {
-    if (htmlElement.querySelectorAll(".o_form_button_edit").length) {
-        return click(htmlElement, ".o_form_button_edit");
-    } else if (htmlElement.querySelectorAll(".o_list_button_edit").length) {
+    if (htmlElement.querySelectorAll(".o_list_button_edit").length) {
         return click(htmlElement, ".o_list_button_edit");
     } else {
         throw new Error("No edit button found to be clicked.");
     }
 }
 
-export function clickSave(htmlElement) {
+export async function clickSave(htmlElement) {
+    if (htmlElement.querySelectorAll(".o_form_status_indicator").length) {
+        await mouseEnter(htmlElement, ".o_form_status_indicator");
+    }
     if (htmlElement.querySelectorAll(".o_form_button_save").length) {
         return click(htmlElement, ".o_form_button_save");
     } else if (htmlElement.querySelectorAll(".o_list_button_save").length) {
@@ -404,7 +405,10 @@ export function clickSave(htmlElement) {
     }
 }
 
-export function clickDiscard(htmlElement) {
+export async function clickDiscard(htmlElement) {
+    if (htmlElement.querySelectorAll(".o_form_status_indicator").length) {
+        await mouseEnter(htmlElement, ".o_form_status_indicator");
+    }
     if (htmlElement.querySelectorAll(".o_form_button_cancel").length) {
         return click(htmlElement, ".o_form_button_cancel");
     } else if (htmlElement.querySelectorAll(".o_list_button_discard").length) {
diff --git a/addons/web/static/tests/mobile/mobile_form_view_tests.js b/addons/web/static/tests/mobile/mobile_form_view_tests.js
index c21fcac3bd5..bb29f0f4452 100644
--- a/addons/web/static/tests/mobile/mobile_form_view_tests.js
+++ b/addons/web/static/tests/mobile/mobile_form_view_tests.js
@@ -3,7 +3,6 @@
 import { registry } from "@web/core/registry";
 import {
     click,
-    clickEdit,
     clickSave,
     editInput,
     getFixture,
@@ -124,7 +123,6 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
             );
 
             // change display_name to update buttons modifiers and make it visible
-            await clickEdit(fixture);
             await editInput(fixture, ".o_field_widget[name=display_name] input", "test");
             await clickSave(fixture);
             assert.containsOnce(
@@ -135,43 +133,6 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
         }
     );
 
-    QUnit.test(
-        `statusbar "Action" button not displayed in edit mode with .oe_read_only button`,
-        async (assert) => {
-            await makeView({
-                type: "form",
-                resModel: "partner",
-                serverData,
-                arch: `
-                    <form>
-                        <header>
-                            <button string="Share" type="action" class="oe_highlight oe_read_only" />
-                            <button string="Email" type="action" class="oe_highlight oe_read_only" />
-                        </header>
-                        <sheet>
-                            <group>
-                                <field name="display_name" />
-                            </group>
-                        </sheet>
-                    </form>
-                `,
-            });
-
-            assert.containsNone(
-                fixture,
-                ".o_statusbar_buttons .dropdown",
-                "dropdown should not be there"
-            );
-
-            await clickSave(fixture);
-            assert.containsOnce(
-                fixture,
-                ".o_statusbar_buttons .dropdown",
-                "dropdown should not be there"
-            );
-        }
-    );
-
     QUnit.test(
         `statusbar "Action" button shouldn't be displayed for only one visible button`,
         async (assert) => {
@@ -195,8 +156,6 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
                 `,
             });
 
-            await clickEdit(fixture);
-
             // There should be a simple statusbar button and no action dropdown
             assert.containsNone(
                 fixture,
@@ -248,7 +207,6 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
                 `,
             });
 
-            await clickEdit(fixture);
             // Now there should an action dropdown, because there are two visible buttons
             assert.containsOnce(
                 fixture,
@@ -449,8 +407,6 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
                 },
             });
 
-            await clickEdit(fixture);
-
             window.scrollTo({ top: 265, left: 0 });
             assert.strictEqual(window.scrollY, 265, "Should have scrolled 265 px vertically");
             assert.strictEqual(window.screenLeft, 0, "Should be 0 px from left as it is");
diff --git a/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js b/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js
index 03254bb08e9..91f50eaa4c6 100644
--- a/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js
+++ b/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js
@@ -102,10 +102,10 @@ QUnit.module("Mobile Fields", ({ beforeEach }) => {
             `,
         });
 
-        assert.hasClass(
+        assert.doesNotHaveClass(
             fixture.querySelector(".o_field_statusbar"),
             "o_field_empty",
-            "statusbar widget should have class o_field_empty"
+            "statusbar widget should have class o_field_empty in edit"
         );
         assert.containsOnce(
             fixture,
diff --git a/addons/web/static/tests/views/fields/ace_editor_field_tests.js b/addons/web/static/tests/views/fields/ace_editor_field_tests.js
index 7e45300da30..d028d922f38 100644
--- a/addons/web/static/tests/views/fields/ace_editor_field_tests.js
+++ b/addons/web/static/tests/views/fields/ace_editor_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { clickEdit, getFixture, triggerEvents } from "@web/../tests/helpers/utils";
+import { getFixture, triggerEvents } from "@web/../tests/helpers/utils";
 import { pagerNext } from "@web/../tests/search/helpers";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
@@ -70,7 +70,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
         await triggerEvents(target, ".ace-view-editor textarea", ["focus", "click"]);
         assert.hasClass(target.querySelector(".ace-view-editor"), "ace_focus");
     });
diff --git a/addons/web/static/tests/views/fields/binary_field_tests.js b/addons/web/static/tests/views/fields/binary_field_tests.js
index e680e657b46..edd77e93518 100644
--- a/addons/web/static/tests/views/fields/binary_field_tests.js
+++ b/addons/web/static/tests/views/fields/binary_field_tests.js
@@ -4,6 +4,7 @@ import { registerCleanup } from "@web/../tests/helpers/cleanup";
 import { makeMockXHR } from "@web/../tests/helpers/mock_services";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     makeDeferred,
@@ -66,8 +67,81 @@ QUnit.module("Fields", (hooks) => {
 
     QUnit.module("BinaryField");
 
+    QUnit.test("BinaryField is correctly rendered (readonly)", async function (assert) {
+        assert.expect(6);
+
+        async function send(data) {
+            assert.ok(data instanceof FormData);
+            assert.strictEqual(
+                data.get("field"),
+                "document",
+                "we should download the field document"
+            );
+            assert.strictEqual(
+                data.get("data"),
+                "coucou==\n",
+                "we should download the correct data"
+            );
+
+            this.status = 200;
+            this.response = new Blob([data.get("data")], { type: "text/plain" });
+        }
+        const MockXHR = makeMockXHR("", send);
+
+        patchWithCleanup(
+            browser,
+            {
+                XMLHttpRequest: MockXHR,
+            },
+            { pure: true }
+        );
+
+        await makeView({
+            serverData,
+            type: "form",
+            resModel: "partner",
+            arch: `
+                <form edit="0">
+                    <field name="document" filename="foo"/>
+                    <field name="foo"/>
+                </form>`,
+            resId: 1,
+        });
+        assert.containsOnce(
+            target,
+            '.o_field_widget[name="document"] a > .fa-download',
+            "the binary field should be rendered as a downloadable link in readonly"
+        );
+        assert.strictEqual(
+            target.querySelector('.o_field_widget[name="document"]').textContent,
+            "coucou.txt",
+            "the binary field should display the name of the file in the link"
+        );
+        assert.strictEqual(
+            target.querySelector(".o_field_char").textContent,
+            "coucou.txt",
+            "the filename field should have the file name as value"
+        );
+
+        // Testing the download button in the field
+        // We must avoid the browser to download the file effectively
+        const prom = makeDeferred();
+        const downloadOnClick = (ev) => {
+            const target = ev.target;
+            if (target.tagName === "A" && "download" in target.attributes) {
+                ev.preventDefault();
+                document.removeEventListener("click", downloadOnClick);
+                prom.resolve();
+            }
+        };
+        document.addEventListener("click", downloadOnClick);
+        registerCleanup(() => document.removeEventListener("click", downloadOnClick));
+        await click(target.querySelector('.o_field_widget[name="document"] a'));
+        await prom;
+    });
+
     QUnit.test("BinaryField is correctly rendered", async function (assert) {
-        assert.expect(15);
+        assert.expect(9);
 
         async function send(data) {
             assert.ok(data instanceof FormData);
@@ -106,39 +180,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        assert.containsOnce(
-            target,
-            '.o_field_widget[name="document"] a > .fa-download',
-            "the binary field should be rendered as a downloadable link in readonly"
-        );
-        assert.strictEqual(
-            target.querySelector('.o_field_widget[name="document"]').textContent,
-            "coucou.txt",
-            "the binary field should display the name of the file in the link"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_char").textContent,
-            "coucou.txt",
-            "the filename field should have the file name as value"
-        );
-
-        // Testing the download button in the field
-        // We must avoid the browser to download the file effectively
-        const prom = makeDeferred();
-        const downloadOnClick = (ev) => {
-            const target = ev.target;
-            if (target.tagName === "A" && "download" in target.attributes) {
-                ev.preventDefault();
-                document.removeEventListener("click", downloadOnClick);
-                prom.resolve();
-            }
-        };
-        document.addEventListener("click", downloadOnClick);
-        registerCleanup(() => document.removeEventListener("click", downloadOnClick));
-        await click(target.querySelector('.o_field_widget[name="document"] a'));
-        await prom;
-
-        await click(target, ".o_form_button_edit");
 
         assert.containsNone(
             target,
@@ -178,7 +219,7 @@ QUnit.module("Fields", (hooks) => {
             "the filename field should be empty since we removed the file"
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsNone(
             target,
             '.o_field_widget[name="document"] a > .fa-download',
@@ -230,8 +271,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await click(target, ".o_form_button_edit");
-
             const file = new File(["test"], "fake_file.txt", { type: "text/plain" });
             await editInput(target, ".o_field_binary .o_input_file", file);
 
diff --git a/addons/web/static/tests/views/fields/boolean_favorite_field_tests.js b/addons/web/static/tests/views/fields/boolean_favorite_field_tests.js
index 9a780983108..6881f4254f8 100644
--- a/addons/web/static/tests/views/fields/boolean_favorite_field_tests.js
+++ b/addons/web/static/tests/views/fields/boolean_favorite_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -114,8 +114,6 @@ QUnit.module("Fields", (hooks) => {
             'the label should say "Add to Favorites"'
         );
 
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
         assert.containsOnce(
             target,
             ".o_field_widget .o_favorite > a i.fa.fa-star-o",
@@ -141,7 +139,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsOnce(
             target,
             ".o_field_widget .o_favorite > a i.fa.fa-star",
@@ -188,7 +186,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_list_button_save");
+        await clickSave(target);
         assert.containsOnce(
             target,
             ".o_data_row:first .o_field_widget .o_favorite > a i.fa.fa-star-o",
diff --git a/addons/web/static/tests/views/fields/boolean_field_tests.js b/addons/web/static/tests/views/fields/boolean_field_tests.js
index 86c698d885d..5278b69d38c 100644
--- a/addons/web/static/tests/views/fields/boolean_field_tests.js
+++ b/addons/web/static/tests/views/fields/boolean_field_tests.js
@@ -2,6 +2,7 @@
 
 import {
     click,
+    clickSave,
     getFixture,
     nextTick,
     triggerEvent,
@@ -50,15 +51,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.containsOnce(target, ".o_field_boolean input:checked", "checkbox should be checked");
-        assert.containsOnce(
-            target,
-            ".o_field_boolean input:disabled",
-            "checkbox should be disabled"
-        );
-
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
         assert.containsOnce(
             target,
             ".o_field_boolean input:checked",
@@ -79,15 +71,13 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsNone(
             target,
             ".o_field_boolean input:checked",
             "checkbox should still no longer be checked"
         );
 
-        // switch to edit mode and test the opposite change
-        await click(target, ".o_form_button_edit");
         assert.containsNone(
             target,
             ".o_field_boolean input:checked",
@@ -155,7 +145,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsOnce(
             target,
             ".o_field_boolean input:checked",
@@ -211,7 +201,7 @@ QUnit.module("Fields", (hooks) => {
         await click(cell, ".o-checkbox");
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await clickSave(target);
         cell = target.querySelector("tr.o_data_row td:not(.o_list_record_selector)");
         assert.ok(
             cell.querySelector(".o-checkbox input:not(:checked)").disabled,
@@ -236,7 +226,7 @@ QUnit.module("Fields", (hooks) => {
         await click(cell, ".o-checkbox");
 
         // Save
-        await click(target.querySelector(".o_list_button_save"));
+        await clickSave(target);
         assert.containsN(
             target,
             "tbody td:not(.o_list_record_selector) .o-checkbox",
@@ -282,14 +272,7 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             arch: `<form><field name="bar" readonly="1"/></form>`,
         });
-        assert.containsOnce(target, ".o_field_boolean input:checked", "checkbox should be checked");
-        assert.containsOnce(
-            target,
-            ".o_field_boolean input:disabled",
-            "checkbox should be disabled"
-        );
 
-        await click(target, ".o_form_button_edit");
         assert.containsOnce(
             target,
             ".o_field_boolean input:checked",
diff --git a/addons/web/static/tests/views/fields/boolean_toggle_field_tests.js b/addons/web/static/tests/views/fields/boolean_toggle_field_tests.js
index 1f28dab830b..558154e33b4 100644
--- a/addons/web/static/tests/views/fields/boolean_toggle_field_tests.js
+++ b/addons/web/static/tests/views/fields/boolean_toggle_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, clickEdit, getFixture } from "@web/../tests/helpers/utils";
+import { click, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -79,7 +79,7 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.containsOnce(target, ".o_form_readonly");
+        assert.containsOnce(target, ".o_form_editable");
         assert.containsOnce(target, ".form-check.o_boolean_toggle");
         assert.notOk(target.querySelector(".o_boolean_toggle input").disabled);
         assert.notOk(target.querySelector(".o_boolean_toggle input").checked);
@@ -98,8 +98,6 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(target, ".form-check.o_boolean_toggle");
         assert.ok(target.querySelector(".o_boolean_toggle input").disabled);
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.ok(target.querySelector(".o_boolean_toggle input").disabled);
     });
 
     QUnit.test("BooleanToggleField is enabled in edit mode", async function (assert) {
@@ -112,7 +110,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.containsOnce(target, ".form-check.o_boolean_toggle");
-        await click(target.querySelector(".o_form_button_edit"));
 
         assert.notOk(target.querySelector(".o_boolean_toggle input").disabled);
         assert.notOk(target.querySelector(".o_boolean_toggle input").checked);
@@ -165,8 +162,6 @@ QUnit.module("Fields", (hooks) => {
                 ".form-check.o_boolean_toggle",
                 "Boolean toggle widget applied to boolean field"
             );
-
-            await clickEdit(target);
             assert.containsNone(target, ".o_boolean_toggle input:checked");
 
             await click(target, ".o_boolean_toggle");
@@ -193,8 +188,6 @@ QUnit.module("Fields", (hooks) => {
             ".form-check.o_boolean_toggle",
             "Boolean toggle widget applied to boolean field"
         );
-
-        await clickEdit(target);
         assert.containsNone(target, ".o_boolean_toggle input:checked");
 
         await click(target, ".o_boolean_toggle");
diff --git a/addons/web/static/tests/views/fields/char_field_tests.js b/addons/web/static/tests/views/fields/char_field_tests.js
index 05bd6634daf..95748c10fdf 100644
--- a/addons/web/static/tests/views/fields/char_field_tests.js
+++ b/addons/web/static/tests/views/fields/char_field_tests.js
@@ -3,6 +3,7 @@
 import { registry } from "@web/core/registry";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     makeDeferred,
@@ -147,14 +148,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "yop",
-            "the value should be displayed properly"
-        );
-
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
         assert.containsOnce(
             target,
             ".o_field_widget input[type='text']",
@@ -170,9 +163,9 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, ".o_field_widget input[type='text']", "limbo");
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input[type='text']").value,
             "limbo",
             "the new value should be displayed"
         );
@@ -203,12 +196,8 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             await editInput(target, ".o_field_widget input[type='text']", "");
-
-            // save
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
         }
     );
 
@@ -229,9 +218,6 @@ QUnit.module("Fields", (hooks) => {
                     </sheet>
                 </form>`,
         });
-
-        await click(target, ".o_form_button_edit");
-
         assert.hasAttrValue(
             target.querySelector("input"),
             "maxlength",
@@ -271,7 +257,7 @@ QUnit.module("Fields", (hooks) => {
         await editInput(cell, "input", "brolo");
 
         // save
-        await click(target, ".o_list_button_save");
+        await clickSave(target);
         cell = target.querySelector("tbody td:not(.o_list_record_selector)");
         assert.doesNotHaveClass(
             cell.parentElement,
@@ -336,8 +322,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.hasClass(target.querySelector("[name=foo] input"), "o_field_translate");
 
         assert.containsOnce(
@@ -465,7 +449,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await click(target, ".o_form_button_edit");
 
         // this will not affect the translate_fields effect until the record is
         // saved but is set for consistency of the test
@@ -546,12 +529,10 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, "[name='foo'] input", "<script>throw Error();</script>");
-
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "<script>throw Error();</script>",
             "the value should have been properly escaped"
         );
@@ -576,16 +557,9 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         await editInput(target, ".o_field_widget[name='foo'] input", "  abc  ");
-
         await editInput(target, ".o_field_widget[name='foo2'] input", "  def  ");
-
-        await click(target, ".o_form_button_save");
-
-        // edit mode
-        await click(target, ".o_form_button_edit");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget[name='foo'] input").value,
             "abc",
@@ -629,7 +603,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
             await click(target, ".o_field_x2many_list_row_add a");
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name='foo'] input").value,
@@ -763,8 +736,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name='foo'] input").value,
                 "yop",
@@ -802,7 +773,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.hasAttrValue(
             target.querySelector('.o_field_widget[name="display_name"] input'),
             "autocomplete",
@@ -820,7 +790,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.hasAttrValue(
             target.querySelector('.o_field_widget[name="display_name"] input'),
             "autocomplete",
@@ -838,12 +807,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.strictEqual(
-            target.querySelector('.o_field_widget[name="foo"]').innerText,
-            "***",
-            "password should be displayed with stars"
-        );
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="foo"] input').value,
             "yop",
@@ -856,6 +819,30 @@ QUnit.module("Fields", (hooks) => {
         );
     });
 
+    QUnit.test("input field: readonly password", async function (assert) {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `
+                <form>
+                    <field name="foo" password="True" readonly="1" />
+                </form>`,
+        });
+
+        assert.notEqual(
+            target.querySelector(".o_field_char").textContent,
+            "yop",
+            "password field value should not be visible in read mode"
+        );
+        assert.strictEqual(
+            target.querySelector(".o_field_char").textContent,
+            "***",
+            "password field value should be hidden with '*' in read mode"
+        );
+    });
+
     QUnit.test("input field: change password value", async function (assert) {
         await makeView({
             type: "form",
@@ -868,19 +855,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.notEqual(
-            target.querySelector(".o_field_char").textContent,
-            "yop",
-            "password field value should not be visible in read mode"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_char").textContent,
-            "***",
-            "password field value should be hidden with '*' in read mode"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.hasAttrValue(
             target.querySelector(".o_field_char input"),
             "type",
@@ -908,14 +882,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_char").textContent,
-            "",
-            "password field value should be empty in read mode"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.hasAttrValue(
             target.querySelector(".o_field_char input"),
             "type",
diff --git a/addons/web/static/tests/views/fields/color_field_tests.js b/addons/web/static/tests/views/fields/color_field_tests.js
index abf8a7beafa..abab67061d0 100644
--- a/addons/web/static/tests/views/fields/color_field_tests.js
+++ b/addons/web/static/tests/views/fields/color_field_tests.js
@@ -1,5 +1,5 @@
 /** @odoo-module **/
-import { click, editInput, getFixture, clickEdit } from "@web/../tests/helpers/utils";
+import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -129,7 +129,6 @@ QUnit.module("Fields", (hooks) => {
             "field has the default color set as background if no value has been selected"
         );
         assert.strictEqual(target.querySelector(".o_field_color input").value, "#000000");
-        await clickEdit(target);
         await editInput(target, ".o_field_char[name='foo'] input", "someValue");
         assert.verifySteps([
             'onchange [[1],{"id":1,"foo":"someValue","hex_color":false},"foo",{"foo":"1","hex_color":""}]',
diff --git a/addons/web/static/tests/views/fields/color_picker_field_tests.js b/addons/web/static/tests/views/fields/color_picker_field_tests.js
index b8d5d78d2a3..f5050684848 100644
--- a/addons/web/static/tests/views/fields/color_picker_field_tests.js
+++ b/addons/web/static/tests/views/fields/color_picker_field_tests.js
@@ -59,9 +59,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            // switch to edit mode
-            await click(target, ".o_form_button_edit");
-
             assert.hasClass(
                 target.querySelectorAll(".o_field_color_picker button"),
                 "o_colorlist_item_color_0",
@@ -102,9 +99,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
-
         await click(target, ".o_field_color_picker button");
 
         assert.strictEqual(
diff --git a/addons/web/static/tests/views/fields/date_field_tests.js b/addons/web/static/tests/views/fields/date_field_tests.js
index 5a17d19374f..a26b6cc2179 100644
--- a/addons/web/static/tests/views/fields/date_field_tests.js
+++ b/addons/web/static/tests/views/fields/date_field_tests.js
@@ -9,6 +9,8 @@ import {
     patchTimeZone,
     triggerEvent,
     triggerEvents,
+    clickSave,
+    clickCreate,
 } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
@@ -120,7 +122,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
             assert.containsNone(
                 document.body,
                 ".bootstrap-datetimepicker-widget",
@@ -155,11 +156,11 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(
             target,
-            ".o_field_widget > span",
-            "should have one span in the form view"
+            ".o_field_widget input",
+            "should have one input in the form view"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_widget > span").textContent,
+            target.querySelector(".o_field_widget input").value,
             "",
             "and it should be empty"
         );
@@ -175,7 +176,6 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 arch: '<form><field name="date"/></form>',
             });
-            await click(target, ".o_form_button_edit");
 
             const input = target.querySelector(".o_field_widget[name='date'] input");
             assert.strictEqual(input.value, "02/03/2017");
@@ -196,7 +196,6 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 arch: '<form><field name="date"/></form>',
             });
-            await click(target, ".o_form_button_edit");
 
             const input = target.querySelector(".o_field_widget[name='date'] input");
             assert.strictEqual(input.value, "");
@@ -215,7 +214,6 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             arch: '<form><field name="date"/></form>',
         });
-        await click(target, ".o_form_button_edit");
 
         await click(target, ".o_datepicker input");
         // open datepicker and select a date
@@ -236,7 +234,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("DateField in form view (with positive time zone offset)", async function (assert) {
-        assert.expect(8);
+        assert.expect(7);
 
         patchTimeZone(120); // Should be ignored by date fields
 
@@ -257,14 +255,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_date").textContent,
-            "02/03/2017",
-            "the date should be correctly displayed in readonly"
-        );
-
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_datepicker_input").value,
             "02/03/2017",
@@ -304,9 +294,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_date").textContent,
+            target.querySelector(".o_field_date input").value,
             "02/22/2017",
             "the selected date should be displayed after saving"
         );
@@ -323,14 +313,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="date"/></form>',
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_date").textContent,
-            "02/03/2017",
-            "the date should be correctly displayed in readonly"
-        );
-
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_datepicker_input").value,
             "02/03/2017",
@@ -351,7 +333,6 @@ QUnit.module("Fields", (hooks) => {
                     </div>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         await click(target, ".o_datepicker input");
         assert.containsOnce(
@@ -379,8 +360,6 @@ QUnit.module("Fields", (hooks) => {
                     <field name="date" options="{ 'datepicker': { 'warn_future': true } }" />
                 </form>`,
         });
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
 
         // open datepicker and select another value
         await click(target, ".o_datepicker input");
@@ -430,8 +409,6 @@ QUnit.module("Fields", (hooks) => {
                         <field name="date" options="{ 'datepicker': { 'warn_future': true } }" />
                     </form>`,
             });
-            // switch to edit mode
-            await click(target, ".o_form_button_edit");
 
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name='date'] input").value,
@@ -439,11 +416,8 @@ QUnit.module("Fields", (hooks) => {
                 "The existing record should have a value for the date field"
             );
 
-            // save with no changes
-            await click(target, ".o_form_button_save");
-
             //Create a new record
-            await click(target, ".o_form_button_create");
+            await clickCreate(target);
             assert.notOk(
                 target.querySelector(".o_field_widget[name='date'] input").value,
                 "The new record should not have a value that the framework would have set"
@@ -513,7 +487,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector("tr.o_data_row td:not(.o_list_record_selector)").textContent,
             "02/22/2017",
@@ -534,8 +508,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
 
         assert.strictEqual(
             target.querySelector(".o_datepicker_input").value,
@@ -553,7 +525,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_field_date").textContent,
             "",
@@ -574,7 +546,6 @@ QUnit.module("Fields", (hooks) => {
                     assert.step(method);
                 },
             });
-            await click(target, ".o_form_button_edit");
 
             assert.strictEqual(
                 target.querySelector(".o_datepicker_input").value,
@@ -585,8 +556,8 @@ QUnit.module("Fields", (hooks) => {
             const input = target.querySelector(".o_field_widget[name='datetime'] input");
             input.value = "02/08/2017";
             await triggerEvents(input, null, ["input", "change", "focusout"]);
-            await click(target, ".o_form_button_save");
 
+            assert.containsOnce(target, ".o_form_saved");
             assert.verifySteps(["get_views", "read"]); // should not have save as nothing changed
         }
     );
@@ -604,7 +575,6 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 arch: '<form><field name="date"/></form>',
             });
-            await click(target, ".o_form_button_edit");
 
             $(target).on("show.datetimepicker", () => {
                 assert.containsOnce(
@@ -660,8 +630,7 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        const dateViewForm = target.querySelector(".o_field_date").textContent;
-        await click(target.querySelector(".o_form_button_edit"));
+        const dateViewForm = target.querySelector(".o_field_date input").value;
         await click(target, ".o_datepicker input");
 
         assert.strictEqual(
@@ -671,9 +640,9 @@ QUnit.module("Fields", (hooks) => {
         );
         await click(document.body.querySelector(".day[data-day*='/22/']"));
         const dateEditForm = target.querySelector(".o_datepicker_input").value;
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_date").textContent,
+            target.querySelector(".o_field_date input").value,
             dateEditForm,
             "date field should be the same as the one selected in the view form"
         );
@@ -692,7 +661,6 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             arch: '<form><field name="date"/></form>',
         });
-        await click(target, ".o_form_button_edit");
 
         const year = new Date().getFullYear();
         const input = target.querySelector(".o_field_widget[name='date'] input");
diff --git a/addons/web/static/tests/views/fields/daterange_field_tests.js b/addons/web/static/tests/views/fields/daterange_field_tests.js
index 58c6bbc5028..3cdf6dc4f3d 100644
--- a/addons/web/static/tests/views/fields/daterange_field_tests.js
+++ b/addons/web/static/tests/views/fields/daterange_field_tests.js
@@ -2,6 +2,7 @@
 
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     patchDate,
@@ -69,22 +70,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            let fields = target.querySelectorAll(".o_field_daterange");
-            // Check date display correctly in readonly
-            assert.strictEqual(
-                fields[0].textContent,
-                "02/08/2017 15:30:00",
-                "the start date should be correctly displayed in readonly"
-            );
-            assert.strictEqual(
-                fields[fields.length - 1].textContent,
-                "03/13/2017 05:30:00",
-                "the end date should be correctly displayed in readonly"
-            );
-
-            // Edit
-            await click(target, ".o_form_button_edit");
-
             // Check date range picker initialization
             assert.containsN(
                 document.body,
@@ -103,7 +88,7 @@ QUnit.module("Fields", (hooks) => {
             );
 
             // open the first one
-            fields = target.querySelectorAll(".o_field_daterange");
+            let fields = target.querySelectorAll(".o_field_daterange");
             await click(fields[0].querySelector("input"));
 
             let datepicker = document.querySelector(
@@ -206,12 +191,12 @@ QUnit.module("Fields", (hooks) => {
             );
 
             // Save
-            await click(target, ".o_form_button_save");
-            fields = target.querySelectorAll(".o_field_daterange");
+            await clickSave(target);
+            fields = target.querySelectorAll(".o_field_daterange input");
 
             // Check date after save
-            assert.strictEqual(fields[0].textContent, "02/08/2017 15:30:00");
-            assert.strictEqual(fields[fields.length - 1].textContent, "02/09/2017 05:30:00");
+            assert.strictEqual(fields[0].value, "02/08/2017 15:30:00");
+            assert.strictEqual(fields[fields.length - 1].value, "02/09/2017 05:30:00");
         }
     );
 
@@ -234,23 +219,6 @@ QUnit.module("Fields", (hooks) => {
             });
 
             let fields = target.querySelectorAll(".o_field_daterange");
-
-            // Check date display correctly in readonly
-            assert.strictEqual(
-                fields[0].textContent,
-                "02/03/2017",
-                "the start date should be correctly displayed in readonly"
-            );
-            assert.strictEqual(
-                fields[fields.length - 1].textContent,
-                "02/08/2017",
-                "the end date should be correctly displayed in readonly"
-            );
-
-            // Edit
-            await click(target, ".o_form_button_edit");
-
-            fields = target.querySelectorAll(".o_field_daterange");
             const datepickers = document.querySelectorAll(`.daterangepicker`);
 
             // Check date range picker initialization
@@ -361,17 +329,17 @@ QUnit.module("Fields", (hooks) => {
             );
 
             // Save
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
             fields = target.querySelectorAll(".o_field_daterange");
 
             // Check date after save
             assert.strictEqual(
-                fields[0].textContent,
+                fields[0].querySelector("input").value,
                 "02/13/2017",
                 "the start date should be '02/13/2017' after save"
             );
             assert.strictEqual(
-                fields[fields.length - 1].textContent,
+                fields[1].querySelector("input").value,
                 "03/18/2017",
                 "the end date should be '03/18/2017' after save"
             );
@@ -399,9 +367,7 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
             await click(target.querySelector(".o_field_daterange[name='datetime'] input"));
-
             assert.isVisible(
                 document.querySelector(".daterangepicker[data-name='datetime']"),
                 "date range picker should be opened"
@@ -445,18 +411,16 @@ QUnit.module("Fields", (hooks) => {
 
             // check date display correctly in readonly
             assert.strictEqual(
-                target.querySelector(".o_field_daterange").textContent,
+                target.querySelector(".o_field_daterange input").value,
                 "02/08/2017 15:30:00",
                 "the start date should be correctly displayed in readonly"
             );
             assert.strictEqual(
-                target.querySelectorAll(".o_field_daterange")[1].textContent,
+                target.querySelectorAll(".o_field_daterange input")[1].value,
                 "03/13/2017 05:30:00",
                 "the end date should be correctly displayed in readonly"
             );
 
-            // edit form
-            await click(target.querySelector(".o_form_button_edit"));
             // update input for Datetime
             await editInput(
                 target,
@@ -464,12 +428,12 @@ QUnit.module("Fields", (hooks) => {
                 "02/08/2017 11:30:00"
             );
             // save form
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
-                target.querySelector(".o_field_daterange").textContent,
+                target.querySelector(".o_field_daterange input").value,
                 "02/08/2017 11:30:00",
-                "the start date should be correctly displayed in readonly after manual update"
+                "the start date should be correctly displayed after manual update"
             );
         }
     );
@@ -492,7 +456,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await click(target, ".o_form_button_edit");
             await editInput(target, ".o_field_daterange[name='date'] input", "blabla");
             // click outside daterange field
             await click(target);
@@ -511,7 +474,7 @@ QUnit.module("Fields", (hooks) => {
 
             // again enter wrong value and try to save should raise invalid fields value
             await editInput(target, ".o_field_daterange[name='date'] input", "blabla");
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
             assert.strictEqual(
                 target.querySelector(".o_notification_title").textContent,
                 "Invalid fields: "
@@ -591,12 +554,12 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_daterange[name='datetime']").textContent,
+            target.querySelector(".o_field_daterange[name='datetime'] input").value,
             "02/08/2017",
             "the start date should only show date when option formatType is Date"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_daterange[name='datetime_end']").textContent,
+            target.querySelector(".o_field_daterange[name='datetime_end'] input").value,
             "03/13/2017",
             "the end date should only show date when option formatType is Date"
         );
diff --git a/addons/web/static/tests/views/fields/datetime_field_tests.js b/addons/web/static/tests/views/fields/datetime_field_tests.js
index 9f33d0496cf..70eb8fd068d 100644
--- a/addons/web/static/tests/views/fields/datetime_field_tests.js
+++ b/addons/web/static/tests/views/fields/datetime_field_tests.js
@@ -4,6 +4,7 @@ import { registry } from "@web/core/registry";
 import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     patchTimeZone,
@@ -67,13 +68,11 @@ QUnit.module("Fields", (hooks) => {
 
         const expectedDateString = "02/08/2017 12:00:00"; // 10:00:00 without timezone
         assert.strictEqual(
-            target.querySelector(".o_field_datetime").textContent,
+            target.querySelector(".o_field_datetime input").value,
             expectedDateString,
             "the datetime should be correctly displayed in readonly"
         );
 
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_datepicker_input").value,
             expectedDateString,
@@ -126,9 +125,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_datetime").textContent,
+            target.querySelector(".o_field_datetime input").value,
             newExpectedDateString,
             "the selected date should be displayed after saving"
         );
@@ -155,8 +154,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             await click(target, ".o_datepicker_input");
             assert.containsOnce(document.body, ".bootstrap-datetimepicker-widget");
 
@@ -325,7 +322,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector("tr.o_data_row td:not(.o_list_record_selector)").textContent,
             newExpectedDateString,
@@ -390,8 +387,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        // switch to edit mode
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_datepicker_input").value,
             "02/08/2017 12:00:00",
@@ -408,7 +403,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_field_datetime").textContent,
             "",
@@ -452,7 +447,7 @@ QUnit.module("Fields", (hooks) => {
             // switch to form view
             await click(target, ".o_field_widget[name='p'] .o_data_cell");
             assert.strictEqual(
-                document.body.querySelector(".modal .o_field_date[name='datetime']").textContent,
+                document.body.querySelector(".modal .o_field_date[name='datetime'] input").value,
                 "02/07/2017",
                 "the datetime (date widget) should be correctly displayed in form view"
             );
@@ -495,7 +490,7 @@ QUnit.module("Fields", (hooks) => {
             // switch to form view
             await click(target, ".o_field_widget[name='p'] .o_data_cell");
             assert.strictEqual(
-                document.body.querySelector(".modal .o_field_date[name='datetime']").textContent,
+                document.body.querySelector(".modal .o_field_date[name='datetime'] input").value,
                 "02/08/2017",
                 "the datetime (date widget) should be correctly displayed in form view"
             );
@@ -556,8 +551,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const datetime = target.querySelector(".o_field_datetime input");
 
         // Enter a beginning of date and press enter to validate
@@ -573,10 +566,10 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(datetime.value, datetimeValue);
 
         // Save and check that it's still ok
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
-        const { textContent } = target.querySelector(".o_field_datetime span");
-        assert.strictEqual(textContent, datetimeValue);
+        const { value } = target.querySelector(".o_field_datetime input");
+        assert.strictEqual(value, datetimeValue);
     });
 
     QUnit.test(
@@ -595,15 +588,13 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await click(target, ".o_form_button_edit");
-
             await editInput(target, ".o_field_widget input", "01/08/22");
             await triggerEvent(target, ".o_field_widget input", "keydown", { key: "Enter" });
 
             assert.strictEqual(target.querySelector(".o_field_widget input").value, "01/08/2022");
 
             // Click outside the field to check that the field is not changed
-            await click(target);
+            await clickSave(target);
             assert.strictEqual(target.querySelector(".o_field_widget input").value, "01/08/2022");
         }
     );
diff --git a/addons/web/static/tests/views/fields/domain_field_tests.js b/addons/web/static/tests/views/fields/domain_field_tests.js
index a4460e31347..85d413641bc 100644
--- a/addons/web/static/tests/views/fields/domain_field_tests.js
+++ b/addons/web/static/tests/views/fields/domain_field_tests.js
@@ -3,6 +3,7 @@
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     makeDeferred,
@@ -112,7 +113,7 @@ QUnit.module("Fields", (hooks) => {
             });
 
             assert.strictEqual(
-                target.querySelector(".o_read_mode").textContent,
+                target.querySelector(".o_edit_mode").textContent,
                 "This domain is not supported.",
                 "The widget should not crash the view, but gracefully admit its failure."
             );
@@ -136,7 +137,6 @@ QUnit.module("Fields", (hooks) => {
                     </sheet>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         // As the domain is empty, there should be a button to add the first
         // domain part
@@ -189,7 +189,7 @@ QUnit.module("Fields", (hooks) => {
 
         // Saving the form view should show a readonly domain containing the
         // "color" field
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.ok(
             target.querySelector(".o_field_domain").textContent.includes("Color index"),
             "field selector readonly value should now contain 'Color index'"
@@ -216,7 +216,6 @@ QUnit.module("Fields", (hooks) => {
                     </sheet>
                 </form>`,
         });
-        await click(target, ".o_form_button_edit");
 
         // As the domain is equal to [["id", "=", 1]] there should be a field
         // selector to change this
@@ -293,7 +292,6 @@ QUnit.module("Fields", (hooks) => {
                         <field name="foo" widget="domain" options="{'model': 'partner'}" />
                     </form>`,
             });
-            await click(target, ".o_form_button_edit");
 
             assert.strictEqual(
                 target.querySelector(".o_domain_show_selection_button").textContent.trim(),
@@ -312,7 +310,7 @@ QUnit.module("Fields", (hooks) => {
     );
 
     QUnit.test("domain field: handle false domain as []", async function (assert) {
-        assert.expect(4);
+        assert.expect(3);
 
         serverData.models.partner.records[0].foo = false;
         serverData.models.partner.fields.bar.type = "char";
@@ -343,8 +341,6 @@ QUnit.module("Fields", (hooks) => {
             ".o_field_widget[name='foo']:not(.o_field_empty)",
             "there should be a domain field, not considered empty"
         );
-
-        await click(target, ".o_form_button_edit");
         assert.containsNone(
             target,
             ".o_field_widget[name='foo'] .text-warning",
@@ -460,13 +456,10 @@ QUnit.module("Fields", (hooks) => {
         await doAction(webClient, 1);
         assert.verifySteps(["[]"]);
 
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             target.querySelector(".o_domain_show_selection_button").textContent.trim(),
             "2 record(s)"
         );
-        assert.verifySteps(["[]"]);
 
         await editInput(target, ".o_domain_debug_input", "[['id', '<', 40]]");
         // the count should not be re-computed when editing with the textarea
@@ -476,15 +469,12 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.verifySteps([]);
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_domain_show_selection_button").textContent.trim(),
             "1 record(s)"
         );
-        assert.verifySteps([
-            '[["id","<",40]]', // to validate the domain, before saving
-            '[["id","<",40]]', // to render in readonly once it has been saved
-        ]);
+        assert.verifySteps(['[["id","<",40]]']);
     });
 
     QUnit.test(
@@ -531,13 +521,10 @@ QUnit.module("Fields", (hooks) => {
             await doAction(webClient, 1);
             assert.verifySteps(["[]"]);
 
-            await click(target, ".o_form_button_edit");
-
             assert.strictEqual(
                 target.querySelector(".o_domain_show_selection_button").textContent.trim(),
                 "2 record(s)"
             );
-            assert.verifySteps(["[]"]);
 
             await editInput(target, ".o_domain_debug_input", "[['abc']]");
             // the count should not be re-computed when editing with the textarea
@@ -547,7 +534,7 @@ QUnit.module("Fields", (hooks) => {
             );
             assert.verifySteps([]);
 
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
             assert.hasClass(
                 target.querySelector(".o_field_domain"),
                 "o_field_invalid",
@@ -603,8 +590,6 @@ QUnit.module("Fields", (hooks) => {
             await doAction(webClient, 1);
             assert.verifySteps(["[]"]);
 
-            await click(target, ".o_form_button_edit");
-
             assert.strictEqual(
                 target.querySelector(".o_domain_show_selection_button").textContent.trim(),
                 "2 record(s)"
@@ -616,7 +601,6 @@ QUnit.module("Fields", (hooks) => {
                 target.querySelector(".o_domain_show_selection_button").textContent.trim(),
                 "2 record(s)"
             );
-            assert.verifySteps(["[]"]);
 
             // click on the refresh button
             await click(target, ".o_refresh_count");
@@ -709,7 +693,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         await doAction(webClient, 1);
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
 
         rawDomain = `
@@ -720,7 +703,7 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, ".o_domain_debug_input", rawDomain);
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
     });
 
     QUnit.test("domain field: edit through selector (dynamic content)", async function (assert) {
@@ -762,8 +745,6 @@ QUnit.module("Fields", (hooks) => {
         await doAction(webClient, 1);
         assert.verifySteps(["/web/action/load", "get_views", "read", "search_count", "fields_get"]);
 
-        await click(target, ".o_form_button_edit");
-        assert.verifySteps(["search_count"]);
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
         assert.containsOnce(target, ".o_datepicker", "there should be a datepicker");
 
@@ -775,15 +756,6 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
         assert.verifySteps([]);
 
-        // Save
-        await click(target, ".o_form_button_save");
-        assert.verifySteps(["search_count"]);
-
-        // Edit again
-        await click(target, ".o_form_button_edit");
-        assert.verifySteps(["search_count"]);
-        assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
-
         // Manually input a date
         rawDomain = `[("date", ">=", "2020-09-09")]`;
         await editInput(target, ".o_datepicker_input", "09/09/2020");
@@ -791,12 +763,8 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
 
         // Save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.verifySteps(["write", "read", "search_count"]);
-
-        // Edit again
-        await click(target, ".o_form_button_edit");
-        assert.verifySteps(["search_count"]);
         assert.strictEqual(target.querySelector(".o_domain_debug_input").value, rawDomain);
     });
 
diff --git a/addons/web/static/tests/views/fields/email_field_tests.js b/addons/web/static/tests/views/fields/email_field_tests.js
index 13d588a5633..eaaa211bc6c 100644
--- a/addons/web/static/tests/views/fields/email_field_tests.js
+++ b/addons/web/static/tests/views/fields/email_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -58,13 +58,8 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        let mailtoLink = target.querySelector(".o_field_email a.o_form_uri.o_text_overflow");
-        assert.containsOnce(target, mailtoLink, "should have a anchor with correct classes");
-        assert.strictEqual(mailtoLink.textContent, "yop", "the value should be displayed properly");
-        assert.hasAttrValue(mailtoLink, "href", "mailto:yop", "should have proper mailto prefix");
 
         // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
         const mailtoEdit = target.querySelector('.o_field_email input[type="email"]');
         assert.containsOnce(target, mailtoEdit, "should have an input for the email field");
         assert.strictEqual(
@@ -77,15 +72,9 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, ".o_field_email input[type='email']", "new");
 
         // save
-        await click(target.querySelector(".o_form_button_save"));
-        mailtoLink = target.querySelector(".o_field_email a");
-        assert.strictEqual(mailtoLink.textContent, "new", "new value should be displayed properly");
-        assert.hasAttrValue(
-            mailtoLink,
-            "href",
-            "mailto:new",
-            "should still have proper mailto prefix"
-        );
+        await clickSave(target);
+        const mailtoLink = target.querySelector(".o_field_email input[type='email']");
+        assert.strictEqual(mailtoLink.value, "new", "new value should be displayed properly");
     });
 
     QUnit.test("EmailField in editable list view", async function (assert) {
@@ -132,7 +121,7 @@ QUnit.module("Fields", (hooks) => {
         await editInput(cell, "input", "new");
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await clickSave(target);
         cell = target.querySelector("tbody td:not(.o_list_record_selector)");
         assert.doesNotHaveClass(
             cell.parentElement,
@@ -168,11 +157,9 @@ QUnit.module("Fields", (hooks) => {
                     </sheet>
                 </form>`,
         });
-        assert.strictEqual(target.querySelector(".o_field_email input").placeholder, "Placeholder");
-
-        await click(target.querySelector(".o_form_button_save"));
-        const mailtoLink = target.querySelector(".o_field_email a");
-        assert.strictEqual(mailtoLink.textContent, "", "the value should be displayed properly");
+        const input = target.querySelector(".o_field_email input");
+        assert.strictEqual(input.placeholder, "Placeholder");
+        assert.strictEqual(input.value, "", "the value should be displayed properly");
     });
 
     QUnit.test("EmailField trim user value", async function (assert) {
@@ -184,8 +171,7 @@ QUnit.module("Fields", (hooks) => {
         });
         await editInput(target, ".o_field_widget[name='foo'] input", "  abc@abc.com  ");
         const mailFieldInput = target.querySelector('.o_field_widget[name="foo"] input');
-        await click(target.querySelector(".o_form_button_save"));
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
         assert.strictEqual(
             mailFieldInput.value,
             "abc@abc.com",
@@ -229,7 +215,6 @@ QUnit.module("Fields", (hooks) => {
             );
 
             // edit the phone field, but with the mail in readonly mode
-            await click(target.querySelector(".o_form_button_edit"));
             await editInput(target, ".o_field_widget[name='int_field'] input", 3);
 
             // check rendering after changes
diff --git a/addons/web/static/tests/views/fields/float_factor_field_tests.js b/addons/web/static/tests/views/fields/float_factor_field_tests.js
index ff5ebeff88a..3e0ec00ac5e 100644
--- a/addons/web/static/tests/views/fields/float_factor_field_tests.js
+++ b/addons/web/static/tests/views/fields/float_factor_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -25,7 +25,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.module("FloatFactorField");
 
     QUnit.test("FloatFactorField in form view", async function (assert) {
-        assert.expect(4);
+        assert.expect(3);
 
         await makeView({
             type: "form",
@@ -45,13 +45,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "4.55", // 9.1 / 0.5
-            "The formatted value should be displayed properly."
-        );
-
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_field_widget[name='qux'] input").value,
             "4.55",
@@ -59,10 +52,10 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name='qux'] input", "2.3");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "2.30",
             "The new value should be saved and displayed properly."
         );
diff --git a/addons/web/static/tests/views/fields/float_field_tests.js b/addons/web/static/tests/views/fields/float_field_tests.js
index 6a84d68e00e..478825efa80 100644
--- a/addons/web/static/tests/views/fields/float_field_tests.js
+++ b/addons/web/static/tests/views/fields/float_field_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
-import { click, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
+import { click, clickSave, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { registry } from "@web/core/registry";
 
@@ -50,7 +50,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "0.00",
             "Non-set float field should be considered as 0."
         );
@@ -68,7 +68,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_float").textContent,
+            target.querySelector(".o_field_float input").value,
             "0.4",
             "should contain a number rounded to 1 decimal"
         );
@@ -84,7 +84,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_float").textContent,
+            target.querySelector(".o_field_float input").value,
             "0.4",
             "should contain a number rounded to 1 decimal"
         );
@@ -100,7 +100,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_float").textContent,
+            target.querySelector(".o_field_float input").value,
             "0.4",
             "should contain a number rounded to 1 decimal"
         );
@@ -115,8 +115,6 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="float_field" options="{'type': 'number', 'step': 0.3}"/></form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.ok(
             target.querySelector(".o_field_widget input").hasAttribute("step"),
             "Integer field with option type must have a step attribute."
@@ -145,19 +143,11 @@ QUnit.module("Fields", (hooks) => {
             "Float field should be considered set for value 0."
         );
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "0.000",
             "The value should be displayed properly."
         );
 
-        await click(target, ".o_form_button_edit");
-
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name=float_field] input").value,
-            "0.000",
-            "The value should be rendered with correct precision."
-        );
-
         await editInput(target, 'div[name="float_field"] input', "108.2451938598598");
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=float_field] input").value,
@@ -166,10 +156,10 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name=float_field] input", "18.8958938598598");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "18.896",
             "The new value should be rounded properly."
         );
@@ -184,40 +174,36 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="float_field" options="{ 'digits': [0, 3] }" /></form>`,
         });
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=float_field] input", "=20+3*2");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "26.000",
             "The new value should be calculated properly."
         );
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=float_field] input", "=2**3");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "8.000",
             "The new value should be calculated properly."
         );
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=float_field] input", "=2^3");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "8.000",
             "The new value should be calculated properly."
         );
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=float_field] input", "=100/3");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "33.333",
             "The new value should be calculated properly."
         );
@@ -232,9 +218,8 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="float_field" options="{ 'digits': [0, 3] }" /></form>`,
         });
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=float_field] input", "=abc");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.hasClass(
             target.querySelector(".o_field_widget[name=float_field]"),
@@ -244,7 +229,7 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".o_form_editable", "form view should still be editable");
 
         await editInput(target, ".o_field_widget[name=float_field] input", "=3:2?+4");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.containsOnce(target, ".o_form_editable", "form view should still be editable");
         assert.hasClass(
@@ -291,32 +276,6 @@ QUnit.module("Fields", (hooks) => {
         );
     });
 
-    QUnit.test("do not trigger a field_changed if they have not changed", async function (assert) {
-        serverData.models.partner.records[0].float_field = false;
-        serverData.models.partner.records[0].int_field = false;
-        await makeView({
-            serverData,
-            type: "form",
-            resModel: "partner",
-            arch: `
-                <form>
-                    <sheet>
-                        <field name="float_field" widget="float" digits="[5,3]"/>
-                        <field name="int_field"/>
-                    </sheet>
-                </form>`,
-            mockRPC(route, { method }) {
-                assert.step(method);
-            },
-            resId: 1,
-        });
-
-        await click(target.querySelector(".o_form_button_edit"));
-        await click(target.querySelector(".o_form_button_save"));
-
-        assert.verifySteps(["get_views", "read"]); // should not have save as nothing changed
-    });
-
     QUnit.test("float field with type number option", async function (assert) {
         await makeView({
             serverData,
@@ -336,7 +295,6 @@ QUnit.module("Fields", (hooks) => {
                 makeFakeLocalizationService({ thousandsSep: ",", grouping: [3, 0] })
             );
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.ok(
             target.querySelector(".o_field_widget input").hasAttribute("type"),
             "Float field with option type must have a type attribute."
@@ -348,19 +306,12 @@ QUnit.module("Fields", (hooks) => {
             'Float field with option type must have a type attribute equals to "number".'
         );
         await editInput(target, ".o_field_widget[name=float_field] input", "123456.7890");
-        await click(target.querySelector(".o_form_button_save"));
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "123456.789",
             "Float value must be not formatted if input type is number. (but the trailing 0 is gone)"
         );
-        await click(target.querySelector(".o_form_button_save"));
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "123,456.79",
-            "Float value must be formatted in readonly view even if the input type is number."
-        );
     });
 
     QUnit.test(
@@ -386,7 +337,6 @@ QUnit.module("Fields", (hooks) => {
                 })
             );
 
-            await click(target.querySelector(".o_form_button_edit"));
             assert.ok(
                 target.querySelector(".o_field_widget input").hasAttribute("type"),
                 "Float field with option type must have a type attribute."
@@ -398,19 +348,12 @@ QUnit.module("Fields", (hooks) => {
                 'Float field with option type must have a type attribute equals to "number".'
             );
             await editInput(target, ".o_field_widget[name=float_field] input", "123456.789");
-            await click(target.querySelector(".o_form_button_save"));
-            await click(target.querySelector(".o_form_button_edit"));
+            await clickSave(target);
             assert.strictEqual(
                 target.querySelector(".o_field_widget input").value,
                 "123456.789",
                 "Float value must be not formatted if input type is number."
             );
-            await click(target.querySelector(".o_form_button_save"));
-            assert.strictEqual(
-                target.querySelector(".o_field_widget").textContent,
-                "123.456,79",
-                "Float value must be formatted in readonly view even if the input type is number."
-            );
         }
     );
 
@@ -430,7 +373,6 @@ QUnit.module("Fields", (hooks) => {
                 makeFakeLocalizationService({ thousandsSep: ",", grouping: [3, 0] })
             );
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.hasAttrValue(
             target.querySelector(".o_field_widget input"),
             "type",
@@ -439,8 +381,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name=float_field] input", "123456.7890");
-        await click(target.querySelector(".o_form_button_save"));
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "123,456.79",
diff --git a/addons/web/static/tests/views/fields/float_time_field_tests.js b/addons/web/static/tests/views/fields/float_time_field_tests.js
index e8aada0d09d..e9b9b59f313 100644
--- a/addons/web/static/tests/views/fields/float_time_field_tests.js
+++ b/addons/web/static/tests/views/fields/float_time_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
+import { clickSave, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -26,7 +26,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.module("FloatTimeField");
 
     QUnit.test("FloatTimeField in form view", async function (assert) {
-        assert.expect(5);
+        assert.expect(4);
 
         await makeView({
             serverData,
@@ -52,13 +52,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // 9 + 0.1 * 60 = 9.06
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "09:06",
-            "The formatted time value should be displayed properly."
-        );
-
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_field_float_time[name=qux] input").value,
             "09:06",
@@ -76,9 +69,9 @@ QUnit.module("Fields", (hooks) => {
             "The new value should be displayed properly in the input."
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "-11:48",
             "The new value should be saved and displayed properly."
         );
@@ -108,12 +101,11 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "09:06",
             "The formatted time value should be displayed properly."
         );
 
-        await click(target, ".o_form_button_edit");
         await editInput(target.querySelector(".o_field_float_time[name=qux] input"), null, "9.5");
         assert.strictEqual(
             target.querySelector(".o_field_float_time[name=qux] input").value,
@@ -121,9 +113,9 @@ QUnit.module("Fields", (hooks) => {
             "The new value should be displayed properly in the input."
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "09:30",
             "The new value should be saved and displayed properly."
         );
@@ -145,7 +137,7 @@ QUnit.module("Fields", (hooks) => {
             null,
             "blabla"
         );
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_notification_title").textContent,
             "Invalid fields: "
diff --git a/addons/web/static/tests/views/fields/float_toggle_field_tests.js b/addons/web/static/tests/views/fields/float_toggle_field_tests.js
index 427c0c29b1a..76925189200 100644
--- a/addons/web/static/tests/views/fields/float_toggle_field_tests.js
+++ b/addons/web/static/tests/views/fields/float_toggle_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, clickEdit, clickSave, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -47,9 +47,6 @@ QUnit.module("Fields", (hooks) => {
             "0.056", // 0.4444 * 0.125
             "The formatted time value should be displayed properly."
         );
-
-        await clickEdit(target);
-
         assert.strictEqual(
             target.querySelector("button.o_field_float_toggle").textContent,
             "0.056",
diff --git a/addons/web/static/tests/views/fields/handle_field_tests.js b/addons/web/static/tests/views/fields/handle_field_tests.js
index 4d17d8b8797..b638af8041f 100644
--- a/addons/web/static/tests/views/fields/handle_field_tests.js
+++ b/addons/web/static/tests/views/fields/handle_field_tests.js
@@ -73,16 +73,13 @@ QUnit.module("Fields", (hooks) => {
             "handle should not have any content"
         );
 
-        assert.strictEqual(
-            getComputedStyle(target.querySelector("td span.o_row_handle")).display,
-            "none",
-            "handle should be invisible in readonly mode"
+        assert.isVisible(
+            target.querySelector("td span.o_row_handle"),
+            "handle should be invisible"
         );
 
         assert.containsN(target, "span.o_row_handle", 2, "should have 2 handles");
 
-        await click(target, ".o_form_button_edit");
-
         assert.hasClass(
             target.querySelector("td"),
             "o_handle_cell",
@@ -150,16 +147,7 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(
             getComputedStyle(target.querySelector("td span.o_row_handle")).display,
             "none",
-            "handle should be invisible in readonly mode"
-        );
-
-        await click(target, ".o_form_button_edit");
-
-        assert.containsN(target, ".o_row_handle", 3, "the handle fields should still be there");
-        assert.strictEqual(
-            getComputedStyle(target.querySelector("td span.o_row_handle")).display,
-            "none",
-            "the handle icons should still not be displayed (on readonly fields)"
+            "handle should be invisible"
         );
     });
 });
diff --git a/addons/web/static/tests/views/fields/html_field_tests.js b/addons/web/static/tests/views/fields/html_field_tests.js
index eccac230021..2ef1afd4acc 100644
--- a/addons/web/static/tests/views/fields/html_field_tests.js
+++ b/addons/web/static/tests/views/fields/html_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { registry } from "@web/core/registry";
 import { HtmlField } from "@web/views/fields/html/html_field";
@@ -34,7 +34,21 @@ QUnit.module("Fields", ({ beforeEach }) => {
 
     QUnit.module("HtmlField");
 
-    QUnit.test("html fields are correctly rendered", async (assert) => {
+    QUnit.test("html fields are correctly rendered (readonly)", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: /* xml */ `<form><field name="txt" readonly="1" /></form>`,
+        });
+
+        assert.containsOnce(target, "div.kek");
+        assert.strictEqual(target.querySelector(".o_field_html .kek").style.color, "red");
+        assert.strictEqual(target.querySelector(".o_field_html").textContent, "some text");
+    });
+
+    QUnit.test("html fields are correctly rendered (edit)", async (assert) => {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -43,11 +57,6 @@ QUnit.module("Fields", ({ beforeEach }) => {
             arch: /* xml */ `<form><field name="txt" /></form>`,
         });
 
-        assert.containsOnce(target, ".o_field_html", "should have a text area");
-        assert.strictEqual(target.querySelector(".o_field_html .kek").style.color, "red");
-        assert.strictEqual(target.querySelector(".o_field_html").textContent, "some text");
-
-        await click(target, ".o_form_button_edit");
         const textarea = target.querySelector(".o_field_html textarea");
         assert.ok(textarea, "should have a text area");
         assert.strictEqual(textarea.value, RED_TEXT);
@@ -58,10 +67,5 @@ QUnit.module("Fields", ({ beforeEach }) => {
 
         await editInput(textarea, null, BLUE_TEXT);
         assert.strictEqual(textarea.value, BLUE_TEXT);
-
-        await click(target, ".o_form_button_save");
-
-        assert.strictEqual(target.querySelector(".o_field_html .kek").style.color, "blue");
-        assert.strictEqual(target.querySelector(".o_field_html").textContent, "hello world");
     });
 });
diff --git a/addons/web/static/tests/views/fields/image_field_tests.js b/addons/web/static/tests/views/fields/image_field_tests.js
index 510bf92807e..ce36b089db6 100644
--- a/addons/web/static/tests/views/fields/image_field_tests.js
+++ b/addons/web/static/tests/views/fields/image_field_tests.js
@@ -5,7 +5,6 @@ import {
     getFixture,
     nextTick,
     triggerEvent,
-    clickEdit,
     clickSave,
     editInput,
 } from "@web/../tests/helpers/utils";
@@ -131,8 +130,6 @@ QUnit.module("Fields", (hooks) => {
             "the image should correctly set its attributes"
         );
 
-        await click(target, ".o_form_button_edit");
-
         assert.containsOnce(
             target,
             ".o_field_image .o_select_file_button",
@@ -209,8 +206,6 @@ QUnit.module("Fields", (hooks) => {
                 "the image should correctly set its attributes"
             );
 
-            await click(target, ".o_form_button_edit");
-
             assert.containsOnce(
                 target,
                 ".o_field_image .o_select_file_button",
@@ -241,7 +236,6 @@ QUnit.module("Fields", (hooks) => {
             "data:image/png;base64,coucou==",
             "the image should have the initial src"
         );
-        await click(target, ".o_form_button_edit");
         // Whitebox: replace the event target before the event is handled by the field so that we can modify
         // the files that it will take into account. This relies on the fact that it reads the files from
         // event.target and not from a direct reference to the input element.
@@ -281,7 +275,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
         // The view must be in edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector("input.o_input_file").getAttribute("accept"),
             ".png,.jpeg",
@@ -320,7 +313,7 @@ QUnit.module("Fields", (hooks) => {
         );
     });
 
-    QUnit.test("ImageField: zoom and zoom_delay options", async function (assert) {
+    QUnit.test("ImageField: zoom and zoom_delay options (readonly)", async (assert) => {
         serverData.models.partner.records[0].document = MY_IMAGE;
 
         await makeView({
@@ -330,7 +323,7 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             arch: `
                 <form>
-                    <field name="document" widget="image" options="{'zoom': true, 'zoom_delay': 600}" />
+                    <field name="document" widget="image" options="{'zoom': true, 'zoom_delay': 600}" readonly="1" />
                 </form>`,
         });
         // data-tooltip attribute is used by the tooltip service
@@ -344,8 +337,22 @@ QUnit.module("Fields", (hooks) => {
             "600",
             "tooltip has the right delay"
         );
+    });
+
+    QUnit.test("ImageField: zoom and zoom_delay options (edit)", async function (assert) {
+        serverData.models.partner.records[0].document = MY_IMAGE;
+
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `
+                <form>
+                    <field name="document" widget="image" options="{'zoom': true, 'zoom_delay': 600}" />
+                </form>`,
+        });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.ok(
             !target.querySelector(".o_field_image img").dataset["tooltipInfo"],
             "the tooltip is not present in edition"
@@ -353,7 +360,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test(
-        "ImageField displays the right images with zoom and preview_image options",
+        "ImageField displays the right images with zoom and preview_image options (readonly)",
         async function (assert) {
             serverData.models.partner.records[0].document = "3 kb";
             serverData.models.partner.records[0].__last_update = "2022-08-05 08:37:00";
@@ -365,7 +372,7 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 arch: `
                 <form>
-                    <field name="document" widget="image" options="{'zoom': true, 'preview_image': 'document_preview', 'zoom_delay': 600}" />
+                    <field name="document" widget="image" options="{'zoom': true, 'preview_image': 'document_preview', 'zoom_delay': 600}" readonly="1" />
                 </form>`,
             });
 
@@ -479,7 +486,7 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.containsOnce(
             target.querySelector(".o_form_view"),
@@ -535,7 +542,6 @@ QUnit.module("Fields", (hooks) => {
         assert.verifySteps(["get_views", "read"]);
         assert.strictEqual(getUnique(target.querySelector(".o_field_image img")), "1659688620000");
 
-        await clickEdit(target);
         assert.verifySteps([]);
         // same unique as before
         assert.strictEqual(getUnique(target.querySelector(".o_field_image img")), "1659688620000");
@@ -547,8 +553,8 @@ QUnit.module("Fields", (hooks) => {
 
         await clickSave(target);
         assert.verifySteps(["write", "read"]);
-        // different unique: the record has been written
-        assert.strictEqual(getUnique(target.querySelector(".o_field_image img")), "1659692220000");
+
+        assert.strictEqual(getUnique(target.querySelector(".o_field_image img")), "1659688620000");
     });
 
     QUnit.test("unique in url change on record change", async (assert) => {
diff --git a/addons/web/static/tests/views/fields/image_url_field_tests.js b/addons/web/static/tests/views/fields/image_url_field_tests.js
index 6545ec6f7fe..274562f0b5b 100644
--- a/addons/web/static/tests/views/fields/image_url_field_tests.js
+++ b/addons/web/static/tests/views/fields/image_url_field_tests.js
@@ -228,7 +228,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.hasClass(
-            target.querySelector('div[name="foo"].o_field_empty'),
+            target.querySelector('div[name="foo"]'),
             "o_field_image_url",
             "the widget should have the correct class"
         );
diff --git a/addons/web/static/tests/views/fields/integer_field_tests.js b/addons/web/static/tests/views/fields/integer_field_tests.js
index c6001131d7a..7b8ef00acb4 100644
--- a/addons/web/static/tests/views/fields/integer_field_tests.js
+++ b/addons/web/static/tests/views/fields/integer_field_tests.js
@@ -4,6 +4,7 @@ import { localization } from "@web/core/l10n/localization";
 import { defaultLocalization } from "@web/../tests/helpers/mock_services";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
     patchWithCleanup,
@@ -56,7 +57,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "0",
             "Non-set integer field should be recognized as 0."
         );
@@ -71,8 +72,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="int_field"/></form>',
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=int_field] input").value,
             "10",
@@ -87,10 +86,9 @@ QUnit.module("Fields", (hooks) => {
             "The value should be correctly displayed in the input."
         );
 
-        await click(target, ".o_form_button_save");
-
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "30",
             "The new value should be saved and displayed properly."
         );
@@ -105,12 +103,11 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="int_field"/></form>',
         });
 
-        await click(target, ".o_form_button_edit");
         await editInput(target, ".o_field_widget[name=int_field] input", "=100/3");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "33",
             "The new value should be calculated properly."
         );
@@ -127,8 +124,6 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="int_field" options="{'type': 'number'}"/></form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.ok(
             target.querySelector(".o_field_widget input").hasAttribute("type"),
             "Integer field with option type must have a type attribute."
@@ -142,22 +137,13 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name=int_field] input", "1234567890");
-        await click(target, ".o_form_button_save");
-        await click(target, ".o_form_button_edit");
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "1234567890",
             "Integer value must be not formatted if input type is number."
         );
-
-        await click(target, ".o_form_button_save");
-
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "1,234,567,890",
-            "Integer value must be formatted in readonly view even if the input type is number."
-        );
     });
 
     QUnit.test("with 'step' option", async function (assert) {
@@ -169,13 +155,10 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="int_field" options="{'type': 'number', 'step': 3}"/></form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.ok(
             target.querySelector(".o_field_widget input").hasAttribute("step"),
             "Integer field with option type must have a step attribute."
         );
-
         assert.hasAttrValue(
             target.querySelector(".o_field_widget input"),
             "step",
@@ -195,8 +178,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="int_field"/></form>',
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.hasAttrValue(
             target.querySelector(".o_field_widget input"),
             "type",
@@ -205,8 +186,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name=int_field] input", "1234567890");
-        await click(target, ".o_form_button_save");
-        await click(target, ".o_form_button_edit");
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
@@ -224,14 +204,6 @@ QUnit.module("Fields", (hooks) => {
             arch: `<form><field name="int_field"  options="{'format': 'false'}"/></form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name=int_field]").textContent,
-            "8069",
-            "Integer value must not be formatted"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "8069",
@@ -250,14 +222,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="int_field"/></form>',
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name=int_field]").textContent,
-            "8,069",
-            "Integer value must be formatted by default"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "8,069",
diff --git a/addons/web/static/tests/views/fields/label_selection_field_tests.js b/addons/web/static/tests/views/fields/label_selection_field_tests.js
index 73ef19c83d0..8b686dd979a 100644
--- a/addons/web/static/tests/views/fields/label_selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/label_selection_field_tests.js
@@ -91,52 +91,6 @@ QUnit.module("Fields", (hooks) => {
             "Blocked",
             "the label should say 'Blocked' since this is the label value for that state"
         );
-
-        // // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.containsOnce(
-            target,
-            ".o_field_widget .badge.text-bg-warning",
-            "should have a warning status label since selection is the second, blocked state"
-        );
-        assert.containsNone(
-            target,
-            ".o_field_widget .badge.text-bg-secondary",
-            "should not have a default status since selection is the second, blocked state"
-        );
-        assert.containsNone(
-            target,
-            ".o_field_widget .badge.text-bg-success",
-            "should not have a success status since selection is the second, blocked state"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_widget .badge.text-bg-warning").textContent,
-            "Blocked",
-            "the label should say 'Blocked' since this is the label value for that state"
-        );
-
-        // save
-        await click(target.querySelector(".o_form_button_save"));
-        assert.containsOnce(
-            target,
-            ".o_field_widget .badge.text-bg-warning",
-            "should have a warning status label since selection is the second, blocked state"
-        );
-        assert.containsNone(
-            target,
-            ".o_field_widget .badge.text-bg-secondary",
-            "should not have a default status since selection is the second, blocked state"
-        );
-        assert.containsNone(
-            target,
-            ".o_field_widget .badge.text-bg-success",
-            "should not have a success status since selection is the second, blocked state"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_widget .badge.text-bg-warning").textContent,
-            "Blocked",
-            "the label should say 'Blocked' since this is the label value for that state"
-        );
     });
 
     QUnit.test("LabelSelectionField in editable list view", async function (assert) {
diff --git a/addons/web/static/tests/views/fields/many2many_binary_field_tests.js b/addons/web/static/tests/views/fields/many2many_binary_field_tests.js
index 1737efc4c98..796327e478b 100644
--- a/addons/web/static/tests/views/fields/many2many_binary_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_binary_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, getFixture, nextTick } from "@web/../tests/helpers/utils";
+import { click, clickSave, getFixture, nextTick } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { registry } from "@web/core/registry";
 
@@ -111,19 +111,17 @@ QUnit.module("Fields", (hooks) => {
             "div.o_field_widget .oe_fileupload .o_attachments",
             "there should be one attachment"
         );
-        assert.containsNone(
+        assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attach",
-            "there should not be an Add button (readonly)"
+            "there should be an Add button (edit)"
         );
-        assert.containsNone(
+        assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attachment .o_attachment_delete",
-            "there should not be a Delete button (readonly)"
+            "there should be a Delete button (edit)"
         );
 
-        // to edit mode
-        await click(target, ".o_form_button_edit");
         assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attach",
@@ -176,7 +174,7 @@ QUnit.module("Fields", (hooks) => {
             )
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attachments",
@@ -251,20 +249,17 @@ QUnit.module("Fields", (hooks) => {
             "div.o_field_widget .oe_fileupload .o_attachments",
             "there should be one attachment"
         );
-        assert.containsNone(
+        assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attach",
-            "there should not be an Add button (readonly)"
+            "there should be an Add button (edit)"
         );
-        assert.containsNone(
+        assert.containsOnce(
             target,
             "div.o_field_widget .oe_fileupload .o_attachment .o_attachment_delete",
-            "there should not be a Delete button (readonly)"
+            "there should be a Delete button (edit)"
         );
 
-        // to edit mode
-        await click(target, ".o_form_button_edit");
-
         // Set and trigger the import of 2 files in the input
         const fileInput = target.querySelector('input[type="file"]');
         const dataTransfer = new DataTransfer();
diff --git a/addons/web/static/tests/views/fields/many2many_checkboxes_field_tests.js b/addons/web/static/tests/views/fields/many2many_checkboxes_field_tests.js
index 5059e041bb5..9acd753e8ea 100644
--- a/addons/web/static/tests/views/fields/many2many_checkboxes_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_checkboxes_field_tests.js
@@ -67,22 +67,17 @@ QUnit.module("Fields", (hooks) => {
         assert.ok(checkboxes[0].checked);
         assert.notOk(checkboxes[1].checked);
 
-        assert.containsN(target, "div.o_field_widget div.form-check input:disabled", 2);
-
-        await click(target, ".o_form_button_edit");
-
         assert.containsNone(target, "div.o_field_widget div.form-check input:disabled");
 
         // add a m2m value by clicking on input
         checkboxes = target.querySelectorAll("div.o_field_widget div.form-check input");
         await click(checkboxes[1]);
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsN(target, "div.o_field_widget div.form-check input:checked", 2);
 
         // remove a m2m value by clinking on label
-        await click(target, ".o_form_button_edit");
         await click(target.querySelector("div.o_field_widget div.form-check > label"));
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         checkboxes = target.querySelectorAll("div.o_field_widget div.form-check input");
         assert.notOk(checkboxes[0].checked);
         assert.ok(checkboxes[1].checked);
@@ -111,25 +106,6 @@ QUnit.module("Fields", (hooks) => {
             2,
             "should have fetched and displayed the 2 values of the many2many"
         );
-
-        assert.ok(
-            target.querySelector("div.o_field_widget div.form-check input").checked,
-            "first checkbox should be checked"
-        );
-        assert.notOk(
-            target.querySelectorAll("div.o_field_widget div.form-check input")[1].checked,
-            "second checkbox should not be checked"
-        );
-
-        assert.containsN(
-            target,
-            "div.o_field_widget div.form-check input:disabled",
-            2,
-            "the checkboxes should be disabled"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(
             target,
             "div.o_field_widget div.form-check input:disabled",
@@ -166,11 +142,9 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
-
             await click(target.querySelectorAll("div.o_field_widget div.form-check input")[0]);
             await click(target.querySelectorAll("div.o_field_widget div.form-check input")[1]);
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
             assert.notOk(
                 target.querySelectorAll("div.o_field_widget div.form-check input")[0].checked,
                 "first checkbox should not be checked"
@@ -197,8 +171,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
-
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name='int_field'] input").value,
                 "10"
@@ -255,8 +227,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(
             target,
             ".o_field_widget[name='timmy'] input[type='checkbox']:checked",
@@ -269,7 +239,7 @@ QUnit.module("Fields", (hooks) => {
         );
         await click(checkboxes[checkboxes.length - 1]);
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         checkboxes = target.querySelectorAll(
             ".o_field_widget[name='timmy'] input[type='checkbox']"
         );
@@ -316,8 +286,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(
             target,
             ".o_field_widget[name='timmy'] input[type='checkbox']",
@@ -331,7 +299,7 @@ QUnit.module("Fields", (hooks) => {
         // toggle the first value
         await click(target.querySelector(".o_field_widget[name='timmy'] input[type='checkbox']"));
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.notOk(
             target.querySelector(".o_field_widget[name='timmy'] input[type='checkbox']").checked
         );
@@ -367,7 +335,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target, ".o_form_button_edit");
         await click(target.querySelector(".o_data_cell"));
 
         // edit the timmy field by (un)checking boxes on the widget
@@ -379,7 +346,7 @@ QUnit.module("Fields", (hooks) => {
         assert.notOk(secondCheckbox.checked, "the checkbox should be unticked");
 
         await click(target.querySelector(".modal .o_form_button_save"));
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("Many2ManyCheckBoxesField with default values", async function (assert) {
diff --git a/addons/web/static/tests/views/fields/many2many_field_tests.js b/addons/web/static/tests/views/fields/many2many_field_tests.js
index 6e1de164f77..3f4bc49f5c8 100644
--- a/addons/web/static/tests/views/fields/many2many_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_field_tests.js
@@ -4,7 +4,6 @@ import { browser } from "@web/core/browser/browser";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import {
     click,
-    clickEdit,
     clickSave,
     clickOpenedDropdownItem,
     editInput,
@@ -223,7 +222,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.module("Many2ManyField");
 
     QUnit.test("many2many kanban: edition", async function (assert) {
-        assert.expect(33);
+        assert.expect(31);
 
         serverData.views = {
             "partner_type,false,form": '<form><field name="display_name"/></form>',
@@ -296,17 +295,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.ok(
-            !$(target).find(".o_kanban_renderer .delete_icon").length,
-            "delete icon should not be visible in readonly"
-        );
-        assert.ok(
-            !$(target).find(".o_field_many2many .o-kanban-button-new").length,
-            '"Add" button should not be visible in readonly'
-        );
-
-        await clickEdit(target);
-
         assert.strictEqual(
             $(target).find(".o_kanban_record:not(.o_kanban_ghost)").length,
             2,
@@ -467,7 +455,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
             assert.strictEqual(
                 target
                     .querySelector(".o_field_many2many[name=timmy] .o-kanban-button-new")
@@ -549,13 +536,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.ok(
-            !$(target).find(".o-kanban-button-new").length,
-            '"Add" button should not be available in readonly'
-        );
-
-        await clickEdit(target);
-
         assert.ok(
             $(target).find(".o-kanban-button-new").length,
             '"Add" button should be available in edit'
@@ -603,7 +583,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         // color is red
         assert.containsOnce(target, ".o-kanban-button-new", '"Add" button should be available');
@@ -653,7 +632,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("many2many list (non editable): edition", async function (assert) {
-        assert.expect(34);
+        assert.expect(32);
 
         serverData.models.partner.records[0].timmy = [12, 14];
         serverData.models.partner_type.records.push({ id: 15, display_name: "bronze", color: 6 });
@@ -693,18 +672,6 @@ QUnit.module("Fields", (hooks) => {
             "read", // main record
             "read", // relational field
         ]);
-        assert.containsNone(
-            target,
-            ".o_list_record_remove",
-            "delete icon should not be visible in readonly"
-        );
-        assert.containsNone(
-            target,
-            ".o_field_x2many_list_row_add",
-            '"Add an item" should not be visible in readonly'
-        );
-
-        await clickEdit(target);
 
         assert.containsN(
             target,
@@ -842,7 +809,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("many2many list (editable): edition", async function (assert) {
-        assert.expect(31);
+        assert.expect(29);
 
         serverData.models.partner.records[0].timmy = [12, 14];
         serverData.models.partner_type.records.push({ id: 15, display_name: "bronze", color: 6 });
@@ -879,11 +846,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.containsNone(target, ".o_list_record_remove");
-        assert.containsNone(target, ".o_field_x2many_list_row_add");
-
-        await clickEdit(target);
-
         assert.containsN(
             target,
             ".o_list_renderer td.o_list_number",
@@ -1020,8 +982,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.containsOnce(
             target,
             ".o_field_x2many_list_row_add",
@@ -1048,8 +1008,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.containsOnce(
             target,
             ".o_field_x2many_list_row_add",
@@ -1079,8 +1037,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.containsNone(target, ".o_field_x2many_list_row_add");
-        await clickEdit(target);
         assert.containsOnce(target, ".o_field_x2many_list_row_add");
     });
 
@@ -1138,7 +1094,6 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".o_field_many2many .o_field_x2many_list_row_add");
 
         await clickSave(target);
-        await clickEdit(target);
 
         assert.containsOnce(target, ".o_field_many2many .o_data_row .o_list_record_remove");
         await click(target.querySelector(".o_field_many2many .o_data_row .o_list_record_remove"));
@@ -1169,8 +1124,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         // color is red -> create and delete actions are available
         assert.containsOnce(
             target,
@@ -1239,8 +1192,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         // color is red -> link and unlink actions are available
         assert.containsOnce(
             target,
@@ -1300,8 +1251,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             // color is red -> link and unlink actions are available
             assert.containsOnce(
                 target,
@@ -1364,7 +1313,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         // color is red -> link and unlink actions are available
         assert.containsOnce(target, ".o-kanban-button-new", "should have the 'Add' button");
@@ -1416,7 +1364,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         // color is red -> link and unlink actions are available
         assert.containsOnce(target, ".o-kanban-button-new", "should have the 'Add' button");
@@ -1502,8 +1449,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         await click($(target).find(".modal .o_data_row:first .o_data_cell")[0]);
 
@@ -1569,7 +1514,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         assert.strictEqual($(".modal .o_data_row").length, 1, "should contain only one row (gold)");
@@ -1608,7 +1552,6 @@ QUnit.module("Fields", (hooks) => {
         });
         assert.verifySteps(["get_views", "read", "read"]);
 
-        await clickEdit(target);
         await click($(target).find("td.o_data_cell:first")[0]);
         assert.verifySteps(["get_views", "read"]);
 
@@ -1671,8 +1614,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         assert.verifySteps(["get_views", "read"]);
 
         await editInput(target, ".o_field_widget[name=foo] input", "trigger onchange");
@@ -1823,7 +1764,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // First round: add 51 records in batch
-        await clickEdit(target);
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
 
         var $modal = $(".modal-lg");
@@ -1844,7 +1784,6 @@ QUnit.module("Fields", (hooks) => {
         await clickSave(target);
 
         // Secound round: remove one record
-        await clickEdit(target);
         var trash_buttons = $(target).find(
             ".o_field_many2many.o_field_widget .o_field_x2many.o_field_x2many_list .o_list_record_remove"
         );
@@ -1942,7 +1881,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         await click(target, ".o_field_many2many_selection input");
         checkGetViews = true;
         await clickOpenedDropdownItem(target, "timmy", "Search More...");
@@ -2000,6 +1938,7 @@ QUnit.module("Fields", (hooks) => {
 
         await click(target.querySelector(".o_data_cell"));
         await editInput(target, ".o_field_many2many_selection input", "indianapolis");
+        await nextTick();
         await clickOpenedDropdownItem(target, "timmy", "Create and edit...");
         assert.containsOnce(target, ".modal .o_field_many2one");
         assert.strictEqual(
@@ -2055,8 +1994,8 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await editInput(target, ".o_field_many2many_selection input", "indianapolis");
+        await nextTick();
         await clickOpenedDropdownItem(target, "timmy", "Create and edit...");
         assert.containsOnce(target, ".modal .o_field_many2one");
         assert.strictEqual(
@@ -2120,7 +2059,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await click(target, ".o_data_cell");
             await editInput(target, ".o_field_many2many_selection input", "indianapolis");
             await clickOpenedDropdownItem(target, "timmy", "Create and edit...");
diff --git a/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js b/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
index 00abfbaf44e..71ddfc2d1c2 100644
--- a/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
@@ -1,12 +1,6 @@
 /** @odoo-module **/
 
-import {
-    click,
-    clickEdit,
-    clickSave,
-    getFixture,
-    selectDropdownItem,
-} from "@web/../tests/helpers/utils";
+import { click, clickSave, getFixture, selectDropdownItem } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -206,12 +200,12 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(
             tag.dataset["tooltipTemplate"],
             "web.TagsList.Tooltip",
-            "uses the proper tooltip template",
+            "uses the proper tooltip template"
         );
         const tooltipInfo = JSON.parse(tag.dataset["tooltipInfo"]);
         assert.strictEqual(
-            tooltipInfo.tags.map(tag => tag.text).join(" "),
-            'record 6 record 7',
+            tooltipInfo.tags.map((tag) => tag.text).join(" "),
+            "record 6 record 7",
             "shows a tooltip on hover"
         );
 
@@ -363,12 +357,12 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(
             tag.dataset["tooltipTemplate"],
             "web.TagsList.Tooltip",
-            "uses the proper tooltip template",
+            "uses the proper tooltip template"
         );
         const tooltipInfo = JSON.parse(tag.dataset["tooltipInfo"]);
         assert.strictEqual(
-            tooltipInfo.tags.map(tag => tag.text).join(" "),
-            'aaa record 5',
+            tooltipInfo.tags.map((tag) => tag.text).join(" "),
+            "aaa record 5",
             "shows a tooltip on hover"
         );
 
@@ -391,7 +385,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
         assert.containsN(
             target,
             ".o_field_many2many_tags_avatar.o_field_widget .badge",
diff --git a/addons/web/static/tests/views/fields/many2many_tags_field_tests.js b/addons/web/static/tests/views/fields/many2many_tags_field_tests.js
index 7cccd6f41f5..32ace21498f 100644
--- a/addons/web/static/tests/views/fields/many2many_tags_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_tags_field_tests.js
@@ -6,7 +6,6 @@ import { Many2ManyTagsField } from "@web/views/fields/many2many_tags/many2many_t
 import {
     click,
     clickDropdown,
-    clickEdit,
     clickOpenedDropdownItem,
     clickSave,
     editInput,
@@ -162,7 +161,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("Many2ManyTagsField with color: rendering and edition", async function (assert) {
-        assert.expect(28);
+        assert.expect(26);
 
         serverData.models.partner.records[0].timmy = [12, 14];
         serverData.models.partner_type.records.push({ id: 13, display_name: "red", color: 8 });
@@ -211,19 +210,6 @@ QUnit.module("Fields", (hooks) => {
             "o_tag_color_2",
             "should have correctly set the color"
         );
-
-        await clickEdit(target);
-
-        assert.containsN(
-            target,
-            ".o_field_many2many_tags .badge",
-            2,
-            "should still contain 2 tags in edit mode"
-        );
-        assert.ok(
-            target.querySelector(".o_tag_color_2 .o_tag_badge_text").textContent === "gold",
-            'first tag should still contain "gold" and be color 2 in edit mode'
-        );
         assert.containsN(
             target,
             ".o_field_many2many_tags .o_delete",
@@ -274,7 +260,7 @@ QUnit.module("Fields", (hooks) => {
             `should not contain tag 'silver' anymore but found: ${textContent}`
         );
         // save the record (should do the write RPC with the correct commands)
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         // checkbox 'Hide in Kanban'
         const badgeElement = target.querySelectorAll(".o_field_many2many_tags .badge")[1]; // selects 'red' tag
@@ -426,8 +412,6 @@ QUnit.module("Fields", (hooks) => {
             "should have fetched and rendered gold partner tag"
         );
 
-        await clickEdit(target);
-
         await clickDropdown(target, "timmy");
 
         const autocompleteDropdown = target.querySelector(".o-autocomplete--dropdown-menu");
@@ -540,7 +524,6 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // Update the color in edit => write on save with rest of the record
-        await clickEdit(target);
         await click(badgeNode);
         await click(target, '.o_colorlist button[data-color="6"]');
         await nextTick();
@@ -727,7 +710,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.containsOnce(target, ".o_field_many2many_tags .badge", "should contain one tag");
 
         // update foo, which will trigger an onchange and update timmy
@@ -840,8 +822,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.strictEqual(
             target.querySelectorAll(".o_field_many2many_tags .badge").length,
             1,
@@ -913,7 +893,7 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(target, ".o_field_many2many_tags .badge");
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector(".o_field_many2many_tags").textContent.trim(),
@@ -986,7 +966,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.deepEqual(
             getNodesTextContent(target.querySelectorAll(".o_data_cell")),
             ["second recordaaa"],
@@ -1027,7 +1006,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.verifySteps(["world"]);
-        await clickEdit(target);
         await selectDropdownItem(target, "timmy", "silver");
         assert.verifySteps(["world"]);
     });
@@ -1056,7 +1034,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
         await selectDropdownItem(target, "timmy", "Search More...");
 
         assert.ok(target.querySelector(".o_dialog"), "should have open the modal");
@@ -1113,7 +1090,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await clickEdit(target);
             await selectDropdownItem(target, "timmy", "Search More...");
 
             // -1 for the one that is already on the form & +1 for the select all,
@@ -1172,7 +1148,6 @@ QUnit.module("Fields", (hooks) => {
                     }
                 },
             });
-            await clickEdit(target);
 
             await editInput(target, `div[name="timmy"] input`, "Ralts");
             await nameSearchProm;
@@ -1244,8 +1219,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
-
             await editInput(target, ".o_field_widget input", "hello");
             await nameSearchProm;
             await nextTick();
@@ -1301,8 +1274,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         // turtle_bar is true -> create and delete actions are available
         assert.containsOnce(
             target,
diff --git a/addons/web/static/tests/views/fields/many2one_avatar_field_tests.js b/addons/web/static/tests/views/fields/many2one_avatar_field_tests.js
index 8d857f7c2fa..514e7490bf1 100644
--- a/addons/web/static/tests/views/fields/many2one_avatar_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2one_avatar_field_tests.js
@@ -3,7 +3,6 @@
 import { browser } from "@web/core/browser/browser";
 import {
     click,
-    clickEdit,
     clickSave,
     editInput,
     getFixture,
@@ -78,7 +77,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget[name=user_id]").textContent.trim(),
+            target.querySelector(".o_field_widget[name=user_id] input").value,
             "Aline"
         );
         assert.containsOnce(
@@ -86,8 +85,6 @@ QUnit.module("Fields", (hooks) => {
             '.o_m2o_avatar > img[data-src="/web/image/user/17/avatar_128"]'
         );
 
-        await clickEdit(target);
-
         assert.containsOnce(target, ".o_input_dropdown");
         assert.strictEqual(target.querySelector(".o_input_dropdown input").value, "Aline");
         assert.containsOnce(target, ".o_external_button");
@@ -105,7 +102,7 @@ QUnit.module("Fields", (hooks) => {
         await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget[name=user_id]").textContent.trim(),
+            target.querySelector(".o_field_widget[name=user_id] input").value,
             "Christine"
         );
         assert.containsOnce(
@@ -113,7 +110,6 @@ QUnit.module("Fields", (hooks) => {
             '.o_m2o_avatar > img[data-src="/web/image/user/19/avatar_128"]'
         );
 
-        await clickEdit(target);
         await editInput(target, '.o_field_widget[name="user_id"] input', "");
 
         assert.containsNone(target, ".o_m2o_avatar > img");
@@ -121,7 +117,7 @@ QUnit.module("Fields", (hooks) => {
         await clickSave(target);
 
         assert.containsNone(target, ".o_m2o_avatar > img");
-        assert.containsNone(target, ".o_m2o_avatar > .o_m2o_avatar_empty");
+        assert.containsOnce(target, ".o_m2o_avatar > .o_m2o_avatar_empty");
     });
 
     QUnit.test("onchange in form view flow", async function (assert) {
diff --git a/addons/web/static/tests/views/fields/many2one_field_tests.js b/addons/web/static/tests/views/fields/many2one_field_tests.js
index bc1163f45c0..13b1bd742d7 100644
--- a/addons/web/static/tests/views/fields/many2one_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2one_field_tests.js
@@ -10,7 +10,6 @@ import {
     click,
     clickDiscard,
     clickDropdown,
-    clickEdit,
     clickOpenedDropdownItem,
     clickSave,
     dragAndDrop,
@@ -214,7 +213,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.module("Many2oneField");
 
     QUnit.test("many2ones in form views", async function (assert) {
-        assert.expect(5);
+        assert.expect(2);
 
         function createMockActionService(assert) {
             return {
@@ -253,7 +252,7 @@ QUnit.module("Fields", (hooks) => {
                 <form>
                     <sheet>
                         <group>
-                            <field name="trululu" string="custom label" />
+                            <field name="trululu" string="custom label" open_target="new" />
                         </group>
                     </sheet>
                 </form>`,
@@ -278,11 +277,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.containsOnce(target, "a.o_form_uri:contains(aaa)", "should contain a link");
-        await click(target, "a.o_form_uri");
-
-        await click(target, ".o_form_button_edit");
-
         await click(target, ".o_external_button");
         assert.strictEqual(
             target.querySelector(".modal .modal-title").textContent.trim(),
@@ -313,7 +307,7 @@ QUnit.module("Fields", (hooks) => {
             arch: `
                 <form>
                     <sheet>
-                        <field name="trululu" />
+                        <field name="trululu" open_target="new" />
                     </sheet>
                 </form>`,
             mockRPC(route, { args, method }) {
@@ -324,8 +318,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         // click on the external button (should do an RPC)
         await click(target, ".o_external_button");
         // save and close modal
@@ -390,7 +382,7 @@ QUnit.module("Fields", (hooks) => {
                 arch: `
                     <form>
                         <sheet>
-                            <field name="trululu" />
+                            <field name="trululu" open_target="new" />
                         </sheet>
                     </form>`,
                 mockRPC(route, { method }) {
@@ -400,8 +392,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             // click on the external button (should do an RPC)
             await click(target, ".o_external_button");
 
@@ -412,7 +402,7 @@ QUnit.module("Fields", (hooks) => {
             // save and close modal
             await clickSave(target.querySelector(".modal"));
             // save form
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
             // click next on pager
             await click(target, ".o_pager .o_pager_next");
 
@@ -447,13 +437,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.strictEqual(
-            target.querySelector("a.o_form_uri").innerHTML,
-            "<span>aaa</span><br><span>Street</span><br><span>City ZIP</span>",
-            "input should have a multi-line content in readonly due to show_address"
-        );
-
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(target.querySelector("input.o_input").value, "aaa");
         assert.strictEqual(
             target.querySelector(".o_field_many2one_extra").innerHTML,
@@ -493,7 +476,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
         const input = target.querySelector(".o_field_widget input");
 
         assert.strictEqual(input.value, "aaa");
@@ -543,7 +525,7 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 resId: 1,
                 arch: `
-                    <form>
+                    <form edit="0">
                         <field name="display_name" />
                         <field name="turtles" />
                     </form>`,
@@ -587,7 +569,7 @@ QUnit.module("Fields", (hooks) => {
                 serverData,
                 resId: 1,
                 arch: `
-                    <form>
+                    <form edit="0">
                         <field name="display_name" />
                         <field name="turtles" />
                     </form>`,
@@ -644,8 +626,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         await selectDropdownItem(target, "trululu", "Search More...");
 
         assert.strictEqual($("tr.o_data_row").length, 9, "should display 9 records");
@@ -754,7 +734,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.test(
         "onchanges on many2ones trigger when editing record in form view",
         async function (assert) {
-            assert.expect(11);
+            assert.expect(10);
 
             serverData.models.partner.onchanges.user_id = function () {};
             serverData.models.user.fields.other_field = { string: "Other Field", type: "char" };
@@ -774,7 +754,7 @@ QUnit.module("Fields", (hooks) => {
                     <form>
                         <sheet>
                             <group>
-                                <field name="user_id" />
+                                <field name="user_id" open_target="new" />
                             </group>
                         </sheet>
                     </form>`,
@@ -794,7 +774,6 @@ QUnit.module("Fields", (hooks) => {
             });
 
             // open the many2one in form view and change something
-            await click(target, ".o_form_button_edit");
             await click(target, ".o_external_button");
             await editInput(
                 target,
@@ -814,11 +793,6 @@ QUnit.module("Fields", (hooks) => {
                 "read",
                 "onchange",
             ]);
-
-            // save the main record, and check that no extra rpcs are done (record
-            // is not dirty, only a related record was modified)
-            await click(target, ".o_form_button_save");
-            assert.verifySteps([]);
         }
     );
 
@@ -938,14 +912,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.containsOnce(
-            target,
-            ".o_field_widget[name='trululu'] > span",
-            "should be displayed inside a span (sanity check)"
-        );
-        assert.containsNone(target, "span.o_form_uri", "should not have an anchor");
-
-        await click(target, ".o_form_button_edit");
         assert.containsNone(
             target,
             ".o_field_widget[name='trululu'] .o_external_button",
@@ -1086,14 +1052,12 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             // trigger the onchange
             await editInput(target, ".o_field_widget[name='foo'] input", "3");
             assert.verifySteps(["onchange"]);
 
             // save
-            await click(target, ".o_form_button_save");
+            await clickSave(target);
             assert.verifySteps(["write"]);
         }
     );
@@ -1142,7 +1106,6 @@ QUnit.module("Fields", (hooks) => {
         // event to specify a fake session to prevent it from crashing
         patchWithCleanup(session.user_context, {});
 
-        await click(target, ".o_form_button_edit");
         await clickDropdown(target, "trululu");
 
         let dropdown = target.querySelector(".o_field_many2one[name='trululu'] .dropdown-menu");
@@ -1229,22 +1192,22 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector("a.o_form_uri").textContent,
+            target.querySelector(".o_field_many2one input").value,
             "Partner 20",
             "should display correct value after save"
         );
     });
 
-    QUnit.test("many2one in non edit mode", async function (assert) {
+    QUnit.test("many2one in non edit mode (with value)", async function (assert) {
         await makeView({
             type: "form",
             resModel: "partner",
             resId: 1,
             serverData,
             arch: `
-                <form>
+                <form edit="0">
                     <field name="trululu" />
                 </form>`,
         });
@@ -1256,12 +1219,23 @@ QUnit.module("Fields", (hooks) => {
             "#id=4&model=partner",
             "href should contain id and model"
         );
+    });
+
+    QUnit.test("many2one in non edit mode (without value)", async function (assert) {
+        serverData.models.partner.records[0].trululu = false;
+
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `
+                <form edit="0">
+                    <field name="trululu" />
+                </form>`,
+        });
 
         // Remove value from many2one and then save, there should be no link anymore
-        await click(target, ".o_form_button_edit");
-        await editInput(target, ".o_field_many2one input", "");
-
-        await click(target, ".o_form_button_save");
         assert.containsNone(target, "a.o_form_uri");
     });
 
@@ -1320,7 +1294,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await click(target, ".o_form_button_edit");
 
         assert.strictEqual(
             target.querySelector(".o_field_many2one input").value,
@@ -1404,7 +1377,34 @@ QUnit.module("Fields", (hooks) => {
         assert.verifySteps(["search: ", "search: first", "search: first", "search: first"]);
     });
 
-    QUnit.test("many2one field with option always_reload", async function (assert) {
+    QUnit.test("many2one field with option always_reload (readonly)", async function (assert) {
+        let count = 0;
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 2,
+            serverData,
+            arch: `
+                <form>
+                    <field name="trululu" options="{'always_reload': 1}" readonly="1" />
+                </form>`,
+            mockRPC(route, { method }) {
+                if (method === "name_get") {
+                    count++;
+                    return Promise.resolve([[1, "first record\nand some address"]]);
+                }
+            },
+        });
+
+        assert.strictEqual(count, 1, "an extra name_get should have been done");
+        assert.ok(
+            target.querySelector("a.o_form_uri").textContent.includes("and some address"),
+            "should display additional result"
+        );
+        assert.containsNone(target, ".o_field_many2one_extra");
+    });
+
+    QUnit.test("many2one field with option always_reload (edit)", async function (assert) {
         let count = 0;
         await makeView({
             type: "form",
@@ -1424,22 +1424,15 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.strictEqual(count, 1, "an extra name_get should have been done");
-        assert.ok(
-            target.querySelector("a.o_form_uri").textContent.includes("and some address"),
-            "should display additional result"
-        );
-
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector(".o_field_widget[name='trululu'] input").value,
             "first record",
             "actual field value should be displayed to be edited"
         );
-
-        await click(target, ".o_form_button_save");
-        assert.ok(
-            target.querySelector("a.o_form_uri").textContent.includes("and some address"),
-            "should still display additional result"
+        assert.containsOnce(target, ".o_field_many2one_extra");
+        assert.strictEqual(
+            target.querySelector(".o_field_many2one_extra").textContent,
+            "and some address"
         );
     });
 
@@ -2469,7 +2462,7 @@ QUnit.module("Fields", (hooks) => {
                 <form>
                     <field name="p">
                         <tree editable="bottom">
-                            <field name="product_id" />
+                            <field name="product_id" open_target="new" />
                         </tree>
                     </field>
                 </form>`,
@@ -2480,7 +2473,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await click(target.querySelector("td.o_data_cell"));
         await click(target, ".o_external_button");
         assert.containsOnce(target, ".modal");
@@ -2568,7 +2560,7 @@ QUnit.module("Fields", (hooks) => {
                     <field name="name" />
                     <field name="turtle_ids" widget="one2many">
                         <tree editable="bottom">
-                            <field name="type_id" />
+                            <field name="type_id" open_target="new" />
                         </tree>
                     </field>
                 </form>`,
@@ -2593,7 +2585,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_data_cell");
         await click(target, ".o_external_button");
 
@@ -2634,8 +2625,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await click(target, ".o_form_button_edit");
-
         click(target, ".o_field_widget[name=product_id] input");
     });
 
@@ -2661,8 +2650,6 @@ QUnit.module("Fields", (hooks) => {
                     }
                 },
             });
-            await click(target, ".o_form_button_edit");
-
             click(target, ".o_field_widget[name='trululu'] input");
         }
     );
@@ -2738,11 +2725,10 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="product_id" /></form>',
         });
         assert.strictEqual(
-            target.querySelector(".o_field_widget[name='product_id']").textContent,
+            target.querySelector(".o_field_widget[name='product_id'] input").value,
             "",
             "the tag a should be empty"
         );
-        await click(target, ".o_form_button_edit");
 
         await click(target, ".o_field_widget[name='product_id'] input");
         await click(target.querySelector(".o_field_widget[name='product_id'] .dropdown-item"));
@@ -2752,9 +2738,9 @@ QUnit.module("Fields", (hooks) => {
             "should have selected xphone"
         );
 
-        await click(target, ".o_form_button_cancel");
+        await clickDiscard(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget[name='product_id']").textContent,
+            target.querySelector(".o_field_widget[name='product_id'] input").value,
             "",
             "the tag a should be empty"
         );
@@ -2812,7 +2798,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
             click(target, ".o_field_widget[name='product_id'] input");
             click(target, ".o_field_widget[name='trululu'] input");
         }
@@ -3068,7 +3053,7 @@ QUnit.module("Fields", (hooks) => {
             arch: `
                 <form>
                     <sheet>
-                        <field name="product_id" can_create="false" can_write="false" />
+                        <field name="product_id" can_create="false" can_write="false" open_target="new" />
                     </sheet>
                 </form>`,
             mockRPC(route) {
@@ -3150,7 +3135,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
         await click(target.querySelector(".o_field_widget[name=product_id] input"));
 
         assert.containsNone(target, ".o-autocomplete a:contains(Start typing...)");
@@ -3321,8 +3305,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             const input = target.querySelector(".o_field_many2one input");
 
             await editInput(input, null, "first");
@@ -3395,8 +3377,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
-
             const input = target.querySelector(".o_field_many2one input");
             assert.ok(input.value, "many2one should have value");
 
@@ -3580,8 +3560,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         // trigger a name_search (domain should be [])
         await click(target, ".o_field_widget[name=trululu] input");
         // close the dropdown
@@ -3629,8 +3607,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         // add a first row with a specific domain for the m2o
         domain = [["id", "in", [10]]]; // domain for subrecord 1
         await click(target, ".o_field_x2many_list_row_add a");
@@ -3835,7 +3811,7 @@ QUnit.module("Fields", (hooks) => {
                     <field name="turtles">
                         <tree editable="bottom">
                             <field name="display_name" />
-                            <field name="turtle_trululu" />
+                            <field name="turtle_trululu" open_target="new" />
                         </tree>
                     </field>
                 </form>`,
@@ -3848,7 +3824,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // Opening the modal
-        await clickEdit(target);
         await click(target.querySelectorAll(".o_data_row td")[1]);
         await click(target, ".o_external_button");
         assert.containsOnce(target, ".modal");
@@ -3940,8 +3915,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         await click(target, ".o_field_many2one input");
         assert.containsOnce(target, ".o_field_many2one .dropdown-menu");
 
@@ -4001,8 +3974,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="trululu" /></form>',
         });
 
-        await clickEdit(target);
-
         await selectDropdownItem(target, "trululu", "Search More...");
         const modal = target.querySelector(".modal");
         await toggleGroupByMenu(modal);
@@ -4017,7 +3988,7 @@ QUnit.module("Fields", (hooks) => {
 
     QUnit.test("focus when closing many2one modal in many2one modal", async function (assert) {
         serverData.views = {
-            "partner,false,form": '<form><field name="trululu" /></form>',
+            "partner,false,form": '<form><field name="trululu" open_target="new" /></form>',
         };
 
         await makeView({
@@ -4025,7 +3996,7 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             resModel: "partner",
             resId: 2,
-            arch: '<form><field name="trululu" /></form>',
+            arch: '<form><field name="trululu" open_target="new" /></form>',
             mockRPC(route, { method }) {
                 if (method === "get_formview_id") {
                     return Promise.resolve(false);
@@ -4034,7 +4005,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // Open many2one modal
-        await clickEdit(target);
         await click(target, ".o_external_button");
 
         const originalModal = target.querySelector(".modal");
@@ -4102,8 +4072,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
-
         await selectDropdownItem(target, "trululu", "Search More...");
 
         const modal = target.querySelector(".modal");
diff --git a/addons/web/static/tests/views/fields/monetary_field_tests.js b/addons/web/static/tests/views/fields/monetary_field_tests.js
index 5504a8d8217..2c56014771f 100644
--- a/addons/web/static/tests/views/fields/monetary_field_tests.js
+++ b/addons/web/static/tests/views/fields/monetary_field_tests.js
@@ -4,7 +4,6 @@ import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import {
     addRow,
     click,
-    clickEdit,
     clickSave,
     editInput,
     getFixture,
@@ -108,14 +107,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a09.10",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
-
         assert.containsOnce(
             target,
             ".o_field_monetary > div.text-nowrap",
@@ -141,8 +132,8 @@ QUnit.module("Fields", (hooks) => {
 
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a0108.25",
+            target.querySelector(".o_field_widget input").value,
+            "108.25",
             "The new value should be rounded properly."
         );
     });
@@ -169,13 +160,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a09.10",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "9.10",
@@ -196,8 +180,8 @@ QUnit.module("Fields", (hooks) => {
 
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a0108.25",
+            target.querySelector(".o_field_widget input").value,
+            "108.25",
             "The new value should be rounded properly."
         );
     });
@@ -225,12 +209,11 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // Test computation and rounding
-        await clickEdit(target);
         await editInput(target, ".o_field_monetary input", "=100/3");
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a033.33",
+            target.querySelector(".o_field_widget input").value,
+            "33.33",
             "The new value should be calculated and rounded properly."
         );
     });
@@ -258,12 +241,11 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // Test computation and rounding
-        await clickEdit(target);
         await editInput(target, ".o_field_monetary input", "=100/3");
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a033.33",
+            target.querySelector(".o_field_widget input").value,
+            "33.33",
             "The new value should be calculated and rounded properly."
         );
     });
@@ -290,14 +272,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // Non-breaking space between the currency and the amount
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "0.00\u00a0€",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "0.00",
@@ -317,10 +291,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-        // Non-breaking space between the currency and the amount
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "108.25\u00a0€",
+            target.querySelector(".o_field_widget input").value,
+            "108.25",
             "The new value should be rounded properly."
         );
     });
@@ -347,14 +320,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // Non-breaking space between the currency and the amount
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "0.00\u00a0€",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "0.00",
@@ -374,10 +339,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-        // Non-breaking space between the currency and the amount
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "108.25\u00a0€",
+            target.querySelector(".o_field_widget input").value,
+            "108.25",
             "The new value should be rounded properly."
         );
     });
@@ -417,14 +381,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // Non-breaking space between the currency and the amount
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "99.1234\u00a0Bs.F",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "99.1234",
@@ -444,10 +400,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-        // Non-breaking space between the currency and the amount
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "99.1111\u00a0Bs.F",
+            target.querySelector(".o_field_widget input").value,
+            "99.1111",
             "The new value should be rounded properly."
         );
     });
@@ -487,14 +442,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // Non-breaking space between the currency and the amount
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "99.1234\u00a0Bs.F",
-            "The value should be displayed properly."
-        );
-
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget input").value,
             "99.1234",
@@ -514,10 +461,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-        // Non-breaking space between the currency and the amount
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "99.1111\u00a0Bs.F",
+            target.querySelector(".o_field_widget input").value,
+            "99.1111",
             "The new value should be rounded properly."
         );
     });
@@ -734,14 +680,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_monetary").textContent,
-            "$\u00a04.20",
-            "readonly value should contain the currency"
-        );
-
-        await clickEdit(target);
-
         // replace bottom with new helpers when they exist
         await click(target, ".o_field_many2one_selection input");
         const euroM2OListItem = Array.from(
@@ -757,10 +695,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-
         assert.strictEqual(
-            target.querySelector(".o_field_monetary").textContent,
-            "4.20\u00a0€",
+            target.querySelector(".o_field_monetary input").value,
+            "4.20",
             "The new value should still be correct."
         );
     });
@@ -787,14 +724,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_monetary").textContent,
-            "$\u00a04.20",
-            "readonly value should contain the currency"
-        );
-
-        await clickEdit(target);
-
         // replace bottom with new helpers when they exist
         await click(target, ".o_field_many2one_selection input");
         const euroM2OListItem = Array.from(
@@ -810,10 +739,9 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-
         assert.strictEqual(
-            target.querySelector(".o_field_monetary").textContent,
-            "4.20\u00a0€",
+            target.querySelector(".o_field_monetary input").value,
+            "4.20",
             "The new value should still be correct."
         );
     });
@@ -831,7 +759,7 @@ QUnit.module("Fields", (hooks) => {
             type: "form",
             resModel: "partner",
             arch: `
-                <form>
+                <form edit="0">
                     <sheet>
                         <field name="float_field" options="{'currency_field': 'company_currency_id'}"/>
                         <field name="company_currency_id"/>
@@ -1008,7 +936,7 @@ QUnit.module("Fields", (hooks) => {
             type: "form",
             resModel: "partner",
             arch: `
-                <form>
+                <form edit="0">
                     <sheet>
                         <field name="monetary" widget="float"/>
                         <field name="currency_id" invisible="1"/>
@@ -1059,14 +987,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        // Non-breaking space between the currency and the amount
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a0-8.9",
-            "The value should be displayed properly."
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=float_field] input").value,
             "-8.9",
@@ -1086,11 +1006,10 @@ QUnit.module("Fields", (hooks) => {
             "The value should should be formatted on blur."
         );
 
-        await click(target.querySelector(".o_form_button_save"));
-        // Non-breaking space between the currency and the amount
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "$\u00a0109.2",
+            target.querySelector(".o_field_widget input").value,
+            "109.2",
             "The new value should be rounded properly."
         );
     });
@@ -1110,8 +1029,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
-
         // Non-breaking space between the currency and the amount
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=float_field] input").value,
@@ -1154,10 +1071,5 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(target, ".o_form_editable");
         assert.strictEqual(target.querySelector("[name=monetary_field] input").value, "0.00");
-
-        await clickSave(target);
-
-        assert.containsOnce(target, ".o_form_readonly");
-        assert.strictEqual(target.querySelector("[name=monetary_field] span").innerText, "0.00");
     });
 });
diff --git a/addons/web/static/tests/views/fields/numeric_fields_tests.js b/addons/web/static/tests/views/fields/numeric_fields_tests.js
index b67fd369a82..a64fadc872c 100644
--- a/addons/web/static/tests/views/fields/numeric_fields_tests.js
+++ b/addons/web/static/tests/views/fields/numeric_fields_tests.js
@@ -105,9 +105,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            // Record edit mode
-            await click(target.querySelector(".o_form_button_edit"));
-
             // Get all inputs
             const floatFactorField = target.querySelector(".o_field_float_factor input");
             const floatInput = target.querySelector(".o_field_float input");
diff --git a/addons/web/static/tests/views/fields/one2many_field_tests.js b/addons/web/static/tests/views/fields/one2many_field_tests.js
index dc3bdc57c85..3b89e05dd1e 100644
--- a/addons/web/static/tests/views/fields/one2many_field_tests.js
+++ b/addons/web/static/tests/views/fields/one2many_field_tests.js
@@ -6,7 +6,6 @@ import {
     click,
     clickCreate,
     clickDiscard,
-    clickEdit,
     clickSave,
     clickM2OHighlightedItem,
     clickOpenedDropdownItem,
@@ -308,7 +307,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await click(target, ".o_form_button_edit");
 
             await addRow(target, ".o_field_x2many_list");
 
@@ -429,7 +427,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         await addRow(target);
 
         const targetInput = target.querySelector(".o_selected_row [name=foo] input");
@@ -492,15 +489,14 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.verifySteps(["get_views", "read", "read"]);
-        assert.containsNone(target, "td.o_list_record_selector");
-        assert.containsNone(target, ".o_field_x2many_list_row_add");
-        assert.containsNone(target, "td.o_list_record_remove", 1);
-
-        await clickEdit(target);
+        // assert.containsNone(target, "td.o_list_record_selector");
+        // assert.containsNone(target, ".o_field_x2many_list_row_add");
+        // assert.containsNone(target, "td.o_list_record_remove");
+        // await clickEdit(target);
 
         assert.containsOnce(target, ".o_field_x2many_list_row_add");
         assert.hasAttrValue(target.querySelector(".o_field_x2many_list_row_add"), "colspan", "2");
-        assert.containsOnce(target, "td.o_list_record_remove", 1);
+        assert.containsOnce(target, "td.o_list_record_remove");
     });
 
     QUnit.test("transferring class attributes in one2many sub fields", async function (assert) {
@@ -520,9 +516,6 @@ QUnit.module("Fields", (hooks) => {
         });
         assert.containsOnce(target, "td.hey");
 
-        await clickEdit(target);
-        assert.containsOnce(target, "td.hey");
-
         await click(target.querySelector("td.o_data_cell"));
         assert.containsOnce(target, 'td.hey div[name="turtle_foo"] input'); // WOWL to check! hey on input?
     });
@@ -733,13 +726,6 @@ QUnit.module("Fields", (hooks) => {
             ["yop", "blip", "kawa"]
         );
 
-        await clickEdit(target);
-
-        assert.deepEqual(
-            [...target.querySelectorAll(".o_data_cell.o_list_char")].map((el) => el.innerText),
-            ["yop", "blip", "kawa"]
-        );
-
         // Drag and drop the second line in first position
         await dragAndDrop("tbody tr:nth-child(2) .o_handle_cell", "tbody tr", "top");
 
@@ -819,7 +805,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await click(target.querySelectorAll(".o_data_cell")[1]);
         await editInput(target, ".o_selected_row .o_field_widget[name=turtle_foo] input", "hop");
         await clickSave(target);
@@ -899,7 +884,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await click(target.querySelectorAll(".o_data_cell")[1]);
             await editInput(
                 target,
@@ -984,7 +968,6 @@ QUnit.module("Fields", (hooks) => {
                 ["second record"]
             );
 
-            await clickEdit(target);
             await click(target.querySelectorAll(".o_data_cell")[1]);
             await editInput(target, ".o_selected_row [name=turtle_foo] input", "hop");
             await clickSave(target);
@@ -1030,8 +1013,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".o_data_cell.o_list_char")), [
             "yop",
             "blip",
@@ -1092,8 +1073,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
-
             assert.deepEqual(
                 getNodesTextContent(target.querySelectorAll(".o_data_cell.o_list_char")),
                 ["yop", "blip", "kawa"]
@@ -1156,8 +1135,6 @@ QUnit.module("Fields", (hooks) => {
                 ["yop", "blip", "kawa"]
             );
 
-            await clickEdit(target);
-
             await click(target.querySelector(".o_data_cell.o_list_char"));
             await editInput(target, '.o_list_renderer div[name="turtle_foo"] input', "blurp");
 
@@ -1242,13 +1219,12 @@ QUnit.module("Fields", (hooks) => {
                 ).join("");
             };
 
-            await clickEdit(target);
             assert.strictEqual(getTurtleFooValues(), "#20#21#22#23#24#25#26#27#28#29");
 
             await click(target.querySelector(".o_data_cell.o_list_char"));
             await editInput(target, "div[name=turtle_foo] input", "blurp");
             // click outside of the one2many to unselect the row
-            await click(target, ".o_cp_bottom_left");
+            await click(target, ".o_form_view");
             assert.strictEqual(getTurtleFooValues(), "blurp#21#22#23#24#25#26#27#28#29");
 
             // the domain fail if the widget does not use the already loaded data.
@@ -1256,7 +1232,6 @@ QUnit.module("Fields", (hooks) => {
             assert.containsNone(target, ".modal");
             assert.strictEqual(getTurtleFooValues(), "#20#21#22#23#24#25#26#27#28#29");
 
-            await clickEdit(target);
             // Drag and drop the third line in second position
             await dragAndDrop("tbody tr:nth-child(3) .o_handle_cell", "tbody tr:nth-child(2)");
             assert.strictEqual(getTurtleFooValues(), "#20#30#31#32#33#34#35#36#37#38");
@@ -1265,7 +1240,7 @@ QUnit.module("Fields", (hooks) => {
             await dragAndDrop("tbody tr:nth-child(3) .o_handle_cell", "tbody tr:nth-child(2)");
             assert.strictEqual(getTurtleFooValues(), "#20#39#40#41#42#43#44#45#46#47");
 
-            await click(target, ".o_cp_bottom_left");
+            await click(target, ".o_form_view");
             assert.strictEqual(getTurtleFooValues(), "#20#39#40#41#42#43#44#45#46#47");
 
             await clickDiscard(target);
@@ -1313,7 +1288,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_widget[name=turtles] .o_pager_next"));
 
         await click(
@@ -1449,7 +1423,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_widget[name=turtles] .o_pager_next"));
 
         await click(
@@ -1563,7 +1536,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.containsOnce(target, ".o_data_row");
 
         // change the value of foo to trigger the onchange
@@ -1619,7 +1591,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
             assert.containsOnce(
                 target,
                 ".o_data_row",
@@ -1695,7 +1666,6 @@ QUnit.module("Fields", (hooks) => {
                 },
                 resId: 1,
             });
-            await clickEdit(target);
 
             assert.containsOnce(target, ".o_data_row");
             assert.deepEqual(
@@ -2005,8 +1975,6 @@ QUnit.module("Fields", (hooks) => {
 
             const formHandle = Object.keys(model.localData).find((k) => /partner/.test(k));
 
-            await clickEdit(target);
-
             assert.deepEqual(
                 Object.values(model.get(formHandle).data.turtles.data).map((r) => {
                     return r.data;
@@ -2086,13 +2054,6 @@ QUnit.module("Fields", (hooks) => {
             "yop",
         ]);
 
-        await clickEdit(target);
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".o_data_cell.o_list_char")), [
-            "My little Foo Value",
-            "blip",
-            "yop",
-        ]);
-
         assert.verifySteps([]);
 
         // Drag and drop the second line in first position
@@ -2363,7 +2324,6 @@ QUnit.module("Fields", (hooks) => {
 
         // add a record on page one
         checkRead = true;
-        await clickEdit(target);
         await click(target.querySelector(".o-kanban-button-new"));
         await editInput(target, ".modal input", "new record");
 
@@ -2394,7 +2354,6 @@ QUnit.module("Fields", (hooks) => {
 
         // delete a record on page one
         checkRead = true;
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_kanban_record:not(.o_kanban_ghost)").innerText,
             "relational record 10"
@@ -2423,7 +2382,6 @@ QUnit.module("Fields", (hooks) => {
         await clickSave(target);
 
         // add and delete records in both pages
-        await clickEdit(target);
         checkRead = true;
         readIDs = undefined;
         // add and delete a record in page 1
@@ -2500,7 +2458,7 @@ QUnit.module("Fields", (hooks) => {
             resModel: "partner",
             serverData,
             arch: `
-                <form>
+                <form edit="0">
                     <field name="turtles">
                         <kanban>
                             <field name="display_name"/>
@@ -2557,8 +2515,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.strictEqual(target.querySelector(".o_kanban_record ").innerText, "donatello");
 
         await click(target.querySelector(".o_kanban_record"));
@@ -2633,7 +2589,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
             await addRow(target);
             await editInput(target, 'div[name="turtle_int"] input', "5");
             await click(target.querySelector(".modal-footer button.btn-primary"));
@@ -2721,7 +2676,6 @@ QUnit.module("Fields", (hooks) => {
             "relational record 1"
         );
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_one2many tbody td"));
         assert.hasClass(
             target.querySelector(".o_field_one2many tbody .o_data_row"),
@@ -2754,7 +2708,6 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // edit again and save
-        await clickEdit(target);
         await click(target.querySelector(".o_field_one2many tbody td"));
         await editInput(target, ".o_field_one2many tbody td input", "new value");
         await click(target.querySelector(".o_form_view"));
@@ -2783,9 +2736,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
         assert.containsNone(target, ".o_field_x2many_list_row_add");
-
-        await clickEdit(target);
-        assert.containsNone(target, ".o_field_x2many_list_row_add");
     });
 
     QUnit.test("one2many list: conditional create/delete actions", async function (assert) {
@@ -2806,7 +2756,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         // bar is true -> create and delete action are available
         assert.containsOnce(target, ".o_field_x2many_list_row_add");
         assert.containsN(target, "td.o_list_record_remove button", 2);
@@ -2859,7 +2808,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         assert.containsN(target, "td.o_list_record_remove button", 3);
 
         await click(target.querySelector("td.o_list_record_remove button"));
@@ -2905,7 +2853,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         assert.containsN(target, "td.o_list_record_remove button", 3);
 
         await click(target.querySelector("td.o_list_record_remove button"));
@@ -2920,7 +2867,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("one2many kanban: edition", async function (assert) {
-        assert.expect(22);
+        assert.expect(20);
 
         serverData.models.partner.records[0].p = [2];
         await makeView({
@@ -2969,11 +2916,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.containsNone(target, ".delete_icon");
-        assert.containsNone(target, ".o_field_one2many .o-kanban-button-new");
-
-        await clickEdit(target);
-
         assert.containsOnce(target, ".o_kanban_record:not(.o_kanban_ghost)");
         assert.strictEqual(
             target.querySelector(".o_kanban_record span").textContent,
@@ -3100,7 +3042,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
             assert.deepEqual(
                 [
                     ...target.querySelectorAll(
@@ -3138,9 +3079,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        assert.containsNone(target, ".o-kanban-button-new");
-
-        await clickEdit(target);
 
         assert.containsNone(target, ".o-kanban-button-new");
         assert.containsOnce(target, ".o_field_x2many_kanban .delete_icon");
@@ -3175,7 +3113,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
         // bar is initially true -> create and delete actions are available
         assert.containsOnce(target, ".o-kanban-button-new", '"Add" button should be available');
 
@@ -3223,7 +3160,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add a record, add value to turtle_foo then click in form view to confirm it
-        await clickEdit(target);
         await addRow(target);
 
         await editInput(target, 'div[name="turtle_foo"] input', "nora");
@@ -3237,7 +3173,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("one2many list (non editable): edition", async function (assert) {
-        assert.expect(12);
+        assert.expect(10);
 
         let nbWrite = 0;
         serverData.models.partner.records[0].p = [2, 4];
@@ -3271,11 +3207,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.containsNone(target, ".o_list_record_remove");
-        assert.containsNone(target, ".o_field_x2many_list_row_add");
-
-        await clickEdit(target);
-
         assert.containsN(target, "td.o_list_number", 2);
         assert.strictEqual(
             target.querySelector(".o_list_renderer tbody td").textContent,
@@ -3341,7 +3272,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // edit mode, then click on Add an item and enter a value
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, ".o_selected_row > td input", "kartoffel");
         assert.strictEqual(target.querySelector("td .o_field_char input").value, "kartoffel");
@@ -3383,7 +3313,6 @@ QUnit.module("Fields", (hooks) => {
 
         // edit mode, then click on Add an item, enter value in turtle_foo and Add an item again
         assert.containsOnce(target, "tr.o_data_row");
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, 'div[name="turtle_foo"] input', "nora");
         await addRow(target);
@@ -3429,7 +3358,6 @@ QUnit.module("Fields", (hooks) => {
 
         // edit mode, then click on Add an item
         assert.containsNone(target, "tr.o_data_row");
-        await clickEdit(target);
         await addRow(target);
         assert.strictEqual(target.querySelector(".o_data_row textarea").value, "");
 
@@ -3460,7 +3388,6 @@ QUnit.module("Fields", (hooks) => {
         // edit mode, then click on Add an item, enter value in turtle_foo and Add an item again
         assert.containsOnce(target, "tr.o_data_row");
         assert.strictEqual(target.querySelector(".o_data_cell").innerText, "blip");
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, ".o_field_widget[name=turtle_foo] input", "aaa");
         assert.containsN(target, "tr.o_data_row", 2);
@@ -3497,7 +3424,6 @@ QUnit.module("Fields", (hooks) => {
 
         // edit mode, then click on Add an item, then click elsewhere
         assert.containsNone(target, "tr.o_data_row");
-        await clickEdit(target);
         await addRow(target);
         await click(target);
         assert.containsNone(target, "tr.o_data_row");
@@ -3528,7 +3454,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add a record, to reach the page size limit
-        await clickEdit(target);
         await addRow(target);
         // the record currently being added should not count in the pager
         assert.containsNone(target, ".o_field_widget[name=turtles] .o_pager");
@@ -3567,7 +3492,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add a record, then discard
-        await clickEdit(target);
         await addRow(target);
 
         await clickDiscard(target);
@@ -3601,7 +3525,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add a (empty) record
-        await clickEdit(target);
         await addRow(target);
 
         // go on next page. The new record is not valid and should be discarded
@@ -3633,7 +3556,6 @@ QUnit.module("Fields", (hooks) => {
             });
 
             // add a record with a dirty state, but not valid
-            await clickEdit(target);
             await addRow(target);
             await editInput(target, '.o_field_widget[name="turtle_int"] input', 4321);
 
@@ -3708,7 +3630,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add 4 records (to have more records than the limit)
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, '.o_field_widget[name="turtle_foo"] input', "nora");
         await addRow(target);
@@ -3750,7 +3671,6 @@ QUnit.module("Fields", (hooks) => {
 
         // edit mode, then click on Add an item, then click elsewhere
         assert.containsNone(target, "tr.o_data_row");
-        await clickEdit(target);
         await addRow(target);
         assert.containsOnce(target, "tr.o_data_row");
 
@@ -3793,7 +3713,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // edit mode, then click on Add an item, then press enter
-        await clickEdit(target);
         await addRow(target);
         triggerHotkey("Enter");
         await nextTick();
@@ -3817,7 +3736,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 2,
         });
 
-        await clickEdit(target);
         await addRow(target);
         assert.containsOnce(target, ".o_data_row");
         assert.hasClass(target.querySelectorAll(".o_data_row")[0], "o_selected_row");
@@ -3860,7 +3778,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 2,
             });
 
-            await clickEdit(target);
             await addRow(target);
             assert.strictEqual(
                 document.activeElement,
@@ -3910,7 +3827,6 @@ QUnit.module("Fields", (hooks) => {
 
         // edit mode, then click on Add an item
         assert.containsNone(target, "tr.o_data_row");
-        await clickEdit(target);
         await addRow(target);
 
         // input some text in required turtle_foo field
@@ -3954,7 +3870,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await addRow(target);
         assert.containsOnce(target, "tr.o_data_row");
 
@@ -3986,7 +3901,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await addRow(target);
             assert.containsOnce(target, "tr.o_data_row");
 
@@ -4024,8 +3938,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         await addRow(target);
         await addRow(target, ".modal");
 
@@ -4065,7 +3977,6 @@ QUnit.module("Fields", (hooks) => {
             });
 
             assert.verifySteps(["get_views", "read", "read"]);
-            await clickEdit(target);
             await click(target.querySelector(".o_data_cell"));
             await editInput(target, ".o_field_widget[name=product_id] input", "");
             assert.verifySteps([], "no onchange should be done as line is invalid");
@@ -4109,7 +4020,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_one2many tbody td"));
         await editInput(
             target.querySelector(".o_field_one2many tbody td input"),
@@ -4205,7 +4115,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method);
             },
         });
-        await clickEdit(target);
         const td = target.querySelector("td");
         assert.strictEqual(td.textContent, "9");
         await click(td);
@@ -4236,7 +4145,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method);
             },
         });
-        await clickEdit(target);
         const td = target.querySelector("td");
         assert.strictEqual(td.textContent, "01/25/2017");
 
@@ -4293,7 +4201,6 @@ QUnit.module("Fields", (hooks) => {
             },
             resId: 1,
         });
-        await clickEdit(target);
         assert.containsOnce(target, ".o_data_row");
 
         // empty o2m by triggering the onchange
@@ -4385,7 +4292,6 @@ QUnit.module("Fields", (hooks) => {
             },
             resId: 1,
         });
-        await clickEdit(target);
         assert.containsOnce(target, ".o_data_row");
         await click(target.querySelector(".o_field_one2many td"));
         await editInput(target, ".o_field_widget[name=display_name] input", "blurp");
@@ -4481,7 +4387,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
         assert.containsNone(target, ".o_data_row");
 
         await addRow(target);
@@ -4536,7 +4441,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
             assert.containsOnce(target, ".o_form_view .o_field_x2many_list_row_add ");
             assert.containsNone(target, ".o_form_view input");
 
@@ -4566,7 +4470,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
         assert.deepEqual(
             [...target.querySelectorAll(".o_data_cell")].map((el) => el.textContent),
             ["first record", "second record", "aaa"]
@@ -4601,7 +4504,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         // switch the first row in edition
         await click(target.querySelector(".o_data_cell"));
@@ -4688,7 +4590,6 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".o_data_cell[data-tooltip='xphone']");
         assert.containsNone(target, ".o_data_cell[data-tooltip='xpad']");
 
-        await clickEdit(target);
         await addRow(target);
 
         checkOnchange = true;
@@ -4741,7 +4642,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         await addRow(target);
 
         // write in the many2one field, value = 37 (xphone)
@@ -4830,7 +4730,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             // open a modal
             await click(target.querySelector("tr.o_data_row td[data-tooltip='xphone']"));
 
@@ -4870,7 +4769,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await click(target, ".o_field_widget[name=product_id] input");
         }
     );
@@ -4908,7 +4806,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await click(target.querySelector("tr.o_data_row td[data-tooltip='xphone']"));
 
             // trigger a name search
@@ -4949,7 +4846,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await addRow(target);
     });
 
@@ -4992,7 +4888,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, '[name="turtle_foo"] input', "hammer");
         await addRow(target);
@@ -5015,7 +4910,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
         await addRow(target);
         assert.containsOnce(
             target,
@@ -5067,7 +4961,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await addRow(target);
         }
     );
@@ -5103,7 +4996,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await addRow(target);
             assert.containsOnce(target, ".modal");
         }
@@ -5167,7 +5059,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await addRow(target);
 
         assert.strictEqual(
@@ -5179,8 +5070,7 @@ QUnit.module("Fields", (hooks) => {
         await click($(".modal .o_data_row:first .o_list_record_selector input")[0]);
         await nextTick(); // additional render due to the change of selection (done in owl, not pure js)
         await click($(".modal .o_select_button")[0]);
-        await click($(".o_form_button_save")[0]);
-        await clickEdit(target);
+        await clickSave(target);
         await addRow(target);
 
         assert.strictEqual(
@@ -5206,7 +5096,7 @@ QUnit.module("Fields", (hooks) => {
             "should display the record values in one2many list"
         );
 
-        await click($(".o_form_button_save")[0]);
+        await clickSave(target);
     });
 
     QUnit.test("one2many with many2many widget: edition", async function (assert) {
@@ -5273,7 +5163,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
         //await new Promise(() => {})
-        await clickEdit(target);
         await click($(target).find(".o_data_cell:first")[0]);
         assert.strictEqual(
             $(".modal .modal-title").first().text().trim(),
@@ -5288,10 +5177,9 @@ QUnit.module("Fields", (hooks) => {
         await clickM2OHighlightedItem(target, "product_id");
         await click($(".modal-footer button:first")[0]);
 
-        await click($(".o_form_button_save")[0]);
+        await clickSave(target);
 
         // add a one2many record
-        await clickEdit(target);
         await addRow(target);
         await click($(".modal .o_data_row:first .o_list_record_selector input")[0]);
         await nextTick(); // wait for re-rendering because of the change of selection
@@ -5303,7 +5191,7 @@ QUnit.module("Fields", (hooks) => {
         await clickM2OHighlightedItem(target, "product_id");
         await click($(".modal .modal-footer button:first")[0]);
 
-        await click($(".o_form_button_save")[0]);
+        await clickSave(target);
     });
 
     QUnit.test("new record, the context is properly evaluated and sent", async function (assert) {
@@ -5369,7 +5257,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         await addRow(target);
     });
 
@@ -5409,7 +5296,6 @@ QUnit.module("Fields", (hooks) => {
                     }
                 },
             });
-            await clickEdit(target);
             assert.containsOnce(target, ".o_data_row");
 
             await click(target.querySelector(".o_data_row .o_data_cell"));
@@ -5539,7 +5425,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         await addRow(target);
         await click(target.querySelector(".modal-footer button.btn-primary"));
 
@@ -5733,8 +5618,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         await addRow(target, ".o_field_one2many");
         assert.containsOnce(target, ".modal");
         await click(target.querySelector(".modal-footer button"));
@@ -5790,7 +5673,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("many2one and many2many in one2many", async function (assert) {
-        assert.expect(13);
+        assert.expect(12);
 
         serverData.models.turtle.records[1].product_id = 37;
         serverData.models.partner.records[0].turtles = [2, 3];
@@ -5862,13 +5745,9 @@ QUnit.module("Fields", (hooks) => {
             "m2m values should have been correctly fetched"
         );
 
-        await click(target.querySelector(".o_data_row td"));
-
-        assert.strictEqual(target.querySelector(".modal .o_field_widget").innerText, "xphone");
-
-        await click(target.querySelector(".modal-footer button"));
-
-        await clickEdit(target);
+        // await click(target.querySelector(".o_data_row td"));
+        // assert.strictEqual(target.querySelector(".modal .o_field_widget").innerText, "xphone");
+        // await click(target.querySelector(".modal-footer button"));
 
         assert.containsOnce(
             target,
@@ -5946,7 +5825,6 @@ QUnit.module("Fields", (hooks) => {
                     assert.step(args.method);
                 },
             });
-            await clickEdit(target);
             assert.containsN(target, ".o_data_row", 2);
 
             await click(target.querySelector(".o_list_record_remove"));
@@ -6185,7 +6063,7 @@ QUnit.module("Fields", (hooks) => {
                 resModel: "partner",
                 serverData,
                 arch: `
-                    <form>
+                    <form edit="0">
                         <group>
                             <field name="turtles">
                                 <tree>
@@ -6249,8 +6127,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         await click(target.querySelector(".o_data_row td")); // edit first record
 
         await click(target.querySelector('div[name="partner_ids"] input'));
@@ -6282,7 +6158,7 @@ QUnit.module("Fields", (hooks) => {
                 <form>
                     <field name="turtles">
                         <tree editable="bottom">
-                            <field name="turtle_trululu"/>
+                            <field name="turtle_trululu" open_target="new"/>
                         </tree>
                     </field>
                 </form>`,
@@ -6301,8 +6177,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         // edit the first partner in the one2many partner form view
         await click(target.querySelector(".o_data_row td.o_data_cell"));
         // open form view for many2one
@@ -6530,7 +6404,7 @@ QUnit.module("Fields", (hooks) => {
                 resModel: "partner",
                 serverData,
                 arch: `
-                    <form>
+                    <form edit="0">
                         <group>
                             <field name="turtles">
                                 <tree>
@@ -6602,8 +6476,7 @@ QUnit.module("Fields", (hooks) => {
             "should not have kanban records yet"
         );
 
-        // // switch to edit mode and create a new kanban record
-        await clickEdit(target);
+        // create a new kanban record
         await click(target, ".o_field_widget .o-kanban-button-new");
 
         // save & close the modal
@@ -6761,9 +6634,6 @@ QUnit.module("Fields", (hooks) => {
         await click(target, btn1Warn);
         assert.verifySteps(["button_warn_partner_4"]);
 
-        // switch to edit mode
-        await clickEdit(target);
-
         // click on existing buttons
         await click(target, btn1Disabled);
         assert.verifySteps(["button_disabled_partner_4"]);
@@ -6813,8 +6683,7 @@ QUnit.module("Fields", (hooks) => {
         ]);
 
         // save the form
-        await clickSave(target);
-        assert.verifySteps([]); // the write has already been done
+        assert.containsOnce(target, ".o_form_saved");
 
         // click all buttons
         await click(target, btn1Disabled);
@@ -6852,7 +6721,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
 
         await click(target.querySelector(".o_data_row td"));
         const turtleFooInput = target.querySelector('[name="turtle_foo"] input');
@@ -6891,8 +6759,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
-
         assert.containsOnce(target, ".o_data_row", "should start with one data row");
 
         await addRow(target);
@@ -6939,7 +6805,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
 
         assert.containsOnce(target, ".o_data_row", "should start with one data row");
 
@@ -6980,15 +6845,12 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
         await addRow(target);
         assert.containsOnce(target, ".modal");
         assert.containsNone(target, ".modal .modal-footer .o_btn_remove");
 
         // Discard a modal
         await click(target.querySelector(".modal-footer .btn-secondary"));
-
-        await clickDiscard(target);
     });
 
     QUnit.test('x2many fields use their "mode" attribute', async function (assert) {
@@ -7054,7 +6916,6 @@ QUnit.module("Fields", (hooks) => {
             },
             resId: 1,
         });
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="int_field"] input').value,
             "0"
@@ -7121,7 +6982,6 @@ QUnit.module("Fields", (hooks) => {
                 },
                 resId: 1,
             });
-            await clickEdit(target);
 
             assert.strictEqual(
                 $(target).find('.o_field_widget[name="int_field"] input').val(),
@@ -7185,7 +7045,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
             assert.strictEqual(
                 target.querySelector('.o_field_widget[name="int_field"] input').value,
                 "10"
@@ -7234,7 +7093,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
             assert.strictEqual(
                 target.querySelector('.o_field_widget[name="int_field"] input').value,
                 "10"
@@ -7432,8 +7290,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
-
         patchWithCleanup(form.env.services.notification, {
             add: (message, params) => {
                 assert.step(params.type);
@@ -7512,8 +7368,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
             context: { active_field: 2 },
         });
-        await clickEdit(target);
-
         await click(target.querySelector(".o_data_cell"));
         await editInput(target, ".o_field_widget[name=display_name] input", "abc");
         await clickSave(target);
@@ -7539,8 +7393,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method);
             },
         });
-        await clickEdit(target);
-
         await editInput(target, '[name="foo"] input', "abcd");
         assert.verifySteps(["get_views", "read", "onchange"]);
     });
@@ -7598,7 +7450,7 @@ QUnit.module("Fields", (hooks) => {
     );
 
     QUnit.test("multi level of nested x2manys, onchange and rawChanges", async function (assert) {
-        assert.expect(8);
+        assert.expect(7);
         serverData.models.partner.records[0].p = [1];
         serverData.models.partner.onchanges = {
             name: function () {},
@@ -7634,14 +7486,7 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(target, ".o_data_row");
 
-        // open the o2m record in readonly first
-        await click(target.querySelector(".o_data_row td"));
-        assert.containsOnce(target, ".modal .o_form_readonly");
-
-        await clickDiscard(target.querySelector(".modal"));
-
-        // switch to edit mode and open it again
-        await clickEdit(target);
+        // open the dialog
         await click(target.querySelector(".o_data_row td"));
         assert.containsOnce(target, ".modal .o_form_editable");
         assert.containsOnce(target, ".modal .o_data_row");
@@ -7692,8 +7537,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method);
             },
         });
-        await clickEdit(target);
-
         // triggers an onchange on partner, because the new record is valid
         await addRow(target);
 
@@ -7784,8 +7627,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-
-        await clickEdit(target);
         await addRow(target);
         assert.containsN(target, "tr.o_data_row", 41);
         assert.hasClass([...target.querySelectorAll("tr.o_data_row")].pop(), "o_selected_row");
@@ -7819,8 +7660,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-
-        await clickEdit(target);
         // add a new record page 1 (this increases the limit to 4)
         await addRow(target);
         await editInput(target, '.o_data_row [name="turtle_foo"] input', "rainbow dash");
@@ -7863,8 +7702,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-
-        await clickEdit(target);
         await click(target, ".o_field_widget[name=turtles] .o_pager_next");
         assert.containsN(target, "tr.o_data_row", 2);
 
@@ -8081,8 +7918,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
-
         let rows = target.querySelectorAll(".o_data_row");
         await click(rows[0].querySelector(".o_data_cell"));
         assert.containsOnce(target, ".o_data_row.o_selected_row");
@@ -8191,7 +8026,6 @@ QUnit.module("Fields", (hooks) => {
             },
             resId: 1,
         });
-        await clickEdit(target);
         assert.strictEqual(target.querySelector(".o_data_row .o_data_cell").textContent, "blip");
 
         // click and edit value to 'foo', which will trigger onchange
@@ -8418,7 +8252,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         await click(target.querySelector(".o_list_record_remove button"));
         assert.deepEqual(
             [...target.querySelectorAll(".o_data_row")].map((el) => el.textContent),
@@ -8460,7 +8293,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         assert.deepEqual(
             getNodesTextContent(target.querySelectorAll(".o_data_row .o_data_cell.o_list_char")),
             ["yop", "blip"]
@@ -8493,8 +8325,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
-
             // starting condition
             assert.deepEqual(
                 [...target.querySelectorAll(".o_data_row")].map((el) => el.textContent),
@@ -8538,8 +8368,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             // starting condition
             assert.deepEqual(
                 [...target.querySelectorAll(".o_data_row")].map((el) => el.textContent),
@@ -8587,8 +8415,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             // starting condition
             assert.deepEqual(
                 [...target.querySelectorAll(".o_data_row")].map((el) => el.textContent),
@@ -8641,8 +8467,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
-
             // click add a new line
             // check turtle_int for new is the current max of the page
             await addRow(target);
@@ -8676,9 +8500,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-
-            await clickEdit(target);
-
             // click add a new line
             // check turtle_int for new is the current max of the page +1
             await addRow(target);
@@ -8806,7 +8627,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target, ".o_form_button_edit");
         assert.deepEqual(
             [...target.querySelectorAll(".o_data_cell.foo")].map((el) => el.textContent),
             ["blip", "kawa"]
@@ -8907,7 +8727,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await click(target, ".o_form_button_edit");
             await addRow(target);
             assert.containsN(target, ".o_data_row", 4);
 
@@ -8956,9 +8775,6 @@ QUnit.module("Fields", (hooks) => {
                     assert.step(args.method);
                 },
             });
-
-            await clickEdit(target);
-
             // swap 2 lines in the one2many
             await dragAndDrop("tbody tr:nth-child(2) .o_handle_cell", "tbody tr", "top");
 
@@ -9224,7 +9040,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         assert.deepEqual(
             [...target.querySelector(".o_field_x2many_list_row_add").children].map(
                 (el) => el.textContent
@@ -9305,9 +9120,6 @@ QUnit.module("Fields", (hooks) => {
                     </field>
                 </form>`,
         });
-
-        await clickEdit(target);
-
         assert.containsOnce(target, ".o_data_row");
         assert.strictEqual(target.querySelector(".o_data_cell").textContent, "second record");
 
@@ -9390,7 +9202,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // add a turtle on second partner
-        await clickEdit(target);
         await click(target.querySelectorAll(".o_data_row")[1].querySelector(".o_data_cell"));
         await addRow(target.querySelector(".modal"));
         await editInput(target, ".modal .o_field_widget[name=display_name] input", "michelangelo");
@@ -9568,8 +9379,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             // add a row, fill it, then trigger the tab shortcut
             await addRow(target);
             await editInput(target, "[name=turtle_foo] textarea", "ninja");
@@ -9617,8 +9426,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
-
         await click(target.querySelector(".o_data_row .o_data_cell"));
         await editInput(target, "[name='turtle_foo'] input", "Test");
         assert.containsOnce(target, ".o_data_row");
@@ -9791,7 +9598,7 @@ QUnit.module("Fields", (hooks) => {
             await addRow(target);
             await clickSave(target);
 
-            assert.containsOnce(target, ".o_form_readonly");
+            assert.containsOnce(target, ".o_form_editable");
             assert.strictEqual(
                 target.querySelector(".o_data_row").textContent.trim(),
                 "some foo value"
@@ -9833,8 +9640,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         // Add a record in the list
         await addRow(target);
         await editInput(target, ".modal div[name=display_name] input", "michelangelo");
@@ -9893,7 +9698,6 @@ QUnit.module("Fields", (hooks) => {
             "should be 2 columns in the one2many"
         );
 
-        await clickEdit(target);
         await selectDropdownItem(target, "product_id", "xphone");
 
         assert.containsOnce(
@@ -9934,8 +9738,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await clickEdit(target);
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=product_id] input").value,
             ""
@@ -9975,7 +9777,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=product_id] input").value,
             ""
@@ -10083,17 +9884,14 @@ QUnit.module("Fields", (hooks) => {
             ["yop", "blip", "kawa"]
         );
 
-        // should not work (form in mode "readonly")
-        await dragAndDrop(".o_kanban_record:nth-child(1)", ".o_kanban_record:nth-child(3)");
-
-        assert.deepEqual(
-            [...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
-                (el) => el.innerText
-            ),
-            ["yop", "blip", "kawa"]
-        );
-
-        await clickEdit(target);
+        // // should not work (form in mode "readonly")
+        // await dragAndDrop(".o_kanban_record:nth-child(1)", ".o_kanban_record:nth-child(3)");
+        // assert.deepEqual(
+        //     [...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
+        //         (el) => el.innerText
+        //     ),
+        //     ["yop", "blip", "kawa"]
+        // );
 
         await dragAndDrop(".o_kanban_record:nth-child(1)", ".o_kanban_record:nth-child(3)");
 
@@ -10133,7 +9931,6 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".o_data_row");
 
         // edit first row
-        await clickEdit(target);
         await click(target.querySelector(".o_data_row .o_data_cell"));
         assert.hasClass(target.querySelector(".o_data_row"), "o_selected_row");
         target.querySelector(".o_selected_row .o_field_widget[name=turtle_int] input").value = "44";
@@ -10446,40 +10243,6 @@ QUnit.module("Fields", (hooks) => {
         assert.strictEqual(target.querySelector('th[data-name="date"]').offsetWidth, width);
     });
 
-    QUnit.test("editable one2many list with oe_read_only button", async function (assert) {
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: `
-                <form>
-                    <field name="turtles">
-                        <tree editable="bottom">
-                            <field name="turtle_foo"/>
-                            <button name="do_it" type="object" class="oe_read_only"/>
-                        </tree>
-                    </field>
-                </form>`,
-            resId: 1,
-        });
-
-        // should have two visible columns in readonly: foo + readonly button
-        assert.containsOnce(target, ".o_form_view .o_form_readonly");
-        assert.containsN(target, ".o_field_x2many_list thead th", 2);
-        assert.containsN(target, ".o_field_x2many_list tbody .o_data_row td", 2);
-        assert.containsN(target, ".o_field_x2many_list tfoot td", 2);
-        assert.containsNone(target, ".o_list_actions_header");
-
-        await clickEdit(target);
-
-        // should have two visible columns in edit: foo + trash
-        assert.containsOnce(target, ".o_form_view .o_form_editable");
-        assert.containsN(target, ".o_field_x2many_list thead th", 2);
-        assert.containsN(target, ".o_field_x2many_list tbody .o_data_row td", 2);
-        assert.containsN(target, ".o_field_x2many_list tfoot td", 2);
-        assert.containsOnce(target, ".o_list_actions_header");
-    });
-
     QUnit.test(
         "one2many reset by onchange (of another field) while being edited",
         async function (assert) {
@@ -10940,6 +10703,7 @@ QUnit.module("Fields", (hooks) => {
             type: "form",
             resModel: "partner",
             serverData,
+            mode: "readonly",
             arch: `
                 <form>
                     <field name="p" widget="my_relational_field"/>
@@ -10989,8 +10753,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         assert.containsN(target, ".o_data_row", 2);
         assert.hasClass(
             target.querySelectorAll(".o_data_row")[1].querySelector(".o_field_badge .badge"),
@@ -11038,8 +10800,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             assert.deepEqual(
                 [...target.querySelectorAll(".o_data_cell:not(.o_handle_cell)")].map(
                     (el) => el.innerText
@@ -11335,7 +11095,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         // add a line (virtual record)
         await addRow(target);
         await editInput(target, ".o_field_widget[name=turtle_foo] input", "pi");
@@ -11376,7 +11135,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method + " " + args.model);
             },
         });
-        await clickEdit(target);
         await addRow(target);
         await editInput(target, ".o_field_widget[name=turtle_foo] input", "nora");
         await addRow(target);
@@ -11451,7 +11209,6 @@ QUnit.module("Fields", (hooks) => {
         });
 
         // open first partner and change turtle name
-        await clickEdit(target);
         await click(target.querySelector(".o_data_row .o_data_cell"));
         await click(target.querySelector(".modal .o_data_row .o_data_cell"));
         await editInput(target, ".modal .o_field_widget[name=display_name] input", "Donatello");
@@ -11562,8 +11319,6 @@ QUnit.module("Fields", (hooks) => {
             assert.containsOnce(target, ".o_list_renderer th:not(.o_list_actions_header)");
             assert.containsOnce(target, ".o_list_renderer .o_data_row");
 
-            await clickEdit(target);
-
             // add a new o2m record
             await addRow(target);
             target.querySelector(".o_field_one2many input").focus(); // useless?
@@ -11611,7 +11366,6 @@ QUnit.module("Fields", (hooks) => {
             2,
             "should be 2 columns in the one2many"
         );
-        await clickEdit(target);
         await selectDropdownItem(target, "product_id", "xphone");
         assert.containsOnce(
             target,
@@ -11652,20 +11406,12 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            // should have 2 column
-            assert.containsN(
-                target.querySelector(".o_field_one2many"),
-                "th",
-                2,
-                "should be 2 th in the one2many in readonly mode"
-            );
             assert.containsOnce(
                 target.querySelector(".o_field_one2many table"),
                 ".o_optional_columns_dropdown .dropdown-toggle",
                 "should have the optional columns dropdown toggle inside the table"
             );
 
-            await clickEdit(target);
             // should have 2 columns 1 for foo and 1 for trash icon, dropdown is displayed
             // on trash icon cell, no separate cell created for trash icon and advanced field dropdown
             assert.containsN(
@@ -11742,7 +11488,7 @@ QUnit.module("Fields", (hooks) => {
                 target.querySelector(".o_field_one2many"),
                 "th",
                 3,
-                "should still have 3 th in the one2many after reloading whole form view"
+                "should have 3 th in the one2many after reloading whole form view"
             );
         }
     );
@@ -11812,8 +11558,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await clickEdit(target);
-
             // Add a record in the list
             await addRow(target);
             await editInput(target, ".o_field_widget[name=display_name] input", "michelangelo");
@@ -11846,8 +11590,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await clickEdit(target);
-
             // Add a first record in the list
             await addRow(target);
             await editInput(target, ".modal .o_field_widget[name=display_name] input", "first");
@@ -11894,7 +11636,7 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
+            target.querySelector("[name=qux] input").focus();
             assert.strictEqual(target.querySelector("[name=qux] input"), document.activeElement);
 
             getNextTabableElement(target).focus(); // go inside one2many
@@ -11939,8 +11681,7 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
+            target.querySelector("[name=qux] input").focus();
             assert.strictEqual(document.activeElement, target.querySelector("[name=qux] input"));
 
             getNextTabableElement(target).focus(); // go inside one2many
@@ -12002,8 +11743,7 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
+            target.querySelector("[name=qux] input").focus();
             assert.strictEqual(document.activeElement, target.querySelector("[name=qux] input"));
 
             getNextTabableElement(target).focus(); // go inside one2many
@@ -12083,8 +11823,7 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
+            target.querySelector("[name=qux] input").focus();
             assert.strictEqual(target.querySelector("[name=qux] input"), document.activeElement);
 
             getNextTabableElement(target).focus(); // go inside one2many
@@ -12142,8 +11881,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
-
             // add a new line
             await addRow(target);
 
@@ -12279,7 +12016,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
             await click(target.querySelector(".o_data_row .o_data_cell"));
             target.querySelector(".o_list_renderer .o_column_sortable").focus();
             triggerHotkey("a");
@@ -12380,8 +12116,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
-
         await clickOpenM2ODropdown(target, "turtle_trululu");
         await clickM2OHighlightedItem(target, "turtle_trululu");
 
@@ -12487,12 +12221,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            // Should contain 4 blank lines
-            assert.containsNone(target, ".o_list_renderer tbody tr .o_data_row");
-            assert.containsNone(target, ".o_list_renderer tbody tr .o_field_x2many_list_row_add");
-            assert.containsN(target, ".o_list_renderer tbody tr", 4);
-
-            await clickEdit(target);
             // Should only contain the "Add a line" line and 3 blank lines
             assert.containsNone(target, ".o_list_renderer tbody tr .o_data_row");
             assert.containsOnce(target, ".o_list_renderer tbody tr .o_field_x2many_list_row_add");
@@ -12543,7 +12271,6 @@ QUnit.module("Fields", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
         assert.containsNone(target, ".o_kanban_record:not(.o_kanban_ghost)");
 
         await click(target, ".o-kanban-button-new");
@@ -12584,7 +12311,6 @@ QUnit.module("Fields", (hooks) => {
                 assert.step(args.method + " " + args.model);
             },
         });
-        await clickEdit(target);
         assert.verifySteps(["get_views partner", "read partner", "read turtle"]);
 
         await click(target, ".o_boolean_toggle");
@@ -12650,7 +12376,6 @@ QUnit.module("Fields", (hooks) => {
         assert.containsNone(target, "[name='p']");
         assert.verifySteps(["get_views partner", "read partner"]);
 
-        await clickEdit(target);
         await editInput(target, "[name='foo'] input", "plop");
         await clickSave(target);
         assert.verifySteps(["write partner", "read partner"]);
@@ -12695,7 +12420,6 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await clickEdit(target);
             await addRow(target);
             await editInput(target, ".o_field_widget[name=int_field] input", "3");
             await clickSave(target);
diff --git a/addons/web/static/tests/views/fields/pdf_viewer_field_tests.js b/addons/web/static/tests/views/fields/pdf_viewer_field_tests.js
index 35895c53402..1657fb7dfed 100644
--- a/addons/web/static/tests/views/fields/pdf_viewer_field_tests.js
+++ b/addons/web/static/tests/views/fields/pdf_viewer_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -64,7 +64,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         assert.hasClass(target.querySelector(".o_field_widget"), "o_field_pdf_viewer");
-        assert.containsNone(target, ".o_select_file_button", "there should be no 'Upload' button");
+        assert.containsOnce(target, ".o_select_file_button", "there should be an 'Upload' button");
         assert.containsOnce(
             target,
             ".o_field_widget iframe.o_pdfview_iframe",
@@ -75,7 +75,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("PdfViewerField: upload rendering", async function (assert) {
-        assert.expect(6);
+        assert.expect(5);
 
         await makeView({
             type: "form",
@@ -97,9 +97,8 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".o_pdfview_iframe", "there is a PDF Viewer");
         assert.strictEqual(getIframeProtocol(), "blob");
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
-        assert.strictEqual(getIframeProtocol(), "http");
-        assert.strictEqual(getIframeViewerParams(), "model=partner&field=document&id=2");
+        assert.strictEqual(getIframeProtocol(), "blob");
     });
 });
diff --git a/addons/web/static/tests/views/fields/percent_pie_field_tests.js b/addons/web/static/tests/views/fields/percent_pie_field_tests.js
index 93067f739a2..91cb25074e1 100644
--- a/addons/web/static/tests/views/fields/percent_pie_field_tests.js
+++ b/addons/web/static/tests/views/fields/percent_pie_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, getFixture } from "@web/../tests/helpers/utils";
+import { getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -81,8 +81,6 @@ QUnit.module("Fields", (hooks) => {
             "right mask should be rotated from 360*(10/100) = 36 degrees"
         );
 
-        // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(
             target,
             ".o_field_percent_pie.o_field_widget .o_pie",
@@ -111,8 +109,6 @@ QUnit.module("Fields", (hooks) => {
             "right mask should be rotated from 360*(10/100) = 36 degrees"
         );
 
-        // save
-        await click(target.querySelector(".o_form_button_save"));
         assert.containsOnce(
             target,
             ".o_field_percent_pie.o_field_widget .o_pie",
@@ -179,8 +175,6 @@ QUnit.module("Fields", (hooks) => {
             "right mask should be hidden since the value > 50%"
         );
 
-        // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(
             target,
             ".o_field_percent_pie.o_field_widget .o_pie",
@@ -204,8 +198,6 @@ QUnit.module("Fields", (hooks) => {
             "right mask should be hidden since the value > 50%"
         );
 
-        // save
-        await click(target.querySelector(".o_form_button_save"));
         assert.containsOnce(
             target,
             ".o_field_percent_pie.o_field_widget .o_pie",
diff --git a/addons/web/static/tests/views/fields/percentage_field_tests.js b/addons/web/static/tests/views/fields/percentage_field_tests.js
index 7035b8ecb7b..427ec0ec82d 100644
--- a/addons/web/static/tests/views/fields/percentage_field_tests.js
+++ b/addons/web/static/tests/views/fields/percentage_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
+import { clickSave, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -30,7 +30,7 @@ QUnit.module("Fields", (hooks) => {
     QUnit.module("PercentageField");
 
     QUnit.test("PercentageField in form view", async function (assert) {
-        assert.expect(6);
+        assert.expect(5);
 
         await makeView({
             serverData,
@@ -51,12 +51,6 @@ QUnit.module("Fields", (hooks) => {
             },
             resId: 1,
         });
-        assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "44.4%",
-            "The value should be displayed properly."
-        );
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=float_field] input").value,
             "44.4",
@@ -70,10 +64,10 @@ QUnit.module("Fields", (hooks) => {
         const field = target.querySelector("[name='float_field'] input");
         await editInput(target, "[name='float_field'] input", "24");
         assert.strictEqual(field.value, "24", "The value should not be formated yet.");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
-            "24%",
+            target.querySelector(".o_field_widget input").value,
+            "24",
             "The new value should be formatted properly."
         );
     });
diff --git a/addons/web/static/tests/views/fields/phone_field_tests.js b/addons/web/static/tests/views/fields/phone_field_tests.js
index e33acf183be..db2316e2843 100644
--- a/addons/web/static/tests/views/fields/phone_field_tests.js
+++ b/addons/web/static/tests/views/fields/phone_field_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { getNextTabableElement } from "@web/core/utils/ui";
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -31,11 +31,12 @@ QUnit.module("Fields", (hooks) => {
 
     QUnit.module("PhoneField");
 
-    QUnit.test("PhoneField in form view on normal screens", async function (assert) {
+    QUnit.test("PhoneField in form view on normal screens (readonly)", async function (assert) {
         await makeView({
             serverData,
             type: "form",
             resModel: "partner",
+            mode: "readonly",
             arch: `
                 <form>
                     <sheet>
@@ -55,9 +56,24 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.strictEqual(phone.textContent, "yop", "value should be displayed properly");
         assert.hasAttrValue(phone, "href", "tel:yop", "should have proper tel prefix");
+    });
+
+    QUnit.test("PhoneField in form view on normal screens (edit)", async function (assert) {
+        await makeView({
+            serverData,
+            type: "form",
+            resModel: "partner",
+            arch: `
+                <form>
+                    <sheet>
+                        <group>
+                            <field name="foo" widget="phone"/>
+                        </group>
+                    </sheet>
+                </form>`,
+            resId: 1,
+        });
 
-        // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(
             target,
             'input[type="tel"]',
@@ -73,9 +89,9 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, "input[type='tel']", "new");
 
         // save
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_field_phone a").textContent,
+            target.querySelector("input[type='tel']").value,
             "new",
             "new value should be displayed properly"
         );
diff --git a/addons/web/static/tests/views/fields/priority_field_tests.js b/addons/web/static/tests/views/fields/priority_field_tests.js
index 7ddee5d8208..432b7ebef59 100644
--- a/addons/web/static/tests/views/fields/priority_field_tests.js
+++ b/addons/web/static/tests/views/fields/priority_field_tests.js
@@ -2,6 +2,7 @@
 
 import {
     click,
+    clickSave,
     getFixture,
     nextTick,
     triggerEvent,
@@ -211,8 +212,6 @@ QUnit.module("Fields", (hooks) => {
             "should temporary have no empty star since we are hovering the third value"
         );
 
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
         assert.containsN(
             target,
             ".o_field_widget .o_priority a.o_priority_star",
@@ -230,8 +229,6 @@ QUnit.module("Fields", (hooks) => {
             "should still have one empty star since the value is the second value"
         );
 
-        // save
-        await click(target, ".o_form_button_save");
         assert.containsN(
             target,
             ".o_field_widget .o_priority a.o_priority_star",
@@ -249,9 +246,6 @@ QUnit.module("Fields", (hooks) => {
             "should still have one empty star since the value is the second value"
         );
 
-        // switch to edit mode to check that the new value was properly written
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(
             target,
             ".o_field_widget .o_priority a.o_priority_star",
@@ -292,7 +286,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.containsN(
             target,
             ".o_field_widget .o_priority a.o_priority_star",
diff --git a/addons/web/static/tests/views/fields/progress_bar_field_tests.js b/addons/web/static/tests/views/fields/progress_bar_field_tests.js
index dcfaf650eb0..7f2be6dabce 100644
--- a/addons/web/static/tests/views/fields/progress_bar_field_tests.js
+++ b/addons/web/static/tests/views/fields/progress_bar_field_tests.js
@@ -6,11 +6,14 @@ import {
 } from "@web/../tests/helpers/mock_services";
 import {
     click,
+    clickSave,
     editInput,
     getFixture,
-    nextTick
+    nextTick,
+    patchWithCleanup,
 } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
+import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
 
 let serverData;
@@ -52,6 +55,10 @@ QUnit.module("Fields", (hooks) => {
         };
 
         setupViewRegistries();
+
+        patchWithCleanup(browser, {
+            setTimeout: (fn) => fn(),
+        });
     });
 
     QUnit.module("ProgressBarField");
@@ -95,11 +102,9 @@ QUnit.module("Fields", (hooks) => {
             "10 / 2",
             "The initial value of the progress bar should be correct"
         );
-        // The view should be in edit mode
-        await click(target.querySelector(".o_form_button_edit"));
 
         await editInput(target, ".o_field_widget[name=display_name] input", "new name");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector(".o_progressbar_value").textContent,
@@ -134,9 +139,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            // The view should be in edit mode by default
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
 
             assert.strictEqual(
@@ -155,7 +157,7 @@ QUnit.module("Fields", (hooks) => {
             );
 
             await editInput(target, ".o_progressbar_value.o_input", "69");
-            target.querySelector(".o_progressbar_value.o_input").blur();
+            await click(target, ".o_form_view");
 
             await nextTick();
             assert.strictEqual(
@@ -164,7 +166,7 @@ QUnit.module("Fields", (hooks) => {
                 "New value should be different after focusing out of the field"
             );
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
                 target.querySelector(".o_progressbar_value").textContent,
@@ -200,8 +202,6 @@ QUnit.module("Fields", (hooks) => {
                     }
                 },
             });
-            // The view should be in edit mode by default
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
             assert.ok(
@@ -216,7 +216,7 @@ QUnit.module("Fields", (hooks) => {
 
             await editInput(target, ".o_progressbar_value.o_input", "69");
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
                 target.querySelector(".o_progressbar_value").textContent,
@@ -258,19 +258,15 @@ QUnit.module("Fields", (hooks) => {
                 "99 / 0",
                 "Initial value should be correct"
             );
-            // The view should be in edit mode by default
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
-
             await click(target.querySelector(".o_progress"));
-
             const input = target.querySelector(".o_progressbar_value.o_input");
             assert.strictEqual(input.value, "0.44", "Initial value in input is correct");
 
             await editInput(target, ".o_progressbar_value.o_input", "69");
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
                 target.querySelector(".o_progressbar_value").textContent,
@@ -313,8 +309,6 @@ QUnit.module("Fields", (hooks) => {
                 "99 / 0",
                 "Initial value should be correct"
             );
-            // The view should be in edit mode by default
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
 
@@ -330,7 +324,7 @@ QUnit.module("Fields", (hooks) => {
             await nextTick();
             assert.strictEqual(document.activeElement, maxVal, "Second input is focused");
 
-            maxVal.blur();
+            await click(target, ".o_form_view");
             await nextTick();
             assert.containsNone(
                 target,
@@ -342,7 +336,7 @@ QUnit.module("Fields", (hooks) => {
             await editInput(target, ".o_progressbar input:nth-of-type(1)", "2000");
             await editInput(target, ".o_progressbar input:nth-of-type(2)", "69");
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
                 target.querySelector(".o_progressbar_value").textContent,
@@ -360,7 +354,7 @@ QUnit.module("Fields", (hooks) => {
             type: "form",
             resModel: "partner",
             arch: `
-                <form>
+                <form edit="0">
                     <field name="float_field" invisible="1"/>
                     <field name="int_field" widget="progressbar" options="{'editable': true, 'max_value': 'float_field', 'edit_max_value': true}"/>
                 </form>`,
@@ -370,8 +364,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.ok(target.querySelector(".o_form_view .o_form_readonly"), "Form in readonly mode");
-
         assert.strictEqual(
             target.querySelector(".o_progressbar_value").textContent,
             "99 / 0",
@@ -555,68 +547,6 @@ QUnit.module("Fields", (hooks) => {
         }
     );
 
-    QUnit.test(
-        "ProgressBar: value should update in readonly mode with right parameter when typing in input with field value",
-        async function (assert) {
-            assert.expect(7);
-            serverData.models.partner.records[0].int_field = 99;
-
-            await makeView({
-                serverData,
-                type: "form",
-                resModel: "partner",
-                arch: `
-                    <form>
-                        <field name="int_field" widget="progressbar" title="ProgressBarTitle" options="{'editable': true, 'editable_readonly': true}" />
-                    </form>`,
-                resId: 1,
-                mockRPC(route, args) {
-                    if (args.method === "write") {
-                        assert.strictEqual(
-                            args.args[1].int_field,
-                            69,
-                            "New value of progress bar saved"
-                        );
-                    }
-                },
-            });
-
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_value").textContent,
-                "99%",
-                "Initial value should be correct"
-            );
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_title").textContent,
-                "ProgressBarTitle"
-            );
-
-            await click(target.querySelector(".o_progress"));
-
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_value.o_input").value,
-                "99",
-                "Initial value in input is correct"
-            );
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_title").textContent,
-                "ProgressBarTitle"
-            );
-
-            await editInput(target, ".o_field_widget input", "69.6");
-
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_value").textContent,
-                "69%",
-                "New value should be different than initial after changing it"
-            );
-            assert.strictEqual(
-                target.querySelector(".o_progressbar_title").textContent,
-                "ProgressBarTitle"
-            );
-        }
-    );
-
     QUnit.test(
         "ProgressBarField: write float instead of int works, in locale",
         async function (assert) {
@@ -657,7 +587,6 @@ QUnit.module("Fields", (hooks) => {
                 "Initial value should be correct"
             );
 
-            await click(target.querySelector(".o_form_button_edit"));
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
 
             await click(target.querySelector(".o_progress"));
@@ -667,7 +596,7 @@ QUnit.module("Fields", (hooks) => {
 
             await editInput(target, ".o_field_widget input", "1#037:9");
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
                 target.querySelector(".o_progressbar_value").textContent,
@@ -699,8 +628,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            // The view should be in edit mode by default
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.ok(target.querySelector(".o_form_view .o_form_editable"), "Form in edit mode");
 
@@ -718,8 +645,8 @@ QUnit.module("Fields", (hooks) => {
             );
 
             await editInput(target, ".o_progressbar_value.o_input", "trente sept virgule neuf");
-            await click(target.querySelector(".o_form_button_save"));
-            assert.containsOnce(target, ".o_form_button_save", "The form has not been saved");
+            await clickSave(target);
+            assert.containsOnce(target, ".o_form_dirty", "The form has not been saved");
             assert.verifySteps(["Show error message"], "The error message was shown correctly");
         }
     );
diff --git a/addons/web/static/tests/views/fields/properties_field_tests.js b/addons/web/static/tests/views/fields/properties_field_tests.js
index c84884210c2..f6fc8a9e044 100644
--- a/addons/web/static/tests/views/fields/properties_field_tests.js
+++ b/addons/web/static/tests/views/fields/properties_field_tests.js
@@ -1,6 +1,14 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture, nextTick, triggerEvent } from "@web/../tests/helpers/utils";
+import {
+    click,
+    clickDiscard,
+    clickSave,
+    editInput,
+    getFixture,
+    nextTick,
+    triggerEvent,
+} from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -147,8 +155,6 @@ QUnit.module("Fields", (hooks) => {
             mockRPC,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const field = target.querySelector(".o_field_properties");
         assert.ok(field, "The field must be in the view");
 
@@ -190,8 +196,6 @@ QUnit.module("Fields", (hooks) => {
             mockRPC,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const field = target.querySelector(".o_field_properties");
         assert.ok(field, "The field must be in the view");
 
@@ -255,12 +259,12 @@ QUnit.module("Fields", (hooks) => {
         assert.notOk(inputValue.value);
 
         // Discard the form view and check that the properties take its old values
-        await click(target, ".o_form_button_cancel");
+        await clickDiscard(target);
         const propertyValue = document.querySelector(
-            ".o_property_field:first-child .o_property_field_value"
+            ".o_property_field:first-child .o_property_field_value input"
         );
         assert.strictEqual(
-            propertyValue.innerText,
+            propertyValue.value,
             "char value",
             "Discarding the form view should reset the old values"
         );
@@ -293,8 +297,6 @@ QUnit.module("Fields", (hooks) => {
             mockRPC,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const field = target.querySelector(".o_field_properties");
         assert.ok(field, "The field must be in the view");
 
@@ -352,8 +354,6 @@ QUnit.module("Fields", (hooks) => {
             mockRPC,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const field = target.querySelector(".o_field_properties");
         assert.ok(field, "The field must be in the view");
 
@@ -498,8 +498,6 @@ QUnit.module("Fields", (hooks) => {
             return [...labels].map((label) => label.innerText);
         };
 
-        await click(target, ".o_form_button_edit");
-
         const field = target.querySelector(".o_field_properties");
         assert.ok(field, "The field must be in the view");
 
@@ -585,7 +583,6 @@ QUnit.module("Fields", (hooks) => {
             return [...tags].map((tag) => tag.innerText);
         };
 
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_property_field:nth-child(2) .o_field_property_open_popover");
         let popover = target.querySelector(".o_property_field_popover");
         // Select the tags type
@@ -718,7 +715,6 @@ QUnit.module("Fields", (hooks) => {
             mockRPC,
         });
 
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_property_field:nth-child(2) .o_field_property_open_popover");
         const popover = target.querySelector(".o_property_field_popover");
         // Select the many2one type
@@ -807,7 +803,6 @@ QUnit.module("Fields", (hooks) => {
             return [...selectedUsers].map((badge) => badge.innerText);
         };
 
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_property_field:nth-child(2) .o_field_property_open_popover");
         const popover = target.querySelector(".o_property_field_popover");
         // Select the many2many type
@@ -916,16 +911,15 @@ QUnit.module("Fields", (hooks) => {
 
         // check initial properties
         assert.equal(
-            target.querySelector("[property-name=property_1] .o_property_field_value").innerText,
+            target.querySelector("[property-name=property_1] .o_property_field_value input").value,
             "01/01/2019"
         );
         assert.equal(
-            target.querySelector("[property-name=property_2] .o_property_field_value").innerText,
+            target.querySelector("[property-name=property_2] .o_property_field_value input").value,
             "01/01/2019 11:00:00"
         );
 
         // edit date property
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_property_field[property-name=property_1] input");
         await click(document.body, ".datepicker [data-day='12/31/2018']");
         assert.equal(target.querySelector("[property-name=property_1] input").value, "12/31/2018");
@@ -945,7 +939,7 @@ QUnit.module("Fields", (hooks) => {
 
         // save
         assert.verifySteps([]);
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.verifySteps(["write", "read"]);
     });
 });
diff --git a/addons/web/static/tests/views/fields/radio_field_tests.js b/addons/web/static/tests/views/fields/radio_field_tests.js
index a65053138a4..e33ed61b037 100644
--- a/addons/web/static/tests/views/fields/radio_field_tests.js
+++ b/addons/web/static/tests/views/fields/radio_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { click, clickSave, editInput, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -92,7 +92,7 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsOnce(target, "input:checked", "one of the input should be checked");
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.hasAttrValue(
             target.querySelector("input.o_radio_input:checked"),
@@ -116,7 +116,7 @@ QUnit.module("Fields", (hooks) => {
             "none of the input should be checked"
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
         assert.strictEqual(
             target.querySelector(".o_notification_title").textContent,
             "Invalid fields: "
@@ -195,7 +195,7 @@ QUnit.module("Fields", (hooks) => {
         // click on 2nd option
         await click(target.querySelectorAll("input.o_radio_input")[1]);
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.hasAttrValue(
             target.querySelector("input.o_radio_input:checked"),
@@ -244,7 +244,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("fieldradio widget with numerical keys encoded as strings", async function (assert) {
-        assert.expect(7);
+        assert.expect(5);
 
         serverData.models.partner.fields.selection = {
             type: "selection",
@@ -273,25 +273,13 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.containsNone(target, ".o_radio_input:checked", "no value should be checked");
 
-        await click(target, ".o_form_button_edit");
-
-        assert.containsNone(target, ".o_radio_input:checked", "no value should be checked");
-
         await click(target.querySelectorAll("input.o_radio_input")[1]);
-
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector(".o_field_widget").textContent.replace(/\s+/g, ""),
             "RedBlack"
         );
-        assert.containsOnce(
-            target,
-            ".o_radio_input[data-index='1']:checked",
-            "'Black' should be checked"
-        );
-
-        await click(target, ".o_form_button_edit");
 
         assert.containsOnce(
             target,
@@ -338,7 +326,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
             assert.containsN(
                 target,
                 ".o_field_widget[name='trululu'] .o_radio_item",
@@ -363,7 +350,7 @@ QUnit.module("Fields", (hooks) => {
             resId: 2,
             serverData,
             arch: `
-                <form>
+                <form edit="0">
                     <field name="trululu" widget="radio" />
                 </form>`,
         });
diff --git a/addons/web/static/tests/views/fields/reference_field_tests.js b/addons/web/static/tests/views/fields/reference_field_tests.js
index fc4629c7f99..6b42c2737d6 100644
--- a/addons/web/static/tests/views/fields/reference_field_tests.js
+++ b/addons/web/static/tests/views/fields/reference_field_tests.js
@@ -10,7 +10,6 @@ import {
     triggerEvent,
     editSelect,
     clickSave,
-    clickEdit,
     triggerHotkey,
     nextTick,
 } from "@web/../tests/helpers/utils";
@@ -239,7 +238,7 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, ".o_field_widget[name='reference'] input", "new partner");
         await click(target, ".o_field_widget[name='reference'] .o_m2o_dropdown_option_create");
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.verifySteps(
             [
@@ -280,7 +279,7 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
             serverData,
             arch: `
-                <form>
+                <form edit="0">
                     <field name="reference" />
                     <field name="p" />
                 </form>`,
@@ -339,9 +338,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // current form
-        await click(target, ".o_form_button_edit");
-
         let fieldRef = target.querySelector(".o_field_widget[name=reference]");
         assert.strictEqual(
             fieldRef.querySelector("option:checked").textContent,
@@ -374,7 +370,7 @@ QUnit.module("Fields", (hooks) => {
     });
 
     QUnit.test("reference in form view", async function (assert) {
-        assert.expect(14);
+        assert.expect(11);
 
         serverData.views = {
             "product,false,form": `
@@ -408,7 +404,7 @@ QUnit.module("Fields", (hooks) => {
                 <form>
                     <sheet>
                         <group>
-                            <field name="reference" string="custom label" />
+                            <field name="reference" string="custom label" open_target="new" />
                         </group>
                     </sheet>
                 </form>`,
@@ -448,14 +444,12 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.strictEqual(
-            target.querySelector("a.o_form_uri").textContent,
-            "xphone",
-            "should contain a link"
-        );
-        await click(target, "a.o_form_uri");
-
-        await click(target, ".o_form_button_edit");
+        // assert.strictEqual(
+        //     target.querySelector("a.o_form_uri").textContent,
+        //     "xphone",
+        //     "should contain a link"
+        // );
+        // await click(target, "a.o_form_uri");
 
         assert.containsOnce(target, ".o_field_many2one_selection", "should contain one many2one");
         assert.strictEqual(
@@ -499,7 +493,7 @@ QUnit.module("Fields", (hooks) => {
 
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector("a.o_form_uri").textContent,
+            target.querySelector(".o_field_widget[name=reference] input").value,
             "gold",
             "should contain a link with the new value"
         );
@@ -547,7 +541,7 @@ QUnit.module("Fields", (hooks) => {
         await click(target.querySelector(".ui-autocomplete .ui-menu-item"));
 
         // save
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
     });
 
     QUnit.test("default_get and onchange with a reference field", async function (assert) {
@@ -673,8 +667,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(nbNameGet, 1, "the first name_get should have been done");
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo]").textContent,
@@ -738,8 +730,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.containsNone(
             target,
             "select",
@@ -797,18 +787,6 @@ QUnit.module("Fields", (hooks) => {
                    </form>`,
             });
 
-            assert.strictEqual(
-                target.querySelector(".o_field_widget[name='model_id'] span").textContent,
-                "Product",
-                "the value of model_id field should be Product"
-            );
-            assert.strictEqual(
-                target.querySelector(".o_field_widget[name='reference'] span").textContent,
-                "John Smith",
-                "the value of model_id field should be John Smith"
-            );
-
-            await click(target, ".o_form_button_edit");
             assert.containsNone(
                 target,
                 "select",
@@ -851,8 +829,6 @@ QUnit.module("Fields", (hooks) => {
                    </form>`,
             });
 
-            await clickEdit(target);
-
             assert.strictEqual(target.querySelector(".reference_field").textContent, "xpad");
 
             // Select the second product without changing the model
@@ -904,7 +880,6 @@ QUnit.module("Fields", (hooks) => {
                 "xpad"
             );
 
-            await clickEdit(target);
             await click(target.querySelector(".o_list_table .o_data_cell"));
             await editInput(target, ".o_list_table [name='name'] input", "plop");
             await click(target, ".o_form_view");
@@ -944,8 +919,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         const groups = target.querySelectorAll(".o_group");
 
         assert.containsNone(
diff --git a/addons/web/static/tests/views/fields/remaining_days_field_tests.js b/addons/web/static/tests/views/fields/remaining_days_field_tests.js
index d33c5600df7..ce03dd05c46 100644
--- a/addons/web/static/tests/views/fields/remaining_days_field_tests.js
+++ b/addons/web/static/tests/views/fields/remaining_days_field_tests.js
@@ -208,11 +208,7 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        assert.strictEqual(target.querySelector(".o_field_widget").textContent, "Today");
-        assert.hasClass(target.querySelector(".o_field_widget > div "), "fw-bold text-warning");
-
-        // in edit mode, this widget should be editable.
-        await click(target, ".o_form_button_edit");
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "10/08/2017");
 
         assert.containsOnce(target, ".o_form_editable");
         assert.containsOnce(target, "div.o_field_widget[name='date'] .o_datepicker");
@@ -226,14 +222,43 @@ QUnit.module("Fields", (hooks) => {
 
         await click(document.body, ".bootstrap-datetimepicker-widget .day[data-day='10/09/2017']");
         await click(target, ".o_form_button_save");
-        assert.strictEqual(target.querySelector(".o_field_widget").textContent, "Tomorrow");
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "10/09/2017");
+    });
 
-        await click(target, ".o_form_button_edit");
-        await click(target.querySelector(".o_datepicker .o_datepicker_input"));
-        await click(document.body, ".bootstrap-datetimepicker-widget .day[data-day='10/07/2017']");
-        await click(target, ".o_form_button_save");
-        assert.strictEqual(target.querySelector(".o_field_widget").textContent, "Yesterday");
-        assert.hasClass(target.querySelector(".o_field_widget > div"), "text-danger");
+    QUnit.test("RemainingDaysField in form view (readonly)", async function (assert) {
+        patchDate(2017, 9, 8, 15, 35, 11); // October 8 2017, 15:35:11
+        serverData.models.partner.records = [
+            { id: 1, date: "2017-10-08", datetime: "2017-10-08 10:00:00" }, // today
+        ];
+
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `
+                <form>
+                    <field name="date" widget="remaining_days" readonly="1" />
+                    <field name="datetime" widget="remaining_days" readonly="1" />
+                </form>`,
+        });
+
+        assert.strictEqual(
+            target.querySelector(".o_field_widget[name='date']").textContent,
+            "Today"
+        );
+        assert.hasClass(
+            target.querySelector(".o_field_widget[name='date'] > div "),
+            "fw-bold text-warning"
+        );
+        assert.strictEqual(
+            target.querySelector(".o_field_widget[name='datetime']").textContent,
+            "Today"
+        );
+        assert.hasClass(
+            target.querySelector(".o_field_widget[name='datetime'] > div "),
+            "fw-bold text-warning"
+        );
     });
 
     QUnit.test("RemainingDaysField on a datetime field in form view", async function (assert) {
@@ -252,13 +277,10 @@ QUnit.module("Fields", (hooks) => {
                     <field name="datetime" widget="remaining_days" />
                 </form>`,
         });
-        assert.strictEqual(target.querySelector(".o_field_widget").textContent, "Today");
-        assert.hasClass(target.querySelector(".o_field_widget > div"), "text-warning");
-
-        // in edit mode, this widget should be editable.
-        await click(target, ".o_form_button_edit");
-
-        assert.containsOnce(target, ".o_form_editable");
+        assert.strictEqual(
+            target.querySelector(".o_field_widget input").value,
+            "10/08/2017 11:00:00"
+        );
         assert.containsOnce(target, "div.o_field_widget[name='datetime'] .o_datepicker");
 
         await click(target.querySelector(".o_datepicker .o_datepicker_input"));
@@ -271,7 +293,10 @@ QUnit.module("Fields", (hooks) => {
         await click(document.body, ".bootstrap-datetimepicker-widget .day[data-day='10/09/2017']");
         await click(document.body, "a[data-action='close']");
         await click(target, ".o_form_button_save");
-        assert.strictEqual(target.querySelector(".o_field_widget > div").textContent, "Tomorrow");
+        assert.strictEqual(
+            target.querySelector(".o_field_widget input").value,
+            "10/09/2017 11:00:00"
+        );
     });
 
     QUnit.test(
diff --git a/addons/web/static/tests/views/fields/selection_field_tests.js b/addons/web/static/tests/views/fields/selection_field_tests.js
index 90bb8aa5b83..fe86f4a7346 100644
--- a/addons/web/static/tests/views/fields/selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/selection_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, editSelect, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { click, editSelect, editInput, getFixture, clickSave } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -111,38 +111,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "select");
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name='product_id']").textContent,
-            "xphone",
-            "should have rendered the many2one field correctly"
-        );
-        assert.hasAttrValue(
-            target.querySelector(".o_field_widget[name='product_id'] span"),
-            "raw-value",
-            "37",
-            "should have set the raw-value attr for many2one field correctly"
-        );
-
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name='trululu']").textContent,
-            "",
-            "should have rendered the unset many2one field correctly"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name='color']").textContent,
-            "Red",
-            "should have rendered the selection field correctly"
-        );
-        assert.hasAttrValue(
-            target.querySelector(".o_field_widget[name='color'] span"),
-            "raw-value",
-            "red",
-            "should have set the raw-value attr for selection field correctly"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(target, "select", 3);
         assert.containsOnce(
             target,
@@ -199,7 +167,7 @@ QUnit.module("Fields", (hooks) => {
             resModel: "partner",
             resId: 1,
             serverData,
-            arch: '<form><field name="selection" /></form>',
+            arch: '<form edit="0"><field name="selection" /></form>',
         });
 
         assert.strictEqual(
@@ -232,7 +200,7 @@ QUnit.module("Fields", (hooks) => {
             resModel: "partner",
             resId: 1,
             serverData,
-            arch: '<form><field name="selection" /></form>',
+            arch: '<form edit="0"><field name="selection" /></form>',
         });
 
         assert.strictEqual(
@@ -267,9 +235,8 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
         await editSelect(target, ".o_form_view select", "false");
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
     });
 
     QUnit.test("field selection with many2ones and special characters", async function (assert) {
@@ -284,8 +251,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="trululu" widget="selection" /></form>',
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             target.querySelector("select option[value='4']").textContent,
             "<span>hey</span>"
@@ -327,8 +292,6 @@ QUnit.module("Fields", (hooks) => {
                 },
             });
 
-            await click(target, ".o_form_button_edit");
-
             assert.containsN(
                 target,
                 ".o_field_widget[name='trululu'] option",
@@ -370,7 +333,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
         assert.deepEqual(
             [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
                 (option) => option.style.display
@@ -424,12 +386,11 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
-            assert.deepEqual(
-                [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
-                    (option) => option.style.display
-                ),
-                ["", "", ""]
+            assert.containsN(
+                target.querySelector(".o_field_widget[name='color']"),
+                "option",
+                3,
+                "Three options in non required field (one blank option)"
             );
 
             // change value to update widget modifier values
diff --git a/addons/web/static/tests/views/fields/signature_field_tests.js b/addons/web/static/tests/views/fields/signature_field_tests.js
index 788ed59642f..f6a5ab1574f 100644
--- a/addons/web/static/tests/views/fields/signature_field_tests.js
+++ b/addons/web/static/tests/views/fields/signature_field_tests.js
@@ -1,5 +1,5 @@
 /** @odoo-module **/
-import { click, clickEdit, getFixture, patchWithCleanup } from "@web/../tests/helpers/utils";
+import { click, getFixture, patchWithCleanup } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { NameAndSignature } from "@web/core/signature/name_and_signature";
 
@@ -72,7 +72,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         assert.containsOnce(
             target,
             "div[name=sign] div.o_signature svg",
@@ -112,7 +111,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         assert.containsOnce(
             target,
             "div[name=sign] div.o_signature svg",
@@ -150,7 +148,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await clickEdit(target);
         assert.containsN(target, ".o_signature", 3);
 
         const sign = target.querySelector("[name='sign'] .o_signature");
diff --git a/addons/web/static/tests/views/fields/stat_info_field_tests.js b/addons/web/static/tests/views/fields/stat_info_field_tests.js
index aaf7202e7de..92fc2de5bbc 100644
--- a/addons/web/static/tests/views/fields/stat_info_field_tests.js
+++ b/addons/web/static/tests/views/fields/stat_info_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, getFixture } from "@web/../tests/helpers/utils";
+import { getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 let serverData;
@@ -111,42 +111,6 @@ QUnit.module("Fields", (hooks) => {
             "int_field",
             "should have 'int_field' as text"
         );
-
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should still have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should still have 10 as value"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_text").textContent,
-            "int_field",
-            "should have 'int_field' as text"
-        );
-
-        // save
-        await click(target, ".o_form_button_save");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should have 10 as value"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_text").textContent,
-            "int_field",
-            "should have 'int_field' as text"
-        );
     });
 
     QUnit.test("StatInfoField in form view with specific label_field", async function (assert) {
@@ -185,42 +149,6 @@ QUnit.module("Fields", (hooks) => {
             "yop",
             "should have 'yop' as text, since it is the value of field foo"
         );
-
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should still have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should still have 10 as value"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_text").textContent,
-            "yop",
-            "should have 'yop' as text, since it is the value of field foo"
-        );
-
-        // save
-        await click(target, ".o_form_button_save");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should have 10 as value"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_text").textContent,
-            "yop",
-            "should have 'yop' as text, since it is the value of field foo"
-        );
     });
 
     QUnit.test("StatInfoField in form view with no label", async function (assert) {
@@ -255,41 +183,5 @@ QUnit.module("Fields", (hooks) => {
             ".oe_stat_button .o_field_widget .o_stat_text",
             "should not have any label"
         );
-
-        // switch to edit mode and check the result
-        await click(target, ".o_form_button_edit");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should still have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should still have 10 as value"
-        );
-        assert.containsNone(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_text",
-            "should not have any label"
-        );
-
-        // save
-        await click(target, ".o_form_button_save");
-        assert.containsOnce(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_info",
-            "should have one stat button"
-        );
-        assert.strictEqual(
-            target.querySelector(".oe_stat_button .o_field_widget .o_stat_value").textContent,
-            "10",
-            "should have 10 as value"
-        );
-        assert.containsNone(
-            target,
-            ".oe_stat_button .o_field_widget .o_stat_text",
-            "should not have any label"
-        );
     });
 });
diff --git a/addons/web/static/tests/views/fields/state_selection_field_tests.js b/addons/web/static/tests/views/fields/state_selection_field_tests.js
index 69cd4ee9626..75fe0590aba 100644
--- a/addons/web/static/tests/views/fields/state_selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/state_selection_field_tests.js
@@ -118,8 +118,6 @@ QUnit.module("Fields", (hooks) => {
             "should have one grey status since selection is the first, normal state"
         );
 
-        // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsNone(target, ".dropdown-menu", "there should still not be a dropdown");
         assert.containsNone(
             target,
diff --git a/addons/web/static/tests/views/fields/statusbar_field_tests.js b/addons/web/static/tests/views/fields/statusbar_field_tests.js
index 937be0d3d8e..48e39dda003 100644
--- a/addons/web/static/tests/views/fields/statusbar_field_tests.js
+++ b/addons/web/static/tests/views/fields/statusbar_field_tests.js
@@ -402,7 +402,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
             assert.containsN(target, ".o_statusbar_status button:not(.dropdown-toggle)", 3);
             const buttons = target.querySelectorAll(
                 ".o_statusbar_status button:not(.dropdown-toggle)"
@@ -435,7 +434,6 @@ QUnit.module("Fields", (hooks) => {
                     </form>`,
             });
 
-            await click(target, ".o_form_button_edit");
             await click(target, ".o_statusbar_status .dropdown-toggle");
 
             const status = target.querySelectorAll(".o_statusbar_status");
@@ -464,7 +462,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
         assert.strictEqual(
             target.querySelector("[aria-label='Current state']").textContent,
             "aaa",
@@ -512,8 +509,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.containsN(target, ".o_statusbar_status button.disabled", 3);
         assert.strictEqual(rpcCount, 1, "should have done 1 search_read rpc");
         await editInput(target, ".o_field_widget[name='qux'] input", 9.5);
diff --git a/addons/web/static/tests/views/fields/text_field_tests.js b/addons/web/static/tests/views/fields/text_field_tests.js
index e216d15286c..62ec480b07a 100644
--- a/addons/web/static/tests/views/fields/text_field_tests.js
+++ b/addons/web/static/tests/views/fields/text_field_tests.js
@@ -2,7 +2,14 @@
 
 import { registry } from "@web/core/registry";
 import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
-import { click, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
+import {
+    click,
+    clickCreate,
+    clickSave,
+    editInput,
+    getFixture,
+    triggerEvent,
+} from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 const serviceRegistry = registry.category("services");
@@ -67,14 +74,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="foo"/></form>',
         });
 
-        assert.containsOnce(target, ".o_field_text", "should have a text area");
-        assert.strictEqual(
-            target.querySelector(".o_field_text").textContent,
-            "yop",
-            "should be 'yop' in readonly"
-        );
-
-        await click(target, ".o_form_button_edit");
         const textarea = target.querySelector(".o_field_text textarea");
         assert.ok(textarea, "should have a text area");
         assert.strictEqual(textarea.value, "yop", "should still be 'yop' in edit");
@@ -89,10 +88,10 @@ QUnit.module("Fields", (hooks) => {
             "should be 'hello world' after second edition"
         );
 
-        await click(target, ".o_form_button_save");
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_text").textContent,
+            target.querySelector(".o_field_text textarea").value,
             "hello world",
             "should be 'hello world' after save"
         );
@@ -109,15 +108,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="foo"/></form>',
         });
 
-        const field = target.querySelector(".o_field_text");
-        assert.strictEqual(
-            field.offsetHeight,
-            field.scrollHeight,
-            "text field should not have a scroll bar"
-        );
-
-        await click(target, ".o_form_button_edit");
-
         const textarea = target.querySelector(".o_field_text textarea");
         assert.strictEqual(
             textarea.clientHeight,
@@ -135,8 +125,6 @@ QUnit.module("Fields", (hooks) => {
             arch: '<form><field name="txt"/></form>',
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.strictEqual(
             window.getComputedStyle(target.querySelector("textarea")).resize,
             "none",
@@ -175,8 +163,6 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        await click(target, ".o_form_button_edit");
-
         let textarea = target.querySelector(".o_field_widget[name='txt'] textarea");
         const initialHeight = textarea.offsetHeight;
 
@@ -242,10 +228,8 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
         });
 
-        // edit the form
         // trigger a textarea reset (through onchange) by clicking the box
         // then check there is no scroll bar
-        await click(target, ".o_form_button_edit");
         await click(target, "div[name='bar'] input");
 
         const textarea = target.querySelector("textarea");
@@ -275,8 +259,7 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            // switch to edit mode to ensure that autoresize is correctly done
-            await click(target.querySelector(".o_form_button_edit"));
+            // ensure that autoresize is correctly done
             let height = target.querySelector(".o_field_widget[name=text_field] textarea")
                 .offsetHeight;
             // focus the field to manually trigger autoresize
@@ -290,9 +273,8 @@ QUnit.module("Fields", (hooks) => {
             // its minimal size, even after being focused
             assert.ok(height > 80, "textarea should have an height of at least 80px");
 
-            // save and create a new record to ensure that autoresize is correctly done
-            await click(target.querySelector(".o_form_button_save"));
-            await click(target.querySelector(".o_form_button_create"));
+            // create a new record to ensure that autoresize is correctly done
+            await clickCreate(target);
             height = target.querySelector(".o_field_widget[name=text_field] textarea").offsetHeight;
             // focus the field to manually trigger autoresize
             await triggerEvent(target, ".o_field_widget[name=text_field] textarea", "focus");
@@ -337,7 +319,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.hasClass(target.querySelectorAll(".o_notebook .nav .nav-link")[0], "active");
 
         await click(target.querySelectorAll(".o_notebook .nav .nav-link")[1]);
@@ -394,8 +375,6 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
-
         assert.hasClass(target.querySelector("[name=txt] textarea"), "o_field_translate");
 
         assert.containsOnce(
@@ -485,7 +464,7 @@ QUnit.module("Fields", (hooks) => {
                 resModel: "partner",
                 serverData,
                 arch: `
-                    <form>
+                    <form edit="0">
                         <sheet>
                             <group>
                                 <field name="txt"/>
diff --git a/addons/web/static/tests/views/fields/url_field_tests.js b/addons/web/static/tests/views/fields/url_field_tests.js
index 45f47e8bc3d..e5692586571 100644
--- a/addons/web/static/tests/views/fields/url_field_tests.js
+++ b/addons/web/static/tests/views/fields/url_field_tests.js
@@ -52,6 +52,49 @@ QUnit.module("Fields", (hooks) => {
                 </form>`,
             resId: 1,
         });
+        assert.containsOnce(
+            target,
+            '.o_field_widget input[type="text"]',
+            "should have an input for the url field"
+        );
+        assert.strictEqual(
+            target.querySelector('.o_field_widget input[type="text"]').value,
+            "yop",
+            "input should contain field value"
+        );
+
+        await editInput(target, ".o_field_widget input[type='text']", "limbo");
+
+        // save
+        const editedElement = ".o_field_widget input[type='text']";
+        assert.containsOnce(target, editedElement, "should still have an input for the url field");
+        assert.containsOnce(
+            target,
+            editedElement,
+            "should still have a anchor with correct classes"
+        );
+        assert.strictEqual(
+            target.querySelector(editedElement).value,
+            "limbo",
+            "has the proper value"
+        );
+    });
+
+    QUnit.test("UrlField in form view (readonly)", async function (assert) {
+        await makeView({
+            serverData,
+            type: "form",
+            resModel: "partner",
+            arch: `
+                <form>
+                    <sheet>
+                        <group>
+                            <field name="foo" widget="url" readonly="1"/>
+                        </group>
+                    </sheet>
+                </form>`,
+            resId: 1,
+        });
         const matchingEl = target.querySelector("a.o_field_widget.o_form_uri");
         assert.containsOnce(target, matchingEl, "should have a anchor with correct classes");
         assert.hasAttrValue(matchingEl, "href", "http://yop", "should have proper href link");
@@ -62,48 +105,6 @@ QUnit.module("Fields", (hooks) => {
             "should have target attribute set to _blank"
         );
         assert.strictEqual(matchingEl.textContent, "yop", "the value should be displayed properly");
-
-        // switch to edit mode and check the result
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.containsOnce(
-            target,
-            '.o_field_widget input[type="text"]',
-            "should have an input for the char field"
-        );
-        assert.strictEqual(
-            target.querySelector('.o_field_widget input[type="text"]').value,
-            "yop",
-            "input should contain field value in edit mode"
-        );
-
-        await editInput(target, ".o_field_widget input[type='text']", "limbo");
-
-        // save
-        await click(target.querySelector(".o_form_button_save"));
-        const editedElement = target.querySelector("a.o_field_widget.o_form_uri");
-        assert.containsOnce(
-            target,
-            editedElement,
-            "should still have a anchor with correct classes"
-        );
-        assert.hasAttrValue(
-            editedElement,
-            "href",
-            "http://limbo",
-            "should have proper new href link"
-        );
-        assert.strictEqual(editedElement.textContent, "limbo", "the new value should be displayed");
-
-        await click(target.querySelector(".o_form_button_edit"));
-        await editInput(target, ".o_field_widget input[type='text']", "/web/limbo");
-
-        await click(target.querySelector(".o_form_button_save"));
-        assert.hasAttrValue(
-            target.querySelector(".o_field_widget[name='foo'] a"),
-            "href",
-            "/web/limbo",
-            "shouldn't have change link"
-        );
     });
 
     QUnit.test("UrlField takes text from proper attribute", async function (assert) {
@@ -111,7 +112,7 @@ QUnit.module("Fields", (hooks) => {
             serverData,
             type: "form",
             resModel: "partner",
-            arch: '<form><field name="foo" widget="url" text="kebeclibre"/></form>',
+            arch: '<form><field name="foo" widget="url" text="kebeclibre" readonly="1"/></form>',
             resId: 1,
         });
 
@@ -150,10 +151,10 @@ QUnit.module("Fields", (hooks) => {
             resModel: "partner",
             arch: `
                 <form>
-                    <field name="url1" widget="url"/>
-                    <field name="url2" widget="url" options="{'website_path': True}"/>
-                    <field name="url3" widget="url"/>
-                    <field name="url4" widget="url"/>
+                    <field name="url1" widget="url" readonly="1"/>
+                    <field name="url2" widget="url" readonly="1" options="{'website_path': True}"/>
+                    <field name="url3" widget="url" readonly="1"/>
+                    <field name="url4" widget="url" readonly="1"/>
                 </form>`,
             resId: 1,
         });
@@ -245,11 +246,6 @@ QUnit.module("Fields", (hooks) => {
             resId: 1,
         });
 
-        assert.containsOnce(target, "[name=foo]");
-        assert.strictEqual(target.querySelector("[name=foo]").textContent, "");
-
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsOnce(target, ".o_field_widget[name=foo] input");
         assert.strictEqual(target.querySelector("[name=foo] input").value, "");
     });
@@ -281,8 +277,6 @@ QUnit.module("Fields", (hooks) => {
             "yop",
             "the starting value should be displayed properly"
         );
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo2] input").value,
             "foo2",
diff --git a/addons/web/static/tests/views/form/form_compiler_tests.js b/addons/web/static/tests/views/form/form_compiler_tests.js
index 0fd31739bce..d16a400ddbd 100644
--- a/addons/web/static/tests/views/form/form_compiler_tests.js
+++ b/addons/web/static/tests/views/form/form_compiler_tests.js
@@ -3,7 +3,7 @@ import { makeView } from "../helpers";
 import { setupViewRegistries } from "@web/../tests/views/helpers";
 import { FormCompiler } from "@web/views/form/form_compiler";
 import { registry } from "@web/core/registry";
-import { click, getFixture, patchWithCleanup } from "../../helpers/utils";
+import { getFixture, patchWithCleanup } from "../../helpers/utils";
 import { createElement } from "@web/core/utils/xml";
 import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
 
@@ -38,7 +38,7 @@ QUnit.module("Form Compiler", (hooks) => {
         const arch = /*xml*/ `<form><div>lol</div></form>`;
         const expected = /*xml*/ `
             <t>
-                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block" class="o_form_nosheet" t-ref="compiled_view_root">
+                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block {{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}" class="o_form_nosheet" t-ref="compiled_view_root">
                     <div>lol</div>
                 </div>
             </t>`;
@@ -52,7 +52,7 @@ QUnit.module("Form Compiler", (hooks) => {
             const arch = /*xml*/ `<form><field name="test"/><label for="test" string=""/></form>`;
             const expected = /*xml*/ `
             <t>
-                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block" class="o_form_nosheet" t-ref="compiled_view_root">
+                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block {{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}" class="o_form_nosheet" t-ref="compiled_view_root">
                     <Field id="'test'" name="'test'" record="props.record" fieldInfo="props.archInfo.fieldNodes['test']" />
                     <FormLabel t-props="{id:'test',fieldName:'test',record:props.record,fieldInfo:props.archInfo.fieldNodes['test'],className:&quot;&quot;}" string="\`\`" />
                 </div>
@@ -65,7 +65,7 @@ QUnit.module("Form Compiler", (hooks) => {
         const arch = /*xml*/ `<form><div class="someClass">lol<field name="display_name"/></div></form>`;
         const expected = /*xml*/ `
             <t>
-                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block" class="o_form_nosheet" t-ref="compiled_view_root">
+                <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block {{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}" class="o_form_nosheet" t-ref="compiled_view_root">
                     <div class="someClass">
                         lol
                         <Field id="'display_name'" name="'display_name'" record="props.record" fieldInfo="props.archInfo.fieldNodes['display_name']"/>
@@ -149,7 +149,7 @@ QUnit.module("Form Compiler", (hooks) => {
 
         const expected = /*xml*/ `
             <t>
-            <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block" class="o_form_nosheet" t-ref="compiled_view_root">
+            <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block {{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}" class="o_form_nosheet" t-ref="compiled_view_root">
                 <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom"><StatusBarButtons readonly="!props.record.isInEdition"/></div>
                 <div>someDiv</div>
             </div>
@@ -171,7 +171,7 @@ QUnit.module("Form Compiler", (hooks) => {
 
         const expected = /*xml*/ `
             <t>
-            <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-flex {{ uiService.size &lt; 6 ? &quot;flex-column&quot; : &quot;flex-nowrap h-100&quot; }}" t-ref="compiled_view_root">
+            <div t-att-class="props.class" t-attf-class="{{props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-flex {{ uiService.size &lt; 6 ? &quot;flex-column&quot; : &quot;flex-nowrap h-100&quot; }} {{ props.record.isVirtual or props.record.isDirty ? 'o_form_dirty' : 'o_form_saved' }}" t-ref="compiled_view_root">
                 <div class="o_form_sheet_bg">
                     <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom"><StatusBarButtons readonly="!props.record.isInEdition"/></div>
                     <div>someDiv</div>
@@ -235,7 +235,7 @@ QUnit.module("Form Compiler", (hooks) => {
         const expected = /*xml*/ `
             <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom">
                <StatusBarButtons readonly="!props.record.isInEdition">
-                  <t t-set-slot="button_0" isVisible="true" displayInReadOnly="false">
+                  <t t-set-slot="button_0" isVisible="true">
                      <div>someDiv</div>
                   </t>
                </StatusBarButtons>
@@ -298,7 +298,6 @@ QUnit.module("Form Renderer", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsN(target, ".o_form_editable input", 2);
     });
 
diff --git a/addons/web/static/tests/views/form/form_view_tests.js b/addons/web/static/tests/views/form/form_view_tests.js
index 41e0556dc4b..e79115f7a6a 100644
--- a/addons/web/static/tests/views/form/form_view_tests.js
+++ b/addons/web/static/tests/views/form/form_view_tests.js
@@ -5,7 +5,7 @@ import { makeFakeNotificationService } from "@web/../tests/helpers/mock_services
 import {
     addRow,
     click,
-    clickEdit,
+    clickDiscard,
     clickSave,
     dragAndDrop,
     editInput,
@@ -273,7 +273,8 @@ QUnit.module("Views", (hooks) => {
             "should keep the inline style on html elements"
         );
         assert.containsOnce(target, "label:contains(Foo)");
-        assert.containsOnce(target, "span:contains(blip)");
+        assert.containsOnce(target, ".o_field_char input");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "blip");
         assert.hasAttrValue(
             target.querySelector(".o_group .o_group"),
             "style",
@@ -518,8 +519,6 @@ QUnit.module("Views", (hooks) => {
             resId: 6,
         });
 
-        await clickEdit(target);
-
         assert.containsN(target, ".o_field_one2many", 2);
         assert.doesNotHaveClass(
             target.querySelectorAll(".o_field_one2many")[0],
@@ -657,7 +656,7 @@ QUnit.module("Views", (hooks) => {
                 resModel: "user",
                 serverData,
                 arch: `
-                <form>
+                <form edit="0">
                     <field name="partner_ids">
                         <tree editable="top">
                             <field name="display_name"/>
@@ -757,7 +756,6 @@ QUnit.module("Views", (hooks) => {
                 </form>`,
             resId: 2,
         });
-        await click(target.querySelector(".o_form_button_edit"));
         assert.doesNotHaveClass(
             target.querySelector('.o_field_widget[name="display_name"]'),
             "text-danger"
@@ -777,7 +775,6 @@ QUnit.module("Views", (hooks) => {
             arch: `<form><field name="int_field" decoration-danger="int_field &lt; 5"/></form>`,
             resId: 2,
         });
-        await click(target.querySelector(".o_form_button_edit"));
         assert.doesNotHaveClass(
             target.querySelector('.o_field_widget[name="int_field"]'),
             "text-danger"
@@ -940,7 +937,7 @@ QUnit.module("Views", (hooks) => {
             views: [[false, "form"]],
         });
 
-        await click(target.querySelector('.o_field_widget[name="product_id"] a'));
+        await click(target.querySelector('.o_field_widget[name="product_id"] .o_external_button'));
     });
 
     QUnit.test("invisible fields are properly hidden", async function (assert) {
@@ -1065,7 +1062,6 @@ QUnit.module("Views", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.containsOnce(target, ".o_field_widget[name=int_field]");
             assert.containsNone(target, ".o_field_widget[name=timmy]");
@@ -1102,8 +1098,6 @@ QUnit.module("Views", (hooks) => {
             });
 
             assert.containsNone(target, ".o_notebook");
-
-            await click(target.querySelector(".o_form_button_edit"));
             await editInput(target, ".o_field_widget[name=int_field] input", 44);
 
             assert.containsOnce(target, ".o_notebook");
@@ -1125,14 +1119,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        // Does not change when switching state
-        await click(target.querySelector(".o_form_button_edit"));
-
-        assert.containsNone(target, ":scope .o_notebook .nav");
-
-        // Does not change when coming back to initial state
-        await click(target.querySelector(".o_form_button_save"));
-
         assert.containsNone(target, ":scope .o_notebook .nav");
     });
 
@@ -1181,18 +1167,6 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsNone(target, ".o_notebook_headers .nav-item");
         assert.containsNone(target, ".tab-content .tab-pane");
-
-        // Does not change when switching state
-        await click(target.querySelector(".o_form_button_edit"));
-
-        assert.containsNone(target, ".o_notebook_headers .nav-item");
-        assert.containsNone(target, ".tab-content .tab-pane");
-
-        // Does not change when coming back to initial state
-        await click(target.querySelector(".o_form_button_save"));
-
-        assert.containsNone(target, ".o_notebook_headers .nav-item");
-        assert.containsNone(target, ".tab-content .tab-pane");
     });
 
     QUnit.test("notebook: pages with invisible modifiers", async function (assert) {
@@ -1220,8 +1194,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsN(target, ".o_notebook .nav-link", 2);
         assert.containsOnce(target, ".o_notebook .nav .nav-link.active");
         assert.hasClass(target.querySelector(".o_notebook .nav .nav-link"), "active");
@@ -1257,7 +1229,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsN(target, ".o_notebook .nav .nav-link", 2);
         assert.hasClass(target.querySelector(".o_notebook .nav .nav-link"), "active");
         assert.hasClass(target.querySelector(".o_notebook .tab-content .tab-pane"), "active");
@@ -1288,7 +1259,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsNone(target, ".o_notebook");
 
         // enable checkbox
@@ -1522,8 +1492,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 1,
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.containsOnce(target, "div.o_group");
             await click(target.querySelector(".o_field_boolean input"));
             assert.containsNone(target, "div.o_group");
@@ -2058,7 +2026,7 @@ QUnit.module("Views", (hooks) => {
                 </form>`,
         });
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.containsN(target, ".o_form_label.o_field_invalid", 2);
         assert.containsN(target, ".o_field_many2one.o_field_invalid", 2);
@@ -2139,7 +2107,6 @@ QUnit.module("Views", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.containsOnce(
                 target,
@@ -2186,11 +2153,12 @@ QUnit.module("Views", (hooks) => {
         );
 
         await editInput(target, ".o_field_widget[name=int_field] input", "34");
-        await click(target.querySelector(".o_form_button_save"));
-        assert.containsOnce(target, ".o_form_readonly");
-        assert.strictEqual(target.querySelector(".o_field_widget[name=int_field]").innerText, "34");
+        await clickSave(target);
+        assert.strictEqual(
+            target.querySelector(".o_field_widget[name=int_field]").textContent,
+            "34"
+        );
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(target, ".o_form_editable");
         assert.containsNone(target, ".o_field_widget[name=int_field] input");
         assert.hasClass(
@@ -2237,7 +2205,6 @@ QUnit.module("Views", (hooks) => {
                     `,
                 resId: 1,
             });
-            await click(target.querySelector(".o_form_button_edit"));
 
             let m2oName = "first record";
             for (const value of [true, false, true, false]) {
@@ -2287,21 +2254,6 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
         });
 
-        assert.containsN(
-            target,
-            ".o_field_widget.o_field_empty",
-            2,
-            "should have 2 empty fields with correct class"
-        );
-        assert.containsN(
-            target,
-            ".o_form_label_empty",
-            2,
-            "should have 2 muted labels (for the empty fieds) in readonly"
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsOnce(
             target,
             ".o_field_empty",
@@ -2361,16 +2313,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 2,
             });
 
-            assert.containsN(target, ".o_field_widget.o_field_empty", 2);
-            assert.containsN(
-                target,
-                ".o_form_label_empty",
-                2,
-                "should have 1 muted label (for the empty fied) in readonly"
-            );
-
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.containsNone(
                 target,
                 ".o_field_empty",
@@ -2455,11 +2397,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 2,
             });
 
-            assert.containsN(target, ".o_field_widget.o_field_empty", 2);
-            assert.containsN(target, ".o_form_label_empty", 2);
-
-            await clickEdit(target);
-
             assert.containsOnce(target, ".o_field_empty");
             assert.containsOnce(target, ".o_form_label_empty");
 
@@ -2475,27 +2412,6 @@ QUnit.module("Views", (hooks) => {
         }
     );
 
-    QUnit.test("form view can switch to edit mode", async function (assert) {
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: '<form><field name="foo"/></form>',
-            resId: 1,
-        });
-
-        assert.containsOnce(target, ".o_form_readonly");
-        assert.isVisible(target.querySelector(".o_form_buttons_view"));
-        assert.isNotVisible(target.querySelector(".o_form_buttons_edit"));
-
-        await click(target.querySelector(".o_form_button_edit"));
-
-        assert.containsOnce(target, ".o_form_editable");
-        assert.containsNone(target, ".o_form_readonly");
-        assert.isNotVisible(target.querySelector(".o_form_buttons_view"));
-        assert.isVisible(target.querySelector(".o_form_buttons_edit"));
-    });
-
     QUnit.test(
         "required attrs on fields are re-evaluated on field change",
         async function (assert) {
@@ -2514,7 +2430,6 @@ QUnit.module("Views", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await click(target.querySelector(".o_form_button_edit"));
 
             assert.containsOnce(
                 target,
@@ -2552,10 +2467,6 @@ QUnit.module("Views", (hooks) => {
                 </form>`,
             resId: 1,
         });
-
-        assert.containsOnce(target, ".o_field_widget.o_required_modifier");
-
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(target, ".o_field_widget.o_required_modifier");
     });
 
@@ -2585,21 +2496,10 @@ QUnit.module("Views", (hooks) => {
             "qux input is 0 by default (float field)"
         );
 
-        await click(target.querySelector(".o_form_button_save"));
-
-        assert.containsNone(
-            target,
-            '.o_field_widget[name="qux"] input',
-            "should have switched to readonly"
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
 
         await editInput(target, ".o_field_widget[name=qux] input", "1");
-
-        await click(target.querySelector(".o_form_button_save"));
-
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
 
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="qux"] input').value,
@@ -2907,10 +2807,10 @@ QUnit.module("Views", (hooks) => {
         assert.verifySteps(["read1", "willStart"]);
 
         await click(target.querySelector(".o_form_statusbar button.p"));
-        assert.verifySteps(["willUpdateProps", "read2", "willUpdateProps"]);
+        assert.verifySteps(["read2", "willUpdateProps", "willUpdateProps"]);
 
         await click(target.querySelector(".o_form_statusbar button.p"));
-        assert.verifySteps(["willUpdateProps", "read3", "willUpdateProps"]);
+        assert.verifySteps(["willUpdateProps", "read3", "willUpdateProps", "willUpdateProps"]);
     });
 
     QUnit.test("buttons in form view, new record", async function (assert) {
@@ -3037,14 +2937,14 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
         });
 
-        assert.containsOnce(target, ".o_form_readonly button[data-hotkey=v]");
+        assert.containsOnce(target, ".o_form_view button[data-hotkey=v]");
         triggerHotkey("alt+v");
         await nextTick();
         assert.verifySteps(["validate"]);
     });
 
     QUnit.test("change and save char", async function (assert) {
-        assert.expect(6);
+        assert.expect(3);
 
         await makeView({
             type: "form",
@@ -3054,26 +2954,15 @@ QUnit.module("Views", (hooks) => {
             mockRPC(route, args) {
                 if (args.method === "write") {
                     assert.ok(true, "should call the /write route");
+                    assert.strictEqual(args.args[1].foo, "tralala");
                 }
             },
             resId: 2,
         });
 
-        assert.containsOnce(target, ".o_form_readonly", "form view should be in readonly mode");
-        assert.containsOnce(target, "span:contains(blip)", "should contain span with field value");
-
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsOnce(target, ".o_form_editable", "form view should be in edit mode");
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
-        await click(target.querySelector(".o_form_button_save"));
-
-        assert.containsOnce(target, ".o_form_readonly", "form view should be in readonly mode");
-        assert.containsOnce(
-            target,
-            "span:contains(tralala)",
-            "should contain span with field value"
-        );
+        await clickSave(target);
     });
 
     QUnit.test("properly reload data from server", async function (assert) {
@@ -3090,10 +2979,9 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
-        await click(target.querySelector(".o_form_button_save"));
-        assert.containsOnce(target, "span:contains(apple)", "should contain span with field value");
+        await clickSave(target);
+        assert.strictEqual(target.querySelector(".o_field_widget[name=foo] input").value, "apple");
     });
 
     QUnit.test("disable buttons until reload data from server", async function (assert) {
@@ -3115,18 +3003,19 @@ QUnit.module("Views", (hooks) => {
         });
 
         def = makeDeferred();
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         // Save button should be disabled
         assert.hasAttrValue(target.querySelector(".o_form_button_save"), "disabled", "disabled");
+        assert.hasAttrValue(target.querySelector(".o_form_button_cancel"), "disabled", "disabled");
         // Release the 'read' call
         def.resolve();
         await nextTick();
 
-        // Edit button should be enabled after the reload
-        assert.hasAttrValue(target.querySelector(".o_form_button_edit"), "disabled", undefined);
+        // Save button should be enabled after the reload
+        assert.hasAttrValue(target.querySelector(".o_form_button_save"), "disabled", undefined);
+        assert.hasAttrValue(target.querySelector(".o_form_button_cancel"), "disabled", undefined);
     });
 
     QUnit.test("properly apply onchange in simple case", async function (assert) {
@@ -3143,8 +3032,6 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=int_field] input").value,
             "9",
@@ -3176,8 +3063,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 2,
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name=int_field] input").value,
                 "9",
@@ -3192,10 +3077,10 @@ QUnit.module("Views", (hooks) => {
                 "value should have been set to 14 by onchange"
             );
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.strictEqual(
-                target.querySelector(".o_field_widget[name=int_field]").textContent,
+                target.querySelector(".o_field_widget[name=int_field] input").value,
                 "14",
                 "value should still be 14"
             );
@@ -3246,7 +3131,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
     });
 
@@ -3294,8 +3178,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // add a o2m row
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         await editInput(
@@ -3368,10 +3250,13 @@ QUnit.module("Views", (hooks) => {
 
         await click(target.querySelector(".o_form_button_create"));
         assert.containsOnce(target, ".o_form_editable");
-        assert.strictEqual(target.querySelector("input").value, "My little Foo Value");
+        assert.strictEqual(
+            target.querySelector(".o_field_char input").value,
+            "My little Foo Value"
+        );
 
-        await click(target.querySelector(".o_form_button_save"));
-        assert.containsOnce(target, ".o_form_readonly");
+        await clickSave(target);
+        assert.containsOnce(target, ".o_form_editable");
         assert.strictEqual(serverData.models.partner.records.length, n + 1);
     });
 
@@ -3465,7 +3350,7 @@ QUnit.module("Views", (hooks) => {
                     <field name="partner_ids">
                         <tree editable="bottom">
                             <field name="display_name"/>
-                            <field name="reference"/>
+                            <field name="reference" open_target="new"/>
                         </tree>
                     </field>
                 </form>`,
@@ -3477,7 +3362,6 @@ QUnit.module("Views", (hooks) => {
             resId: 17,
         });
         // current form
-        await click(target.querySelector(".o_form_button_edit"));
 
         // open the modal form view of the record pointed by the reference field
         await click(target.querySelector('table td[data-tooltip="first record"]'));
@@ -3498,7 +3382,7 @@ QUnit.module("Views", (hooks) => {
         );
     });
 
-    QUnit.test("there is no Actions menu when creating a new record", async function (assert) {
+    QUnit.test("there is an Actions menu when creating a new record", async function (assert) {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -3512,9 +3396,9 @@ QUnit.module("Views", (hooks) => {
 
         await click(target.querySelector(".o_form_button_create"));
 
-        assert.containsNone(target, ".o_cp_action_menus");
+        assert.containsOnce(target, ".o_cp_action_menus");
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.containsOnce(target, ".o_cp_action_menus");
     });
@@ -3816,8 +3700,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         await click(target.querySelector(".oe_stat_button"));
         assert.strictEqual(count, 1, "should have triggered a execute action");
         assert.containsOnce(target, ".o_form_editable", "form view should be in edit mode");
@@ -3872,7 +3754,6 @@ QUnit.module("Views", (hooks) => {
             "second record",
             "should have correct display_name"
         );
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=name] input", "some other name");
 
         await click(target.querySelector(".oe_stat_button"));
@@ -3915,8 +3796,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // make the record dirty
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
         await click(target.querySelector(".o_content button.btn-primary"));
@@ -3957,7 +3836,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
         await click(target.querySelector(".o_content button.btn-primary"));
         assert.verifySteps(["get_views", "read", "write", "read", "execute_action"]);
@@ -4119,8 +3997,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -4128,12 +4004,12 @@ QUnit.module("Views", (hooks) => {
         );
 
         // click on discard
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsNone(document.body, ".modal", "no confirm modal should be displayed");
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
-            "field in readonly should display yop"
+            "field should display yop"
         );
 
         assert.strictEqual(nbWrite, 0, "no write RPC should have been done");
@@ -4154,8 +4030,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        // switch to edit mode and edit the foo field
-        await click(target.querySelector(".o_form_button_edit"));
+        // edit the foo field
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -4169,12 +4044,12 @@ QUnit.module("Views", (hooks) => {
         );
 
         // click on discard
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsNone(document.body, ".modal", "no confirm modal should be displayed");
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "yop",
-            "field in readonly should display yop"
+            "field should display yop"
         );
 
         assert.strictEqual(nbWrite, 0, "no write RPC should have been done");
@@ -4199,11 +4074,11 @@ QUnit.module("Views", (hooks) => {
         // event to properly focusout the input, otherwise it crashes later on
         // when the 'blur' event is triggered by the re-rendering)
         target.querySelector(".o_form_button_cancel").focus();
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
 
         target.querySelector(".o_form_button_save").focus();
-        await click(target.querySelector(".o_form_button_save"));
-        assert.containsOnce(target, "span:contains(2017)");
+        await clickSave(target);
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "01/25/2017");
     });
 
     QUnit.test("discard changes on relational data on new record", async function (assert) {
@@ -4232,7 +4107,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // click on discard
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsNone(target, ".modal", "modal should not be displayed");
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=product_id] input").value,
@@ -4264,7 +4139,7 @@ QUnit.module("Views", (hooks) => {
                 "input should contain ABC"
             );
 
-            await click(target.querySelector(".o_form_button_cancel"));
+            await clickDiscard(target);
 
             assert.containsNone(document.body, ".modal", "there should not be a confirm modal");
             assert.verifySteps(["history-back"]);
@@ -4304,7 +4179,7 @@ QUnit.module("Views", (hooks) => {
             "DEF",
             "input should be DEF"
         );
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "ABC",
@@ -4319,7 +4194,7 @@ QUnit.module("Views", (hooks) => {
             "GHI",
             "input should be GHI"
         );
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "ABC",
@@ -4337,9 +4212,8 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
             actionMenus: {},
         });
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         await toggleActionMenu(target);
         await toggleMenuItem(target, "Duplicate");
@@ -4350,7 +4224,7 @@ QUnit.module("Views", (hooks) => {
             "input should contain tralala"
         );
 
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
 
         assert.containsNone(document.body, ".modal", "there should not be a confirm modal");
     });
@@ -4400,7 +4274,6 @@ QUnit.module("Views", (hooks) => {
                 </form>`,
             resId: 1,
         });
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(
             target,
             ".o_statusbar_status button",
@@ -4413,7 +4286,7 @@ QUnit.module("Views", (hooks) => {
             2,
             "Must have only two statusbar buttons"
         );
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsOnce(
             target,
             ".o_statusbar_status button",
@@ -4450,8 +4323,6 @@ QUnit.module("Views", (hooks) => {
             "pager limit should be 2"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -4519,7 +4390,6 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "");
         await click(target.querySelector(".o_pager_next"));
         assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
@@ -4549,7 +4419,6 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "");
         triggerHotkey("alt+n");
         await nextTick();
@@ -4590,15 +4459,6 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
-
-        // same, but in edit mode
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.containsOnce(target, ".o_form_editable");
-
-        await click(target.querySelector(".o_pager_next"));
-        assert.containsOnce(target, ".o_form_editable");
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "second record");
-        assert.strictEqual(target.querySelector(".o_pager_value").textContent, "2");
     });
 
     QUnit.test("keynav: switching to another record from a dirty one", async function (assert) {
@@ -4628,8 +4488,6 @@ QUnit.module("Views", (hooks) => {
             "pager limit should be 2"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -4693,8 +4551,6 @@ QUnit.module("Views", (hooks) => {
             "pager value should be 1"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -4709,7 +4565,7 @@ QUnit.module("Views", (hooks) => {
             "input should contain new value"
         );
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         // click on the pager to switch to the next record and cancel the confirm request
         await click(target.querySelector(".o_pager_next"));
@@ -4747,8 +4603,6 @@ QUnit.module("Views", (hooks) => {
             "pager value should be 1"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "new value",
@@ -4758,7 +4612,7 @@ QUnit.module("Views", (hooks) => {
         // edit the foo field
         await editInput(target, ".o_field_widget[name=foo] input", "wrong value");
 
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsNone(document.body, ".modal", "no confirm modal should be displayed");
         await click(target.querySelector(".o_pager_next"));
         assert.strictEqual(
@@ -4819,14 +4673,14 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsNone(target, ".o_pager");
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.containsOnce(target, ".o_pager");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "3");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "3");
     });
 
-    QUnit.test("switching to another record, in readonly mode", async function (assert) {
+    QUnit.test("switching to another record", async function (assert) {
         patchWithCleanup(browser, {
             setTimeout(fn) {
                 return fn(); // update the router hash directly
@@ -4841,13 +4695,11 @@ QUnit.module("Views", (hooks) => {
             resIds: [1, 2],
         });
 
-        assert.containsOnce(target, ".o_form_readonly");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(form.env.services.router.current.hash.id, 1);
 
         await click(target.querySelector(".o_pager_next"));
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "2");
-        assert.containsOnce(target, ".o_form_readonly");
         assert.strictEqual(form.env.services.router.current.hash.id, 2);
     });
 
@@ -4946,9 +4798,9 @@ QUnit.module("Views", (hooks) => {
 
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
-        assert.containsOnce(
-            target,
-            ".o_field_widget[name=foo]:contains(blip)",
+        assert.strictEqual(
+            target.querySelector(".o_field_widget[name=foo] input").value,
+            "blip",
             "should have a field with foo value for record 2"
         );
     });
@@ -4993,7 +4845,7 @@ QUnit.module("Views", (hooks) => {
             arch: "<form>" + '<group><field name="foo"/></group>' + "</form>",
         });
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.hasClass(target.querySelector("label.o_form_label"), "o_field_invalid");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_field_invalid");
         assert.containsOnce(target, ".o_notification");
@@ -5011,82 +4863,6 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_field_invalid");
     });
 
-    QUnit.test("changes in a readonly form view are saved directly", async function (assert) {
-        let nbWrite = 0;
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: `
-                <form>
-                    <group>
-                    <field name="foo"/>
-                    <field name="priority" widget="priority"/>
-                    </group>
-                </form>`,
-            mockRPC(route) {
-                if (route === "/web/dataset/call_kw/partner/write") {
-                    nbWrite++;
-                }
-            },
-            resId: 1,
-        });
-
-        assert.containsN(
-            target,
-            ".o_priority .o_priority_star",
-            2,
-            "priority widget should have been rendered"
-        );
-        assert.containsN(
-            target,
-            ".o_priority .fa-star-o",
-            2,
-            "priority widget should have been rendered with correct value"
-        );
-
-        // edit the value in readonly
-        await click(target.querySelector(".o_priority .fa-star-o"));
-        assert.strictEqual(nbWrite, 1, "should have saved directly");
-        assert.containsOnce(
-            target,
-            ".o_priority .fa-star",
-            "priority widget should have been updated"
-        );
-
-        // switch to edit mode and edit the value again
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.containsN(
-            target,
-            ".o_priority .o_priority_star",
-            2,
-            "priority widget should have been correctly rendered"
-        );
-        assert.containsOnce(
-            target,
-            ".o_priority .fa-star",
-            "priority widget should have correct value"
-        );
-        await click(target.querySelector(".o_priority .fa-star-o"));
-        assert.strictEqual(nbWrite, 1, "should not have saved directly");
-        assert.containsN(
-            target,
-            ".o_priority .fa-star",
-            2,
-            "priority widget should have been updated"
-        );
-
-        // save
-        await click(target.querySelector(".o_form_button_save"));
-        assert.strictEqual(nbWrite, 2, "should not have saved directly");
-        assert.containsN(
-            target,
-            ".o_priority .fa-star",
-            2,
-            "priority widget should have correct value"
-        );
-    });
-
     QUnit.test("display a dialog if onchange result is a warning", async function (assert) {
         serverData.models.partner.onchanges = { foo: true };
 
@@ -5110,8 +4886,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=int_field] input").value,
             "9"
@@ -5158,8 +4932,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.strictEqual(
                 target.querySelector(".o_field_widget[name=int_field] input").value,
                 "9"
@@ -5244,15 +5016,14 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            // go to edit mode, click to add a record in the o2m
-            await click(target.querySelector(".o_form_button_edit"));
+            // click to add a record in the o2m
             await click(target.querySelector(".o_field_x2many_list_row_add a"));
             assert.containsNone(target, "tr.o_data_row", "should not have added a line");
             assert.containsOnce(target, ".o_notification .text-warning");
         }
     );
 
-    QUnit.test("button box is rendered in create mode", async function (assert) {
+    QUnit.skip("button box is rendered in create mode", async function (assert) {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -5268,16 +5039,6 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
         });
 
-        // readonly mode
-        assert.containsOnce(
-            target,
-            ".oe_stat_button",
-            "button box should be displayed in readonly"
-        );
-
-        // edit mode
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsOnce(
             target,
             ".oe_stat_button",
@@ -5285,7 +5046,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // create mode (leave edition first!)
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         await click(target.querySelector(".o_form_button_create"));
         assert.containsOnce(
             target,
@@ -5330,8 +5091,6 @@ QUnit.module("Views", (hooks) => {
             "the 'display_name' of the one2many record should be correct"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "let us trigger an onchange");
         assert.containsN(target, ".o_data_row", 2, "there should be two linked record");
         assert.strictEqual(
@@ -5390,7 +5149,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         // Trigger the onchange
         await editInput(target, ".o_field_widget[name=int_field] input", "2");
         // Open first record in one2many
@@ -5445,7 +5203,6 @@ QUnit.module("Views", (hooks) => {
             ["aaa", "No records"],
             "should have proper initial content"
         );
-        await click(target.querySelector(".o_form_button_edit"));
 
         await editInput(target, ".o_field_widget[name=foo] input", "tralala");
 
@@ -5474,7 +5231,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_data_cell"));
         await editInput(target, ".o_field_widget[name=display_name] input", "");
         await click(target.querySelectorAll(".fa-trash-o")[1]);
@@ -5528,8 +5284,6 @@ QUnit.module("Views", (hooks) => {
             "there should be no many2many record linked at first"
         );
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "let us trigger an onchange");
         assert.containsN(target, ".o_data_row", 2, "there should be two linked records");
         assert.strictEqual(
@@ -5543,7 +5297,7 @@ QUnit.module("Views", (hooks) => {
             "the 'display_name' of the second m2m record should be correctly displayed"
         );
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.verifySteps(["get_views", "read", "onchange", "read", "write", "read", "read"]);
     });
@@ -5577,9 +5331,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 1,
             });
 
-            // switch to edit mode
-            await click(target.querySelector(".o_form_button_edit"));
-
             // open a form view and save many2many record
             await click(target.querySelector(".o_data_row .o_data_cell"));
             await click(target.querySelector(".modal-dialog footer .btn-primary"));
@@ -5681,8 +5432,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // trigger the onchange
         await editInput(target, ".o_field_widget[name=foo] input", "coucou");
 
@@ -5714,17 +5463,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name=date]").textContent,
-            "01/25/2017"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_widget[name=datetime]").textContent,
-            "12/12/2016 12:55:05"
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=date] input").value,
             "01/25/2017"
@@ -5764,8 +5502,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // edit int_field, and check that an onchange has been applied
         await editInput(target, '.o_field_widget[name="int_field"] input', "123");
         assert.strictEqual(
@@ -5784,7 +5520,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // save, and check that the int_field input is marked as invalid
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.hasClass(
             target.querySelector('.o_field_widget[name="int_field"]'),
             "o_field_invalid",
@@ -5869,19 +5605,17 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector('.o_field_widget[name="foo"]').textContent,
+            target.querySelector('.o_field_widget[name="foo"] input').value,
             "blip",
             "field foo should be displayed to initial value"
         );
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // edit a field and discard
         await editInput(target, ".o_field_widget[name=foo] input", "1234");
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.containsNone(target, ".modal");
         assert.strictEqual(
-            target.querySelector('.o_field_widget[name="foo"]').textContent,
+            target.querySelector('.o_field_widget[name="foo"] input').value,
             "blip",
             "field foo should still be displayed to initial value"
         );
@@ -5890,7 +5624,7 @@ QUnit.module("Views", (hooks) => {
         def.resolve();
         await nextTick();
         assert.strictEqual(
-            target.querySelector('.o_field_widget[name="foo"]').textContent,
+            target.querySelector('.o_field_widget[name="foo"] input').value,
             "blip",
             "field foo should still be displayed to initial value"
         );
@@ -5920,13 +5654,11 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(target, ".o_form_view .o_form_editable");
-
         await editInput(target, ".o_field_widget[name=foo] input", "1234");
 
         // save the value and discard directly
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.ok(target.querySelector(".o_form_button_cancel").disabled);
         // with form view extensions, it may happen that someone tries to discard
         // while there is a pending save, so we simulate this here
@@ -5945,9 +5677,8 @@ QUnit.module("Views", (hooks) => {
         def.resolve();
         await nextTick();
         assert.containsNone(target, ".modal", "Confirm dialog should not be displayed");
-        assert.containsOnce(target, ".o_form_view .o_form_readonly");
         assert.strictEqual(
-            target.querySelector('.o_field_widget[name="foo"]').textContent,
+            target.querySelector('.o_field_widget[name="foo"] input').value,
             "1234",
             "value should have been saved and rerendered in readonly"
         );
@@ -5988,8 +5719,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "trigger an onchange");
     });
 
@@ -6060,7 +5789,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "trigger an onchange");
 
         assert.strictEqual(
@@ -6069,7 +5797,7 @@ QUnit.module("Views", (hooks) => {
             "onchange should have been correctly applied on field in o2m list"
         );
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("onchange value are not discarded on o2m edition", async function (assert) {
@@ -6125,8 +5853,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_data_row td").textContent,
             "My little Foo Value",
@@ -6182,8 +5908,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 2,
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.strictEqual(
                 target.querySelector(".o_data_row td").textContent,
                 "My little Foo Value",
@@ -6240,8 +5964,6 @@ QUnit.module("Views", (hooks) => {
                 resId: 2,
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.strictEqual(
                 target.querySelector(".o_data_row td").textContent,
                 "My little Foo Value",
@@ -6316,8 +6038,6 @@ QUnit.module("Views", (hooks) => {
                 },
                 resId: 2,
             });
-
-            await click(target.querySelector(".o_form_button_edit"));
             await editInput(target, ".o_field_widget[name=foo] input", "coucou");
         }
     );
@@ -6647,7 +6367,7 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("many2manys inside one2manys are saved correctly", async function (assert) {
@@ -6688,7 +6408,7 @@ QUnit.module("Views", (hooks) => {
         // add a o2m subrecord with a m2m tag
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         await selectDropdownItem(target, "timmy", "gold");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test(
@@ -6750,160 +6470,10 @@ QUnit.module("Views", (hooks) => {
                 "the cell should contains the number of record: 1"
             );
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
         }
     );
 
-    QUnit.test(
-        "oe_read_only and oe_edit_only classNames on fields inside groups",
-        async function (assert) {
-            await makeView({
-                type: "form",
-                resModel: "partner",
-                serverData,
-                arch: `
-                    <form>
-                        <group>
-                            <field name="foo" class="oe_read_only"/>
-                            <field name="bar" class="oe_edit_only"/>
-                        </group>
-                    </form>`,
-                resId: 1,
-            });
-
-            assert.containsOnce(
-                target,
-                ".o_form_view .o_form_readonly",
-                "form should be in readonly mode"
-            );
-            assert.isVisible(target.querySelector(".o_field_widget[name=foo]"));
-            assert.isVisible(target.querySelector(".o_form_label"));
-            assert.isNotVisible(target.querySelector(".o_field_widget[name=bar]"));
-            assert.isNotVisible(target.querySelectorAll(".o_form_label")[1]);
-
-            await click(target.querySelector(".o_form_button_edit"));
-            assert.containsOnce(
-                target,
-                ".o_form_view .o_form_editable",
-                "form should be in readonly mode"
-            );
-            assert.isNotVisible(target.querySelector(".o_field_widget[name=foo]"));
-            assert.isNotVisible(target.querySelector(".o_form_label"));
-            assert.isVisible(target.querySelector(".o_field_widget[name=bar]"));
-            assert.isVisible(target.querySelectorAll(".o_form_label")[1]);
-        }
-    );
-
-    QUnit.test("oe_read_only className is handled in list views", async function (assert) {
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: `
-                <form>
-                    <sheet>
-                        <field name="p">
-                            <tree editable="top">
-                                <field name="foo"/>
-                                <field name="display_name" class="oe_read_only"/>
-                                <field name="bar"/>
-                            </tree>
-                        </field>
-                    </sheet>
-                </form>`,
-            resId: 1,
-        });
-
-        assert.containsOnce(
-            target,
-            ".o_form_view .o_form_readonly",
-            "form should be in readonly mode"
-        );
-        assert.isVisible(
-            target.querySelector('.o_field_one2many thead th[data-name="display_name"]'),
-            "display_name cell should be visible in readonly mode"
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
-
-        assert.strictEqual(
-            target.querySelector('th[data-name="foo"]').style.width,
-            "100%",
-            'As the only visible char field, "foo" should take 100% of the remaining space'
-        );
-
-        assert.containsNone(
-            target,
-            "th.oe_read_only",
-            'the column with "oe_read_only" should not be visible in edit mode'
-        );
-        assert.containsOnce(target, ".o_form_view .o_form_editable", "form should be in edit mode");
-        assert.isNotVisible(
-            target.querySelector('th[data-name="display_name"]'),
-            "display_name cell should not be visible in edit mode"
-        );
-
-        await click(target.querySelector(".o_field_x2many_list_row_add a"));
-
-        assert.containsNone(
-            target,
-            "th.oe_read_only",
-            'the column with "oe_read_only" should not be visible in edit mode'
-        );
-
-        await clickSave(target);
-
-        assert.hasClass(
-            target.querySelector('[name="display_name"]'),
-            "oe_read_only",
-            "display_name input should have oe_read_only class"
-        );
-    });
-
-    QUnit.test("oe_edit_only className is handled in list views", async function (assert) {
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: `
-                <form>
-                    <sheet>
-                        <field name="p">
-                            <tree editable="top">
-                                <field name="foo"/>
-                                <field name="display_name" class="oe_edit_only"/>
-                                <field name="bar"/>
-                            </tree>
-                        </field>
-                    </sheet>
-                </form>`,
-            resId: 1,
-        });
-
-        assert.containsOnce(
-            target,
-            ".o_form_view .o_form_readonly",
-            "form should be in readonly mode"
-        );
-        assert.isNotVisible(
-            target.querySelector('.o_field_one2many thead th[data-name="display_name"]'),
-            "display_name cell should not be visible in readonly mode"
-        );
-
-        await click(target.querySelector(".o_form_button_edit"));
-        assert.containsOnce(target, ".o_form_view .o_form_editable", "form should be in edit mode");
-        assert.isVisible(
-            target.querySelector('.o_field_one2many thead th[data-name="display_name"]'),
-            "display_name cell should be visible in edit mode"
-        );
-
-        await click(target.querySelector(".o_field_x2many_list_row_add a"));
-        assert.isVisible(
-            target.querySelector(".o_selected_row .o_data_cell.oe_edit_only"),
-            "display_name cell should be visible in edit mode"
-        );
-    });
-
     QUnit.test("*_view_ref in context are passed correctly", async function (assert) {
         serverData.views = {
             "partner_type,module.tree_view_ref,list": "<tree/>",
@@ -6963,7 +6533,6 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsNone(target, ".o_form_button_create");
-        await click(target.querySelector(".o_form_button_edit"));
         assert.containsOnce(target, ".o-kanban-button-new");
     });
 
@@ -6994,8 +6563,6 @@ QUnit.module("Views", (hooks) => {
 
         // bar being set to true, foo shouldn't be readonly and thus its value
         // could be saved, even if in its field description it is readonly
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.containsOnce(
             target,
             '.o_field_widget[name="foo"] input',
@@ -7003,10 +6570,10 @@ QUnit.module("Views", (hooks) => {
         );
         await editInput(target, '.o_field_widget[name="foo"] input', "New foo value");
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget[name=foo]").textContent,
+            target.querySelector(".o_field_widget[name=foo] input").value,
             "New foo value",
             "new value for foo field should have been saved"
         );
@@ -7048,7 +6615,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("readonly set by modifier do not break many2many_tags", async function (assert) {
@@ -7070,7 +6637,6 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsNone(target, ".o_field_widget[name=timmy] .o_tag");
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_field_widget[name=bar] input"));
         assert.containsOnce(target, ".o_field_widget[name=timmy] .o_tag");
     });
@@ -7209,7 +6775,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "blip",
@@ -7222,7 +6787,7 @@ QUnit.module("Views", (hooks) => {
             "input should contain new value"
         );
 
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         await click(target.querySelector(".o_form_button_create"));
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
@@ -7295,7 +6860,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             target.querySelectorAll(".o_data_row .o_data_cell")[1].textContent,
             "1 record",
@@ -7319,7 +6883,7 @@ QUnit.module("Views", (hooks) => {
         );
     });
 
-    QUnit.test("in edit mode, first field is focused", async function (assert) {
+    QUnit.test("no field should be focused", async function (assert) {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -7327,7 +6891,17 @@ QUnit.module("Views", (hooks) => {
             arch: '<form><field name="foo"/><field name="bar"/></form>',
             resId: 1,
         });
-        await click(target.querySelector(".o_form_button_edit"));
+
+        assert.strictEqual(document.activeElement, document.body);
+    });
+
+    QUnit.test("in create mode, first field is focused", async function (assert) {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            serverData,
+            arch: '<form><field name="foo"/><field name="bar"/></form>',
+        });
 
         assert.strictEqual(
             document.activeElement,
@@ -7335,7 +6909,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="foo"] input').selectionStart,
-            3,
+            target.querySelector('.o_field_widget[name="foo"] input').value.length,
             "cursor should be at the end"
         );
     });
@@ -7346,9 +6920,7 @@ QUnit.module("Views", (hooks) => {
             resModel: "partner",
             serverData,
             arch: '<form><field name="int_field"/><field name="foo" default_focus="1"/></form>',
-            resId: 1,
         });
-        await click(target.querySelector(".o_form_button_edit"));
         assert.strictEqual(
             document.activeElement,
             target.querySelector('.o_field_widget[name="foo"] input')
@@ -7395,8 +6967,7 @@ QUnit.module("Views", (hooks) => {
                 document.activeElement,
                 target.querySelector('.o_field_widget[name="int_field"] input')
             );
-            await click(target.querySelector(".o_form_button_save"));
-            await click(target.querySelector(".o_form_button_edit"));
+            await clickSave(target);
             assert.notStrictEqual(
                 document.activeElement,
                 target.querySelector('.o_field_widget[name="int_field"] input')
@@ -7410,7 +6981,7 @@ QUnit.module("Views", (hooks) => {
             resModel: "partner",
             serverData,
             arch: `
-                    <form>
+                    <form edit="0">
                         <field name="state" invisible="1"/>
                         <header>
                             <button name="post" class="btn-primary firstButton" string="Confirm" type="object"/>
@@ -7429,34 +7000,6 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector("button.firstButton"), document.activeElement);
     });
 
-    QUnit.test(
-        "In READ mode, focus EDIT button no primary button on the form",
-        async function (assert) {
-            await makeView({
-                type: "form",
-                resModel: "partner",
-                serverData,
-                arch: `
-                    <form>
-                        <field name="state" invisible="1"/>
-                        <header>
-                            <button name="post" class="not-primary" string="Confirm" type="object"/>
-                            <button name="post" class="not-primary" string="Confirm2" type="object"/>
-                        </header>
-                        <sheet>
-                            <group>
-                                <div class="oe_title">
-                                    <field name="display_name"/>
-                                </div>
-                            </group>
-                        </sheet>
-                    </form>`,
-                resId: 2,
-            });
-            assert.strictEqual(target.querySelector(".o_form_button_edit"), document.activeElement);
-        }
-    );
-
     QUnit.test("check scroll on small height screens", async function (assert) {
         serverData.views = {
             "partner,false,list": '<tree><field name="display_name"/></tree>',
@@ -7479,7 +7022,7 @@ QUnit.module("Views", (hooks) => {
                     <field name="p"/>
                     <field name="timmy"/>
                     <field name="product_ids"/>
-                    <field name="trululu"/>
+                    <field name="trululu" open_target="new"/>
                     </group></sheet>
                 </form>`,
             mockRPC(route, args) {
@@ -7493,7 +7036,6 @@ QUnit.module("Views", (hooks) => {
         $(".o_content").css({ overflow: "auto", "max-height": "300px" });
 
         // Open many2one modal, lastActivatedFieldIndex will not set as we directly click on external button
-        await clickEdit(target);
         assert.strictEqual($(".o_content").scrollTop(), 0, "scroll position should be 0");
         // simply triggerEvent focus doesn't do the trick (doesn't scroll).
         target.querySelector("[name='trululu'] input").focus();
@@ -7612,7 +7154,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("open one2many form containing many2many_tags", async function (assert) {
@@ -7679,9 +7221,8 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         def.resolve();
         await nextTick();
@@ -7803,7 +7344,7 @@ QUnit.module("Views", (hooks) => {
             resModel: "partner",
             resId: 1,
             serverData,
-            arch: `<form><field name="product_id"/></form>`,
+            arch: `<form><field name="product_id" open_target="new"/></form>`,
             mockRPC(route, args) {
                 if (route === "/web/dataset/call_kw/product/get_formview_id") {
                     return false;
@@ -7811,7 +7352,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_external_button"));
         assert.containsOnce(target, ".modal");
         assert.containsOnce(
@@ -7850,7 +7390,7 @@ QUnit.module("Views", (hooks) => {
             resModel: "partner",
             resId: 1,
             serverData,
-            arch: `<form><field name="product_id"/></form>`,
+            arch: `<form><field name="product_id" open_target="new"/></form>`,
             mockRPC(route, args) {
                 if (route === "/web/dataset/call_kw/product/get_formview_id") {
                     return false;
@@ -7861,7 +7401,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         // Open first dialog
         await click(target.querySelector(".o_external_button"));
         assert.containsOnce(target, ".modal");
@@ -7908,8 +7447,6 @@ QUnit.module("Views", (hooks) => {
             resId: 2,
             context: { mainContext: 3 },
         });
-
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_field_widget[name=trululu] input"));
     });
 
@@ -8069,7 +7606,6 @@ QUnit.module("Views", (hooks) => {
 
         assert.deepEqual(getFooValues(), ["yop", "My little Foo Value"]);
 
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         assert.containsOnce(target, ".modal");
         await editInput(target, ".modal .o_field_widget[name=foo] input", "xop");
@@ -8081,11 +7617,10 @@ QUnit.module("Views", (hooks) => {
         assert.deepEqual(getFooValues(), ["zop", "yop", "xop", "My little Foo Value"]);
 
         // server-side sort
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         assert.deepEqual(getFooValues(), ["zop", "yop", "xop", "My little Foo Value"]);
 
         // client-side sort on edit
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelectorAll(".o_data_row")[1].querySelector(".o_data_cell"));
         await editInput(target, ".modal .o_field_widget[name=foo] input", "zzz");
         await click(target.querySelector(".modal-footer .o_form_button_save"));
@@ -8115,7 +7650,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector('.o_field_widget[name="trululu"] input'));
     });
 
@@ -8564,7 +8098,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         await editInput(target, '[name="foo"] input', "test");
         await clickSave(target);
         assert.containsOnce(
@@ -8573,7 +8106,6 @@ QUnit.module("Views", (hooks) => {
             "should have single translation alert"
         );
 
-        await clickEdit(target);
         await editInput(target, '[name="foo"] input', "test2");
         await editInput(target, '[name="display_name"] input', "test3");
         await clickSave(target);
@@ -8614,7 +8146,6 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.verifySteps(["get_views", "read"]);
-        await clickEdit(target);
         assert.containsOnce(target, ".o_form_editable");
         // o_field_translate is on the input and on the translate button
         assert.containsN(target, "div[name='foo'] > .o_field_translate", 2);
@@ -8624,7 +8155,7 @@ QUnit.module("Views", (hooks) => {
             ".alert .o_field_translate",
             "should not have a translation alert"
         );
-        assert.containsOnce(target, ".o_form_readonly");
+        assert.containsOnce(target, ".o_form_saved");
         assert.verifySteps([]);
     });
 
@@ -8664,7 +8195,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
 
         await click(target, ".o_field_translate.btn-link");
         assert.verifySteps([
@@ -8784,7 +8314,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
         assert.verifySteps(["get_views", "read"]);
-        await clickEdit(target);
         await click(target, ".o_field_legacy_char .o_field_translate.btn-link");
         assert.verifySteps(["get_installed", "get_field_translations"]);
         assert.containsOnce(target, ".modal");
@@ -8807,7 +8336,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         await editInput(target, '[name="foo"] input', "test");
         await clickSave(target);
 
@@ -8891,7 +8419,7 @@ QUnit.module("Views", (hooks) => {
                         <sheet>
                             <group>
                                 <field name="name"/>
-                                <field name="partner_type_id"/>
+                                <field name="partner_type_id" open_target="new"/>
                             </group>
                         </sheet>
                     </form>`,
@@ -8906,7 +8434,7 @@ QUnit.module("Views", (hooks) => {
                     <form>
                         <sheet>
                             <group>
-                                <field name="product_id"/>
+                                <field name="product_id" open_target="new"/>
                             </group>
                         </sheet>
                     </form>`,
@@ -8934,7 +8462,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
             await click(target.querySelector('[name="product_id"] .o_external_button'));
             assert.containsOnce(
                 target.querySelector(".modal-body"),
@@ -8986,8 +8513,8 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_form_buttons_view button:not(:disabled)",
-            2,
+            ".o_control_panel button:not(.fa):not(:disabled)",
+            3,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9007,8 +8534,8 @@ QUnit.module("Views", (hooks) => {
         // The unresolved promise lets us check the state of the buttons
         assert.containsN(
             target,
-            ".o_form_buttons_view button:disabled",
-            2,
+            ".o_control_panel button:not(.fa):disabled",
+            3,
             "control panel buttons should be disabled"
         );
         assert.containsN(
@@ -9027,8 +8554,8 @@ QUnit.module("Views", (hooks) => {
         await nextTick();
         assert.containsN(
             target,
-            ".o_form_buttons_view button:not(:disabled)",
-            2,
+            ".o_control_panel button:not(.fa):not(:disabled)",
+            3,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9083,8 +8610,8 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_form_buttons_view button:not(:disabled)",
-            2,
+            ".o_control_panel button:not(.fa):not(:disabled)",
+            3,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9104,8 +8631,8 @@ QUnit.module("Views", (hooks) => {
         // The unresolved promise lets us check the state of the buttons
         assert.containsN(
             target,
-            ".o_form_buttons_view button:disabled",
-            2,
+            ".o_control_panel button:not(.fa):disabled",
+            3,
             "control panel buttons should be disabled"
         );
         assert.containsN(
@@ -9124,8 +8651,8 @@ QUnit.module("Views", (hooks) => {
         await nextTick();
         assert.containsN(
             target,
-            ".o_form_buttons_view button:not(:disabled)",
-            2,
+            ".o_control_panel button:not(.fa):not(:disabled)",
+            3,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9229,7 +8756,7 @@ QUnit.module("Views", (hooks) => {
                 type: "form",
                 resModel: "partner",
                 serverData,
-                arch: `<form><field name="trululu"/></form>`,
+                arch: `<form><field name="trululu" open_target="new"/></form>`,
                 resId: 1,
                 mockRPC(route, args) {
                     if (args.method === "get_formview_id") {
@@ -9238,7 +8765,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
             await click(target.querySelector(".o_external_button"));
             assert.notOk(target.querySelector(".modal .oe_button_box button").disabled);
 
@@ -9268,10 +8794,9 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, '.o_field_widget[name="foo"] input', "test");
-        await click(target.querySelector(".o_form_button_save"));
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
+        await clickSave(target);
 
         def.resolve();
         await nextTick();
@@ -9298,11 +8823,10 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=foo] input", "incorrect value");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
         await editInput(target, ".o_field_widget[name=foo] input", "correct value");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.verifySteps([
             "get_views",
@@ -9327,6 +8851,7 @@ QUnit.module("Views", (hooks) => {
                             <field name="trululu" widget="statusbar" options="{'clickable': '1'}"/>
                         </header>
                     </form>`,
+                mode: "readonly",
                 resId: 1,
                 mockRPC(route, args) {
                     if (args.method === "write") {
@@ -9393,7 +8918,6 @@ QUnit.module("Views", (hooks) => {
                     }
                 },
             });
-            await click(target.querySelector(".o_form_button_edit"));
             await click(target.querySelector(".o_field_x2many_list_row_add a"));
             assert.containsOnce(target, ".modal");
 
@@ -9493,7 +9017,7 @@ QUnit.module("Views", (hooks) => {
         );
         await click(target.querySelector(".modal-footer .btn-primary"));
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("id is False in evalContext for new records", async function (assert) {
@@ -9514,8 +9038,7 @@ QUnit.module("Views", (hooks) => {
             "foo should be readonly in 'Create' mode"
         );
 
-        await click(target.querySelector(".o_form_button_save"));
-        await click(target.querySelector(".o_form_button_edit"));
+        await clickSave(target);
 
         assert.doesNotHaveClass(
             target.querySelector(".o_field_widget[name=foo]"),
@@ -9552,7 +9075,7 @@ QUnit.module("Views", (hooks) => {
             "first record (copy)",
             "duplicated record should have correct name"
         );
-        await click(target.querySelector(".o_form_button_save")); // save duplicated record
+        await clickSave(target); // save duplicated record
 
         // delete duplicated record
         await toggleActionMenu(target);
@@ -9562,7 +9085,7 @@ QUnit.module("Views", (hooks) => {
         await click(target.querySelector(".modal-footer .btn-primary"));
 
         assert.strictEqual(
-            target.querySelector(".o_field_widget").textContent,
+            target.querySelector(".o_field_widget input").value,
             "first record",
             "should have come back to previous record"
         );
@@ -9662,7 +9185,7 @@ QUnit.module("Views", (hooks) => {
         // parent view. If this event isn't stopPropagated by the first controller
         // catching it, it will crash when the other one will try to handle it,
         // as this one doesn't know at all the dataPointID to reload.
-        const arch = `<form><field name="display_name"/><field name="trululu"/></form>`;
+        const arch = `<form><field name="display_name"/><field name="trululu" open_target="new"/></form>`;
         serverData.views = {
             "partner,false,form": arch,
         };
@@ -9680,7 +9203,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_external_button"));
         await click(target.querySelector(".modal .o_external_button"));
 
@@ -9777,7 +9299,7 @@ QUnit.module("Views", (hooks) => {
             type: "form",
             resModel: "partner",
             serverData,
-            arch: `<form><field name="trululu"/></form>`,
+            arch: `<form><field name="trululu" open_target="new"/></form>`,
             resId: 1,
             mockRPC(route, args) {
                 if (route === "/web/dataset/call_kw/partner/get_formview_id") {
@@ -9785,7 +9307,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await click(target.querySelector(".o_form_button_edit"));
         await click(target.querySelector(".o_external_button"));
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".modal-body .o_data_cell")), [
             "yop",
@@ -9909,36 +9430,6 @@ QUnit.module("Views", (hooks) => {
         widgetRegistry.remove("test_widget");
     });
 
-    QUnit.test("bounce edit button in readonly mode", async function (assert) {
-        await makeView({
-            type: "form",
-            resModel: "partner",
-            serverData,
-            arch: `
-                <form>
-                    <div class="oe_title">
-                        <field name="display_name"/>
-                    </div>
-                    <notebook>
-                        <page name="a" string="A"></page>
-                    </notebook>
-                </form>`,
-            resId: 1,
-        });
-
-        // in readonly
-        await click(target.querySelector(".nav-tabs .nav-item"));
-        assert.containsNone(target, ".o_catch_attention");
-
-        await click(target.querySelector("div.oe_title"));
-        assert.hasClass(target.querySelector(".o_form_button_edit"), "o_catch_attention");
-
-        // in edit
-        await click(target.querySelector(".o_form_button_edit"));
-        await click(target.querySelector('[name="display_name"]'));
-        assert.containsNone(target, ".o_catch_attention");
-    });
-
     QUnit.test("proper stringification in debug mode tooltip", async function (assert) {
         patchWithCleanup(odoo, { debug: true });
 
@@ -10017,8 +9508,7 @@ QUnit.module("Views", (hooks) => {
             "pager should indicate that we are on second record"
         );
 
-        await click(target.querySelector(".o_form_button_edit"));
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
 
         assert.strictEqual(
             target.querySelector(".o_pager_value").textContent,
@@ -10147,8 +9637,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         form.env.bus.on("CLEAR-CACHES", target, assert.step.bind(assert, "clear_cache"));
 
         await editInput(target, "[name=display_name] input", "new value");
@@ -10175,8 +9663,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await clickEdit(target);
-
         form.env.bus.on("CLEAR-CACHES", target, assert.step.bind(assert, "clear_cache"));
 
         await editInput(target, "[name=display_name] input", "new value");
@@ -10237,8 +9723,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
-
             await editInput(target.querySelector("[name=display_name]"), "input", "new value");
             await clickSave(target);
             assert.verifySteps(["get_views", "read", "write", "reload currencies", "read"]);
@@ -10287,9 +9771,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
-
         // add a row and partially fill it
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         await editInput(target, ".o_field_widget[name=display_name] input", "abc");
@@ -10316,7 +9797,7 @@ QUnit.module("Views", (hooks) => {
         values = {
             product_id: 37,
         };
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
     });
 
     QUnit.test("no deadlock when saving with uncommitted changes", async function (assert) {
@@ -10341,11 +9822,11 @@ QUnit.module("Views", (hooks) => {
         });
 
         await editInput(target, ".o_field_widget[name=foo] input", "some foo value");
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
-        assert.containsOnce(target, ".o_form_readonly", "form view should be in readonly");
+        assert.containsOnce(target, ".o_form_editable", "form view should be in edit");
         assert.strictEqual(
-            target.querySelector(".o_form_view .o_form_readonly").textContent.trim(),
+            target.querySelector(".o_field_widget[name=foo] input").value,
             "some foo value",
             "foo field should have correct value"
         );
@@ -10366,7 +9847,7 @@ QUnit.module("Views", (hooks) => {
 
         await editInput(target, ".o_field_widget[name=qux] input", "some qux value");
 
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.containsOnce(target, ".o_form_editable", "form view should stay in edit mode");
         assert.strictEqual(
@@ -10442,7 +9923,7 @@ QUnit.module("Views", (hooks) => {
 
             await editInput(target, ".o_field_widget[name=display_name] input", "some value");
 
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.step("resolve");
             onchangeDef.resolve();
@@ -10511,7 +9992,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // save (will wait for the onchange to return), and will be delayed as well
-        await click(target.querySelector(".o_form_button_save"));
+        await clickSave(target);
 
         assert.containsOnce(target, ".o_form_editable");
         assert.strictEqual(
@@ -10595,9 +10076,6 @@ QUnit.module("Views", (hooks) => {
             // switch to form view
             await click(target.querySelector(".o_list_table .o_data_row .o_data_cell"));
 
-            // switch to edit mode
-            await click(target.querySelector(".o_form_button_edit"));
-
             assert.containsOnce(target, ".o_form_editable");
             await editInput(target, ".o_field_widget[name=foo] input", "some value");
 
@@ -10648,9 +10126,6 @@ QUnit.module("Views", (hooks) => {
             resIds: [1, 2],
         });
 
-        // switch to edit mode
-        await click(target.querySelector(".o_form_button_edit"));
-
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "yop",
@@ -10705,7 +10180,6 @@ QUnit.module("Views", (hooks) => {
 
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 1);
-
         await click(target.querySelector(".o_control_panel .o-kanban-button-new"));
 
         //cannot save because there is a required field
@@ -10750,46 +10224,6 @@ QUnit.module("Views", (hooks) => {
         }
     );
 
-    QUnit.test(
-        "edit a record in readonly and switch to edit before it is actually saved",
-        async function (assert) {
-            assert.expect(3);
-
-            const def = makeDeferred();
-            await makeView({
-                type: "form",
-                resModel: "partner",
-                serverData,
-                arch: `
-                    <form>
-                        <field name="foo"/>
-                        <field name="bar" widget="toggle_button"/>
-                    </form>`,
-                async mockRPC(route, args) {
-                    if (args.method === "write") {
-                        assert.deepEqual(args.args[1], { bar: false });
-                        await def;
-                    }
-                },
-                resId: 1,
-            });
-
-            // edit the record (in readonly) with toogle_button widget (and delay the write RPC)
-            await click(target.querySelector(".o_field_widget[name=bar] button"));
-
-            // switch to edit mode
-            await click(target.querySelector(".o_form_button_edit"));
-
-            assert.containsOnce(target, ".o_form_readonly"); // should wait for the RPC to return
-
-            // make write RPC return
-            def.resolve();
-            await nextTick();
-
-            assert.containsOnce(target, ".o_form_editable");
-        }
-    );
-
     QUnit.test(
         '"bare" buttons in template should not trigger button click',
         async function (assert) {
@@ -11112,7 +10546,7 @@ QUnit.module("Views", (hooks) => {
             });
 
             await editInput(target, '.o_field_widget[name="name"] input', "Test Company");
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.verifySteps(["get_views", "onchange", "create", "reload company", "read"]);
         }
@@ -11156,9 +10590,8 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
             await editInput(target, '.o_field_widget[name="name"] input', "Test Company2");
-            await click(target.querySelector(".o_form_button_save"));
+            await clickSave(target);
 
             assert.verifySteps(["get_views", "read", "write", "reload company", "read"]);
         }
@@ -11315,7 +10748,6 @@ QUnit.module("Views", (hooks) => {
             "first record",
         ]);
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await click(target.querySelector(`.o_pager button.o_pager_next`));
@@ -11329,23 +10761,23 @@ QUnit.module("Views", (hooks) => {
             "name"
         );
 
-        await click(target.querySelector(".o_form_button_cancel"));
+        await clickDiscard(target);
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
             "Partner",
             "second record",
         ]);
         assert.strictEqual(
-            target.querySelector('.o_field_widget[name="name"]').textContent,
+            target.querySelector('.o_field_widget[name="name"] input').value,
             "name"
         );
 
         await click(target.querySelector(`.o_pager button.o_pager_previous`));
-        assert.containsOnce(target, ".o_form_readonly");
+        assert.containsOnce(target, ".o_form_saved");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
             "Partner",
             "first record",
         ]);
-        assert.strictEqual(target.querySelector('.o_field_widget[name="name"]').textContent, "aaa");
+        assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
     QUnit.test("Auto save: save when breadcrumb clicked", async function (assert) {
@@ -11392,7 +10824,6 @@ QUnit.module("Views", (hooks) => {
             "first record",
         ]);
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await click(target.querySelector(".breadcrumb-item.o_back_button"));
@@ -11401,12 +10832,12 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_field_cell").textContent, "aaa");
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.containsOnce(target, ".o_form_readonly");
+        assert.containsOnce(target, ".o_form_editable");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
             "Partner",
             "first record",
         ]);
-        assert.strictEqual(target.querySelector('.o_field_widget[name="name"]').textContent, "aaa");
+        assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
     QUnit.test("Auto save: save when action changed", async function (assert) {
@@ -11470,7 +10901,6 @@ QUnit.module("Views", (hooks) => {
             "first record",
         ]);
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await doAction(webClient, 2, { clearBreadcrumbs: true });
@@ -11480,12 +10910,12 @@ QUnit.module("Views", (hooks) => {
         await doAction(webClient, 1, { clearBreadcrumbs: true });
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.containsOnce(target, ".o_form_readonly");
+        assert.containsOnce(target, ".o_form_editable");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
             "Partner",
             "first record",
         ]);
-        assert.strictEqual(target.querySelector('.o_field_widget[name="name"]').textContent, "aaa");
+        assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
     QUnit.test("Auto save: save on closing tab/browser", async function (assert) {
@@ -11509,7 +10939,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         assert.notStrictEqual(
             target.querySelector('.o_field_widget[name="display_name"]').value,
             "test"
@@ -11539,7 +10968,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, '.o_field_widget[name="display_name"] input', "");
         window.dispatchEvent(new Event("beforeunload"));
         await nextTick();
@@ -11566,8 +10994,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         window.dispatchEvent(new Event("beforeunload"));
         await nextTick();
 
@@ -11662,7 +11088,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, '.o_field_widget[name="display_name"] input', "test");
 
         window.dispatchEvent(new Event("beforeunload"));
@@ -11699,7 +11124,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
         await editInput(target, '.o_field_widget[name="display_name"] input', "test1");
         await editInput(target, '.o_field_widget[name="name"] input', "test2");
 
@@ -11724,8 +11148,6 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_form_button_edit"));
-
         // edit 'foo' but do not focusout -> the model isn't aware of the change
         // until the 'beforeunload' event is triggered
         const input = target.querySelector(".o_field_widget[name='foo'] input");
@@ -11775,7 +11197,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
             // edit 'display_name' and simulate a focusout (trigger the 'change' event)
             await editInput(target, '.o_field_widget[name="display_name"] input', "test");
 
@@ -11815,8 +11236,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
-
             // edit 'foo' but do not focusout -> the model isn't aware of the change
             // until the 'beforeunload' event is triggered
             const input = target.querySelector(".o_field_widget[name='qux'] input");
@@ -11863,7 +11282,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_form_button_edit"));
             await editInput(target, '.o_field_widget[name="display_name"] input', "test");
             await editInput(target, '.o_field_widget[name="name"] input', "");
 
@@ -11960,9 +11378,9 @@ QUnit.module("Views", (hooks) => {
                 ".modal .o_field_widget[name=foo] span",
                 "foo should be readonly"
             );
-            await click(target.querySelector(".modal-footer .btn-primary.o_form_button_save"));
+            await clickSave(target.querySelector(".modal"));
 
-            await click(target.querySelector(".o_form_button_save")); // save the record
+            await clickSave(target); // save the record
         }
     );
 
@@ -12215,7 +11633,6 @@ QUnit.module("Views", (hooks) => {
             });
 
             assert.containsOnce(target, ".o_form_readonly");
-            assert.containsOnce(target, ".o_form_button_edit");
             assert.containsOnce(target, ".o_form_button_create");
 
             await click(target, ".o_form_button_create");
@@ -12225,22 +11642,19 @@ QUnit.module("Views", (hooks) => {
         }
     );
 
-    QUnit.test(
-        "form with an initial mode (readonly) -- new record from scratch",
-        async (assert) => {
-            await makeView({
-                type: "form",
-                resModel: "partner", // no resId: important
-                serverData,
-                arch: `<form><field name="display_name" /></form>`,
-                mode: "readonly", // important
-            });
+    QUnit.test("form with an initial mode (edit) -- new record from scratch", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner", // no resId: important
+            serverData,
+            arch: `<form><field name="display_name" /></form>`,
+            mode: "readonly", // important
+        });
 
-            assert.containsOnce(target, ".o_form_editable");
-            assert.containsOnce(target, ".o_form_button_save");
-            assert.containsOnce(target, ".o_form_button_cancel");
-        }
-    );
+        assert.containsOnce(target, ".o_form_editable");
+        assert.containsOnce(target, ".o_form_button_save");
+        assert.containsOnce(target, ".o_form_button_cancel");
+    });
 
     QUnit.test("save a form view with an invisible required field", async function (assert) {
         serverData.models.partner.fields.text = { string: "Text", type: "char", required: 1 };
@@ -12342,10 +11756,10 @@ QUnit.module("Views", (hooks) => {
             onDiscard: () => assert.step("discard"),
         });
 
-        await click(target, ".o_form_button_edit");
-        await click(target, ".o_form_button_save");
-        await click(target, ".o_form_button_edit");
-        await click(target, ".o_form_button_cancel");
+        await editInput(target, ".o_field_widget input", "test");
+        await clickSave(target);
+        await editInput(target, ".o_field_widget input", "test");
+        await clickDiscard(target);
         assert.verifySteps(["save", "discard"]);
     });
 
@@ -12408,4 +11822,125 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_form_view .o_field_x2many .o_kanban_renderer");
         assert.containsNone(target, ".o_view_nocontent");
     });
+
+    QUnit.test("status indicator: saved state", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `<form><field name="foo"/></form>`,
+        });
+
+        assert.containsOnce(target, ".o_form_status_indicator");
+        assert.containsOnce(target, ".o_form_status_indicator_buttons");
+        assert.containsOnce(target, ".o_form_status_indicator_buttons_hidden");
+        assert.containsN(target, ".o_form_status_indicator_buttons button", 2);
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "SaveDiscard"
+        );
+    });
+
+    QUnit.test("status indicator: dirty state", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `<form><field name="foo"/></form>`,
+        });
+
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "SaveDiscard"
+        );
+        assert.containsOnce(target, ".o_form_status_indicator_buttons_hidden");
+        await editInput(target, ".o_field_widget input", "dirty");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "Unsaved changesSaveDiscard"
+        );
+        assert.containsNone(target, ".o_form_status_indicator_buttons_hidden");
+    });
+
+    QUnit.test("status indicator: save dirty state", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `<form><field name="foo"/></form>`,
+        });
+
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "yop");
+        await editInput(target, ".o_field_widget input", "dirty");
+        assert.containsNone(target, ".o_form_status_indicator_buttons_hidden");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "Unsaved changesSaveDiscard"
+        );
+        await clickSave(target);
+        assert.containsOnce(target, ".o_form_status_indicator_buttons_hidden");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "SaveDiscard"
+        );
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "dirty");
+    });
+
+    QUnit.test("status indicator: discard dirty state", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `<form><field name="foo"/></form>`,
+        });
+
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "yop");
+        await editInput(target, ".o_field_widget input", "dirty");
+        assert.containsNone(target, ".o_form_status_indicator_buttons_hidden");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "Unsaved changesSaveDiscard"
+        );
+        await clickDiscard(target);
+        assert.containsOnce(target, ".o_form_status_indicator_buttons_hidden");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "SaveDiscard"
+        );
+        assert.strictEqual(target.querySelector(".o_field_widget input").value, "yop");
+    });
+
+    QUnit.test("status indicator: invalid state", async (assert) => {
+        await makeView({
+            type: "form",
+            resModel: "partner",
+            resId: 1,
+            serverData,
+            arch: `<form><field name="foo" required="1"/></form>`,
+            mockRPC(route, { method }) {
+                if (method === "write") {
+                    return Promise.reject(false);
+                }
+            },
+        });
+
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "SaveDiscard"
+        );
+        await editInput(target, ".o_field_widget input", "");
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "Unsaved changesSaveDiscard"
+        );
+        await clickSave(target);
+        assert.strictEqual(
+            target.querySelector(".o_form_status_indicator").textContent,
+            "Unable to saveSaveDiscard"
+        );
+    });
 });
diff --git a/addons/web/static/tests/views/list_view_tests.js b/addons/web/static/tests/views/list_view_tests.js
index 22f968d8820..f40c7ed87a6 100644
--- a/addons/web/static/tests/views/list_view_tests.js
+++ b/addons/web/static/tests/views/list_view_tests.js
@@ -14,7 +14,6 @@ import {
     addRow,
     click,
     clickDiscard,
-    clickEdit,
     clickOpenedDropdownItem,
     clickOpenM2ODropdown,
     clickSave,
@@ -1897,7 +1896,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-        await clickEdit(target);
 
         assert.hasClass(target.querySelectorAll(".o_data_cell")[1], "o_boolean_toggle_cell");
 
@@ -1943,7 +1941,6 @@ QUnit.module("Views", (hooks) => {
                         </field>
                     </form>`,
             });
-            await clickEdit(target);
             await addRow(target);
             await click(
                 [...target.querySelectorAll(".o_data_row")].pop().querySelector("td.o_list_char")
@@ -3245,7 +3242,7 @@ QUnit.module("Views", (hooks) => {
         }
     );
 
-    QUnit.test("colspan of empty lines is correct in readonly and edit", async function (assert) {
+    QUnit.test("colspan of empty lines is correct in readonly", async function (assert) {
         serverData.models.foo.fields.foo_o2m = {
             string: "Foo O2M",
             type: "one2many",
@@ -3268,10 +3265,33 @@ QUnit.module("Views", (hooks) => {
                         </sheet>
                     </form>`,
         });
-        // in edit mode, the delete action is available and the empty lines should cover that col
+        // in readonly mode, the delete action is available and the empty lines should cover that col
         assert.strictEqual(target.querySelector("tbody td").getAttribute("colspan"), "2");
-        await clickEdit(target);
-        // in edit mode, the colspan shouldn't change
+    });
+
+    QUnit.test("colspan of empty lines is correct in edit", async function (assert) {
+        serverData.models.foo.fields.foo_o2m = {
+            string: "Foo O2M",
+            type: "one2many",
+            relation: "foo",
+        };
+        await makeView({
+            type: "form",
+            resModel: "foo",
+            serverData,
+            resId: 1,
+            arch: `
+                    <form>
+                        <sheet>
+                            <field name="foo_o2m">
+                                <tree editable="bottom">
+                                    <field name="int_field"/>
+                                </tree>
+                            </field>
+                        </sheet>
+                    </form>`,
+        });
+        // in edit mode, the delete action is available and the empty lines should cover that col
         assert.strictEqual(target.querySelector("tbody td").getAttribute("colspan"), "2");
     });
 
@@ -3543,7 +3563,6 @@ QUnit.module("Views", (hooks) => {
                         </sheet>
                     </form>`,
             });
-            await clickEdit(target);
             assert.containsNone(target, ".o_field_one2many");
 
             await click(target.querySelector(".nav-item:last-child .nav-link"));
@@ -3593,7 +3612,6 @@ QUnit.module("Views", (hooks) => {
                     </sheet>
                 </form>`,
         });
-        await clickEdit(target);
         assert.containsNone(target, ".o_field_one2many");
 
         await click(target.querySelector(".o_field_boolean input"));
@@ -3634,7 +3652,6 @@ QUnit.module("Views", (hooks) => {
                     </sheet>
                 </form>`,
         });
-        await clickEdit(target);
         assert.containsNone(target, ".o_field_one2many");
 
         await click(target.querySelector(".o_field_boolean input"));
@@ -4912,7 +4929,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.deepEqual(
             [...target.querySelectorAll(".o_field_x2many_list .o_data_row")].map(
                 (el) => el.textContent
@@ -4964,7 +4980,6 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        await clickEdit(target);
         assert.deepEqual(
             [...target.querySelectorAll(".o_field_x2many_list .o_data_row")].map(
                 (el) => el.textContent
@@ -6982,7 +6997,6 @@ QUnit.module("Views", (hooks) => {
                     </form>`,
                 resId: 1,
             });
-            await clickEdit(target);
             assert.deepEqual(
                 [
                     ...target.querySelectorAll(
@@ -7875,8 +7889,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
-
             await click(target.querySelector(".o_data_cell"));
             assert.strictEqual(
                 document.activeElement,
@@ -10374,7 +10386,7 @@ QUnit.module("Views", (hooks) => {
         await makeView({
             arch: `
                 <tree editable="top" multi_edit="1">
-                    <field name="m2o"/>
+                    <field name="m2o" open_target="new"/>
                 </tree>`,
             serverData,
             mockRPC: async function (route, args) {
@@ -14502,8 +14514,6 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await clickEdit(target);
-
             await click(target.querySelector(".o_data_cell"));
             assert.strictEqual(
                 document.activeElement,
diff --git a/addons/web/static/tests/views/view_dialogs/form_view_dialog_tests.js b/addons/web/static/tests/views/view_dialogs/form_view_dialog_tests.js
index 3233f922a67..e6cb2a48ec6 100644
--- a/addons/web/static/tests/views/view_dialogs/form_view_dialog_tests.js
+++ b/addons/web/static/tests/views/view_dialogs/form_view_dialog_tests.js
@@ -209,7 +209,7 @@ QUnit.module("ViewDialogs", (hooks) => {
             serverData,
             arch: `<form>
                     <field name="name"/>
-                    <field name="instrument" context="{'tree_view_ref': 'some_tree_view'}"/>
+                    <field name="instrument" context="{'tree_view_ref': 'some_tree_view'}" open_target="new"/>
                    </form>`,
             mockRPC: function (route, args) {
                 if (args.method === "get_formview_id") {
@@ -242,7 +242,6 @@ QUnit.module("ViewDialogs", (hooks) => {
                 }
             },
         });
-        await click(target, ".o_form_button_edit");
         await click(target, '.o_field_widget[name="instrument"] button.o_external_button');
     });
 
diff --git a/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js b/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
index 3692d3638bf..d921bee7ba3 100644
--- a/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
+++ b/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
@@ -319,7 +319,6 @@ QUnit.module("ViewDialogs", (hooks) => {
             },
         });
 
-        await click(target, ".o_form_button_edit");
         await click(target, ".o_field_x2many_list_row_add a");
 
         await editInput(target, ".o_field_widget[name=instrument] input", "ABC");
diff --git a/addons/web/static/tests/views/widgets/attach_document_tests.js b/addons/web/static/tests/views/widgets/attach_document_tests.js
index 6603b8094b7..c76eb9a9d34 100644
--- a/addons/web/static/tests/views/widgets/attach_document_tests.js
+++ b/addons/web/static/tests/views/widgets/attach_document_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { click, clickEdit, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
+import { click, editInput, getFixture, triggerEvent } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 import { registry } from "@web/core/registry";
 
@@ -72,7 +72,6 @@ QUnit.module("Widgets", (hooks) => {
                 </form>`,
         });
 
-        await clickEdit(target);
         await editInput(target, "[name='display_name'] input", "yop");
         await click(target, ".o_attach_document");
         await triggerEvent(
diff --git a/addons/web/static/tests/views/widgets/week_days_tests.js b/addons/web/static/tests/views/widgets/week_days_tests.js
index 21e506b4d93..0e3b07bb3d4 100644
--- a/addons/web/static/tests/views/widgets/week_days_tests.js
+++ b/addons/web/static/tests/views/widgets/week_days_tests.js
@@ -2,7 +2,7 @@
 
 import { registry } from "@web/core/registry";
 import { makeFakeLocalizationService } from "../../helpers/mock_services";
-import { getFixture, click, clickEdit, clickSave } from "../../helpers/utils";
+import { getFixture, click, clickSave } from "../../helpers/utils";
 import { makeView, setupViewRegistries } from "../helpers";
 
 let serverData;
@@ -46,7 +46,7 @@ QUnit.module("Widgets", ({ beforeEach }) => {
     QUnit.module("WeekDays");
 
     QUnit.test("simple week recurrence widget", async (assert) => {
-        assert.expect(14);
+        assert.expect(13);
 
         let writeCall = 0;
         registry.category("services", makeFakeLocalizationService({ weekStart: 1 }));
@@ -80,12 +80,6 @@ QUnit.module("Widgets", ({ beforeEach }) => {
             },
         });
 
-        assert.containsN(
-            fixture,
-            "input:disabled",
-            7,
-            "all inputs should be disabled in readonly mode"
-        );
         const labelsTexts = [...fixture.querySelectorAll(".o_recurrent_weekday_label")].map((el) =>
             el.innerText.trim()
         );
@@ -95,7 +89,6 @@ QUnit.module("Widgets", ({ beforeEach }) => {
             "labels should be short week names"
         );
 
-        await clickEdit(fixture);
         assert.containsNone(
             fixture,
             ".form-check input:disabled",
@@ -109,7 +102,6 @@ QUnit.module("Widgets", ({ beforeEach }) => {
         );
         await clickSave(fixture);
 
-        await clickEdit(fixture);
         await click(fixture.querySelector("td:nth-child(1) input"));
         assert.ok(
             fixture.querySelector("td:nth-child(1) input").checked,
diff --git a/addons/web/static/tests/webclient/actions/concurrency_tests.js b/addons/web/static/tests/webclient/actions/concurrency_tests.js
index 21db298a081..3d7aa35a57a 100644
--- a/addons/web/static/tests/webclient/actions/concurrency_tests.js
+++ b/addons/web/static/tests/webclient/actions/concurrency_tests.js
@@ -387,7 +387,7 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("open a record while reloading the list view", async function (assert) {
-        assert.expect(12);
+        assert.expect(10);
         let def;
         const mockRPC = async function (route) {
             if (route === "/web/dataset/search_read") {
@@ -408,14 +408,12 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_list_view .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
         assert.containsNone(target, ".o_control_panel .o_list_buttons");
-        assert.containsOnce(target, ".o_control_panel .o_form_buttons_view");
         // unblock the search_read RPC
         def.resolve();
         await nextTick();
         assert.containsOnce(target, ".o_form_view");
         assert.containsNone(target, ".o_list_view");
         assert.containsNone(target, ".o_control_panel .o_list_buttons");
-        assert.containsOnce(target, ".o_control_panel .o_form_buttons_view");
     });
 
     QUnit.test(
diff --git a/addons/web/static/tests/webclient/actions/window_action_tests.js b/addons/web/static/tests/webclient/actions/window_action_tests.js
index 284a47b79c3..cb562138f4a 100644
--- a/addons/web/static/tests/webclient/actions/window_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/window_action_tests.js
@@ -17,6 +17,7 @@ import {
     makeDeferred,
     nextTick,
     patchWithCleanup,
+    clickSave,
 } from "../../helpers/utils";
 import { createWebClient, doAction, getActionManagerServerData, loadState } from "./../helpers";
 import { errorService } from "../../../src/core/errors/error_service";
@@ -111,7 +112,7 @@ QUnit.module("ActionManager", (hooks) => {
         assert.containsNone(target, ".o_list_view", "should no longer display the list view");
         assert.containsOnce(target, ".o_form_view", "should display the form view");
         assert.strictEqual(
-            $(target).find(".o_field_widget[name=foo]").text(),
+            $(target).find(".o_field_widget[name=foo] input").val(),
             "yop",
             "should have opened the correct record"
         );
@@ -489,7 +490,7 @@ QUnit.module("ActionManager", (hooks) => {
             <form>
                 <group>
                     <field name="display_name" />
-                    <field name="m2o" />
+                    <field name="m2o" open_target="current" />
                 </group>
             </form>
         `;
@@ -514,42 +515,42 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target, ".o_data_row:first-of-type .o_data_cell");
 
         // Open 1 / 5
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "First record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "First record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [1]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 5);
 
-        await click(target, ".o_field_many2one a");
+        await click(target, ".o_field_many2one .o_external_button");
 
         // Click on M2O -> 1 / 1
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "Third record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "Third record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [1]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 1);
 
         await click(target, ".o_back_button");
 
         // Back to 1 / 5
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "First record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "First record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [1]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 5);
 
         await cpHelpers.pagerNext(target);
 
         // Next page -> 2 / 5
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "Second record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "Second record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [2]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 5);
 
-        await click(target, ".o_field_many2one a");
+        await click(target, ".o_field_many2one .o_external_button");
 
         // Click on M2O -> still 1 / 1
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "Third record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "Third record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [1]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 1);
 
         await click(target, ".o_back_button");
 
         // Back to 2 / 5
-        assert.strictEqual(target.querySelector(".o_field_char").innerText, "Second record");
+        assert.strictEqual(target.querySelector(".o_field_char input").value, "Second record");
         assert.deepEqual(cpHelpers.getPagerValue(target), [2]);
         assert.strictEqual(cpHelpers.getPagerLimit(target), 5);
     });
@@ -674,9 +675,8 @@ QUnit.module("ActionManager", (hooks) => {
             "breadcrumbs should contain the display_name of the opened record"
         );
         // switch to edit mode and change the display_name
-        await click(target.querySelector(".o_control_panel .o_form_button_edit"));
         await editInput(target, ".o_field_widget[name=display_name] input", "New name");
-        await click(target.querySelector(".o_control_panel .o_form_button_save"));
+        await clickSave(target);
         assert.containsN(
             target,
             ".o_control_panel .breadcrumb-item",
@@ -780,7 +780,7 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_list_view .o_data_cell"));
         await legacyExtraNextTick();
         assert.strictEqual(
-            $(target).find(".o_field_widget[name=foo]").text(),
+            $(target).find(".o_field_widget[name=foo] input").val(),
             "yop",
             "check initial value of 'yop' field"
         );
@@ -788,7 +788,7 @@ QUnit.module("ActionManager", (hooks) => {
         await testUtils.dom.click($(target).find(".o_form_view button:contains(Call method)"));
         await legacyExtraNextTick();
         assert.strictEqual(
-            $(target).find(".o_field_widget[name=foo]").text(),
+            $(target).find(".o_field_widget[name=foo] input").val(),
             "value changed",
             "'yop' has been changed by the server, and should be updated in the UI"
         );
@@ -838,7 +838,7 @@ QUnit.module("ActionManager", (hooks) => {
             await testUtils.dom.click(target.querySelector('.o_form_view button[name="4"]'));
             await legacyExtraNextTick();
             assert.ok(
-                target.querySelector(".o_cp_buttons .o_form_button_edit").disabled,
+                target.querySelector(".o_form_button_create").disabled,
                 "control panel buttons should be disabled"
             );
             def.resolve();
@@ -846,13 +846,13 @@ QUnit.module("ActionManager", (hooks) => {
             await legacyExtraNextTick();
             assert.containsOnce(target, ".modal .o_form_view");
             assert.notOk(
-                target.querySelector(".o_cp_buttons .o_form_button_edit").disabled,
+                target.querySelector(".o_form_button_create").disabled,
                 "control panel buttons should have been re-enabled"
             );
             await testUtils.dom.click(target.querySelector(".modal .cancel-btn"));
             await legacyExtraNextTick();
             assert.notOk(
-                target.querySelector(".o_cp_buttons .o_form_button_edit").disabled,
+                target.querySelector(".o_form_button_create").disabled,
                 "control panel buttons should still be enabled"
             );
         }
@@ -870,12 +870,14 @@ QUnit.module("ActionManager", (hooks) => {
             const webClient = await createWebClient({ serverData, mockRPC });
             await doAction(webClient, 3, { viewType: "form" });
             assert.containsOnce(target, ".o_form_view");
-            // click on 'Execute action', to execute action 4 in a dialog
-            testUtils.dom.click(target.querySelector('.o_form_view button[name="object"]'));
-            assert.ok(target.querySelector(".o_cp_buttons button").disabled);
+            // save to ensure the presence of the create button
+            await click(target.querySelector(".o_form_button_save"));
+            // click on 'Execute action', to execute action 4 in a dialogdebugger
+            click(target.querySelector('.o_form_view button[name="object"]'));
+            assert.ok(target.querySelector(".o_form_button_create").disabled);
             await nextTick();
             await legacyExtraNextTick();
-            assert.notOk(target.querySelector(".o_cp_buttons button").disabled);
+            assert.notOk(target.querySelector(".o_form_button_create").disabled);
         }
     );
 
@@ -965,14 +967,14 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 24);
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".o_form_buttons_view button:not([disabled])", 2);
+        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
         await testUtils.dom.click(target.querySelector(".oe_stat_button"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_kanban_view");
         await testUtils.dom.click(target.querySelector(".breadcrumb-item"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".o_form_buttons_view button:not([disabled])", 2);
+        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
         assert.verifySteps(["read", "web_search_read", "read"]);
     });
 
@@ -987,11 +989,11 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 24);
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".o_form_buttons_view button:not([disabled])", 2);
+        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
         await testUtils.dom.click(target.querySelector(".oe_stat_button"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".o_form_buttons_view button:not([disabled])", 2);
+        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -1085,7 +1087,7 @@ QUnit.module("ActionManager", (hooks) => {
             "breadcrumbs should contain the display_name of the opened record"
         );
         assert.strictEqual(
-            $(target).find(".o_field_widget[name=foo]").text(),
+            $(target).find(".o_field_widget[name=foo] input").val(),
             "yop",
             "should have opened the correct record"
         );
@@ -1103,7 +1105,7 @@ QUnit.module("ActionManager", (hooks) => {
             "breadcrumbs should contain the display_name of the opened record"
         );
         assert.strictEqual(
-            $(target).find(".o_field_widget[name=foo]").text(),
+            $(target).find(".o_field_widget[name=foo] input").val(),
             "blip",
             "should have opened the correct record"
         );
@@ -1247,7 +1249,7 @@ QUnit.module("ActionManager", (hooks) => {
         serverData.views["partner,false,form"] = `
             <form>
                 <field name="foo"/>
-                <field name="bar"/>
+                <field name="bar" open_target="new"/>
             </form>`;
         const mockRPC = async (route, args) => {
             assert.step(route);
@@ -1259,8 +1261,6 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         // open first record in form view
         await testUtils.dom.click(target.querySelector(".o_data_row .o_data_cell"));
-        // click on edit
-        await testUtils.dom.click(target.querySelector(".o_control_panel .o_form_button_edit"));
         // click on external button for m2o
         await testUtils.dom.click(target.querySelector(".o_external_button"));
         assert.verifySteps([
@@ -1286,8 +1286,6 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 4);
         // open record in form view
         await click(target.querySelector(".o_kanban_record"));
-        // edit record
-        await click(target.querySelector(".o_control_panel button.o_form_button_edit"));
         await editInput(target, '.o_field_widget[name="foo"] input', "pinkypie");
         // go back to kanban view
         await click(target.querySelector(".o_control_panel .breadcrumb-item a"));
@@ -1383,7 +1381,7 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test(
-        "form views are restored in readonly when coming back in breadcrumbs",
+        "form views are restored in edit when coming back in breadcrumbs",
         async function (assert) {
             assert.expect(2);
             const webClient = await createWebClient({ serverData });
@@ -1391,16 +1389,13 @@ QUnit.module("ActionManager", (hooks) => {
             // open a record in form view
             await click(target.querySelector(".o_list_view .o_data_cell"));
             await legacyExtraNextTick();
-            // switch to edit mode
-            await click(target.querySelector(".o_control_panel .o_form_button_edit"));
-            await legacyExtraNextTick();
             assert.containsOnce(target, ".o_form_view .o_form_editable");
             // do some other action
             await doAction(webClient, 4);
             // go back to form view
             await click(target.querySelectorAll(".o_control_panel .breadcrumb a")[1]);
             await legacyExtraNextTick();
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
+            assert.containsOnce(target, ".o_form_view .o_form_editable");
         }
     );
 
@@ -1796,7 +1791,7 @@ QUnit.module("ActionManager", (hooks) => {
         await editInput(target, '.o_field_widget[name="display_name"] input', "test");
         await editInput(target, ".o_field_widget[name=foo] input", "val");
         await click(target.querySelector(".o_form_uri"));
-        assert.containsOnce(target, ".o_form_view .o_form_readonly");
+        assert.containsOnce(target, ".o_form_view .o_form_editable");
         assert.deepEqual(
             getNodesTextContent(target.querySelectorAll(".o_control_panel .breadcrumb-item")),
             ["Partners", "test", "First record"]
@@ -1805,8 +1800,7 @@ QUnit.module("ActionManager", (hooks) => {
         await testUtils.dom.click(
             target.querySelectorAll(".o_control_panel .breadcrumb-item a")[1]
         );
-        // should be readonly and so saved
-        assert.containsOnce(target, ".o_form_view .o_form_readonly");
+        assert.containsOnce(target, ".o_form_view .o_form_editable");
         assert.deepEqual(
             getNodesTextContent(target.querySelectorAll(".o_control_panel .breadcrumb-item")),
             ["Partners", "test"]
@@ -1865,7 +1859,8 @@ QUnit.module("ActionManager", (hooks) => {
                 res_id: 2,
                 views: [[44, "form"]],
             };
-            serverData.views["partner,44,form"] = '<form><field name="m2o"/></form>';
+            serverData.views["partner,44,form"] =
+                '<form><field name="m2o" open_target="current"/></form>';
             const mockRPC = async (route, args) => {
                 if (args.method === "get_formview_action") {
                     return Promise.resolve({
@@ -1878,20 +1873,20 @@ QUnit.module("ActionManager", (hooks) => {
             };
             const webClient = await createWebClient({ serverData, mockRPC });
             await doAction(webClient, 999);
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
+            assert.containsOnce(target, ".o_form_view .o_form_editable");
             assert.strictEqual(
                 target.querySelector(".o_control_panel .breadcrumb").textContent,
                 "Second record"
             );
             // push another action in the breadcrumb
-            await click(target, ".o_field_many2one .o_form_uri");
+            await click(target, ".o_field_many2one .o_external_button");
             assert.strictEqual(
                 target.querySelector(".o_control_panel .breadcrumb").textContent,
                 "Second recordThird record"
             );
             // go back to the form view
             await click(target.querySelector(".o_control_panel .breadcrumb a"));
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
+            assert.containsOnce(target, ".o_form_view .o_form_editable");
             assert.strictEqual(
                 target.querySelector(".o_control_panel .breadcrumb-item").textContent,
                 "Second record"
@@ -1908,7 +1903,7 @@ QUnit.module("ActionManager", (hooks) => {
         assert.containsN(target, ".o_list_view .o_data_row", 5);
         await click(target.querySelector(".o_list_view .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
-        assert.containsOnce(target, ".o_form_view .o_form_readonly");
+        assert.containsOnce(target, ".o_form_view .o_form_editable");
         // go back using the breadcrumbs
         await click(target.querySelector(".o_control_panel .breadcrumb-item a"));
         assert.containsOnce(target, ".o_list_view");
@@ -1930,13 +1925,13 @@ QUnit.module("ActionManager", (hooks) => {
             await click(target.querySelector(".o_list_view .o_data_cell"));
             assert.containsOnce(target, ".o_form_view");
             assert.strictEqual(
-                $(target).find(".o_field_widget[name=display_name]").text(),
+                $(target).find(".o_field_widget[name=display_name] input").val(),
                 "First record"
             );
             // switch to second record
             await click(target.querySelector(".o_pager_next"));
             assert.strictEqual(
-                $(target).find(".o_field_widget[name=display_name]").text(),
+                $(target).find(".o_field_widget[name=display_name] input").val(),
                 "Second record"
             );
             // execute an action from the second record
@@ -1946,7 +1941,7 @@ QUnit.module("ActionManager", (hooks) => {
             await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb-item:nth(1) a"));
             assert.containsOnce(target, ".o_form_view");
             assert.strictEqual(
-                $(target).find(".o_field_widget[name=display_name]").text(),
+                $(target).find(".o_field_widget[name=display_name] input").val(),
                 "Second record"
             );
         }
@@ -1965,16 +1960,16 @@ QUnit.module("ActionManager", (hooks) => {
             assert.containsOnce(target, ".o_form_view .o_form_editable");
             await editInput(target, ".o_field_widget[name=display_name] input", "another record");
             await click(target.querySelector(".o_form_button_save"));
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
+            assert.containsOnce(target, ".o_form_view .o_form_editable");
             // execute an action from the second record
             await testUtils.dom.click($(target).find(".o_statusbar_buttons button[name=4]"));
             assert.containsOnce(target, ".o_kanban_view");
             // go back using the breadcrumbs
             await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb-item:nth(1) a"));
             assert.containsOnce(target, ".o_form_view");
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
+            assert.containsOnce(target, ".o_form_view .o_form_editable");
             assert.strictEqual(
-                $(target).find(".o_field_widget[name=display_name]").text(),
+                $(target).find(".o_field_widget[name=display_name] input").val(),
                 "another record"
             );
         }
@@ -2034,7 +2029,7 @@ QUnit.module("ActionManager", (hooks) => {
     QUnit.test(
         "Call twice clearUncommittedChanges in a row does not save twice",
         async function (assert) {
-            assert.expect(5);
+            assert.expect(4);
             let writeCalls = 0;
             const mockRPC = async (route, { method }) => {
                 if (method === "write") {
@@ -2045,8 +2040,6 @@ QUnit.module("ActionManager", (hooks) => {
             // execute an action and edit existing record
             await doAction(webClient, 3);
             await click(target.querySelector(".o_list_view .o_data_cell"));
-            assert.containsOnce(target, ".o_form_view .o_form_readonly");
-            await click(target.querySelector(".o_control_panel .o_form_button_edit"));
             assert.containsOnce(target, ".o_form_view .o_form_editable");
             await editInput(target, ".o_field_widget[name=foo] input", "val");
             clearUncommittedChanges(webClient.env);
@@ -2133,7 +2126,7 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("do not restore after action button clicked", async function (assert) {
-        assert.expect(5);
+        assert.expect(4);
         const mockRPC = async (route, args) => {
             if (route === "/web/dataset/call_button" && args.method === "do_something") {
                 return true;
@@ -2149,17 +2142,15 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 3, { viewType: "form", props: { resId: 1 } });
         await legacyExtraNextTick();
-        assert.isVisible(target.querySelector(".o_form_buttons_view .o_form_button_edit"));
-        await click(target.querySelector(".o_form_buttons_view .o_form_button_edit"));
-        await legacyExtraNextTick();
-        assert.isVisible(target.querySelector(".o_form_buttons_edit .o_form_button_save"));
+        await editInput(target, "div[name='display_name'] input", "Edited value");
+        assert.isVisible(target.querySelector(".o_form_button_save"));
         assert.isVisible(target.querySelector(".o_statusbar_buttons button[name=do_something]"));
         await click(target.querySelector(".o_statusbar_buttons button[name=do_something]"));
         await legacyExtraNextTick();
-        assert.isVisible(target.querySelector(".o_form_buttons_edit .o_form_button_save"));
-        await click(target.querySelector(".o_form_buttons_edit .o_form_button_save"));
+        assert.isVisible(target.querySelector(".o_form_button_save"));
+        await click(target.querySelector(".o_form_button_save"));
         await legacyExtraNextTick();
-        assert.isVisible(target.querySelector(".o_form_buttons_view .o_form_button_edit"));
+        assert.isNotVisible(target.querySelector(".o_form_buttons_view .o_form_button_save"));
     });
 
     QUnit.test("debugManager is active for (legacy) views", async function (assert) {
diff --git a/addons/web_tour/static/src/js/tour_step_utils.js b/addons/web_tour/static/src/js/tour_step_utils.js
index 83adb1f842b..d321898de92 100644
--- a/addons/web_tour/static/src/js/tour_step_utils.js
+++ b/addons/web_tour/static/src/js/tour_step_utils.js
@@ -61,7 +61,7 @@ return Class.extend({
     goBackBreadcrumbsMobile(description, ...extraTrigger) {
         return extraTrigger.map(element => ({
             mobile: true,
-            trigger: '.breadcrumb-item:not(.d-none):first',
+            trigger: '.breadcrumb-item.o_back_button',
             extra_trigger: element,
             content: description,
             position: 'bottom',
@@ -160,18 +160,20 @@ return Class.extend({
     /**
      * Utility steps to save a form and wait for the save to complete
      *
-     * @param extra_trigger additional save-condition selector
+     * @param {object} [options]
+     * @param {string} [options.content]
+     * @param {string} [options.extra_trigger] additional save-condition selector
      */
-    saveForm(extra_trigger) {
+    saveForm(options = {}) {
         return [{
-            content: "save form",
-            trigger: '.o_form_button_save:contains("Save")',
-            extra_trigger,
-            run: 'click',
+            content: options.content || "save form",
+            trigger: ".o_form_button_save",
+            extra_trigger: options.extra_trigger,
+            run: "click",
             auto: true,
         }, {
             content: "wait for save completion",
-            trigger: '.o_form_readonly',
+            trigger: '.o_form_readonly, .o_form_saved',
             run() {},
             auto: true,
         }];
@@ -182,15 +184,16 @@ return Class.extend({
      * Supports creation/edition from either a form or a list view (so checks
      * for both states).
      */
-    discardForm() {
+    discardForm(options = {}) {
         return [{
-            content: "exit the form",
+            content: options.content || "exit the form",
             trigger: ".o_form_button_cancel",
-            run: 'click',
+            extra_trigger: options.extra_trigger,
+            run: "click",
             auto: true,
         }, {
             content: "wait for cancellation to complete",
-            trigger: ".o_list_renderer, .o_form_readonly",
+            trigger: ".o_list_renderer, .o_form_readonly, .o_form_saved",
             run() {},
             auto: true,
         }];
diff --git a/addons/website_slides/static/tests/qunit_suite_tests/components/slide_category_one2many_field_tests.js b/addons/website_slides/static/tests/qunit_suite_tests/components/slide_category_one2many_field_tests.js
index e90a863ec7e..65d384e92b8 100644
--- a/addons/website_slides/static/tests/qunit_suite_tests/components/slide_category_one2many_field_tests.js
+++ b/addons/website_slides/static/tests/qunit_suite_tests/components/slide_category_one2many_field_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module */
 
-import { click, clickEdit, getFixture } from "@web/../tests/helpers/utils";
+import { click, getFixture } from "@web/../tests/helpers/utils";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
 
 QUnit.module("SlideCategoryOneToManyField", (hooks) => {
@@ -92,6 +92,7 @@ QUnit.module("SlideCategoryOneToManyField", (hooks) => {
             resModel: "partner",
             resId: 1,
             serverData,
+            mode: "readonly",
             arch: `
                 <form>
                     <field name="lines" widget="slide_category_one2many">
@@ -126,7 +127,6 @@ QUnit.module("SlideCategoryOneToManyField", (hooks) => {
                     </field>
                 </form>`,
         });
-        await clickEdit(target);
         await click(target.querySelector(".o_data_cell"));
         assert.hasClass(target.querySelector(".o_is_section"), "o_selected_row");
         assert.containsNone(target, ".modal .o_form_view");
@@ -150,7 +150,6 @@ QUnit.module("SlideCategoryOneToManyField", (hooks) => {
                 </form>
             `,
         });
-        await clickEdit(target);
         await click(target.querySelector(".o_data_row:nth-child(2) .o_data_cell"));
         assert.containsNone(target, ".o_selected_row");
         assert.containsOnce(target, ".modal .o_form_view");
@@ -179,7 +178,6 @@ QUnit.module("SlideCategoryOneToManyField", (hooks) => {
             `,
         });
 
-        await clickEdit(target);
         assert.containsNone(target, ".o_selected_row.o_is_section");
 
         await click(target.querySelectorAll(".o_field_x2many_list_row_add a")[1]);
@@ -210,7 +208,6 @@ QUnit.module("SlideCategoryOneToManyField", (hooks) => {
             `,
         });
 
-        await clickEdit(target);
         await click(target.querySelector(".o_field_x2many_list_row_add a"));
         assert.containsNone(target, ".o_selected_row");
         assert.containsOnce(target, ".modal .o_form_view");
diff --git a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
index 20ab5d7a9dc..2c178f73a92 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
@@ -76,10 +76,10 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Quotations')"
     content: _t("Save this product and the modifications you've made to it."),
     position: 'bottom',
 },
-tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
+tour.stepUtils.autoExpandMoreButtons('.o_form_saved'),
 {
     trigger: ".oe_button_box .oe_stat_button div[name=bom_count]",
-    extra_trigger: '.o_form_readonly',
+    extra_trigger: '.o_form_saved',
     content: _t('See Bill of material'),
     position: 'bottom',
 }, {
@@ -148,7 +148,7 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
 }, {
     mobile: false,
     trigger: ".o_field_widget[name=partner_id] input",
-    extra_trigger: ".modal-dialog",
+    extra_trigger: ".breadcrumb-item.active:contains(the_flow.component1)",
     content: _t('Select a seller'),
     position: 'top',
     run: "text the_flow.vendor",
@@ -206,23 +206,21 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
 }, {
     mobile: true,
     trigger: '.o_field_widget[name=code] input',
-    extra_trigger: ".o_field_widget[name=product_id] .o_external_button", // Wait name_create
     // click somewhere else to exit cell focus
 }, {
     mobile: false,
     trigger: 'label:contains("Vendor Taxes")',
-    extra_trigger: ".o_field_widget[name=partner_id] .o_external_button", // Wait name_create
     // click somewhere else to exit cell focus
 }, {
     mobile: false,
-    trigger: ".modal-footer .o_form_button_save",
-    content: _t('Save'),
+    trigger: '.breadcrumb .o_back_button',
+    content: _t('Go back'),
     position: 'bottom',
 }, {
 // Add second component
     mobile: false,
     trigger: ".o_field_x2many_list_row_add > a",
-    extra_trigger: "body:not(:has(table.o_list_table div.o_field_widget[name='product_id'] input))",
+    extra_trigger: ".breadcrumb-item.active:contains('the_flow.product')",
     content: _t("Click here to add some lines."),
     position: "bottom",
 }, {
@@ -290,7 +288,7 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
 }, {
     mobile: false,
     trigger: ".o_field_widget[name=partner_id] input",
-    extra_trigger: ".modal-dialog",
+    extra_trigger: ".breadcrumb-item.active:contains(the_flow.component2)",
     content: _t('Select a seller'),
     position: 'top',
     run: "text the_flow.vendor",
@@ -320,7 +318,6 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
 }, {
     mobile: true,
     trigger: '.o_field_widget[name=code] input',
-    extra_trigger: ".o_field_widget[name=product_id] .o_external_button", // Wait name_create
     // click somewhere else to exit cell focus
 }, {
     mobile: false,
@@ -328,13 +325,8 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
     // click somewhere else to exit cell focus
 }, {
     mobile: false,
-    trigger: ".modal-footer .o_form_button_save",
-    content: _t('Save'),
-    position: 'bottom',
-}, {
-    trigger: '.o_form_button_save',
-    extra_trigger: ".o_field_widget[name=bom_line_ids] tr:nth-child(3):has(.o_field_x2many_list_row_add)",
-    content: _t('Save the bom.'),
+    trigger: '.breadcrumb .o_back_button',
+    content: _t('Go back'),
     position: 'bottom',
 }, {
     mobile: false,
@@ -424,7 +416,6 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
     position: 'right',
 }, {
     trigger: '.o_form_button_save',
-    extra_trigger: '.o_field_widget[name=project_id] .o_external_button', // Wait name_create
     content: _t("Save this product and the modifications you've made to it."),
     position: 'bottom',
 }, {
@@ -486,18 +477,18 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
     position: "right",
 }, {
     mobile: false,
-    trigger: ".o_kanban_group:first .o_kanban_record:has(span:contains('the_flow.opportunity'))",
+    trigger: ".o_kanban_group:first .o_kanban_record span:contains('the_flow.opportunity')",
     content: Markup(_t("<b>Drag &amp; drop opportunities</b> between columns as you progress in your sales cycle.")),
     position: "right",
     run: "drag_and_drop_native .o_opportunity_kanban .o_kanban_group:eq(2) ",
 }, {
     mobile: false,
-    trigger: ".o_kanban_group:eq(2) > .o_kanban_record:has(span:contains('the_flow.opportunity'))",
+    trigger: ".o_kanban_group:eq(2) > .o_kanban_record span:contains('the_flow.opportunity')",
     content: _t("Click on an opportunity to zoom to it."),
     position: "bottom",
 }, {
     mobile: true,
-    trigger: ".o_kanban_group:first .o_kanban_record:has(span:contains('the_flow.opportunity'))",
+    trigger: ".o_kanban_group:first .o_kanban_record span:contains('the_flow.opportunity')",
     content: _t("Open the_flow.opportunity"),
     position: "bottom",
 }, {
@@ -615,12 +606,6 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
 },
 ...tour.stepUtils.statusbarButtonsSteps('Confirm', Markup(_t("<p>Confirm this quotation</p>"))),
 {
-    trigger: ".o_form_button_save",
-    extra_trigger: ".o_statusbar_status .btn-primary:contains('Sales Order')",
-    content: Markup(_t("<p>Save this quotation</p>")),
-    position: "bottom"
-// Reordering rule
-}, {
     edition: "enterprise",
     trigger: '.o_menu_toggle',
     content: _t('Go back to the home menu'),
@@ -704,7 +689,7 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('OP/')"),
     position: 'bottom',
 }, {
     mobile: true,
-    trigger: '.o_kanban_record:has(.o_kanban_record_title:contains("the_flow.vendor"))',
+    trigger: '.o_kanban_record .o_kanban_record_title:contains("the_flow.vendor")',
     content: _t('Select the generated request for quotation'),
     position: 'bottom',
 },
@@ -723,11 +708,8 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('OP/')"),
 },
 ...tour.stepUtils.statusbarButtonsSteps('Create Bill', _t('go to Vendor Bills'), ".o_statusbar_status .btn.dropdown-toggle:contains('Purchase Order')"),
 {
-    trigger: '.o_form_button_edit',
-    content: _t('Edit the vendor bill'),
-    extra_trigger: ".o_form_label .o_field_widget:contains('Vendor Bill')",
-}, {
     trigger:".o_field_widget[name=invoice_date] input",
+    extra_trigger: ".o_form_label .o_field_widget:contains('Vendor Bill')",
     content: _t('Set the invoice date'),
     run: "text 01/01/2020",
 },
@@ -761,21 +743,28 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Manufacturing
     position: 'bottom',
 }, {
     mobile: true,
-    trigger: '.o_kanban_record:has(.o_kanban_record_title:contains("the_flow.product")):first',
+    trigger: '.o_kanban_record .o_kanban_record_title:contains("the_flow.product"):first',
     extra_trigger: "li.breadcrumb-item.active:contains('Manufacturing Orders')",
     content: _t('Select the generated manufacturing order'),
     position: 'bottom',
 },
-...tour.stepUtils.statusbarButtonsSteps('Check availability', _t("Check availability")),
+...tour.stepUtils.statusbarButtonsSteps('Unreserve', _t("Unreserve")),
 {
-    trigger: ".o_form_button_edit:not(:disabled)",
-    content: _t('Edit the production order'),
-}, {
     trigger: ".o_field_widget[name=qty_producing] input",
+    extra_trigger: ".o_field_widget[name=move_raw_ids] tr[data-id]:first .o_field_widget[name=forecast_availability]:contains('Available')",
     position: 'left',
     content: _t("Produce"),
     run: "text 1",
 },
+...tour.stepUtils.statusbarButtonsSteps('Check availability', _t("Check availability")),
+{
+    trigger: ".o_field_widget[name=qty_producing] input",
+    extra_trigger: ".o_field_widget[name=move_raw_ids] tr[data-id]:first .o_field_widget[name=forecast_availability]:contains('1')",
+    position: 'left',
+    content: _t("Produce"),
+    run: "text 1",
+},
+
 ...tour.stepUtils.statusbarButtonsSteps('Mark as Done', _t("Mark as Done"), ".o_statusbar_status .btn.dropdown-toggle:contains('To Close')"),
 {
     edition: "enterprise",
@@ -823,9 +812,6 @@ tour.stepUtils.mobileModifier(tour.stepUtils.autoExpandMoreButtons('.o_control_p
     trigger: 'a.nav-link:contains(Timesheets)',
     extra_trigger: 'div.o_notebook_headers',
     content: 'Click on Timesheets page to log a timesheet',
-}, {
-    trigger: '.o_form_button_edit',
-    content: _t('Click on Edit button to enter to the form view of the task.'),
 }, {
     mobile: false,
     trigger: 'div[name="timesheet_ids"] td.o_field_x2many_list_row_add a[role="button"]',
@@ -833,7 +819,7 @@ tour.stepUtils.mobileModifier(tour.stepUtils.autoExpandMoreButtons('.o_control_p
 }, {
     mobile: true,
     trigger: '.o-kanban-button-new',
-    content: _t("Click on Add in order to add a timesheet."),
+    content: _t('Open the full search field'),
     position: 'bottom',
 }, {
     mobile: false,
@@ -856,9 +842,8 @@ tour.stepUtils.mobileModifier(tour.stepUtils.autoExpandMoreButtons('.o_control_p
     content: 'Enter one hour for this timesheet',
     run: 'text 10',
 }, {
-    trigger: '.o_form_button_save',
-    content: _t('Save'),
-    position: 'bottom',
+    content: "save",
+    trigger: ".o_form_button_save",
 },
 ...tour.stepUtils.goBackBreadcrumbsMobile(
         _t('Back to the sale order'),
diff --git a/odoo/addons/test_new_api/static/tests/tours/constraint.js b/odoo/addons/test_new_api/static/tests/tours/constraint.js
index e273d14ae32..892adbc7e96 100644
--- a/odoo/addons/test_new_api/static/tests/tours/constraint.js
+++ b/odoo/addons/test_new_api/static/tests/tours/constraint.js
@@ -30,7 +30,7 @@ odoo.define('web.test.constraint', function (require) {
         run() {}
     }, {
         content: "close notification box",
-        trigger: '.modal-footer .o-default-button',
+        trigger: '.modal-footer .btn-primary',
     },
     ...tour.stepUtils.discardForm(),
     ]);
diff --git a/odoo/addons/test_new_api/static/tests/tours/x2many.js b/odoo/addons/test_new_api/static/tests/tours/x2many.js
index 04d161bb84e..5687013e26e 100644
--- a/odoo/addons/test_new_api/static/tests/tours/x2many.js
+++ b/odoo/addons/test_new_api/static/tests/tours/x2many.js
@@ -69,14 +69,10 @@ odoo.define('web.test.x2many', function (require) {
         content: "save selected participants",
         trigger: '.o_select_button',
         extra_trigger: 'tr:has(td:containsExact(Mitchell Admin)) .o_list_record_selector input[type="checkbox"]:propChecked',
-    }, { // save
+    }, ...tour.stepUtils.saveForm({
         content: "save discussion",
-        trigger: 'button.o_form_button_save',
         extra_trigger: '.o_field_widget[name=participants] .o_data_cell:containsExact(Mitchell Admin)',
-    }, { // edit
-        content: "edit discussion",
-        trigger: 'button.o_form_button_edit',
-    }, { // add message a
+    }), { // add message a
         content: "Select First Tab",
         trigger: '.o_notebook_headers .nav-item a:contains(Messages)',
     }, {
@@ -168,9 +164,6 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.o_content:has(.o_field_widget[name=participants] tbody .o_data_row:eq(2))',
         extra_trigger: 'body:not(:has(.o_field_widget[name=participants] tbody .o_data_row:eq(3)))',
         run: function () {}, // it's a check
-    }, { // edit
-        content: "edit discussion",
-        trigger: 'button.o_form_button_edit',
     }, {
         content: "change tab to Messages",
         trigger: '.o_notebook_headers .nav-item a:contains(Messages)',
@@ -269,9 +262,6 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.o_content:has(.o_field_widget[name=participants] tbody .o_data_row:eq(2))',
         extra_trigger: '.o_content:not(:has(.o_field_widget[name=participants] tbody .o_data_row:eq(3)))',
         run: function () {}, // it's a check
-    }, { // edit
-        content: "edit discussion",
-        trigger: 'button.o_form_button_edit',
     }, {
         content: "go to Messages",
         trigger: '.o_notebook_headers .nav-item a:contains(Messages)',
@@ -306,12 +296,10 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.o_content:has(.o_field_widget[name=messages] .o_data_row:eq(3))',
         extra_trigger: 'body:not(:has(.o_field_widget[name=messages] .o_data_row:eq(4)))',
         run: function () {}, // it's a check
-    }, { // cancel
+    }, ...tour.stepUtils.discardForm({ // cancel
         content: "cancel change",
-        trigger: '.o_cp_buttons .o_form_button_cancel',
         extra_trigger: '.o_field_widget[name=messages]:has(tr td:containsExact(ddd))',
-        run: 'click',
-    },
+    }),
 
     /////////////////////////////////////////////////////////////////////////////////////////////
     // Discussions 2
@@ -327,9 +315,6 @@ odoo.define('web.test.x2many', function (require) {
         content: "select previous created record",
         trigger: 'td:contains(test_trigger):last',
         extra_trigger: '.breadcrumb-item:contains(Discussions 2)',
-    }, {
-        content: "click on edit",
-        trigger: '.o_cp_buttons .o_form_button_edit',
     }, {
         content: "edit content",
         trigger: '.o_field_widget[name=name] input',
@@ -390,22 +375,18 @@ odoo.define('web.test.x2many', function (require) {
         content: "test one2many onchange after delete",
         trigger: '.o_content:not(:has(.o_field_widget[name="message_concat"] textarea:propValueContains(Mitchell Admin:d)))',
         run: function () {},
-    }, { // save
+    }, ...tour.stepUtils.saveForm({ // save
         content: "save discussion",
-        trigger: 'button.o_form_button_save',
         extra_trigger: 'body:not(:has(tr:has(td:containsExact(d))))',
-    }, { // check saved data
+    }), { // check saved data
         content: "check data 10",
-        trigger: '.o_field_widget[name=message_concat] span:containsExact([test_trigger2] Mitchell Admin:aaa\n[test_trigger2] Marc Demo:ccccc)',
+        trigger: '.o_field_widget[name=message_concat] textarea:propValueContains([test_trigger2] Mitchell Admin:aaa\n[test_trigger2] Marc Demo:ccccc)',
         run: function () {}, // don't change texarea content
     }, {
         content: "check data 11",
         trigger: '.o_field_widget[name=messages] tbody .o_data_row:eq(1)',
         extra_trigger: 'body:not(:has(.o_field_widget[name=messages] tbody .o_data_row:eq(2)))',
         run: function () {},
-    }, { // edit
-        content: "edit discussion",
-        trigger: 'button.o_form_button_edit'
     }, { // add message eee
         content: "create new message eee",
         trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
@@ -414,13 +395,12 @@ odoo.define('web.test.x2many', function (require) {
         content: "change text value",
         trigger: '.o_field_widget[name="body"] textarea',
         run: 'text eee'
-    }, { // save
+    }, ...tour.stepUtils.saveForm({ // save
         content: "save discussion",
-        trigger: 'button.o_form_button_save',
         extra_trigger: '.o_field_widget[name="body"] textarea:propValueContains(eee)',
-    }, { // check saved data
+    }), { // check saved data
         content: "check data 12",
-        trigger: '.o_field_widget[name="message_concat"] span:containsExact([test_trigger2] Mitchell Admin:aaa\n[test_trigger2] Marc Demo:ccccc\n[test_trigger2] Mitchell Admin:eee)',
+        trigger: '.o_field_widget[name="message_concat"] textarea:propValueContains([test_trigger2] Mitchell Admin:aaa\n[test_trigger2] Marc Demo:ccccc\n[test_trigger2] Mitchell Admin:eee)',
         run: function () {}, // it's a check
     }, {
         content: "check data 13",
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 58ef4a315ea..4002f07fbab 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -1299,7 +1299,7 @@ class ChromeBrowser:
                 self._websocket_send('DOM.getDocument', params={'depth': 0}, with_future=True),
                 lambda d: self._websocket_send("DOM.querySelector", params={
                     'nodeId': d['root']['nodeId'],
-                    'selector': '.o_form_editable',
+                    'selector': '.o_legacy_form_view.o_form_editable, .o_form_dirty',
                 }, with_future=True)
             )
             @qs.add_done_callback

From 8f1079af69ef29813b6b68b631b695d0033bb43e Mon Sep 17 00:00:00 2001
From: "Michael (mcm)" <mcm@odoo.com>
Date: Fri, 23 Sep 2022 15:17:20 +0000
Subject: [PATCH 4/4] [FIX] web_editor: update record only if changes

Before this commit, the editor was always updating the record even when
it's content was not modified or even focused.

X-original-commit: d067710220f6a528f251a44a51863f4f8fb12034
Part-of: odoo/odoo#101118
---
 addons/web_editor/static/src/js/backend/html_field.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web_editor/static/src/js/backend/html_field.js b/addons/web_editor/static/src/js/backend/html_field.js
index 815b0d603b2..16b398c4639 100644
--- a/addons/web_editor/static/src/js/backend/html_field.js
+++ b/addons/web_editor/static/src/js/backend/html_field.js
@@ -186,7 +186,8 @@ export class HtmlField extends Component {
     }
     updateValue() {
         const value = this.getEditingValue();
-        if (value !== null && value !== (this.props.value || '').toString()) {
+        const lastValue = (this.props.value || "").toString();
+        if (value !== null && !(!lastValue && value === "<p><br></p>") && value !== lastValue) {
             if (this.props.setDirty) {
                 this.props.setDirty(true);
             }
@@ -388,10 +389,7 @@ export class HtmlField extends Component {
         $odooEditor.removeClass('odoo-editor-editable');
         $editable.html(html);
 
-        // Prevent history reverts.
-        this.wysiwyg.odooEditor.observerUnactive('toInline');
         await toInline($editable, this.cssRules, this.wysiwyg.$iframe);
-        this.wysiwyg.odooEditor.observerActive('toInline');
         $odooEditor.addClass('odoo-editor-editable');
 
         this.wysiwyg.setValue($editable.html());