tryton-sao 6.4.14 → 6.4.15

package/CHANGELOG

@@ -1,4 +1,9 @@
 
+Version 6.4.15 - 2023-05-17
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.4.14 - 2023-05-03
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -7178,6 +7178,25 @@ var Sao = {};
         return el.html();
     };
 
+    Sao.common.image_url = function(data) {
+        if (!data) {
+            return null;
+        }
+        var type = '';
+        try {
+            var xml = data;
+            if (xml instanceof Uint8Array) {
+                xml = new TextDecoder().decode(data);
+            }
+            if (jQuery.parseXML(xml)) {
+                type = 'image/svg+xml';
+            }
+        } catch (e) {
+        }
+        var blob = new Blob([data], {type: type});
+        return window.URL.createObjectURL(blob);
+    };
+
 }());
 
 /* This file is part of Tryton.  The COPYRIGHT file at the top level of
@@ -18489,17 +18508,10 @@ function eval_pyson(value){
                 value = jQuery.when(null);
             }
             value.done(data => {
-                var url, blob;
                 if (record !== this.record) {
                     return;
                 }
-                if (!data) {
-                    url = null;
-                } else {
-                    blob = new Blob([data]);
-                    url = window.URL.createObjectURL(blob);
-                }
-                this.image.attr('src', url);
+                this.image.attr('src', Sao.common.image_url(data));
                 this.update_buttons(Boolean(data));
             });
         },
@@ -20295,6 +20307,9 @@ function eval_pyson(value){
 
             // Set column visibility depending on attributes and domain
             var visible_columns = 1;  // start at 1 because of the checkbox
+            if (this.optionals.length && !this.draggable) {
+                visible_columns += 1;
+            }
             var domain = [];
             if (!jQuery.isEmptyObject(this.screen.domain)) {
                 domain.push(this.screen.domain);
@@ -20420,7 +20435,8 @@ function eval_pyson(value){
                 }).map(function(row) {
                     return row.el;
                 }));
-                if (this.display_size < this.group.length) {
+                if ((this.display_size < this.group.length) &&
+                    (!this.tbody.children().last().hasClass('more-row'))) {
                     var more_row = jQuery('<tr/>', {
                         'class': 'more-row',
                     });
@@ -20433,8 +20449,17 @@ function eval_pyson(value){
                         'title': Sao.i18n.gettext("More"),
                     }).text(Sao.i18n.gettext('More')
                     ).click(() => {
+                        var height = this.table.height();
                         this.display_size += Sao.config.display_size;
                         this.display();
+                        height -= this.treeview.height();
+                        height -= 50;
+                        if (this.tfoot) {
+                            height -= this.tfoot.height();
+                        }
+                        this.treeview[0].scroll({
+                            'top': height,
+                        });
                     });
                     more_cell.append(more_button);
                     more_row.append(more_cell);
@@ -20554,6 +20579,11 @@ function eval_pyson(value){
                             Sao.i18n.BC47(Sao.i18n.getlang()), options);
                         sum_ = (sum_ || 0).toLocaleString(
                             Sao.i18n.BC47(Sao.i18n.getlang()), options);
+                    } else {
+                        selected_sum = (selected_sum || 0).toLocaleString(
+                            Sao.i18n.BC47(Sao.i18n.getlang()));
+                        sum_ = (sum_ || 0).toLocaleString(
+                            Sao.i18n.BC47(Sao.i18n.getlang()));
                     }
                     aggregate = selected_sum + ' / ' + sum_;
                 }
@@ -22280,14 +22310,7 @@ function eval_pyson(value){
             }
             const render = () => {
                 const set_src = data => {
-                    var img_url, blob;
-                    if (!data) {
-                        img_url = null;
-                    } else {
-                        blob = new Blob([data]);
-                        img_url = window.URL.createObjectURL(blob);
-                    }
-                    cell.attr('src', img_url);
+                    cell.attr('src', Sao.common.image_url(data));
                 };
 
                 var value = this.field.get_client(record);