tryton 7.4.1__tar.gz → 7.4.3__tar.gz

{tryton-7.4.1 → tryton-7.4.3}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.4.3 - 2025-01-01
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.4.2 - 2024-12-16
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.4.1 - 2024-12-01
 --------------------------
 * Bug fixes (see mercurial logs for details)

{tryton-7.4.1 → tryton-7.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 7.4.1
+Version: 7.4.3
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.4/

{tryton-7.4.1 → tryton-7.4.3}/tryton/__init__.py

@@ -1,6 +1,6 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "7.4.1"
+__version__ = "7.4.3"
 import locale
 
 import gi

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/about.py

@@ -11,7 +11,7 @@ from tryton.common import get_toplevel_window
 from tryton.config import CONFIG, PIXMAPS_DIR
 
 COPYRIGHT = '''\
-Copyright (C) 2004-2024 Tryton.
+Copyright (C) 2004-2025 Tryton.
 '''
 AUTHORS = [
         'Bertrand Chenal <bertrand.chenal@b2ck.com>',

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/model/field.py

@@ -621,12 +621,10 @@ class O2MField(Field):
         from .group import Group
         parent_name = self.attrs.get('relation_field', '')
         fields = fields or {}
-        context = record.expr_eval(self.attrs.get('context', {}))
         group = Group(self.attrs['relation'], fields,
                 parent=record,
                 parent_name=parent_name,
                 child_name=self.name,
-                context=context,
                 parent_datetime_field=self.attrs.get('datetime_field'))
         if not fields and record.model_name == self.attrs['relation']:
             group.fields = record.group.fields

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/model/record.py

@@ -406,6 +406,7 @@ class Record:
         return self.id
 
     def default_get(self, defaults=None):
+        vals = {}
         if len(self.group.fields):
             context = self.get_context()
             if defaults is not None:
@@ -415,7 +416,7 @@ class Record:
                 vals = RPCExecute('model', self.model_name, 'default_get',
                     list(self.group.fields.keys()), context=context)
             except RPCException:
-                return
+                return vals
             if (self.parent
                     and self.parent_name in self.group.fields):
                 parent_field = self.group.fields[self.parent_name]
@@ -606,6 +607,7 @@ class Record:
             values.update(self._get_on_change_args(on_change))
 
         if values:
+            values['id'] = self.id
             try:
                 if len(fieldnames) == 1 or 'id' not in values:
                     changes = []
@@ -667,6 +669,7 @@ class Record:
                                 'on_change_with_' + fieldname,
                                 values, context=self.get_context()))
                 else:
+                    values['id'] = self.id
                     changed = RPCExecute(
                         'model', self.model_name, 'on_change_with',
                         values, list(fieldnames), context=self.get_context())
@@ -689,6 +692,7 @@ class Record:
                                 'on_change_with_' + fieldname,
                                 values, context=self.get_context()))
                 else:
+                    values['id'] = self.id
                     changed = RPCExecute(
                         'model', self.model_name, 'on_change_with',
                         values, list(later), context=self.get_context())
@@ -720,6 +724,7 @@ class Record:
     def on_scan_code(self, code, depends):
         depends = self.expr_eval(depends)
         values = self._get_on_change_args(depends)
+        values['id'] = self.id
         try:
             changes = RPCExecute(
                 'model', self.model_name, 'on_scan_code', values, code,

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/screen/screen.py

@@ -75,7 +75,8 @@ class Screen:
         self.__current_record = None
         self.new_group(context or {})
         self.current_record = None
-        self.screen_container = ScreenContainer(attributes.get('tab_domain'))
+        self.screen_container = ScreenContainer(
+            self, attributes.get('tab_domain'))
         self.screen_container.alternate_view = attributes.get(
             'alternate_view', False)
         self.widget = self.screen_container.widget_get()
@@ -163,7 +164,6 @@ class Screen:
 
     def search_active(self, active=True):
         if active and not self.parent:
-            self.screen_container.set_screen(self)
             self.screen_container.show_filter()
         else:
             self.screen_container.hide_filter()
@@ -816,6 +816,9 @@ class Screen:
             record.group.remove(
                 record, remove=remove, modified=False,
                 force_remove=force_remove)
+        # set current_record to None to prevent __select_changed
+        # to set deleted record as current_record
+        self.current_record = None
         # call only once
         record.set_modified()
 
@@ -1260,6 +1263,7 @@ class Screen:
         record = self.current_record
         args = record.expr_eval(button.get('change', []))
         values = record._get_on_change_args(args)
+        values['id'] = record.id
         try:
             changes = RPCExecute('model', self.model_name, button['name'],
                 values, context=self.context)

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/view/form.py

@@ -382,7 +382,6 @@ class FormXMLViewParser(XMLViewParser):
         group = Container.constructor(
             int(attributes.get('col', 4)),
             attributes.get('homogeneous', False))
-        self.parse_child(node, group)
 
         if 'name' in attributes and attributes['name'] == self.exclude_field:
             self.container.add(None, attributes)
@@ -406,6 +405,9 @@ class FormXMLViewParser(XMLViewParser):
                 bool(attributes.get('yexpand'))))
         self.view.state_widgets.append(widget)
         self.container.add(widget, attributes)
+        # Parse the children at the end to preserve the order of the state
+        # widgets
+        self.parse_child(node, group)
 
     def _parse_hpaned(self, node, attributes):
         self._parse_paned(node, attributes, Gtk.HPaned)

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/view/list.py

@@ -1139,6 +1139,10 @@ class ViewTree(View):
     def display(self, force=False):
         self.treeview.display_counter += 1
         current_record = self.record
+        if current_record and current_record not in current_record.group:
+            # current record may have been removed by on_change calls without
+            # changing the current record of screen before the display
+            current_record = None
         if (force
                 or not self.treeview.get_model()
                 or self.group != self.treeview.get_model().group):

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/view/list_gtk/widget.py

@@ -742,7 +742,7 @@ class _BinarySelect(_BinaryIcon):
         invisible = field.get_state_attrs(record).get('invisible', False)
         readonly = self.attrs.get('readonly',
             field.get_state_attrs(record).get('readonly', False))
-        if readonly and size:
+        if readonly or size:
             cell.set_property('visible', False)
         else:
             cell.set_property('visible', not invisible)

{tryton-7.4.1 → tryton-7.4.3}/tryton/gui/window/view_form/view/screen_container.py

@@ -185,7 +185,8 @@ class Selection(Gtk.ScrolledWindow):
 
 class ScreenContainer(object):
 
-    def __init__(self, tab_domain):
+    def __init__(self, screen, tab_domain):
+        self.screen = screen
         self.viewport = Gtk.Viewport()
         self.viewport.set_shadow_type(Gtk.ShadowType.NONE)
         self.vbox = Gtk.VBox(spacing=3)
@@ -351,12 +352,9 @@ class ScreenContainer(object):
     def widget_get(self):
         return self.vbox
 
-    def set_screen(self, screen):
-        self.screen = screen
+    def show_filter(self):
         self.but_bookmark.set_sensitive(bool(list(self.bookmarks())))
         self.bookmark_match()
-
-    def show_filter(self):
         if self.filter_vbox:
             self.filter_vbox.show()
         if self.notebook:

{tryton-7.4.1 → tryton-7.4.3}/tryton.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 7.4.1
+Version: 7.4.3
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.4/