From 841a7cf815aa5353873a41994c654fdbcd552d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 16 Jan 2026 13:16:50 +0100
Subject: [PATCH] Load icon field before rendering affix

Closes #14509
---
 sao/src/view/tree.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index b9c2d63966..a8a935b0e1 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -2555,11 +2555,14 @@
                     cell.text(value);
                 }
             };
+            let prm = jQuery.when();
             if (!record.is_loaded(this.attributes.name)) {
-                record.load(this.attributes.name, true, false).done(render);
-            } else {
-                render();
+                prm = prm.then(() => record.load(this.attributes.name, true, false));
             }
+            if (this.icon && (this.icon in record.model.fields)) {
+                prm = prm.then(() => record.load(this.icon, true, false));
+            }
+            prm.done(render);
             return cell;
         },
         clicked: function(event) {