tryton 6.6.6__tar.gz → 6.6.8__tar.gz

{tryton-6.6.6 → tryton-6.6.8}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.6.8 - 2023-05-17
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 6.6.7 - 2023-05-03
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.6.6 - 2023-03-04
 --------------------------
 * Bug fixes (see mercurial logs for details)

{tryton-6.6.6 → tryton-6.6.8}/PKG-INFO

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

{tryton-6.6.6 → tryton-6.6.8}/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.6.6"
+__version__ = "6.6.8"
 import locale
 
 import gi

{tryton-6.6.6 → tryton-6.6.8}/tryton/common/common.py

@@ -450,9 +450,9 @@ def file_selection(title, filename='',
     win.add_buttons(*buttons)
     win.set_icon(TRYTON_ICON)
     if filename:
-        filename = slugify(filename)
         if action in (Gtk.FileChooserAction.SAVE,
                 Gtk.FileChooserAction.CREATE_FOLDER):
+            filename = _slugify_filename(filename)
             win.set_current_name(filename)
         else:
             win.set_filename(filename)
@@ -507,15 +507,19 @@ def slugify(value):
     return _slugify_hyphenate_re.sub('-', value)
 
 
-def file_write(filename, data):
-    if isinstance(data, str):
-        data = data.encode('utf-8')
-    dtemp = tempfile.mkdtemp(prefix='tryton_')
+def _slugify_filename(filename):
     if not isinstance(filename, str):
         name, ext = filename
     else:
         name, ext = os.path.splitext(filename)
-    filename = ''.join([slugify(name), os.extsep, slugify(ext)])
+    return ''.join([slugify(name), os.extsep, slugify(ext)])
+
+
+def file_write(filename, data):
+    if isinstance(data, str):
+        data = data.encode('utf-8')
+    dtemp = tempfile.mkdtemp(prefix='tryton_')
+    filename = _slugify_filename(filename)
     filepath = os.path.join(dtemp, filename)
     with open(filepath, 'wb') as fp:
         fp.write(data)
@@ -1197,6 +1201,7 @@ class RPCProgress(object):
         self.res = None
         self.error = False
         self.exception = None
+        self._cursor_timeout = None
 
     def start(self):
         try:
@@ -1221,7 +1226,7 @@ class RPCProgress(object):
             # Parent is only useful if it is asynchronous
             # otherwise the cursor is not updated.
             self.parent = get_toplevel_window()
-            GLib.timeout_add(3000, self._set_cursor)
+            self._cursor_timeout = GLib.timeout_add(3000, self._set_cursor)
             _thread.start_new_thread(self.start, ())
             return
         else:
@@ -1229,6 +1234,7 @@ class RPCProgress(object):
             return self.process()
 
     def _set_cursor(self):
+        self._cursor_timeout = None
         if self.parent:
             window = self.parent.get_window()
             if window:
@@ -1238,9 +1244,11 @@ class RPCProgress(object):
                 window.set_cursor(watch)
 
     def process(self):
+        if self._cursor_timeout:
+            GLib.source_remove(self._cursor_timeout)
+            self._cursor_timeout = None
         if self.parent and self.parent.get_window():
             self.parent.get_window().set_cursor(None)
-            self.parent = None
 
         if self.exception and self.process_exception_p:
             def rpc_execute(*args):

{tryton-6.6.6 → tryton-6.6.8}/tryton/gui/main.py

@@ -971,6 +971,7 @@ class Main(Gtk.Application):
                 return
 
         def open_model(path):
+            attributes = {}
             model, path = (path.split('/', 1) + [''])[:2]
             if not model:
                 return
@@ -978,7 +979,9 @@ class Main(Gtk.Application):
             mode = None
             try:
                 view_ids = json.loads(params.get('views', '[]'))
-                limit = json.loads(params.get('limit', 'null'))
+                if 'limit' in params:
+                    attributes['limit'] = json.loads(
+                        params.get('limit', 'null'))
                 name = json.loads(params.get('name', '""'))
                 search_value = json.loads(params.get('search_value', '[]'),
                     object_hook=object_hook)
@@ -1006,9 +1009,9 @@ class Main(Gtk.Application):
                     context_model=context_model,
                     mode=mode,
                     name=name,
-                    limit=limit,
                     search_value=search_value,
-                    tab_domain=tab_domain)
+                    tab_domain=tab_domain,
+                    **attributes)
             except Exception:
                 # Prevent crashing the client
                 return

{tryton-6.6.6 → tryton-6.6.8}/tryton/gui/window/view_form/model/field.py

@@ -251,6 +251,10 @@ class MultiSelectionField(Field):
         return value
 
     def set_client(self, record, value, force_change=False):
+        if value is None:
+            value = []
+        if isinstance(value, str):
+            value = [value]
         if value:
             value = sorted(value)
         super().set_client(record, value, force_change=force_change)

{tryton-6.6.6 → tryton-6.6.8}/tryton/gui/window/win_export.py

@@ -371,18 +371,19 @@ class WinExport(WinCSV):
                 fname = common.file_selection(_('Save As...'),
                         action=Gtk.FileChooserAction.SAVE)
                 if fname:
-                    self.export_csv(fname, data, paths)
+                    self.export_csv(fname, data, paths, header=header)
             else:
                 fileno, fname = tempfile.mkstemp(
                     '.csv', common.slugify(self.name) + '_')
-                if self.export_csv(fname, data, paths, popup=False):
+                if self.export_csv(
+                        fname, data, paths, popup=False, header=header):
                     os.close(fileno)
                     common.file_open(fname, 'csv')
                 else:
                     os.close(fileno)
         self.destroy()
 
-    def export_csv(self, fname, data, paths, popup=True):
+    def export_csv(self, fname, data, paths, popup=True, header=False):
         encoding = self.csv_enc.get_active_text() or 'utf_8_sig'
         locale_format = self.csv_locale.get_active()
 
@@ -397,10 +398,13 @@ class WinExport(WinCSV):
                     writer.writerow(self.format_row(
                             row, indent=indent, locale_format=locale_format))
             if popup:
-                if len(data) == 1:
-                    common.message(_('%d record saved.') % len(data))
+                size = len(data)
+                if header:
+                    size -= 1
+                if size <= 1:
+                    common.message(_('%d record saved.') % size)
                 else:
-                    common.message(_('%d records saved.') % len(data))
+                    common.message(_('%d records saved.') % size)
             return True
         except (IOError, UnicodeEncodeError, csv.Error) as exception:
             common.warning(str(exception), _('Export failed'))
@@ -470,7 +474,8 @@ class WinExport(WinCSV):
         else:
             domain = self.screen.search_domain(
                 self.screen.screen_container.get_text())
-            if not self.ignore_search_limit.get_active():
+            if (not self.ignore_search_limit.get_active()
+                    and self.screen.limit is not None):
                 query_string.append(('s', str(self.screen.limit)))
                 query_string.append(
                     ('p', str(self.screen.offset // self.screen.limit)))

{tryton-6.6.6 → tryton-6.6.8}/tryton.egg-info/PKG-INFO

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