tryton-sao 6.2.0 → 6.2.4

package/CHANGELOG

@@ -1,3 +1,15 @@
+Version 6.2.4 - 2022-02-01
+* Bug fixes (see mercurial logs for details)
+
+Version 6.2.3 - 2022-01-15
+* Bug fixes (see mercurial logs for details)
+
+Version 6.2.2 - 2022-01-01
+* Bug fixes (see mercurial logs for details)
+
+Version 6.2.1 - 2021-12-03
+* Bug fixes (see mercurial logs for details)
+
 Version 6.2.0 - 2021-11-01
 * Bug fixes (see mercurial logs for details)
 * Support grouping attribute

package/COPYRIGHT

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

package/dist/tryton-sao.css

@@ -8687,6 +8687,9 @@ html[theme="default"] .input-group-sm > .form-control,
 html[theme="default"] .input-group-sm > .input-group-addon {
   padding: 0 5px;
 }
+html[theme="default"] .has-feedback .form-control {
+  padding-right: 42.5px;
+}
 html[theme="default"] .input-group-addon {
   background-color: transparent;
   border: transparent;
@@ -9165,6 +9168,9 @@ button {
   overflow-y: hidden;
   text-overflow: ellipsis;
 }
+.input-group > .form-control-feedback {
+  z-index: 3;
+}
 .navbar-inverse .close {
   color: #6dd1d4;
 }
@@ -9389,7 +9395,7 @@ button.list-group-item-selected.active:focus {
 .table-hover > tbody > tr.danger:hover > th {
   background-color: #ebcccc;
 }
-html.accesskey *[accesskey] + span[data-accesskey]:after,
+html.accesskey *[accesskey] ~ span[data-accesskey]:after,
 html.accesskey *[accesskey]:after {
   background-color: #71bdc1;
   color: #fff;
@@ -9403,19 +9409,19 @@ html.accesskey *[accesskey]:after {
 html.accesskey input[accesskey][type="checkbox"]:after {
   background-color: initial;
 }
-html.accesskey *[accesskey] + span[data-accesskey] {
+html.accesskey *[accesskey] ~ span[data-accesskey] {
   float: right;
   position: relative;
 }
-html.accesskey *[accesskey] + span[data-accesskey]:after {
+html.accesskey *[accesskey] ~ span[data-accesskey]:after {
   content: attr(data-accesskey);
 }
 html.accesskey *[accesskey]:after {
   content: attr(accesskey);
 }
-html.accesskey input[accesskey][type="checkbox"] + span[data-accesskey],
-html.accesskey input[accesskey][type="checkbox"] + span[data-accesskey],
-html.accesskey select[accesskey] + span[data-accesskey] {
+html.accesskey input[accesskey][type="checkbox"] ~ span[data-accesskey],
+html.accesskey input[accesskey][type="checkbox"] ~ span[data-accesskey],
+html.accesskey select[accesskey] ~ span[data-accesskey] {
   bottom: 1em;
 }
 .tab-form nav.toolbar,

package/dist/tryton-sao.js

@@ -1673,13 +1673,13 @@ var Sao = {};
 
     Sao.PYSON.Eval.eval_ = function(value, context) {
         var idx = value.v.indexOf('.');
-        if (idx >= 0) {
+        if ((idx >= 0) && !(value.v in context)) {
             return Sao.PYSON.Eval.eval_({
                 'v': value.v.substring(idx + 1),
                 'd': value.d,
             }, context[value.v.substring(0, idx)] || {});
         }
-        if (value.v in context) {
+        if ((value.v in context) && (context[value.v] !== undefined)) {
             return context[value.v];
         } else {
             return value.d;
@@ -4852,7 +4852,7 @@ var Sao = {};
         },
         default_operator: function(field) {
             if (~['char', 'text', 'many2one', 'many2many', 'one2many',
-                    'reference'].indexOf(field.type)) {
+                    'reference', 'one2one'].indexOf(field.type)) {
                 return 'ilike';
             } else if (field.type == 'multiselection') {
                 return 'in';
@@ -8534,7 +8534,11 @@ var Sao = {};
                 Object.keys(this._values).reduce(function(values, name) {
                     var field = this.model.fields[name];
                     if (field) {
-                        values[name] = field.get(this);
+                        if (field instanceof Sao.field.Binary) {
+                            values[name] = field.get_size(this);
+                        } else {
+                            values[name] = field.get(this);
+                        }
                     }
                     return values;
                 }.bind(this), {}));
@@ -8667,12 +8671,14 @@ var Sao = {};
             }
             return value;
         },
+        _has_changed: function(previous, value) {
+            // Use stringify to compare object instance like Number for Decimal
+            return JSON.stringify(previous) != JSON.stringify(value);
+        },
         set_client: function(record, value, force_change) {
             var previous_value = this.get(record);
             this.set(record, value);
-            // Use stringify to compare object instance like Number for Decimal
-            if (JSON.stringify(previous_value) !=
-                JSON.stringify(this.get(record))) {
+            if (this._has_changed(previous_value, this.get(record))) {
                 record._changed[this.name] = true;
                 this.changed(record);
                 record.validate(null, true, false, true);
@@ -9831,6 +9837,9 @@ var Sao = {};
 
     Sao.field.Binary = Sao.class_(Sao.field.Field, {
         _default: null,
+        _has_changed: function(previous, value) {
+            return previous != value;
+        },
         get_size: function(record) {
             var data = record._values[this.name] || 0;
             if (data instanceof Uint8Array) {
@@ -11462,7 +11471,9 @@ var Sao = {};
                     'disabled', this.screen.readonly);
 
                 var msg = name + ' / ' + data[1];
-                if ((data[1] < data[2]) && (data[2] > this.screen.limit)) {
+                if ((data[1] < data[2]) &&
+                    this.screen.limit !== null &&
+                    (data[2] > this.screen.limit)) {
                     msg += Sao.i18n.gettext(' of ') + data[2];
                 }
                 this.status_label.text(msg).attr('title', msg);
@@ -12298,7 +12309,7 @@ var Sao = {};
         init: function(format, id) {
             this.format = format;
             Sao.ScreenContainer.BetweenDates._super.init.call(this, id);
-            this.from.on('dp.change', this._from_changed.bind(this));
+            this.from.change(this._from_changed.bind(this));
         },
         _get_value: function(entry, value) {
             return entry.find('input[type=text]').val();
@@ -13397,7 +13408,9 @@ var Sao = {};
                 if (props.selection instanceof Array) {
                     continue;
                 }
+                props = jQuery.extend({}, props);
                 props.selection = this.get_selection(props);
+                fields[name] = props;
             }
 
             if ('arch' in view_tree) {
@@ -14181,7 +14194,7 @@ function eval_pyson(value){
                     widget.labelled.get(0).tagName)) {
                     jQuery('<span/>', {
                         'data-accesskey': accesskey,
-                    }).insertAfter(widget.labelled);
+                    }).appendTo(widget.labelled.parent());
                 }
                 label.label_el.attr('for', widget.labelled.attr('id'));
             }
@@ -14997,14 +15010,12 @@ function eval_pyson(value){
                 'aria-controls': this.collapsible.attr('id'),
                 'aria-expanded': attributes.expandable == '1',
             }).appendTo(title);
-            link.append(jQuery('<div/>', {
-                'class': 'btn btn-sm',
-            }).append(jQuery('<span/>', {
-                'class': 'caret',
-            })));
             if (attributes.string) {
                 link.text(attributes.string);
             }
+            link.append(jQuery('<span/>', {
+                'class': 'caret',
+            }));
         },
         add: function(widget) {
             this.body.empty();
@@ -19589,6 +19600,23 @@ function eval_pyson(value){
                 this.table.append(this.tfoot);
             }
 
+            if (this.children_field) {
+                this.expander = jQuery('<span/>', {
+                    'class': 'expander',
+                }).append(jQuery('<img/>', {
+                    'tabindex': 0,
+                    'class': 'icon',
+                }));
+                this.update_expander('more');
+                this.expander.on('click keypress',
+                    Sao.common.click_press(this.unfold.bind(this)));
+                Sao.common.ICONFACTORY.get_icon_url(
+                    'tryton-unfold-' + this.expander.action)
+                    .then(function(url) {
+                        this.expander.children().attr('src', url);
+                    }.bind(this));
+            }
+
             this.columns.forEach(function(column, i) {
                 col = jQuery('<col/>', {
                     'class': column.attributes.widget,
@@ -19596,23 +19624,6 @@ function eval_pyson(value){
                 th = jQuery('<th/>', {
                     'class': column.attributes.widget,
                 });
-                if ((i === 0) && this.children_field) {
-                    this.expander = jQuery('<img/>', {
-                        'tabindex': 0,
-                        'class': 'icon',
-                    });
-                    this.update_expander('more');
-                    this.expander.on('click keypress',
-                        Sao.common.click_press(this.unfold.bind(this)));
-                    Sao.common.ICONFACTORY.get_icon_url(
-                        'tryton-unfold-' + this.expander.action)
-                        .then(function(url) {
-                            this.expander.attr('src', url);
-                        }.bind(this));
-                    th.append(jQuery('<span>', {
-                        'class': 'expander',
-                    }).append(this.expander));
-                }
                 var label = jQuery('<label/>')
                     .text(column.attributes.string)
                     .attr('title', column.attributes.string);
@@ -19703,7 +19714,7 @@ function eval_pyson(value){
             Sao.common.ICONFACTORY.get_icon_url(
                 'tryton-unfold-' + this.expander.action)
                 .then(function(url) {
-                    this.expander.attr('src', url);
+                    this.expander.children().attr('src', url);
                 }.bind(this));
             if (jQuery.isEmptyObject(this.selected_records)) {
                 this.expander.css('visibility', 'hidden');
@@ -20145,8 +20156,8 @@ function eval_pyson(value){
                     !column.col.hasClass('selection-state') &&
                     !column.col.hasClass('favorite')) {
                     var width, c_width;
-                    if (column.width) {
-                        width = c_width = column.width;
+                    if (column.attributes.width) {
+                        width = c_width = column.attributes.width;
                         min_width.push(width + 'px');
                     } else {
                         width = {
@@ -20173,6 +20184,19 @@ function eval_pyson(value){
                     column.col.show();
                 }
             }.bind(this));
+            if (this.children_field) {
+                this.columns.every(function(column) {
+                    if (column.col.hasClass('draggable-handle') ||
+                        column.header.hasClass('invisible')) {
+                        return true;
+                    } else {
+                        if (this.expander.parent()[0] !== column.header[0]) {
+                            column.header.prepend(this.expander);
+                        }
+                        return false;
+                    }
+                }.bind(this));
+            }
             this.table.css('min-width', 'calc(' + min_width.join(' + ') + ')');
             this.scrollbar.css('min-width', this.table.css('min-width'));
             this.tbody.find('tr.more-row > td').attr(
@@ -20768,6 +20792,18 @@ function eval_pyson(value){
                 this.select_column(event_.data.index);
             }.bind(this);
 
+            if (this.children_field) {
+                this.expander = jQuery('<span/>', {
+                    'class': 'expander',
+                }).append('<img/>', {
+                    'tabindex': 0,
+                    'class': 'icon',
+                });
+                this.expander.children().html('&nbsp;');
+                this.expander.on('click keypress',
+                        Sao.common.click_press(this.toggle_row.bind(this)));
+            }
+
             for (var i = 0; i < this.tree.columns.length; i++) {
                 var column = this.tree.columns[i];
                 if (column instanceof Sao.View.Tree.ButtonColumn) {
@@ -20795,18 +20831,6 @@ function eval_pyson(value){
                     'class': 'cell',
                 });
                 td.append(cell);
-                if ((i === 0) && this.children_field) {
-                    this.expander = jQuery('<img/>', {
-                        'tabindex': 0,
-                        'class': 'icon',
-                    });
-                    this.expander.html('&nbsp;');
-                    this.expander.on('click keypress',
-                            Sao.common.click_press(this.toggle_row.bind(this)));
-                    cell.append(jQuery('<span/>', {
-                        'class': 'expander'
-                    }).append(this.expander));
-                }
                 var j;
                 if (column.prefixes) {
                     for (j = 0; j < column.prefixes.length; j++) {
@@ -20919,6 +20943,21 @@ function eval_pyson(value){
                     }
                 }
             }
+            if (this.children_field) {
+                this.tree.columns.every(function(column, i) {
+                    if (column.col.hasClass('draggable-handle') ||
+                        column.header.hasClass('invisible')) {
+                        return true;
+                    } else {
+                        var td = this._get_column_td(i);
+                        var cell = td.find('.cell');
+                        if (this.expander.parent()[0] !== cell[0]) {
+                            cell.prepend(this.expander);
+                        }
+                        return false;
+                    }
+                }.bind(this));
+            }
             this._drawed_record = this.record.identity;
 
             var row_id_path = this.get_id_path();
@@ -20929,7 +20968,7 @@ function eval_pyson(value){
                 if (Sao.i18n.rtl) {
                     margin = 'margin-right';
                 }
-                this.expander.css(margin, (depth - 1) + 'em');
+                this.expander.children().css(margin, (depth - 1) + 'em');
 
                 var update_expander = function() {
                     var length = this.record.field_get_client(
@@ -20993,7 +21032,7 @@ function eval_pyson(value){
             }
             Sao.common.ICONFACTORY.get_icon_url(icon)
                 .then(function(url) {
-                    this.expander.attr('src', url);
+                    this.expander.children().attr('src', url);
                 }.bind(this));
         },
         collapse_children: function() {
@@ -22095,6 +22134,12 @@ function eval_pyson(value){
                 return;
             }
             button.el.prop('disabled', true);  // state will be reset at display
+            var row = this.view.rows.find(function(row) {
+                return row.record == record;
+            });
+            if (row) {
+                row._drawed_record = null;  // force redraw the row
+            }
             this.view.screen.button(this.attributes);
         }
     });
@@ -23239,7 +23284,7 @@ function eval_pyson(value){
                 var ctx = {
                     active_model: data.model || null,
                     active_id: data.id || null,
-                    active_ids: data.ids
+                    active_ids: data.ids || [],
                 };
                 ctx = jQuery.extend(ctx, session.context);
                 ctx._user = session.user_id;

package/dist/tryton-sao.min.css

@@ -8687,6 +8687,9 @@ html[theme="default"] .input-group-sm > .form-control,
 html[theme="default"] .input-group-sm > .input-group-addon {
   padding: 0 5px;
 }
+html[theme="default"] .has-feedback .form-control {
+  padding-right: 42.5px;
+}
 html[theme="default"] .input-group-addon {
   background-color: transparent;
   border: transparent;
@@ -9165,6 +9168,9 @@ button {
   overflow-y: hidden;
   text-overflow: ellipsis;
 }
+.input-group > .form-control-feedback {
+  z-index: 3;
+}
 .navbar-inverse .close {
   color: #6dd1d4;
 }
@@ -9389,7 +9395,7 @@ button.list-group-item-selected.active:focus {
 .table-hover > tbody > tr.danger:hover > th {
   background-color: #ebcccc;
 }
-html.accesskey *[accesskey] + span[data-accesskey]:after,
+html.accesskey *[accesskey] ~ span[data-accesskey]:after,
 html.accesskey *[accesskey]:after {
   background-color: #71bdc1;
   color: #fff;
@@ -9403,19 +9409,19 @@ html.accesskey *[accesskey]:after {
 html.accesskey input[accesskey][type="checkbox"]:after {
   background-color: initial;
 }
-html.accesskey *[accesskey] + span[data-accesskey] {
+html.accesskey *[accesskey] ~ span[data-accesskey] {
   float: right;
   position: relative;
 }
-html.accesskey *[accesskey] + span[data-accesskey]:after {
+html.accesskey *[accesskey] ~ span[data-accesskey]:after {
   content: attr(data-accesskey);
 }
 html.accesskey *[accesskey]:after {
   content: attr(accesskey);
 }
-html.accesskey input[accesskey][type="checkbox"] + span[data-accesskey],
-html.accesskey input[accesskey][type="checkbox"] + span[data-accesskey],
-html.accesskey select[accesskey] + span[data-accesskey] {
+html.accesskey input[accesskey][type="checkbox"] ~ span[data-accesskey],
+html.accesskey input[accesskey][type="checkbox"] ~ span[data-accesskey],
+html.accesskey select[accesskey] ~ span[data-accesskey] {
   bottom: 1em;
 }
 .tab-form nav.toolbar,