tryton 7.2.13__py3-none-any.whl → 7.4.4__py3-none-any.whl

tryton/gui/window/view_form/view/list.py

@@ -5,6 +5,7 @@ import gettext
 import json
 import locale
 import sys
+from collections import defaultdict
 from functools import wraps
 from io import StringIO
 
@@ -336,7 +337,7 @@ class TreeXMLViewParser(XMLViewParser):
         self.view.treeview.append_column(column)
 
         if 'optional' in attributes and name != self.exclude_field:
-            self.view.optionals.append(column)
+            self.view.optionals[column.name].append(column)
 
     def _parse_button(self, node, attributes):
         button = Button(self.view, attributes)
@@ -437,7 +438,7 @@ class ViewTree(View):
 
     def __init__(self, view_id, screen, xml, children_field):
         self.children_field = children_field
-        self.optionals = []
+        self.optionals = defaultdict(list)
         self.sum_widgets = []
         self.sum_box = Gtk.HBox()
         self.treeview = None
@@ -451,6 +452,8 @@ class ViewTree(View):
             grid_lines = Gtk.TreeViewGridLines.VERTICAL
 
         super().__init__(view_id, screen, xml)
+
+        self.set_selection_column()
         self.set_drag_and_drop()
 
         self.mnemonic_widget = self.treeview
@@ -519,21 +522,27 @@ class ViewTree(View):
             self.treeview.append_column(column)
 
     def optional_menu(self, column):
-        def toggle(menuitem, column):
-            column.set_visible(menuitem.get_active())
+        def toggle(menuitem, columns):
+            visible = menuitem.get_active()
+            for column in columns:
+                column.set_visible(visible)
             self.save_optional()
 
         widget = column.get_widget()
         menu = Gtk.Menu()
-        for optional in self.optionals:
-            menuitem = Gtk.CheckMenuItem(label=optional.get_title())
-            menuitem.set_active(optional.get_visible())
-            menuitem.connect('toggled', toggle, optional)
+        for name, columns in self.optionals.items():
+            visible = any(c.get_visible() for c in columns)
+            title = ' / '.join({c.get_title() for c in columns})
+            menuitem = Gtk.CheckMenuItem(label=title)
+            menuitem.set_active(visible)
+            menuitem.connect('toggled', toggle, columns)
             menu.add(menuitem)
         popup(menu, widget)
 
     def save_optional(self):
-        fields = {c.name: not c.get_visible() for c in self.optionals}
+        fields = {}
+        for name, columns in self.optionals.items():
+            fields[name] = all(not c.get_visible() for c in columns)
         try:
             RPCExecute(
                 'model', 'ir.ui.view_tree_optional', 'set_optional',
@@ -616,6 +625,21 @@ class ViewTree(View):
                     else:
                         arrow.clear()
 
+    def set_selection_column(self):
+        def select_data_func(column, cell, model, iter_, selection):
+            cell.set_property('active', selection.iter_is_selected(iter_))
+
+        selection = self.treeview.get_selection()
+        column = Gtk.TreeViewColumn()
+        column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
+        column.name = None
+        column._type = 'selection'
+        cell = Gtk.CellRendererToggle()
+        cell.set_sensitive(False)
+        column.pack_start(cell, expand=False)
+        column.set_cell_data_func(cell, select_data_func, selection)
+        self.treeview.insert_column(column, 0)
+
     def set_drag_and_drop(self):
         dnd = False
         if self.children_field:
@@ -741,7 +765,10 @@ class ViewTree(View):
             clipboard = self.treeview.get_clipboard(clipboard_type)
             selection = self.treeview.get_selection()
             data = StringIO()
-            writer = csv.writer(data, delimiter='\t', lineterminator='\n')
+            lineterminator = (
+                '\n' if selection.count_selected_rows() > 1 else '')
+            writer = csv.writer(
+                data, delimiter='\t', lineterminator=lineterminator)
             selection.selected_foreach(copy_foreach, writer.writerow)
             clipboard.set_text(data.getvalue(), -1)
 
@@ -1129,9 +1156,14 @@ class ViewTree(View):
                 selection.select_path(path)
             # The search column must be set each time the model is changed
             self.treeview.set_search_column(0)
+        selection = self.treeview.get_selection()
         if not current_record:
-            selection = self.treeview.get_selection()
             selection.unselect_all()
+        else:
+            model = self.treeview.get_model()
+            path = Gtk.TreePath(current_record.get_index_path(model.group))
+            if not selection.path_is_selected(path):
+                selection.select_path(path)
         self.treeview.queue_draw()
         if self.editable:
             self.set_state()
@@ -1155,7 +1187,8 @@ class ViewTree(View):
                 continue
             widget = self.get_column_widget(column)
             widget.set_editable()
-            if column.name in tree_column_optional:
+            if ('optional' in widget.attrs
+                    and column.name in tree_column_optional):
                 optional = tree_column_optional[column.name]
             else:
                 optional = bool(int(widget.attrs.get('optional', '0')))
@@ -1174,7 +1207,7 @@ class ViewTree(View):
                 column.set_visible(not unique or bool(self.children_field))
         if self.children_field:
             for i, column in enumerate(self.treeview.get_columns()):
-                if (self.draggable or self.optionals) and not i:
+                if column._type in {'selection', 'optional', 'drag'}:
                     continue
                 if column.get_visible():
                     self.treeview.set_expander_column(column)
@@ -1241,9 +1274,9 @@ class ViewTree(View):
             label.set_text(text)
 
     def set_cursor(self, new=False, reset_view=True):
-        self.treeview.grab_focus()
         model = self.treeview.get_model()
         if self.record and model and self.treeview.get_realized():
+            self.treeview.grab_focus()
             path = self.record.get_index_path(model.group)
             if model.get_flags() & Gtk.TreeModelFlags.LIST_ONLY:
                 path = (path[0],)
@@ -1267,6 +1300,8 @@ class ViewTree(View):
         records = []
         sel = self.treeview.get_selection()
         sel.selected_foreach(_func_sel_get, records)
+        if not records and self.record:
+            records.append(self.record)
         return records
 
     def get_selected_paths(self):

tryton/gui/window/win_csv.py

@@ -7,8 +7,7 @@ import sys
 
 from gi.repository import Gdk, GObject, Gtk
 
-from tryton.common import IconFactory
-from tryton.common.underline import set_underline
+from tryton.common import IconFactory, RPCExecute
 from tryton.config import TRYTON_ICON
 from tryton.gui import Main
 from tryton.gui.window.nomodal import NoModal
@@ -36,6 +35,11 @@ class WinCSV(NoModal):
     def __init__(self, *args, **kwargs):
         super(WinCSV, self).__init__(*args, **kwargs)
 
+        self.languages = RPCExecute(
+            'model', 'ir.lang', 'search_read', [
+                ('translatable', '=', True),
+                ], 0, None, [('name', 'DESC')], ['code', 'name'])
+
         self.dialog = Gtk.Dialog(
             transient_for=self.parent, destroy_with_parent=True)
         Main().add_window(self.dialog)
@@ -172,16 +176,6 @@ class WinCSV(NoModal):
 
         self.add_csv_header_param(box)
 
-        button_cancel = self.dialog.add_button(
-            set_underline(_("Cancel")), Gtk.ResponseType.CANCEL)
-        button_cancel.set_image(IconFactory.get_image(
-                'tryton-cancel', Gtk.IconSize.BUTTON))
-
-        button_ok = self.dialog.add_button(
-            set_underline(_("OK")), Gtk.ResponseType.OK)
-        button_ok.set_image(IconFactory.get_image(
-                'tryton-ok', Gtk.IconSize.BUTTON))
-
         self.dialog.vbox.pack_start(
             dialog_vbox, expand=True, fill=True, padding=0)
 

tryton/gui/window/win_export.py

@@ -14,16 +14,19 @@ from numbers import Number
 from gi.repository import Gdk, GObject, Gtk
 
 import tryton.common as common
-from tryton.common import RPCException, RPCExecute, tempfile
+from tryton.common import IconFactory, RPCException, RPCExecute, tempfile
+from tryton.common.underline import set_underline
 from tryton.config import CONFIG
 from tryton.gui.window.win_csv import WinCSV
 from tryton.jsonrpc import JSONEncoder
 from tryton.rpc import CONNECTION, clear_cache
 
+from .infobar import InfoBar
+
 _ = gettext.gettext
 
 
-class WinExport(WinCSV):
+class WinExport(WinCSV, InfoBar):
     "Window export"
 
     def __init__(self, name, screen):
@@ -32,8 +35,23 @@ class WinExport(WinCSV):
         self.fields = {}
         super(WinExport, self).__init__()
         self.dialog.set_title(_('CSV Export: %s') % name)
-        # Hide as selected record is the default
-        self.ignore_search_limit.hide()
+        self.dialog.vbox.pack_start(
+            self.create_info_bar(), expand=False, fill=True, padding=0)
+        # Trigger changed event to update ignore search limit
+        active_index = self.selected_records.get_active()
+        self.selected_records.set_active(-1)
+        self.selected_records.set_active(active_index)
+
+        self.dialog.add_button(
+            set_underline(_("Close")), Gtk.ResponseType.CANCEL).set_image(
+                IconFactory.get_image('tryton-close', Gtk.IconSize.BUTTON))
+        self.dialog.add_button(
+            set_underline(_("Open")), Gtk.ResponseType.OK).set_image(
+                IconFactory.get_image('tryton-open', Gtk.IconSize.BUTTON))
+        self.dialog.add_button(
+            set_underline(_("Save As...")), Gtk.ResponseType.ACCEPT).set_image(
+                IconFactory.get_image('tryton-save', Gtk.IconSize.BUTTON))
+        self.dialog.set_default_response(Gtk.ResponseType.OK)
 
     @property
     def model(self):
@@ -50,6 +68,10 @@ class WinExport(WinCSV):
             and self.screen.current_view.view_type == 'tree'
             and self.screen.current_view.children_field)
 
+    @property
+    def screen_has_selected(self):
+        return bool(self.screen.selected_records)
+
     def add_buttons(self, box):
         button_save_export = Gtk.Button(
             label=_('_Save Export'), stock=None, use_underline=True)
@@ -113,19 +135,13 @@ class WinExport(WinCSV):
     def add_chooser(self, box):
         hbox_csv_export = Gtk.HBox()
         box.pack_start(hbox_csv_export, expand=False, fill=True, padding=0)
-        self.saveas = Gtk.ComboBoxText()
-        hbox_csv_export.pack_start(
-            self.saveas, expand=True, fill=True, padding=3)
-        self.saveas.append_text(_("Open"))
-        self.saveas.append_text(_("Save"))
-        self.saveas.set_active(0)
 
         self.selected_records = Gtk.ComboBoxText()
         hbox_csv_export.pack_start(
             self.selected_records, expand=True, fill=True, padding=3)
         self.selected_records.append_text(_("Listed Records"))
         self.selected_records.append_text(_("Selected Records"))
-        if not self.screen_is_tree:
+        if not self.screen_is_tree and self.screen_has_selected:
             self.selected_records.set_active(1)
         else:
             self.selected_records.set_active(0)
@@ -176,6 +192,13 @@ class WinExport(WinCSV):
                 if '.' not in name:
                     if field.get('relation'):
                         self.model1.insert(node, 0, [None, ''])
+                    elif field.get('translate', False):
+                        for language in self.languages:
+                            l_path = f"{path}:lang={language['code']}"
+                            l_string = f"{string_} ({language['name']})"
+                            self.model1.insert(
+                                node, 0, [language['name'], l_path])
+                            self.fields[l_path] = (l_string, None)
 
     def _get_fields(self, model):
         try:
@@ -334,7 +357,8 @@ class WinExport(WinCSV):
         self.model2.append((string_, name))
 
     def response(self, dialog, response):
-        if response == Gtk.ResponseType.OK:
+        self.info_bar_clear()
+        if response in {Gtk.ResponseType.OK, Gtk.ResponseType.ACCEPT}:
             fields = []
             iter = self.model2.get_iter_first()
             while iter:
@@ -378,7 +402,7 @@ class WinExport(WinCSV):
                 except RPCException:
                     data = []
 
-            if self.saveas.get_active():
+            if response == Gtk.ResponseType.ACCEPT:
                 fname = common.file_selection(_('Save As...'),
                         action=Gtk.FileChooserAction.SAVE)
                 if fname:
@@ -386,15 +410,15 @@ class WinExport(WinCSV):
             else:
                 fileno, fname = tempfile.mkstemp(
                     '.csv', common.slugify(self.name) + '_')
-                if self.export_csv(
-                        fname, data, paths, popup=False, header=header):
+                if self.export_csv(fname, data, paths, header=header):
                     os.close(fileno)
                     common.file_open(fname, 'csv')
                 else:
                     os.close(fileno)
-        self.destroy()
+        else:
+            self.destroy()
 
-    def export_csv(self, fname, data, paths, popup=True, header=False):
+    def export_csv(self, fname, data, paths, header=False):
         encoding = self.csv_enc.get_active_text() or 'utf_8_sig'
         locale_format = self.csv_locale.get_active()
 
@@ -408,14 +432,14 @@ class WinExport(WinCSV):
                 if row:
                     writer.writerow(self.format_row(
                             row, indent=indent, locale_format=locale_format))
-            if popup:
-                size = len(data)
-                if header:
-                    size -= 1
-                if size <= 1:
-                    common.message(_('%d record saved.') % size)
-                else:
-                    common.message(_('%d records saved.') % size)
+            size = len(data)
+            if header:
+                size -= 1
+            if size <= 1:
+                message = _('%d record saved.') % size
+            else:
+                message = _('%d records saved.') % size
+            self.info_bar_add(message, Gtk.MessageType.INFO)
             return True
         except (IOError, UnicodeEncodeError, csv.Error) as exception:
             common.warning(str(exception), _('Export failed'))

tryton/gui/window/win_import.py

@@ -10,7 +10,8 @@ from decimal import Decimal
 from gi.repository import Gtk
 
 import tryton.common as common
-from tryton.common import RPCException, RPCExecute
+from tryton.common import IconFactory, RPCException, RPCExecute
+from tryton.common.underline import set_underline
 from tryton.gui.window.win_csv import WinCSV
 
 _ = gettext.gettext
@@ -29,6 +30,16 @@ class WinImport(WinCSV):
         super(WinImport, self).__init__()
         self.dialog.set_title(_('CSV Import: %s') % name)
 
+        button_cancel = self.dialog.add_button(
+            set_underline(_("Cancel")), Gtk.ResponseType.CANCEL)
+        button_cancel.set_image(IconFactory.get_image(
+                'tryton-cancel', Gtk.IconSize.BUTTON))
+
+        button_ok = self.dialog.add_button(
+            set_underline(_("Import")), Gtk.ResponseType.OK)
+        button_ok.set_image(IconFactory.get_image(
+                'tryton-import', Gtk.IconSize.BUTTON))
+
     def add_buttons(self, box):
         button_autodetect = Gtk.Button(
             label=_('_Auto-Detect'), stock=None, use_underline=True)
@@ -67,22 +78,34 @@ class WinImport(WinCSV):
         fields_order = list(fields.keys())
         fields_order.sort(
             key=lambda x: fields[x].get('string', ''), reverse=True)
-        for field in fields_order:
-            if not fields[field].get('readonly', False) or field == 'id':
-                self.fields_data[prefix_field + field] = fields[field]
-                name = fields[field]['string'] or field
+        for field_name in fields_order:
+            field = fields[field_name]
+            if not field.get('readonly', False) or field_name == 'id':
+                self.fields_data[prefix_field + field_name] = field
+                name = field['string'] or field_name
                 node = self.model1.insert(
-                    parent_node, 0, [name, prefix_field + field])
+                    parent_node, 0, [name, prefix_field + field_name])
                 name = prefix_name + name
                 # Only One2Many can be nested for import
-                if fields[field]['type'] == 'one2many':
-                    relation = fields[field].get('relation')
+                if field['type'] == 'one2many':
+                    relation = field.get('relation')
                 else:
                     relation = None
-                self.fields[prefix_field + field] = (name, relation)
-                self.fields_invert[name] = prefix_field + field
+                self.fields[prefix_field + field_name] = (name, relation)
+                self.fields_invert[name] = prefix_field + field_name
                 if relation:
                     self.model1.insert(node, 0, [None, ''])
+                elif field.get('translate', False):
+                    for language in self.languages:
+                        l_field_name = f"{field_name}:lang={language['code']}"
+                        self.model1.insert(
+                            node, 0, [
+                                language['name'], prefix_field + l_field_name])
+                        l_name = prefix_name + name + f" ({language['name']})"
+                        self.fields[prefix_field + l_field_name] = (
+                            l_name, relation)
+                        self.fields_invert[l_name] = (
+                            prefix_field + l_field_name)
 
     def _get_fields(self, model):
         try:
@@ -185,7 +208,8 @@ class WinImport(WinCSV):
 
             fname = self.import_csv_file.get_filename()
             if fname:
-                self.import_csv(fname, fields)
+                if not self.import_csv(fname, fields):
+                    return
         self.destroy()
 
     def import_csv(self, fname, fields):
@@ -236,3 +260,4 @@ class WinImport(WinCSV):
             common.message(_('%d record imported.') % count)
         else:
             common.message(_('%d records imported.') % count)
+        return count

tryton/jsonrpc.py

@@ -11,12 +11,18 @@ import logging
 import socket
 import ssl
 import threading
+import time
 import xmlrpc.client
 from contextlib import contextmanager
 from decimal import Decimal
 from functools import partial, reduce
 from urllib.parse import quote, urljoin
 
+try:
+    from http import HTTPStatus
+except ImportError:
+    from http import client as HTTPStatus
+
 from .cache import CacheDict
 from .config import CONFIG
 
@@ -288,12 +294,29 @@ class ServerProxy(xmlrpc.client.ServerProxy):
 
         try:
             try:
-                response = self.__transport.request(
-                    self.__host,
-                    self.__handler,
-                    request,
-                    verbose=self.__verbose
-                    )
+                for i in range(5):
+                    try:
+                        response = self.__transport.request(
+                            self.__host,
+                            self.__handler,
+                            request,
+                            verbose=self.__verbose
+                            )
+                        break
+                    except xmlrpc.client.ProtocolError as e:
+                        if e.errcode == HTTPStatus.SERVICE_UNAVAILABLE:
+                            try:
+                                delay = int(e.headers.get('Retry-After', i))
+                            except ValueError:
+                                if isinstance(
+                                        e.errcode, HTTPStatus.GATEWAY_TIMEOUT):
+                                    # Do not retry on timeout without delay
+                                    raise
+                                delay = i
+                            delay = min(delay, 10)
+                            time.sleep(delay)
+                        else:
+                            raise
             except (socket.error, http.client.HTTPException) as v:
                 if (isinstance(v, socket.error)
                         and v.args[0] == errno.EPIPE):

tryton/pyson.py

@@ -712,7 +712,8 @@ class DateTime(Date):
                 and not isinstance(now, datetime.datetime)):
             now = datetime.datetime.combine(now, datetime.time())
         if not isinstance(now, datetime.datetime):
-            now = datetime.datetime.utcnow()
+            now = datetime.datetime.now(
+                datetime.timezone.utc).replace(tzinfo=None)
         return now + relativedelta(
             year=dct['y'],
             month=dct['M'],

tryton/tests/test_common_domain_parser.py

@@ -962,14 +962,26 @@ class DomainParserTestCase(TestCase):
                     },
                 'relation': {
                     'string': "Relation",
-                    'relation': 'relation',
                     'name': 'relation',
+                    'type': 'many2one',
                     'relation_fields': {
                         'name': {
                             'string': "Name",
                             'name': 'name',
                             'type': 'char',
                             },
+                        'm2o': {
+                            'string': "M2O",
+                            'name': 'm2o',
+                            'type': 'many2one',
+                            'relation_fields': {
+                                'foo': {
+                                    'string': "Foo",
+                                    'name': 'foo',
+                                    'type': 'integer',
+                                    },
+                                },
+                            },
                         },
                     },
                 })
@@ -1094,7 +1106,7 @@ class DomainParserTestCase(TestCase):
                 ])
         self.assertEqual(
             rlist(dom.parse_clause([('Many2One', None, 'John')])), [
-                ('many2one', 'ilike', '%John%'),
+                ('many2one.rec_name', 'ilike', '%John%'),
                 ])
         self.assertEqual(
             rlist(dom.parse_clause([('Many2One', None, ['John', 'Jane'])])), [
@@ -1103,9 +1115,18 @@ class DomainParserTestCase(TestCase):
         self.assertEqual(
             rlist(dom.parse_clause(iter([iter([['John']])]))), [
                 [('rec_name', 'ilike', '%John%')]])
+        self.assertEqual(
+            rlist(dom.parse_clause(iter([['Relation', None, "Test"]]))),
+            [('relation.rec_name', 'ilike', "%Test%")])
         self.assertEqual(
             rlist(dom.parse_clause(iter([['Relation.Name', None, "Test"]]))),
             [('relation.name', 'ilike', "%Test%")])
+        self.assertEqual(
+            rlist(dom.parse_clause(iter([['Relation.M2O', None, "Foo"]]))),
+            [('relation.m2o.rec_name', 'ilike', "%Foo%")])
+        self.assertEqual(
+            rlist(dom.parse_clause(iter([['Relation.M2O.Foo', None, '42']]))),
+            [('relation.m2o.foo', '=', 42)])
         self.assertEqual(
             rlist(dom.parse_clause(iter([['OR']]))),
             [('rec_name', 'ilike', "%OR%")])

{tryton-7.2.13.dist-info → tryton-7.4.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 7.2.13
+Version: 7.4.4
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
-Download-URL: http://downloads.tryton.org/7.2/
+Download-URL: http://downloads.tryton.org/7.4/
 Author: Tryton
 Author-email: foundation@tryton.org
 License: GPL-3