From e084ca5d66def17441eb2265678697d34c2b7ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Mon, 13 Nov 2023 10:40:21 +0100
Subject: [PATCH] Use a standard reporting mecanism for all HTTP errors

---
 sao/src/rpc.js                 | 16 ++++------------
 tryton/tryton/common/common.py | 11 +++--------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/sao/src/rpc.js b/sao/src/rpc.js
index 5523085565..490913030d 100644
--- a/sao/src/rpc.js
+++ b/sao/src/rpc.js
@@ -134,19 +134,11 @@
                         dfd.resolve();
                     }
                 }, dfd.reject);
-            } else if (query.status == 408) {
-                Sao.common.message.run(
-                    Sao.i18n.gettext('Request times out. Try again later.'),
-                    'tryton-error')
-                    .always(dfd.reject);
-            } else if (query.status == 429) {
-                Sao.common.message.run(
-                    Sao.i18n.gettext('Too many requests. Try again later.'),
-                    'tryton-error')
-                    .always(dfd.reject);
             } else {
-                Sao.common.error.run(status_, error)
-                    .always(dfd.reject);
+                var err_msg = `[${query.status}] ${error}`;
+                Sao.common.message.run(
+                    Sao.i18n.gettext('Error: "%1". Try again later.', err_msg),
+                    'tryton-error').always(dfd.reject);
             }
         };
 
diff --git a/tryton/tryton/common/common.py b/tryton/tryton/common/common.py
index c8f27d18ea..db58896267 100644
--- a/tryton/tryton/common/common.py
+++ b/tryton/tryton/common/common.py
@@ -1014,16 +1014,11 @@ def process_exception(exception, *args, **kwargs):
                     PLOCK.release()
                 if args:
                     return rpc_execute(*args)
-        elif exception.faultCode == str(int(HTTPStatus.REQUEST_TIMEOUT)):
+        elif exception.faultCode in map(str, HTTPStatus):
+            err_msg = '[%s] %s' % (exception.faultCode, exception.faultString)
             message(
-                _("Request times out. Try again later."),
+                _('Error "%s". Try again later.') % err_msg,
                 msg_type=Gtk.MessageType.ERROR)
-        elif exception.faultCode == str(int(HTTPStatus.TOO_MANY_REQUESTS)):
-            message(
-                _('Too many requests. Try again later.'),
-                msg_type=Gtk.MessageType.ERROR)
-        elif exception.faultCode == str(int(HTTPStatus.NOT_FOUND)):
-            message(_("Not found."), msg_type=Gtk.MessageType.ERROR)
         else:
             error(exception, exception.faultString)
     else: