diff --git a/addons/web/static/src/views/list/list_renderer.js b/addons/web/static/src/views/list/list_renderer.js index 9fec42948e9..e6aabcfeed3 100644 --- a/addons/web/static/src/views/list/list_renderer.js +++ b/addons/web/static/src/views/list/list_renderer.js @@ -364,7 +364,7 @@ export class ListRenderer extends Component { ); if (cell) { const toFocus = getElementToFocus(cell); - if (toFocus) { + if (cell !== toFocus) { this.focus(toFocus); break; } 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 4c06db3dac3..0eb73b9c506 100644 --- a/addons/web/static/tests/views/fields/one2many_field_tests.js +++ b/addons/web/static/tests/views/fields/one2many_field_tests.js @@ -3786,6 +3786,41 @@ QUnit.module("Fields", (hooks) => { assert.hasClass(target.querySelectorAll(".o_data_row")[3], "o_selected_row"); }); + QUnit.test( + "creating a new line in an o2m with an handle field does not focus the handler", + async function (assert) { + await makeView({ + type: "form", + resModel: "partner", + serverData, + arch: ` +
`, + resId: 2, + }); + + await clickEdit(target); + await addRow(target); + assert.strictEqual( + document.activeElement, + target.querySelector("[name='turtle_foo'] input") + ); + + triggerHotkey("Enter"); + await nextTick(); + assert.strictEqual( + document.activeElement, + target.querySelector("[name='turtle_foo'] input") + ); + } + ); + QUnit.test("editing a o2m, with required field and onchange", async function (assert) { serverData.models.turtle.fields.turtle_foo.required = true; delete serverData.models.turtle.fields.turtle_foo.default;