From dc70c2cd28cdc5551265e60ac0ff3faf7ecbff26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Tue, 24 Sep 2024 16:37:50 +0200
Subject: [PATCH] Return the display promise when creating a new record from
 the screen

This is necessary because otherwise it could result in concurrent update of the
models of the models used by the underlying widgets.

Closes #13545
(grafted from 1dfc23911f2a4cc071a34ec886dc43d949d4b68f)

--HG--
branch : 6.0
---
 sao/src/screen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sao/src/screen.js b/sao/src/screen.js
index ac94a985a7..68481e5626 100644
--- a/sao/src/screen.js
+++ b/sao/src/screen.js
@@ -1516,10 +1516,10 @@
                     if (previous_view.view_type == 'calendar') {
                         previous_view.set_default_date(record, selected_date);
                     }
-                    this.display().done(function() {
+                    return this.display().then(function() {
                         this.set_cursor(true, true);
+                        return record;
                     }.bind(this));
-                    return record;
                 }.bind(this));
             }.bind(this));
         },