tryton-sao 6.2.6 → 6.2.7

package/CHANGELOG

@@ -1,3 +1,6 @@
+Version 6.2.7 - 2022-04-15
+* Bug fixes (see mercurial logs for details)
+
 Version 6.2.6 - 2022-03-01
 * Bug fixes (see mercurial logs for details)
 

package/Gruntfile.js

@@ -135,6 +135,7 @@ module.exports = function(grunt) {
     },
     qunit: {
         options: {
+            timeout: 300000,
             puppeteer: {
                 headless: true,
                 args: [

package/dist/tryton-sao.js

@@ -1251,7 +1251,7 @@ var Sao = {};
                     name = data.error[1][0];
                     msg = data.error[1][1];
                     description = data.error[1][2];
-                    Sao.common.userwarning.run(msg, description)
+                    Sao.common.userwarning.run(description, msg)
                         .then(function(result) {
                             if (!~['always', 'ok'].indexOf(result)) {
                                 dfd.reject();
@@ -2182,10 +2182,14 @@ var Sao = {};
     });
 
     Sao.PYSON.In.eval_ = function(value, context) {
-        if (value.v.indexOf) {
-            return Boolean(~value.v.indexOf(value.k));
+        if (value.v) {
+            if (value.v.indexOf) {
+                return Boolean(~value.v.indexOf(value.k));
+            } else {
+                return !!value.v[value.k];
+            }
         } else {
-            return !!value.v[value.k];
+            return false;
         }
     };
     Sao.PYSON.In.init_from_object = function(obj) {
@@ -6135,8 +6139,8 @@ var Sao = {};
             dialog.body.append(jQuery('<div/>', {
                 'class': 'checkbox',
             }).append(jQuery('<label/>')
-                .append(always)
-                .text(Sao.i18n.gettext('Always ignore this warning.')))
+                .text(Sao.i18n.gettext("Always ignore this warning."))
+                .prepend(always))
             );
             dialog.body.append(jQuery('<p/>')
                     .text(Sao.i18n.gettext('Do you want to proceed?')));
@@ -7783,7 +7787,7 @@ var Sao = {};
                     return;
                 }
             }
-            if (this.group.prm.state() == 'pending') {
+            if (async && this.group.prm.state() == 'pending') {
                 return this.group.prm.then(function() {
                     return this.load(name);
                 }.bind(this));
@@ -10225,10 +10229,16 @@ var Sao = {};
                 this.buttons[item.id].click(item, function(event) {
                     var item = event.data;
                     var button = this.buttons[item.id];
-                    button.prop('disabled', true);
+                    // Use data instead of disabled prop because the action may
+                    // actually disable the button.
+                    if (button.data('disabled')) {
+                        event.preventDefault();
+                        return;
+                    }
+                    button.data('disabled', true);
                     (this[item.id](this) || jQuery.when())
                         .always(function() {
-                            button.prop('disabled', false);
+                            button.data('disabled', false);
                         });
                 }.bind(this));
             };
@@ -10671,13 +10681,14 @@ var Sao = {};
                         menu.children().length);
                 }
 
-                if (menu_action[0] == 'print') {
-                    if (toolbars.exports.length && toolbars.print.length) {
+                if ((menu_action[0] == 'print') &&
+                    toolbars.exports.length) {
+                    button._can_be_sensitive = true;
+                    if (toolbars.print.length) {
                         menu.append(jQuery('<li/>', {
                             'role': 'separator',
                             'class': 'divider',
                         }));
-                        button._can_be_sensitive = true;
                     }
                     toolbars.exports.forEach(function(export_) {
                         var item = jQuery('<li/>', {
@@ -12354,11 +12365,11 @@ var Sao = {};
                     var value = this._parse(this.format, date.val());
                     value = this._format(this.format, value);
                     date.val(value);
-                });
+                }.bind(this));
                 mousetrap.bind('=', function(e, combo) {
                     e.preventDefault();
                     date.val(this._format(this.format, moment()));
-                });
+                }.bind(this));
 
                 Sao.common.DATE_OPERATORS.forEach(function(operator) {
                     mousetrap.bind(operator[0], function(e, combo) {