tryton-sao 7.6.14 → 7.6.16

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.6.16 - 2026-02-18
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.6.15 - 2026-02-01
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.6.14 - 2026-01-15
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/COPYRIGHT

@@ -1,7 +1,7 @@
 Copyright (C) 2012-2025 Nicolas Évrard.
-Copyright (C) 2012-2025 Cédric Krier.
+Copyright (C) 2012-2026 Cédric Krier.
 Copyright (C) 2012-2014 Bertrand Chenal.
-Copyright (C) 2012-2025 B2CK SPRL.
+Copyright (C) 2012-2026 B2CK SPRL.
 Copyright (C) 2019 Jitbit.
 Copyright (C) 2013 Thomas Park
 Copyright (C) 2020-2021 Maxime Richez

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.6.14',
+    __version__: '7.6.16',
 };
 /* eslint-enable no-redeclare */
 
@@ -3428,16 +3428,59 @@ var Sao = {
     };
 
     Sao.common.scrollIntoViewIfNeeded = function(element) {
-        element = element[0];
-        if (element) {
-            var rect = element.getBoundingClientRect();
-            if (rect.bottom > window.innerHeight) {
-                element.scrollIntoView(false);
+        function isScrollable(el) {
+            let style = getComputedStyle(el);
+            return /(auto|scroll|overlay)/.test(
+                style.overflow + style.overflowY + style.overflowX
+            );
+        }
+
+        function getScrollableAncestors(el) {
+            let ancestors = [];
+            let parent = el.parentElement;
+            while (parent && parent !== document.body) {
+                if (isScrollable(parent)) {
+                    ancestors.push(parent);
+                }
+                parent = parent.parentElement;
             }
-            if (rect.top < 0) {
-                element.scrollIntoView();
+            ancestors.push(window);
+            return ancestors;
+        }
+
+        function scrollIntoViewWithin(el, container) {
+            let rect = el.getBoundingClientRect();
+
+            if (container === window) {
+                if (rect.top < 0 || rect.bottom > window.innerHeight) {
+                    el.scrollIntoView({
+                        block: 'center',
+                    });
+                }
+            } else {
+                let container_rect = container.getBoundingClientRect();
+                let top_ = rect.top - container_rect.top;
+                let bottom = top_ + rect.height;
+
+                let target_top = container.scrollTop;
+
+                if (top_ < 0) {
+                    target_top += top_ - container.clientHeight / 2;
+                } else if (bottom > container.clientHeight) {
+                    target_top += bottom - container.clientHeight / 2
+                }
+                container.scrollTo({
+                    top: Math.max(0, target_top),
+                });
             }
         }
+
+        element.each(function() {
+            let ancestors = getScrollableAncestors(this);
+            for (let ancestor of ancestors) {
+                scrollIntoViewWithin(this, ancestor);
+            }
+        });
     };
 
     // Handle click and Return press event
@@ -8304,11 +8347,14 @@ var Sao = {
             } else {
                 cmp = function(a, b) { return a < b; };
             }
+            let max_id = Math.max(0, ...this.map((r) => r.id));
             for (const record of this) {
                 if (record.get_loaded([field]) || changed || record.id < 0) {
+                    let prev_id = null;
                     if (prev) {
                         prev.load(field, false);
                         index = prev.field_get(field);
+                        prev_id = prev.id >= 0 ? prev.id : max_id++;
                     } else {
                         index = null;
                     }
@@ -8319,7 +8365,7 @@ var Sao = {
                             update = true;
                         } else if (prev) {
                             if (record.id >= 0) {
-                                update = cmp(record.id, prev.id);
+                                update = cmp(record.id, prev_id);
                             } else if (position === 0) {
                                 update = true;
                             }
@@ -8327,7 +8373,7 @@ var Sao = {
                     } else if (value === index) {
                         if (prev) {
                             if (record.id >= 0) {
-                                update = cmp(record.id, prev.id);
+                                update = cmp(record.id, prev_id);
                             } else if (position === 0) {
                                 update = true;
                             }
@@ -10424,11 +10470,6 @@ var Sao = {
             }
             return result;
         },
-        get_removed_ids: function(record) {
-            return record._values[this.name].record_removed.map(function(r) {
-                return r.id;
-            });
-        },
         get_domain: function(record) {
             var domains = this.get_domains(record);
             var attr_domain = domains[1];
@@ -18812,8 +18853,6 @@ function eval_pyson(value){
             if (existing_ids.length) {
                 domain = [domain, ['id', 'not in', existing_ids]];
             }
-            var removed_ids = this.field.get_removed_ids(this.record);
-            domain = ['OR', domain, ['id', 'in', removed_ids]];
             var text = this.wid_text.val();
 
             if (this._popup) {
@@ -19106,8 +19145,6 @@ function eval_pyson(value){
             if (existing_ids.length) {
                 domain = [domain, ['id', 'not in', existing_ids]];
             }
-            var removed_ids = this.field.get_removed_ids(this.record);
-            domain = ['OR', domain, ['id', 'in', removed_ids]];
             return Sao.common.update_completion(
                 this.wid_text, this.record, this.field, model, domain);
         },
@@ -23581,11 +23618,14 @@ function eval_pyson(value){
                     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) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.6.14",
+  "version": "7.6.16",
   "homepage": "https://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -79,16 +79,59 @@
     };
 
     Sao.common.scrollIntoViewIfNeeded = function(element) {
-        element = element[0];
-        if (element) {
-            var rect = element.getBoundingClientRect();
-            if (rect.bottom > window.innerHeight) {
-                element.scrollIntoView(false);
+        function isScrollable(el) {
+            let style = getComputedStyle(el);
+            return /(auto|scroll|overlay)/.test(
+                style.overflow + style.overflowY + style.overflowX
+            );
+        }
+
+        function getScrollableAncestors(el) {
+            let ancestors = [];
+            let parent = el.parentElement;
+            while (parent && parent !== document.body) {
+                if (isScrollable(parent)) {
+                    ancestors.push(parent);
+                }
+                parent = parent.parentElement;
             }
-            if (rect.top < 0) {
-                element.scrollIntoView();
+            ancestors.push(window);
+            return ancestors;
+        }
+
+        function scrollIntoViewWithin(el, container) {
+            let rect = el.getBoundingClientRect();
+
+            if (container === window) {
+                if (rect.top < 0 || rect.bottom > window.innerHeight) {
+                    el.scrollIntoView({
+                        block: 'center',
+                    });
+                }
+            } else {
+                let container_rect = container.getBoundingClientRect();
+                let top_ = rect.top - container_rect.top;
+                let bottom = top_ + rect.height;
+
+                let target_top = container.scrollTop;
+
+                if (top_ < 0) {
+                    target_top += top_ - container.clientHeight / 2;
+                } else if (bottom > container.clientHeight) {
+                    target_top += bottom - container.clientHeight / 2
+                }
+                container.scrollTo({
+                    top: Math.max(0, target_top),
+                });
             }
         }
+
+        element.each(function() {
+            let ancestors = getScrollableAncestors(this);
+            for (let ancestor of ancestors) {
+                scrollIntoViewWithin(this, ancestor);
+            }
+        });
     };
 
     // Handle click and Return press event

package/src/model.js

@@ -513,11 +513,14 @@
             } else {
                 cmp = function(a, b) { return a < b; };
             }
+            let max_id = Math.max(0, ...this.map((r) => r.id));
             for (const record of this) {
                 if (record.get_loaded([field]) || changed || record.id < 0) {
+                    let prev_id = null;
                     if (prev) {
                         prev.load(field, false);
                         index = prev.field_get(field);
+                        prev_id = prev.id >= 0 ? prev.id : max_id++;
                     } else {
                         index = null;
                     }
@@ -528,7 +531,7 @@
                             update = true;
                         } else if (prev) {
                             if (record.id >= 0) {
-                                update = cmp(record.id, prev.id);
+                                update = cmp(record.id, prev_id);
                             } else if (position === 0) {
                                 update = true;
                             }
@@ -536,7 +539,7 @@
                     } else if (value === index) {
                         if (prev) {
                             if (record.id >= 0) {
-                                update = cmp(record.id, prev.id);
+                                update = cmp(record.id, prev_id);
                             } else if (position === 0) {
                                 update = true;
                             }
@@ -2633,11 +2636,6 @@
             }
             return result;
         },
-        get_removed_ids: function(record) {
-            return record._values[this.name].record_removed.map(function(r) {
-                return r.id;
-            });
-        },
         get_domain: function(record) {
             var domains = this.get_domains(record);
             var attr_domain = domains[1];

package/src/sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.6.14',
+    __version__: '7.6.16',
 };
 /* eslint-enable no-redeclare */
 

package/src/view/form.js

@@ -3690,8 +3690,6 @@ function eval_pyson(value){
             if (existing_ids.length) {
                 domain = [domain, ['id', 'not in', existing_ids]];
             }
-            var removed_ids = this.field.get_removed_ids(this.record);
-            domain = ['OR', domain, ['id', 'in', removed_ids]];
             var text = this.wid_text.val();
 
             if (this._popup) {
@@ -3984,8 +3982,6 @@ function eval_pyson(value){
             if (existing_ids.length) {
                 domain = [domain, ['id', 'not in', existing_ids]];
             }
-            var removed_ids = this.field.get_removed_ids(this.record);
-            domain = ['OR', domain, ['id', 'in', removed_ids]];
             return Sao.common.update_completion(
                 this.wid_text, this.record, this.field, model, domain);
         },

package/src/view/tree.js

@@ -2537,11 +2537,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) {