tryton 6.0.39__tar.gz → 6.0.41__tar.gz

{tryton-6.0.39 → tryton-6.0.41}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.0.41 - 2024-08-01
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+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)

{tryton-6.0.39 → tryton-6.0.41}/PKG-INFO

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

{tryton-6.0.39 → tryton-6.0.41}/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.39 → tryton-6.0.41}/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.39"
+__version__ = "6.0.41"
 import gi
 import locale
 

{tryton-6.0.39 → tryton-6.0.41}/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):
 
@@ -1072,10 +1102,10 @@ class DictField(Field):
         self.keys = {}
 
     def get(self, record):
-        return super(DictField, self).get(record) or self._default
+        return (super().get(record) or self._default).copy()
 
     def get_client(self, record):
-        return super(DictField, self).get_client(record) or self._default
+        return super().get_client(record)
 
     def validation_domains(self, record, pre_validate=None):
         screen_domain, attr_domain = self.domains_get(record, pre_validate)

{tryton-6.0.39 → tryton-6.0.41}/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.39 → tryton-6.0.41}/tryton/gui/window/view_form/view/form_gtk/dictionary.py

@@ -236,9 +236,10 @@ class DictMultiSelectionEntry(DictEntry):
         selection.handler_block_by_func(self._changed)
         try:
             selection.unselect_all()
-            for v in value:
-                if v in value2path:
-                    selection.select_path(value2path[v])
+            if value:
+                for v in value:
+                    if v in value2path:
+                        selection.select_path(value2path[v])
         finally:
             selection.handler_unblock_by_func(self._changed)
 

{tryton-6.0.39 → tryton-6.0.41}/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.39 → tryton-6.0.41}/tryton/gui/window/win_form.py

@@ -68,7 +68,7 @@ class WinForm(NoModal, InfoBar):
         self.accel_group = Gtk.AccelGroup()
         self.win.add_accel_group(self.accel_group)
 
-        readonly = self.screen.readonly or self.screen.group.readonly
+        readonly = self.screen.group.readonly
 
         self.but_ok = None
         self.but_new = None
@@ -355,7 +355,7 @@ class WinForm(NoModal, InfoBar):
         deletable = True
         if screen.current_record:
             deletable = screen.current_record.deletable
-        readonly = self.screen.readonly or self.screen.group.readonly
+        readonly = self.screen.group.readonly
         if signal_data[0] >= 1:
             name = str(signal_data[0])
             if self.domain is not None:
@@ -368,9 +368,11 @@ class WinForm(NoModal, InfoBar):
                 self.but_pre.set_sensitive(True)
             else:
                 self.but_pre.set_sensitive(False)
-            if access['delete'] and not readonly and deletable:
-                self.but_del.set_sensitive(True)
-                self.but_undel.set_sensitive(True)
+            self.but_del.set_sensitive(bool(
+                    not readonly
+                    and access['delete']
+                    and deletable))
+            self.but_undel.set_sensitive(bool(not readonly))
         else:
             self.but_del.set_sensitive(False)
             self.but_undel.set_sensitive(False)
@@ -399,7 +401,7 @@ class WinForm(NoModal, InfoBar):
         cancel_responses = [
             Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT]
         self.screen.current_view.set_value()
-        readonly = self.screen.readonly or self.screen.group.readonly
+        readonly = self.screen.group.readonly
         if (response_id not in cancel_responses
                 and not readonly
                 and self.screen.current_record is not None):

{tryton-6.0.39 → tryton-6.0.41}/tryton.egg-info/PKG-INFO

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