tryton-sao 7.4.4 → 7.4.6

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.4.6 - 2025-03-04
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.4.5 - 2025-02-16
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.4.4 - 2025-01-16
 --------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.css

@@ -10100,6 +10100,16 @@ img.icon {
 .board .form-binary input {
   min-width: 12ch;
 }
+.form .form-many2one input[type='file'],
+.board .form-many2one input[type='file'],
+.form .form-one2one input[type='file'],
+.board .form-one2one input[type='file'],
+.form .form-reference input[type='file'],
+.board .form-reference input[type='file'],
+.form .form-binary input[type='file'],
+.board .form-binary input[type='file'] {
+  min-width: unset;
+}
 @media screen and (min-width: 768px) {
   .form .form-reference > .input-sm,
   .board .form-reference > .input-sm,

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.4.4',
+    __version__: '7.4.6',
 };
 /* eslint-enable no-redeclare */
 
@@ -8301,38 +8301,37 @@ var Sao = {
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                if (this.id < 0) {
-                    // synchronous call to avoid multiple creation
-                    try {
+                try {
+                    // synchronous call to avoid multiple creation or save
+                    if (this.id < 0) {
                         this.id = this.model.execute(
                             'create', [[values]], context,  false)[0];
-                    } catch (e) {
-                        if (e.promise) {
-                            return e.then(() => this.save(force_reload));
-                        } else {
-                            return jQuery.Deferred().reject();
+
+                    } else {
+                        if (!jQuery.isEmptyObject(values)) {
+                            context._timestamp = this.get_timestamp();
+                            this.model.execute(
+                                'write', [[this.id], values], context, false);
                         }
                     }
-                } else {
-                    if (!jQuery.isEmptyObject(values)) {
-                        context._timestamp = this.get_timestamp();
-                        prm = this.model.execute('write', [[this.id], values],
-                            context);
+                } catch (e) {
+                    if (e.promise) {
+                        return e.then(() => this.save(force_reload));
+                    } else {
+                        return jQuery.Deferred().reject();
                     }
                 }
-                prm = prm.done(() => {
-                    this.cancel();
-                    if (force_reload) {
-                        return this.reload();
-                    }
-                });
+                this.cancel();
+                if (force_reload) {
+                    return this.reload();
+                }
                 if (this.group) {
-                    prm = prm.done(() => this.group.written(this.id));
+                    prm = prm.then(() => this.group.written(this.id));
                 }
             }
             if (this.group.parent) {
                 delete this.group.parent.modified_fields[this.group.child_name];
-                prm = prm.done(() => this.group.parent.save(force_reload));
+                prm = prm.then(() => this.group.parent.save(force_reload));
             }
             return prm;
         },
@@ -11559,7 +11558,7 @@ var Sao = {
                 this.screen.save_tree_state();
             }
             var access = Sao.common.MODELACCESS.get(this.screen.model_name);
-            if (!(access.write || access.create)) {
+            if (this.screen.readonly || !(access.write || access.create)) {
                 return jQuery.Deferred().reject();
             }
             return this.screen.save_current().then(
@@ -11629,7 +11628,8 @@ var Sao = {
             });
         },
         delete_: function() {
-            if (!Sao.common.MODELACCESS.get(this.screen.model_name)['delete']) {
+            if (!Sao.common.MODELACCESS.get(this.screen.model_name)['delete']
+                || !this.screen.deletable) {
                 return jQuery.when();
             }
             var msg;
@@ -14015,6 +14015,7 @@ 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') &&
@@ -14052,6 +14053,9 @@ var Sao = {
                     path.splice(-1, 1,
                             [path[path.length - 1][0], current_record.id]);
                 }
+                if (new_record && this.switch_callback) {
+                    this.switch_callback();
+                }
                 return this.group.get_by_path(path).then(record => {
                     this.current_record = record;
                 });
@@ -14574,7 +14578,9 @@ var Sao = {
                             }
                         }
                     }
-                    if ((this.views.length == 1) && this.current_record) {
+                }
+                if ((view === this.current_view) && (view.view_type == 'form')) {
+                    if (this.current_record) {
                         if (!(parent_ in this.tree_states)) {
                             this.tree_states[parent_] = {};
                         }
@@ -14590,11 +14596,13 @@ var Sao = {
                         paths = [];
                     }
                     var selected_paths = view.get_selected_paths();
-                    if (!(parent_ in this.tree_states)) {
-                        this.tree_states[parent_] = {};
+                    if (view === this.current_view) {
+                        if (!(parent_ in this.tree_states)) {
+                            this.tree_states[parent_] = {};
+                        }
+                        this.tree_states[parent_][view.children_field || null] = [
+                            paths, selected_paths];
                     }
-                    this.tree_states[parent_][view.children_field || null] = [
-                        paths, selected_paths];
                     if (store && parseInt(view.attributes.tree_state, 10)) {
                         var tree_state_model = new Sao.Model(
                                 'ir.ui.view_tree_state');
@@ -19468,10 +19476,14 @@ function eval_pyson(value){
             var editable = !this.text.prop('readonly');
             if (evt.which == Sao.common.F3_KEYCODE && editable) {
                 evt.preventDefault();
-                this.new_();
+                this.select();
             } else if (evt.which == Sao.common.F2_KEYCODE) {
                 evt.preventDefault();
-                this.open();
+                if (this.filename) {
+                    this.open();
+                } else {
+                    this.save_as();
+                }
             }
         },
         set_value: function() {
@@ -19484,7 +19496,7 @@ function eval_pyson(value){
             Sao.View.Form.Binary._super.set_readonly.call(this, readonly);
             var record = this.record;
             this.but_select.toggleClass('disabled', readonly || !record);
-            this.input_select.toggle(!readonly && record);
+            this.input_select.toggle(!readonly && Boolean(record));
             this.but_clear.prop('disabled', readonly || !record);
             if (this.text) {
                 this.text.prop('readonly', readonly);

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.4.4",
+  "version": "7.4.6",
   "homepage": "https://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/model.js

@@ -602,38 +602,37 @@
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                if (this.id < 0) {
-                    // synchronous call to avoid multiple creation
-                    try {
+                try {
+                    // synchronous call to avoid multiple creation or save
+                    if (this.id < 0) {
                         this.id = this.model.execute(
                             'create', [[values]], context,  false)[0];
-                    } catch (e) {
-                        if (e.promise) {
-                            return e.then(() => this.save(force_reload));
-                        } else {
-                            return jQuery.Deferred().reject();
+
+                    } else {
+                        if (!jQuery.isEmptyObject(values)) {
+                            context._timestamp = this.get_timestamp();
+                            this.model.execute(
+                                'write', [[this.id], values], context, false);
                         }
                     }
-                } else {
-                    if (!jQuery.isEmptyObject(values)) {
-                        context._timestamp = this.get_timestamp();
-                        prm = this.model.execute('write', [[this.id], values],
-                            context);
+                } catch (e) {
+                    if (e.promise) {
+                        return e.then(() => this.save(force_reload));
+                    } else {
+                        return jQuery.Deferred().reject();
                     }
                 }
-                prm = prm.done(() => {
-                    this.cancel();
-                    if (force_reload) {
-                        return this.reload();
-                    }
-                });
+                this.cancel();
+                if (force_reload) {
+                    return this.reload();
+                }
                 if (this.group) {
-                    prm = prm.done(() => this.group.written(this.id));
+                    prm = prm.then(() => this.group.written(this.id));
                 }
             }
             if (this.group.parent) {
                 delete this.group.parent.modified_fields[this.group.child_name];
-                prm = prm.done(() => this.group.parent.save(force_reload));
+                prm = prm.then(() => this.group.parent.save(force_reload));
             }
             return prm;
         },

package/src/sao.js

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

package/src/sao.less

@@ -877,6 +877,10 @@ img.icon {
         }
         input {
             min-width: 12ch;
+
+            &[type='file'] {
+                min-width: unset;
+            }
         }
     }
 

package/src/screen.js

@@ -1606,6 +1606,7 @@
         },
         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') &&
@@ -1643,6 +1644,9 @@
                     path.splice(-1, 1,
                             [path[path.length - 1][0], current_record.id]);
                 }
+                if (new_record && this.switch_callback) {
+                    this.switch_callback();
+                }
                 return this.group.get_by_path(path).then(record => {
                     this.current_record = record;
                 });
@@ -2165,7 +2169,9 @@
                             }
                         }
                     }
-                    if ((this.views.length == 1) && this.current_record) {
+                }
+                if ((view === this.current_view) && (view.view_type == 'form')) {
+                    if (this.current_record) {
                         if (!(parent_ in this.tree_states)) {
                             this.tree_states[parent_] = {};
                         }
@@ -2181,11 +2187,13 @@
                         paths = [];
                     }
                     var selected_paths = view.get_selected_paths();
-                    if (!(parent_ in this.tree_states)) {
-                        this.tree_states[parent_] = {};
+                    if (view === this.current_view) {
+                        if (!(parent_ in this.tree_states)) {
+                            this.tree_states[parent_] = {};
+                        }
+                        this.tree_states[parent_][view.children_field || null] = [
+                            paths, selected_paths];
                     }
-                    this.tree_states[parent_][view.children_field || null] = [
-                        paths, selected_paths];
                     if (store && parseInt(view.attributes.tree_state, 10)) {
                         var tree_state_model = new Sao.Model(
                                 'ir.ui.view_tree_state');

package/src/tab.js

@@ -877,7 +877,7 @@
                 this.screen.save_tree_state();
             }
             var access = Sao.common.MODELACCESS.get(this.screen.model_name);
-            if (!(access.write || access.create)) {
+            if (this.screen.readonly || !(access.write || access.create)) {
                 return jQuery.Deferred().reject();
             }
             return this.screen.save_current().then(
@@ -947,7 +947,8 @@
             });
         },
         delete_: function() {
-            if (!Sao.common.MODELACCESS.get(this.screen.model_name)['delete']) {
+            if (!Sao.common.MODELACCESS.get(this.screen.model_name)['delete']
+                || !this.screen.deletable) {
                 return jQuery.when();
             }
             var msg;

package/src/view/form.js

@@ -4589,10 +4589,14 @@ function eval_pyson(value){
             var editable = !this.text.prop('readonly');
             if (evt.which == Sao.common.F3_KEYCODE && editable) {
                 evt.preventDefault();
-                this.new_();
+                this.select();
             } else if (evt.which == Sao.common.F2_KEYCODE) {
                 evt.preventDefault();
-                this.open();
+                if (this.filename) {
+                    this.open();
+                } else {
+                    this.save_as();
+                }
             }
         },
         set_value: function() {
@@ -4605,7 +4609,7 @@ function eval_pyson(value){
             Sao.View.Form.Binary._super.set_readonly.call(this, readonly);
             var record = this.record;
             this.but_select.toggleClass('disabled', readonly || !record);
-            this.input_select.toggle(!readonly && record);
+            this.input_select.toggle(!readonly && Boolean(record));
             this.but_clear.prop('disabled', readonly || !record);
             if (this.text) {
                 this.text.prop('readonly', readonly);