tryton 6.0.38__tar.gz → 6.0.40__tar.gz

{tryton-6.0.38 → tryton-6.0.40}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.0.40 - 2024-07-01
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 6.0.39 - 2024-05-01
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.0.38 - 2024-04-17
 ---------------------------
 * Bug fixes (see mercurial logs for details)

{tryton-6.0.38 → tryton-6.0.40}/PKG-INFO

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

{tryton-6.0.38 → tryton-6.0.40}/bin/tryton

@@ -18,7 +18,8 @@ if hasattr(sys, 'frozen'):
     share = os.path.join(prefix, 'share')
     os.environ['GTK_EXE_PREFIX'] = prefix
     os.environ['GTK_DATA_PREFIX'] = prefix
-    os.environ['EV_BACKENDS_DIR'] = prefix
+    os.environ['EV_BACKENDS_DIR'] = os.path.join(
+        prefix, 'lib', 'evince', '4', 'backends')
     os.environ['XDG_DATA_DIRS'] = share
     os.environ['GDK_PIXBUF_MODULE_FILE'] = os.path.join(
             share, 'gtk-3.0', 'gdk-pixbuf.loaders')

{tryton-6.0.38 → tryton-6.0.40}/setup-freeze.py

@@ -124,14 +124,13 @@ version = version.strip()
 
 setup(name='tryton',
     version=version,
-    packages=find_packages(),
     options={
         'build_exe': {
             'no_compress': True,
             'include_files': include_files,
             'excludes': ['tkinter'],
             'silent': True,
-            'packages': ['gi'],
+            'packages': find_packages() + ['gi'],
             'include_msvcr': True,
             },
         'bdist_mac': {

{tryton-6.0.38 → tryton-6.0.40}/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__ = "6.0.38"
+__version__ = "6.0.40"
 import gi
 import locale
 

{tryton-6.0.38 → tryton-6.0.40}/tryton/common/common.py

@@ -219,7 +219,7 @@ class ModelAccess(object):
             self._models = rpc.execute('model', 'ir.model', 'list_models',
                 rpc.CONTEXT)
         except TrytonServerError:
-            pass
+            logger.error("Unable to get model list.")
 
     def __getitem__(self, model):
         if model in self._access:
@@ -233,7 +233,14 @@ class ModelAccess(object):
             access = rpc.execute('model', 'ir.model.access', 'get_access',
                 self._models[to_load], rpc.CONTEXT)
         except TrytonServerError:
-            access = {}
+            logger.error("Unable to get access for %s.", model)
+            access = {
+                model: {
+                    'read': True,
+                    'write': False,
+                    'create': False,
+                    'delete': False},
+                }
         self._access.update(access)
         return self._access[model]
 
@@ -1135,7 +1142,7 @@ class RPCProgress(object):
 
         def return_():
             if self.exception:
-                raise self.exception
+                raise RPCException(self.exception)
             else:
                 return self.res
 

{tryton-6.0.38 → tryton-6.0.40}/tryton/common/datetime_.py

@@ -10,7 +10,9 @@ from dateutil.parser import parse
 
 from .common import IconFactory
 
-__all__ = ['Date', 'CellRendererDate', 'Time', 'CellRendererTime', 'DateTime']
+__all__ = [
+    'Date', 'CellRendererDate', 'Time', 'CellRendererTime', 'DateTime',
+    'date_parse']
 
 _ = gettext.gettext
 

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/model/field.py

@@ -15,6 +15,7 @@ import datetime
 import decimal
 from decimal import Decimal
 import math
+from pathlib import Path
 from tryton.common import RPCExecute, RPCException
 from tryton.common.htmltextbuffer import guess_decode
 from tryton.pyson import PYSONDecoder
@@ -993,26 +994,56 @@ class ReferenceField(Field):
 
 
 class _FileCache(object):
-    def __init__(self, path):
-        self.path = path
+    def __init__(self, data=None):
+        _, filename = tempfile.mkstemp(prefix='tryton_')
+        self.path = Path(filename)
+        self.suffixes = {}
+        if data:
+            with open(self.path, 'wb') as fp:
+                fp.write(data)
+
+    @property
+    def data(self):
+        with open(self.path, 'rb') as fp:
+            return fp.read()
 
     def __del__(self):
         try:
             os.remove(self.path)
         except IOError:
             pass
+        for path in self.suffixes.values():
+            try:
+                os.remove(path)
+            except IOError:
+                pass
+
+    def with_suffix(self, suffix):
+        if suffix in self.suffixes:
+            return self.suffixes[suffix]
+        _, filename = tempfile.mkstemp(prefix='tryton_', suffix=suffix)
+        self.suffixes[suffix] = path = Path(filename)
+        with open(path, 'wb') as fp:
+            fp.write(self.data)
+        return path
 
 
 class BinaryField(Field):
 
     _default = None
 
+    def _set_file_cache(self, record, data):
+        if isinstance(data, str):
+            data = data.encode('utf-8')
+        file_cache = _FileCache(data)
+        self.set(record, file_cache)
+        return file_cache
+
     def get(self, record):
         result = record.value.get(self.name, self._default)
         if isinstance(result, _FileCache):
             try:
-                with open(result.path, 'rb') as fp:
-                    result = fp.read()
+                result = result.data
             except IOError:
                 result = self.get_data(record)
         return result
@@ -1021,13 +1052,7 @@ class BinaryField(Field):
         return self.get(record)
 
     def set_client(self, record, value, force_change=False):
-        _, filename = tempfile.mkstemp(prefix='tryton_')
-        data = value or b''
-        if isinstance(data, str):
-            data = data.encode('utf-8')
-        with open(filename, 'wb') as fp:
-            fp.write(data)
-        self.set(record, _FileCache(filename))
+        self._set_file_cache(record, value or b'')
         record.modified_fields.setdefault(self.name)
         record.signal('record-modified')
         self.sig_changed(record)
@@ -1053,15 +1078,20 @@ class BinaryField(Field):
                     [record.id], [self.name], context=context)
             except RPCException:
                 return b''
-            _, filename = tempfile.mkstemp(prefix='tryton_')
-            data = values[self.name] or b''
-            if isinstance(data, str):
-                data = data.encode('utf-8')
-            with open(filename, 'wb') as fp:
-                fp.write(data)
-            self.set(record, _FileCache(filename))
+            self._set_file_cache(record, values[self.name] or b'')
         return self.get(record)
 
+    def get_filename(self, record, suffix=None):
+        data = self.get_data(record)
+        file_cache = record.value.get(self.name)
+        if not isinstance(file_cache, _FileCache):
+            file_cache = self._set_file_cache(record, data)
+        if suffix:
+            filename = file_cache.with_suffix(suffix)
+        else:
+            filename = file_cache.path
+        return filename
+
 
 class DictField(Field):
 

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/screen/screen.py

@@ -113,11 +113,10 @@ class Screen(SignalEvent):
                 return child
 
             # Remove first level Viewport and ScrolledWindow to fill the Vbox
-            for widget in [
-                    self.context_screen.screen_container.viewport,
-                    self.context_screen.current_view.widget.get_children()[0],
-                    ]:
-                remove_bin(widget)
+            remove_bin(self.context_screen.screen_container.viewport)
+            if self.context_screen.current_view:
+                remove_bin(
+                    self.context_screen.current_view.widget.get_children()[0])
 
             self.screen_container.filter_vbox.pack_start(
                 context_widget, expand=False, fill=True, padding=0)
@@ -490,7 +489,8 @@ class Screen(SignalEvent):
         self.group.destroy()
 
     def default_row_activate(self):
-        if (self.current_view.view_type == 'tree'
+        if (self.current_view
+                and self.current_view.view_type == 'tree'
                 and int(self.current_view.attributes.get('keyword_open', 0))):
             return Action.exec_keyword('tree_open', {
                 'model': self.model_name,
@@ -611,7 +611,7 @@ class Screen(SignalEvent):
 
     def new(self, default=True, rec_name=None):
         previous_view = self.current_view
-        if self.current_view.view_type == 'calendar':
+        if self.current_view and self.current_view.view_type == 'calendar':
             selected_date = self.current_view.get_selected_date()
         if self.current_view and not self.current_view.editable:
             self.switch_view('form', display=False)
@@ -664,16 +664,19 @@ class Screen(SignalEvent):
 
     def save_current(self):
         if not self.current_record:
-            if self.current_view.view_type == 'tree' and len(self.group):
+            if (self.current_view
+                    and self.current_view.view_type == 'tree'
+                    and len(self.group)):
                 self.current_record = self.group[0]
             else:
                 return True
-        self.current_view.set_value()
         saved = False
         record_id = None
-        fields = self.current_view.get_fields()
+        if self.current_view:
+            self.current_view.set_value()
+            fields = self.current_view.get_fields()
         path = self.current_record.get_path(self.group)
-        if self.current_view.view_type == 'tree':
+        if self.current_view and self.current_view.view_type == 'tree':
             # False value must be not saved
             saved = all((
                     x is not False and x >= 0
@@ -683,7 +686,7 @@ class Screen(SignalEvent):
             record_id = self.current_record.save(force_reload=True)
             # False value must be not saved
             saved = record_id is not False and record_id >= 0
-        else:
+        elif self.current_view:
             self.set_cursor()
             self.current_view.display()
             return False
@@ -711,17 +714,19 @@ class Screen(SignalEvent):
     def get(self):
         if not self.current_record:
             return None
-        self.current_view.set_value()
+        if self.current_view:
+            self.current_view.set_value()
         return self.current_record.get()
 
     def get_on_change_value(self):
         if not self.current_record:
             return None
-        self.current_view.set_value()
+        if self.current_view:
+            self.current_view.set_value()
         return self.current_record.get_on_change_value()
 
     def modified(self):
-        if self.current_view.view_type != 'tree':
+        if self.current_view and self.current_view.view_type != 'tree':
             if self.current_record:
                 if self.current_record.modified or self.current_record.id < 0:
                     return True
@@ -729,7 +734,7 @@ class Screen(SignalEvent):
             for record in self.group:
                 if record.modified or record.id < 0:
                     return True
-        if self.current_view.modified:
+        if self.current_view and self.current_view.modified:
             return True
         return False
 
@@ -807,6 +812,8 @@ class Screen(SignalEvent):
 
     def set_tree_state(self):
         view = self.current_view
+        if not view:
+            return
         if view.view_type not in ('tree', 'form'):
             return
         if id(view) in self.tree_states_done:
@@ -909,8 +916,10 @@ class Screen(SignalEvent):
 
     def load(self, ids, set_cursor=True, modified=False, position=-1):
         self.group.load(ids, modified=modified, position=position)
-        self.current_view.reset()
-        if ids and self.current_view.view_type != 'calendar':
+        if self.current_view:
+            self.current_view.reset()
+        if (ids and self.current_view
+                and self.current_view.view_type != 'calendar'):
             self.display(ids[0])
         else:
             self.current_record = None
@@ -929,7 +938,7 @@ class Screen(SignalEvent):
                 self.current_record = self.group[0]
             else:
                 self.current_record = None
-        if self.views:
+        if self.views and self.current_view:
             self.search_active(self.current_view.view_type
                 in ('tree', 'graph', 'calendar'))
             for view in self.views:
@@ -974,7 +983,8 @@ class Screen(SignalEvent):
                 model = view.treeview.get_model()
                 iter_ = model.get_iter(end)
                 self.current_record = model.get_value(iter_, 0)
-        elif (view.view_type == 'form'
+        elif (view
+                and view.view_type == 'form'
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1002,12 +1012,14 @@ class Screen(SignalEvent):
                 record = next
                 break
             self.current_record = record
-        elif (view.view_type == 'list-form' and len(self.group)
+        elif (view
+                and view.view_type == 'list-form'
+                and len(self.group)
                 and self.current_record in self.group):
             idx = self.group.index(self.current_record)
             if 0 <= idx < len(self.group) - 1:
                 self.current_record = self.group[idx + 1]
-        elif view.view_type == 'calendar':
+        elif view and view.view_type == 'calendar':
             record = self.current_record
             goocalendar = view.widgets.get('goocalendar')
             if goocalendar:
@@ -1039,9 +1051,10 @@ class Screen(SignalEvent):
 
     def display_prev(self):
         view = self.current_view
-        view.set_value()
+        if view:
+            view.set_value()
         self.set_cursor(reset_view=False)
-        if view.view_type == 'tree' and len(self.group):
+        if view and view.view_type == 'tree' and len(self.group):
             range_ = view.treeview.get_visible_range()
             if range_:
                 start, end = range_
@@ -1052,7 +1065,8 @@ class Screen(SignalEvent):
                 model = view.treeview.get_model()
                 iter_ = model.get_iter(start)
                 self.current_record = model.get_value(iter_, 0)
-        elif (view.view_type == 'form'
+        elif (view
+                and view.view_type == 'form'
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1070,7 +1084,7 @@ class Screen(SignalEvent):
                 if parent and record.model_name == parent.model_name:
                     record = parent
             self.current_record = record
-        elif view.view_type == 'calendar':
+        elif view and view.view_type == 'calendar':
             record = self.current_record
             goocalendar = view.widgets.get('goocalendar')
             if goocalendar:
@@ -1095,7 +1109,9 @@ class Screen(SignalEvent):
                             if prev_id >= 0:
                                 self.current_record = events[prev_id].record
                             break
-        elif (view.view_type == 'list-form' and len(self.group)
+        elif (view
+                and view.view_type == 'list-form'
+                and len(self.group)
                 and self.current_record in self.group):
             idx = self.group.index(self.current_record)
             if 0 < idx <= len(self.group) - 1:
@@ -1103,7 +1119,8 @@ class Screen(SignalEvent):
         else:
             self.current_record = self.group[-1] if len(self.group) else None
         self.set_cursor(reset_view=False)
-        view.display()
+        if view:
+            view.display()
 
     def invalid_message(self, record=None):
         if record is None:
@@ -1174,7 +1191,7 @@ class Screen(SignalEvent):
         if not self.selected_records:
             return []
 
-        buttons = self.current_view.get_buttons()
+        buttons = self.current_view.get_buttons() if self.current_view else []
 
         for record in self.selected_records:
             buttons = [b for b in buttons if is_active(record, b)]
@@ -1184,8 +1201,9 @@ class Screen(SignalEvent):
 
     def button(self, button):
         'Execute button on the selected records'
-        self.current_view.set_value()
-        fields = self.current_view.get_fields()
+        if self.current_view:
+            self.current_view.set_value()
+            fields = self.current_view.get_fields()
         for record in self.selected_records:
             domain = record.expr_eval(
                 button.get('states', {})).get('pre_validate', [])
@@ -1199,7 +1217,8 @@ class Screen(SignalEvent):
         if button.get('confirm', False) and not sur(button['confirm']):
             return
         if button.get('type', 'class') == 'class':
-            if not self.current_record.save(force_reload=False):
+            record_id = self.current_record.save(force_reload=False)
+            if record_id is False or record_id < 0:
                 return
         if button.get('type', 'class') == 'class':
             self._button_class(button)
@@ -1266,7 +1285,9 @@ class Screen(SignalEvent):
         elif action.startswith('switch'):
             self.switch_view(*action.split(None, 2)[1:])
         elif action == 'reload':
-            if (self.current_view.view_type in ['tree', 'graph', 'calendar']
+            if (self.current_view
+                    and self.current_view.view_type in [
+                        'tree', 'graph', 'calendar']
                     and not self.parent):
                 self.search_filter()
         elif action == 'reload menu':
@@ -1296,7 +1317,7 @@ class Screen(SignalEvent):
                         cls=JSONEncoder, separators=(',', ':'))))
         path = [CONFIG['login.db'], 'model', self.model_name]
         view_ids = [v.view_id for v in self.views] + self.view_ids
-        if self.current_view.view_type != 'form':
+        if self.current_view and self.current_view.view_type != 'form':
             if self.search_value:
                 search_value = self.search_value
             else:
@@ -1308,8 +1329,9 @@ class Screen(SignalEvent):
                             separators=(',', ':'))))
         elif self.current_record and self.current_record.id > -1:
             path.append(str(self.current_record.id))
-            i = view_ids.index(self.current_view.view_id)
-            view_ids = view_ids[i:] + view_ids[:i]
+            if self.current_view:
+                i = view_ids.index(self.current_view.view_id)
+                view_ids = view_ids[i:] + view_ids[:i]
         if view_ids:
             query_string.append(('views', json.dumps(
                         view_ids, separators=(',', ':'))))

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py

@@ -65,13 +65,18 @@ class Calendar_(goocalendar.Calendar):
             self.current_domain_period.get_dates(True)
         dtstart = self.attrs['dtstart']
         dtend = self.attrs.get('dtend') or dtstart
-        domain = ['OR',
-            ['AND', (dtstart, '>=', first_datetime),
-                (dtstart, '<', last_datetime)],
-            ['AND', (dtend, '>=', first_datetime),
-                (dtend, '<', last_datetime)],
-            ['AND', (dtstart, '<', first_datetime),
-                (dtend, '>', last_datetime)]]
+        domain = [
+            (dtstart, '!=', None),
+            (dtend, '!=', None),
+            ['OR',
+                ['AND', (dtstart, '>=', first_datetime),
+                    (dtstart, '<', last_datetime)],
+                ['AND', (dtend, '>=', first_datetime),
+                    (dtend, '<', last_datetime)],
+                ['AND', (dtstart, '<', first_datetime),
+                    (dtend, '>', last_datetime)],
+                ],
+            ]
         return domain
 
     def get_colors(self, record):

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/view/form_gtk/char.py

@@ -170,10 +170,9 @@ class Password(Char):
         self.widget.pack_start(
             self.visibility_checkbox, expand=False, fill=True, padding=0)
 
-    def _readonly_set(self, value):
-        super(Char, self)._readonly_set(value)
-        self.entry.set_editable(not value)
-        self.visibility_checkbox.props.visible = not value
-
     def toggle_visibility(self, button):
-        self.entry.props.visibility = not self.entry.props.visibility
+        if self.autocomplete:
+            entry = self.entry.get_child()
+        else:
+            entry = self.entry
+        entry.props.visibility = not self.entry.props.visibility

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/view/form_gtk/document.py

@@ -1,7 +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.
 from pathlib import Path
-from tempfile import NamedTemporaryFile
 
 from gi.repository import Gtk, Gdk, GLib
 try:
@@ -75,17 +74,17 @@ class Document(BinaryMixin, Widget):
             self.image.hide()
             if self.evince_view:
                 self.evince_scroll.show()
+                suffix = None
                 if self.filename_field:
-                    suffix = self.filename_field.get(self.record)
-                else:
-                    suffix = None
+                    filename = self.filename_field.get(self.record)
+                    if filename:
+                        suffix = Path(filename).suffix
+                filename = Path(self.field.get_filename(self.record, suffix))
                 try:
-                    with NamedTemporaryFile(suffix=suffix) as fp:
-                        fp.write(data)
-                        path = Path(fp.name)
-                        document = (
-                            EvinceDocument.Document.factory_get_document(
-                                path.as_uri()))
+                    document = (
+                        EvinceDocument.Document.factory_get_document_full(
+                            filename.as_uri(),
+                            EvinceDocument.DocumentLoadFlags.NONE))
                     model = EvinceView.DocumentModel()
                     model.set_document(document)
                     self.evince_view.set_model(model)

{tryton-6.0.38 → tryton-6.0.40}/tryton/gui/window/view_form/view/list_gtk/editabletree.py

@@ -153,7 +153,8 @@ class EditableTreeView(TreeView):
         for renderer in column.get_cells():
             if renderer.props.editing:
                 widget = self.view.get_column_widget(column)
-                self.on_editing_done(widget.editable, renderer)
+                editable = widget.get_editable(renderer)
+                self.on_editing_done(editable, renderer)
         return True
 
     def on_keypressed(self, entry, event, renderer):