tryton-sao 7.2.17 → 7.2.19

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.2.19 - 2025-04-26
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.2.18 - 2025-04-02
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.17 - 2025-03-15
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.css

@@ -10456,6 +10456,9 @@ input.column-boolean {
   float: none;
 }
 @media screen and (max-width: 767px) {
+  .form-dict-container {
+    grid-template-columns: 100%;
+  }
   .dict-row {
     grid-column: 1;
   }

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.17',
+    __version__: '7.2.19',
 };
 /* eslint-enable no-redeclare */
 
@@ -4124,7 +4124,7 @@ var Sao = {
                 });
             }
         };
-        this._selection_prm.done(_update_selection);
+        this._selection_prm.always(_update_selection);
     };
     Sao.common.selection_mixin.filter_selection = function(
             domain, record, field) {
@@ -7659,7 +7659,7 @@ var Sao = {
     'use strict';
 
     function get_x2m_sub_fields(f_attrs, prefix) {
-        if (f_attrs.visible && f_attrs.views) {
+        if (f_attrs.visible && !jQuery.isEmptyObject(f_attrs.views)) {
             // There's only one key but we don't know its value
             const [[, view],] = Object.entries(f_attrs.views);
 
@@ -8238,6 +8238,7 @@ var Sao = {
             this.autocompletion = {};
             this.exception = false;
             this.destroyed = false;
+            this._save_prm = jQuery.when();
         },
         get modified() {
             if (!jQuery.isEmptyObject(this.modified_fields)) {
@@ -8251,33 +8252,28 @@ var Sao = {
         },
         save: function(force_reload=false) {
             var context = this.get_context();
+            if (this._save_prm.state() == 'pending') {
+                return this._save_prm.then(() => this.save(force_reload));
+            }
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                try {
-                    // synchronous call to avoid multiple creation or save
-                    if (this.id < 0) {
-                        this.id = this.model.execute(
-                            'create', [[values]], context,  false)[0];
-
-                    } else {
-                        if (!jQuery.isEmptyObject(values)) {
-                            context._timestamp = this.get_timestamp();
-                            this.model.execute(
-                                'write', [[this.id], values], context, false);
-                        }
-                    }
-                } catch (e) {
-                    if (e.promise) {
-                        return e.then(() => this.save(force_reload));
-                    } else {
-                        return jQuery.Deferred().reject();
+                if (this.id < 0) {
+                    prm = this.model.execute('create', [[values]], context)
+                        .then(ids => this.id = ids[0]);
+                } else {
+                    if (!jQuery.isEmptyObject(values)) {
+                        context._timestamp = this.get_timestamp();
+                        prm = this.model.execute(
+                            'write', [[this.id], values], context);
                     }
                 }
-                this.cancel();
-                if (force_reload) {
-                    return this.reload();
-                }
+                prm = prm.then(() => {
+                    this.cancel();
+                    if (force_reload) {
+                        return this.reload();
+                    }
+                });
                 if (this.group) {
                     prm = prm.then(() => this.group.written(this.id));
                 }
@@ -8286,6 +8282,7 @@ var Sao = {
                 delete this.group.parent.modified_fields[this.group.child_name];
                 prm = prm.then(() => this.group.parent.save(force_reload));
             }
+            this._save_prm = prm;
             return prm;
         },
         reload: function(fields, async=true) {
@@ -12161,6 +12158,7 @@ var Sao = {
                 }
             }
             const view_type = this.screen.current_view.view_type;
+            var next_view_type = this.screen.next_view_type;
             const has_views = this.screen.number_of_views > 1;
             var buttons = ['print', 'relate', 'email', 'attach'];
             for (const button_id of buttons) {
@@ -12181,7 +12179,9 @@ var Sao = {
                 set_sensitive(button_id, position && can_be_sensitive);
             }
             set_sensitive(
-                'switch_', (position || (view_type == 'form')) && has_views);
+                'switch_',
+                (position || (view_type == 'form') || (next_view_type != 'form')) &&
+                has_views);
             set_sensitive('delete_', this.screen.deletable);
             set_sensitive('previous', this.screen.has_previous());
             set_sensitive('next', this.screen.has_next());
@@ -13309,6 +13309,15 @@ var Sao = {
         get view_index() {
             return this.views.indexOf(this.current_view);
         },
+        get next_view_type() {
+            var views = this.views.concat(this.view_to_load)
+            var next_view_index = (this.view_index + 1) % views.length;
+            var next_view = views[next_view_index];
+            if (typeof next_view != 'string') {
+                next_view = next_view.view_type;
+            }
+            return next_view;
+        },
         switch_view: function(
             view_type=null, view_id=null, creatable=null, display=true) {
             if (view_id !== null) {
@@ -13979,7 +13988,6 @@ var Sao = {
         },
         save_current: function() {
             var current_record = this.current_record;
-            let new_record = current_record.id < 0;
             if (!current_record) {
                 if (this.current_view &&
                     (this.current_view.view_type == 'tree') &&
@@ -13990,6 +13998,7 @@ var Sao = {
                     return jQuery.when();
                 }
             }
+            let new_record = current_record.id < 0;
             if (this.current_view) {
                 this.current_view.set_value();
                 var fields = this.current_view.get_fields();
@@ -14668,7 +14677,8 @@ var Sao = {
                     return view.display(selected_nodes);
                 } else {
                     var record;
-                    if (!jQuery.isEmptyObject(selected_nodes)) {
+                    if (!jQuery.isEmptyObject(selected_nodes) &&
+                        !this.current_record) {
                         for (const id of selected_nodes[0]) {
                             const new_record = this.group.get(id);
                             if (!new_record) {
@@ -20427,8 +20437,7 @@ function eval_pyson(value){
             return this._parse(this.format, this.input.val());
         },
         set_value: function(value) {
-            if ((value instanceof Sao.DateTime) ||
-                (value instanceof Sao.Date)) {
+            if (value && (value.isDate || value.isDateTime)) {
                 value = this._format(this.format, value);
             } else {
                 value = '';

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.2.17",
+  "version": "7.2.19",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -828,7 +828,7 @@
                 });
             }
         };
-        this._selection_prm.done(_update_selection);
+        this._selection_prm.always(_update_selection);
     };
     Sao.common.selection_mixin.filter_selection = function(
             domain, record, field) {

package/src/model.js

@@ -4,7 +4,7 @@
     'use strict';
 
     function get_x2m_sub_fields(f_attrs, prefix) {
-        if (f_attrs.visible && f_attrs.views) {
+        if (f_attrs.visible && !jQuery.isEmptyObject(f_attrs.views)) {
             // There's only one key but we don't know its value
             const [[, view],] = Object.entries(f_attrs.views);
 
@@ -583,6 +583,7 @@
             this.autocompletion = {};
             this.exception = false;
             this.destroyed = false;
+            this._save_prm = jQuery.when();
         },
         get modified() {
             if (!jQuery.isEmptyObject(this.modified_fields)) {
@@ -596,33 +597,28 @@
         },
         save: function(force_reload=false) {
             var context = this.get_context();
+            if (this._save_prm.state() == 'pending') {
+                return this._save_prm.then(() => this.save(force_reload));
+            }
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                try {
-                    // synchronous call to avoid multiple creation or save
-                    if (this.id < 0) {
-                        this.id = this.model.execute(
-                            'create', [[values]], context,  false)[0];
-
-                    } else {
-                        if (!jQuery.isEmptyObject(values)) {
-                            context._timestamp = this.get_timestamp();
-                            this.model.execute(
-                                'write', [[this.id], values], context, false);
-                        }
-                    }
-                } catch (e) {
-                    if (e.promise) {
-                        return e.then(() => this.save(force_reload));
-                    } else {
-                        return jQuery.Deferred().reject();
+                if (this.id < 0) {
+                    prm = this.model.execute('create', [[values]], context)
+                        .then(ids => this.id = ids[0]);
+                } else {
+                    if (!jQuery.isEmptyObject(values)) {
+                        context._timestamp = this.get_timestamp();
+                        prm = this.model.execute(
+                            'write', [[this.id], values], context);
                     }
                 }
-                this.cancel();
-                if (force_reload) {
-                    return this.reload();
-                }
+                prm = prm.then(() => {
+                    this.cancel();
+                    if (force_reload) {
+                        return this.reload();
+                    }
+                });
                 if (this.group) {
                     prm = prm.then(() => this.group.written(this.id));
                 }
@@ -631,6 +627,7 @@
                 delete this.group.parent.modified_fields[this.group.child_name];
                 prm = prm.then(() => this.group.parent.save(force_reload));
             }
+            this._save_prm = prm;
             return prm;
         },
         reload: function(fields, async=true) {

package/src/sao.js

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

package/src/sao.less

@@ -1098,6 +1098,9 @@ input.column-boolean {
 }
 
 @media screen and (max-width: @screen-xs-max) {
+    .form-dict-container {
+        grid-template-columns: 100%;
+    }
     .dict-row {
         grid-column: 1;
     }

package/src/screen.js

@@ -927,6 +927,15 @@
         get view_index() {
             return this.views.indexOf(this.current_view);
         },
+        get next_view_type() {
+            var views = this.views.concat(this.view_to_load)
+            var next_view_index = (this.view_index + 1) % views.length;
+            var next_view = views[next_view_index];
+            if (typeof next_view != 'string') {
+                next_view = next_view.view_type;
+            }
+            return next_view;
+        },
         switch_view: function(
             view_type=null, view_id=null, creatable=null, display=true) {
             if (view_id !== null) {
@@ -1597,7 +1606,6 @@
         },
         save_current: function() {
             var current_record = this.current_record;
-            let new_record = current_record.id < 0;
             if (!current_record) {
                 if (this.current_view &&
                     (this.current_view.view_type == 'tree') &&
@@ -1608,6 +1616,7 @@
                     return jQuery.when();
                 }
             }
+            let new_record = current_record.id < 0;
             if (this.current_view) {
                 this.current_view.set_value();
                 var fields = this.current_view.get_fields();
@@ -2286,7 +2295,8 @@
                     return view.display(selected_nodes);
                 } else {
                     var record;
-                    if (!jQuery.isEmptyObject(selected_nodes)) {
+                    if (!jQuery.isEmptyObject(selected_nodes) &&
+                        !this.current_record) {
                         for (const id of selected_nodes[0]) {
                             const new_record = this.group.get(id);
                             if (!new_record) {

package/src/tab.js

@@ -1496,6 +1496,7 @@
                 }
             }
             const view_type = this.screen.current_view.view_type;
+            var next_view_type = this.screen.next_view_type;
             const has_views = this.screen.number_of_views > 1;
             var buttons = ['print', 'relate', 'email', 'attach'];
             for (const button_id of buttons) {
@@ -1516,7 +1517,9 @@
                 set_sensitive(button_id, position && can_be_sensitive);
             }
             set_sensitive(
-                'switch_', (position || (view_type == 'form')) && has_views);
+                'switch_',
+                (position || (view_type == 'form') || (next_view_type != 'form')) &&
+                has_views);
             set_sensitive('delete_', this.screen.deletable);
             set_sensitive('previous', this.screen.has_previous());
             set_sensitive('next', this.screen.has_next());

package/src/view/form.js

@@ -5568,8 +5568,7 @@ function eval_pyson(value){
             return this._parse(this.format, this.input.val());
         },
         set_value: function(value) {
-            if ((value instanceof Sao.DateTime) ||
-                (value instanceof Sao.Date)) {
+            if (value && (value.isDate || value.isDateTime)) {
                 value = this._format(this.format, value);
             } else {
                 value = '';