tryton-sao 6.0.20 → 6.0.22

package/CHANGELOG

@@ -1,3 +1,9 @@
+Version 6.0.22 - 2022-10-17
+* Bug fixes (see mercurial logs for details)
+
+Version 6.0.21 - 2022-08-17
+* Bug fixes (see mercurial logs for details)
+
 Version 6.0.20 - 2022-07-01
 * Bug fixes (see mercurial logs for details)
 

package/dist/tryton-sao.js

@@ -504,8 +504,8 @@ var Sao = {};
         }
         function open_wizard(path) {
             var attributes = {};
-            attributes.name = path[0];
-            if (!attributes.name) {
+            attributes.action = path[0];
+            if (!attributes.action) {
                 return;
             }
             try {
@@ -3171,7 +3171,7 @@ var Sao = {};
 
     Sao.common.date_format = function(format) {
         if (jQuery.isEmptyObject(format)) {
-            format = '%Y-%m-%d';
+            format = '%x';
             if (Sao.Session.current_session) {
                 var context = Sao.Session.current_session.context;
                 if (context.locale && context.locale.date) {
@@ -11563,20 +11563,17 @@ var Sao = {};
         },
         _close_allowed: function() {
             var wizard = this.wizard;
-            var prm = jQuery.when();
             if ((wizard.state !== wizard.end_state) &&
                 (wizard.end_state in wizard.states)) {
-                prm = wizard.response(
+                wizard.response(
                     wizard.states[wizard.end_state].attributes);
             }
             var dfd = jQuery.Deferred();
-            prm.always(function() {
-                if (wizard.state === wizard.end_state) {
-                    dfd.resolve();
-                } else {
-                    dfd.reject();
-                }
-            });
+            if (wizard.state === wizard.end_state) {
+                dfd.resolve();
+            } else {
+                dfd.reject();
+            }
             return dfd.promise();
         }
     });
@@ -14558,7 +14555,7 @@ function eval_pyson(value){
                 i = 0;
                 row.children().map(function() {
                     var cell = jQuery(this);
-                    var colspan = Math.min(Number(cell.attr('colspan')), col);
+                    var colspan = Math.min(Number(cell.attr('colspan')), col || 1);
                     if (cell.hasClass('xexpand') &&
                         (!jQuery.isEmptyObject(cell.children())) &&
                         (cell.children(':not(.tooltip)').css('display') != 'none')) {
@@ -14578,7 +14575,7 @@ function eval_pyson(value){
                     var reduce = function(previous, current) {
                         var cell = current[0];
                         var colspan = Math.min(
-                            Number(cell.attr('colspan')), col);
+                            Number(cell.attr('colspan')), col || 1);
                         return previous + colspan;
                     };
                     return a.reduce(reduce, 0) - b.reduce(reduce, 0);
@@ -14593,7 +14590,8 @@ function eval_pyson(value){
                 xexpands.forEach(function(e) {
                     var cell = e[0];
                     i = e[1];
-                    var colspan = Math.min(Number(cell.attr('colspan')), col);
+                    var colspan = Math.min(
+                        Number(cell.attr('colspan')), col || 1);
                     var current_width = 0;
                     for (j = 0; j < colspan; j++) {
                         current_width += widths[i + j] || 0;
@@ -14621,7 +14619,8 @@ function eval_pyson(value){
                 i = 0;
                 row.children().map(function() {
                     var cell = jQuery(this);
-                    var colspan = Math.min(Number(cell.attr('colspan')), col);
+                    var colspan = Math.min(
+                        Number(cell.attr('colspan')), col || 1);
                     if (cell.hasClass('xexpand') &&
                         (cell.children(':not(.tooltip)').css('display') !=
                          'none')) {
@@ -15583,7 +15582,6 @@ function eval_pyson(value){
         _input_format: '%Y-%m-%d',
         _format: Sao.common.format_date,
         _parse: Sao.common.parse_date,
-        _default_format: '%x',
         init: function(view, attributes) {
             Sao.View.Form.Date._super.init.call(this, view, attributes);
             this.el = jQuery('<div/>', {
@@ -15662,7 +15660,8 @@ function eval_pyson(value){
             if (this.field && this.record) {
                 return this.field.date_format(this.record);
             } else {
-                return this._default_format;
+                return Sao.common.date_format(
+                    this.view.screen.context.date_format);
             }
         },
         get_value: function() {
@@ -15719,13 +15718,13 @@ function eval_pyson(value){
         _input_format: '%Y-%m-%dT%H:%M:%S',
         _format: Sao.common.format_datetime,
         _parse: Sao.common.parse_datetime,
-        _default_format: '%x %X',
         get_format: function() {
             if (this.field && this.record) {
                 return (this.field.date_format(this.record) + ' ' +
                     this.field.time_format(this.record));
             } else {
-                return this._default_format;
+                return (Sao.common.date_format(
+                    this.view.screen.context.date_format) + ' %X');
             }
         },
         cast: function(value){
@@ -15740,7 +15739,6 @@ function eval_pyson(value){
         _input_format: '%H:%M:%S',
         _format: Sao.common.format_time,
         _parse: Sao.common.parse_time,
-        _default_format: '%X',
         init: function(view, attributes) {
             Sao.View.Form.Time._super.init.call(this, view, attributes);
             if (~navigator.userAgent.indexOf("Firefox")) {
@@ -15752,7 +15750,7 @@ function eval_pyson(value){
             if (this.field && this.record) {
                 return this.field.time_format(this.record);
             } else {
-                return this._default_format;
+                return '%X';
             }
         },
         cast: function(value){