tryton 7.0.21__py3-none-any.whl → 7.2.0__py3-none-any.whl

tryton/gui/window/view_form/model/record.py

@@ -1,6 +1,8 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
+import functools
 import logging
+import operator
 
 import tryton.common as common
 from tryton.common import RPCException, RPCExecute
@@ -12,6 +14,30 @@ from . import field as fields
 logger = logging.getLogger(__name__)
 
 
+def get_x2m_sub_fields(f_attrs, prefix):
+    if f_attrs['loading'] == 'eager' and f_attrs.get('views'):
+        sub_fields = functools.reduce(
+            operator.or_,
+            (v.get('fields', {}) for v in f_attrs['views'].values()),
+            {})
+        x2m_sub_fields = []
+        for s_field, f_def in sub_fields.items():
+            x2m_sub_fields.append(f"{prefix}.{s_field}")
+            if f_def['type'] in {'many2one', 'one2one', 'reference'}:
+                x2m_sub_fields.append(f"{prefix}.{s_field}.rec_name")
+            elif f_def['type'] in {'selection', 'multiselection'}:
+                x2m_sub_fields.append(f"{prefix}.{s_field}:string")
+            elif f_def['type'] in {'one2many', 'many2many'}:
+                x2m_sub_fields.extend(
+                    get_x2m_sub_fields(f_def, f"{prefix}.{s_field}"))
+        x2m_sub_fields.extend(
+            f"{prefix}.{f}"
+            for f in ['_timestamp', '_write', '_delete'])
+        return x2m_sub_fields
+    else:
+        return []
+
+
 class Record:
 
     id = -1
@@ -79,6 +105,7 @@ class Record:
             fnames = [fname for fname, field in fields
                 if fname not in self._loaded
                 and (not views or (views & field.views))]
+            related_read_limit = 0
             for fname in list(fnames):
                 f_attrs = self.group.fields[fname].attrs
                 if f_attrs['type'] in {'many2one', 'one2one', 'reference'}:
@@ -86,6 +113,11 @@ class Record:
                 elif (f_attrs['type'] in {'selection', 'multiselection'}
                         and f_attrs.get('loading', 'lazy') == 'eager'):
                     fnames.append('%s:string' % fname)
+                elif f_attrs['type'] in {'many2many', 'one2many'}:
+                    sub_fields = get_x2m_sub_fields(f_attrs, fname)
+                    fnames.extend(sub_fields)
+                    if sub_fields:
+                        related_read_limit += len(sub_fields)
             if 'rec_name' not in fnames:
                 fnames.append('rec_name')
             fnames.extend(['_timestamp', '_write', '_delete'])
@@ -132,22 +164,24 @@ class Record:
             ctx.update(dict(('%s.%s' % (self.model_name, fname), 'size')
                     for fname, field in self.group.fields.items()
                     if field.attrs['type'] == 'binary' and fname in fnames))
+            if related_read_limit:
+                ctx['related_read_limit'] = (
+                    CONFIG['client.limit'] // min(related_read_limit, 10))
+            exception = False
             try:
                 values = RPCExecute('model', self.model_name, 'read',
                     list(id2record.keys()), fnames, context=ctx,
                     process_exception=process_exception)
             except RPCException:
-                for record in id2record.values():
-                    record.exception = True
-                if process_exception:
-                    values = [{'id': x} for x in id2record]
-                    default_values = {f: None for f in fnames if f != 'id'}
-                    for value in values:
-                        value.update(default_values)
-                else:
-                    raise
+                values = [{'id': x} for x in id2record]
+                default_values = dict((f, None) for f in fnames)
+                for value in values:
+                    value.update(default_values)
+                self.exception = exception = True
             id2value = dict((value['id'], value) for value in values)
             for id, record in id2record.items():
+                if not record.exception:
+                    record.exception = exception
                 value = id2value.get(id)
                 if record and not record.destroyed and value:
                     for key in record.modified_fields:
@@ -376,7 +410,6 @@ 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:
@@ -386,7 +419,7 @@ class Record:
                 vals = RPCExecute('model', self.model_name, 'default_get',
                     list(self.group.fields.keys()), context=context)
             except RPCException:
-                return vals
+                return
             if (self.parent
                     and self.parent_name in self.group.fields):
                 parent_field = self.group.fields[self.parent_name]
@@ -498,7 +531,9 @@ class Record:
             self._loaded.add(fieldname)
             fieldnames.append(fieldname)
         for fieldname, value in later.items():
-            self.group.fields[fieldname].set(self, value)
+            if isinstance(
+                    field := self.group.fields[fieldname], fields.O2MField):
+                field.set(self, value, preloaded=val.get(f"{fieldname}."))
             self._loaded.add(fieldname)
             fieldnames.append(fieldname)
         if validate:
@@ -682,7 +717,8 @@ class Record:
         try:
             res = RPCExecute(
                 'model', self.model_name,
-                'autocomplete_' + fieldname, args, context=self.get_context())
+                'autocomplete_' + fieldname, args, context=self.get_context(),
+                process_exception=False)
         except RPCException:
             # ensure res is a list
             res = []
@@ -691,9 +727,12 @@ class Record:
     def on_scan_code(self, code, depends):
         depends = self.expr_eval(depends)
         values = self._get_on_change_args(depends)
-        changes = RPCExecute(
-            'model', self.model_name, 'on_scan_code', values, code,
-            context=self.get_context(), process_exception=False)
+        try:
+            changes = RPCExecute(
+                'model', self.model_name, 'on_scan_code', values, code,
+                context=self.get_context(), process_exception=False)
+        except RPCException:
+            changes = []
         self.set_on_change(changes)
         self.set_modified()
         return bool(changes)

tryton/gui/window/view_form/screen/screen.py

@@ -75,8 +75,7 @@ class Screen:
         self.__current_record = None
         self.new_group(context or {})
         self.current_record = None
-        self.screen_container = ScreenContainer(
-            self, attributes.get('tab_domain'))
+        self.screen_container = ScreenContainer(attributes.get('tab_domain'))
         self.screen_container.alternate_view = attributes.get(
             'alternate_view', False)
         self.widget = self.screen_container.widget_get()
@@ -164,6 +163,7 @@ 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()
@@ -307,7 +307,8 @@ class Screen:
                 try:
                     self.search_count = RPCExecute(
                         'model', self.model_name, 'search_count',
-                        domain, 0, self.count_limit, context=context)
+                        domain, 0, self.count_limit, context=context,
+                        process_exception=False)
                 except RPCException:
                     self.search_count = 0
             else:
@@ -536,6 +537,10 @@ class Screen:
     def number_of_views(self):
         return len(self.views) + len(self.view_to_load)
 
+    @property
+    def view_index(self):
+        return self.__current_view
+
     def switch_view(
             self, view_type=None, view_id=None, creatable=None, display=True):
         if view_id is not None:
@@ -800,9 +805,6 @@ 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()
 
@@ -852,12 +854,11 @@ class Screen:
         parent = self.parent.id if self.parent else None
         if parent is not None and parent < 0:
             return
-        state = self.tree_states[parent][view.children_field]
-        if state:
-            expanded_nodes, selected_nodes = state
-        else:
-            expanded_nodes, selected_nodes = [], []
+        expanded_nodes, selected_nodes = [], []
         if view.view_type in {'tree', 'list-form'}:
+            state = self.tree_states[parent][view.children_field]
+            if state:
+                expanded_nodes, selected_nodes = state
             if (state is None
                     and CONFIG['client.save_tree_state']
                     and int(view.attributes.get('tree_state', False))):
@@ -905,8 +906,7 @@ class Screen:
                     for widget in widgets:
                         if hasattr(widget, 'screen'):
                             widget.screen.save_tree_state(store)
-            if view == self.current_view and view.view_type == 'form':
-                if self.current_record:
+                if len(self.views) == 1 and self.current_record:
                     path = self.current_record.id
                     if path < 0:
                         path = -self.current_record.group.index(
@@ -920,9 +920,8 @@ class Screen:
                 else:
                     paths = []
                 selected_paths = view.get_selected_paths()
-                if view == self.current_view:
-                    self.tree_states[parent][view.children_field] = (
-                        paths, selected_paths)
+                self.tree_states[parent][view.children_field] = (
+                    paths, selected_paths)
                 if (store
                         and int(view.attributes.get('tree_state', False))
                         and CONFIG['client.save_tree_state']):
@@ -936,7 +935,7 @@ class Screen:
                             json_paths, json_selected_path,
                             process_exception=False)
                         clear_cache('model.ir.ui.view_tree_state.get')
-                    except Exception:
+                    except RPCException:
                         logger.warn(
                             _('Unable to set view tree state'), exc_info=True)
 
@@ -1169,6 +1168,8 @@ class Screen:
     def selected_paths(self):
         if self.current_view and self.current_view.view_type == 'tree':
             return self.current_view.get_selected_paths()
+        else:
+            return []
 
     @property
     def listed_records(self):
@@ -1237,7 +1238,6 @@ class Screen:
             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)
         else:
             self._button_instance(button)
@@ -1329,13 +1329,13 @@ class Screen:
         if name:
             query_string.append(
                 ('name', json.dumps(name, separators=(',', ':'))))
-        if self.screen_container.tab_domain:
-            query_string.append(('tab_domain', json.dumps(
-                        self.screen_container.tab_domain,
-                        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 and self.current_view.view_type != 'form':
+            if self.screen_container.tab_domain:
+                query_string.append(('tab_domain', json.dumps(
+                            self.screen_container.tab_domain,
+                            cls=JSONEncoder, separators=(',', ':'))))
             if self.search_value:
                 search_value = self.search_value
             else:

tryton/gui/window/view_form/view/calendar_gtk/calendar_.py

@@ -67,18 +67,13 @@ class Calendar_(goocalendar.Calendar):
             self.current_domain_period.get_dates(True)
         dtstart = self.attrs['dtstart']
         dtend = self.attrs.get('dtend') or dtstart
-        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)],
-                ],
-            ]
+        domain = ['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/gui/window/view_form/view/form.py

@@ -230,6 +230,9 @@ class FormXMLViewParser(XMLViewParser):
             self.container.add(None, attributes)
             return
 
+        if attributes.get('loading') == 'eager':
+            self.field_attrs[name]['loading'] = 'eager'
+
         widget = self.WIDGETS[attributes['widget']](self.view, attributes)
         self.view.widgets[name].append(widget)
 
@@ -340,18 +343,7 @@ class FormXMLViewParser(XMLViewParser):
                 int(attributes.get('width', -1)),
                 int(attributes.get('height', -1)))
 
-        # Force to display the first time it switches on a page
-        # This avoids glitch in position of widgets
-        def switch(notebook, page, page_num):
-            if not self.view.widget:
-                # Not yet finish to parse
-                return
-            notebook.grab_focus()
-            self.view.display()
-            notebook.disconnect(handler_id)
-        handler_id = notebook.connect('switch-page', switch)
         self.view.state_widgets.append(notebook)
-
         self.view.notebooks.append(notebook)
         self.container.add(notebook, attributes)
         self.parse_child(node, notebook)
@@ -390,6 +382,7 @@ 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)
@@ -413,9 +406,6 @@ 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/gui/window/view_form/view/form_gtk/binary.py

@@ -182,13 +182,13 @@ class Binary(BinaryMixin, Widget):
     def sig_key_press(self, widget, event, *args):
         editable = self.wid_text and self.wid_text.get_editable()
         if event.keyval == Gdk.KEY_F3 and editable:
-            self.select(widget)
+            self.sig_new(widget)
             return True
         elif event.keyval == Gdk.KEY_F2:
             if self.filename:
-                self.open_()
+                self.sig_open(widget)
             else:
-                self.save_as()
+                self.sig_save_as(widget)
             return True
         return False
 

tryton/gui/window/view_form/view/form_gtk/dictionary.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.
 
-import datetime as dt
 import decimal
 import gettext
 import locale
@@ -65,7 +64,7 @@ class DictEntry(object):
         return self.widget.get_text()
 
     def set_value(self, value):
-        self.widget.set_text(str(value or ''))
+        self.widget.set_text(value or '')
         reset_position(self.widget)
 
     def set_readonly(self, readonly):
@@ -242,10 +241,9 @@ class DictMultiSelectionEntry(DictEntry):
         selection.handler_block_by_func(self._changed)
         try:
             selection.unselect_all()
-            if value:
-                for v in value:
-                    if v in value2path:
-                        selection.select_path(value2path[v])
+            for v in value:
+                if v in value2path:
+                    selection.select_path(value2path[v])
         finally:
             selection.handler_unblock_by_func(self._changed)
 
@@ -280,7 +278,7 @@ class DictIntegerEntry(DictEntry):
         return None
 
     def set_value(self, value):
-        if isinstance(value, (int, float, Decimal)):
+        if value is not None:
             txt_val = locale.format_string('%d', value, True)
         else:
             txt_val = ''
@@ -317,7 +315,7 @@ class DictFloatEntry(DictIntegerEntry):
         else:
             self.widget.digits = None
         self.widget.set_width_chars(self.width)
-        if isinstance(value, (int, float, Decimal)):
+        if value is not None:
             txt_val = locale.localize(
                 '{0:.{1}f}'.format(value, digits[1]), True)
         else:
@@ -363,8 +361,7 @@ class DictDateTimeEntry(DictEntry):
         return untimezoned_date(self.widget.props.value)
 
     def set_value(self, value):
-        self.widget.props.value = (
-            timezoned_date(value) if isinstance(value, dt.datetime) else None)
+        self.widget.props.value = timezoned_date(value)
 
     def set_readonly(self, readonly):
         for child in self.widget.get_children():
@@ -399,7 +396,7 @@ class DictDateEntry(DictEntry):
         return self.widget.props.value
 
     def set_value(self, value):
-        self.widget.props.value = value if isinstance(value, dt.date) else None
+        self.widget.props.value = value
 
     def set_readonly(self, readonly):
         super().set_readonly(readonly)
@@ -473,6 +470,7 @@ class DictWidget(Widget):
 
         self._readonly = False
         self._record_id = None
+        self._popup = False
 
     @property
     def _invalid_widget(self):
@@ -494,10 +492,16 @@ class DictWidget(Widget):
         value = self.wid_text.get_text()
         domain = self.field.domain_get(self.record)
 
+        if self._popup:
+            return
+        else:
+            self._popup = True
+
         def callback(result):
             if result:
                 self.add_new_keys([r[0] for r in result])
             self.wid_text.set_text('')
+            self._popup = False
 
         win = WinSearch(self.schema_model, callback, sel_multi=True,
             context=context, domain=domain, new=False)
@@ -507,15 +511,13 @@ class DictWidget(Widget):
     def add_new_keys(self, ids):
         new_keys = self.field.add_new_keys(ids, self.record)
         self.send_modified()
-        focus = False
-        for key_name in new_keys:
-            if key_name not in self.fields:
-                self.add_line(key_name)
-                if not focus:
-                    # Use idle add because it can be called from the callback
-                    # of WinSearch while the popup is still there
-                    GLib.idle_add(self.fields[key_name].widget.grab_focus)
-                    focus = True
+        value = self.field.get_client(self.record)
+        value.update({k: None for k in new_keys})
+        self.display()
+
+        # Use idle add because it can be called from the callback
+        # of WinSearch while the popup is still there
+        GLib.idle_add(self.fields[new_keys[0]].widget.grab_focus)
 
     def _sig_remove(self, button, key, modified=True):
         self.fields[key].disconnect_signals()
@@ -561,7 +563,7 @@ class DictWidget(Widget):
                     not self._readonly
                     and self.attrs.get('delete', True)))
 
-    def add_line(self, key):
+    def add_line(self, key, position):
         key_schema = self.field.keys[key]
         self.fields[key] = DICT_ENTRIES[key_schema['type']](key, self)
         field = self.fields[key]
@@ -569,8 +571,8 @@ class DictWidget(Widget):
         label = Gtk.Label(
             label=set_underline(text),
             use_underline=True, halign=Gtk.Align.END)
-        self.grid.attach_next_to(
-            label, None, Gtk.PositionType.BOTTOM, 1, 1)
+        self.grid.insert_row(position)
+        self.grid.attach(label, 0, position, 1, 1)
         label.set_mnemonic_widget(field.widget)
         label.show()
         hbox = Gtk.HBox(hexpand=True)
@@ -607,6 +609,11 @@ class DictWidget(Widget):
             self.field.add_keys(list(new_key_names), self.record)
         decoder = PYSONDecoder()
 
+        # We remove first the old keys in order to keep the order when
+        # inserting the new ones
+        for key in set(self.fields.keys()) - set(value.keys()):
+            self._sig_remove(None, key, modified=False)
+
         def filter_func(item):
             key, value = item
             return key in self.field.keys
@@ -615,9 +622,10 @@ class DictWidget(Widget):
             key, value = item
             return self.field.keys[key]['sequence'] or 0
 
-        for key, val in sorted(filter(filter_func, value.items()), key=key):
+        for position, (key, val) in enumerate(
+                sorted(filter(filter_func, value.items()), key=key)):
             if key not in self.fields:
-                self.add_line(key)
+                self.add_line(key, position)
             widget = self.fields[key]
             widget.set_value(val)
             widget.set_readonly(self._readonly)
@@ -625,8 +633,6 @@ class DictWidget(Widget):
                 self.field.keys[key].get('domain') or '[]')
             widget_class(
                 widget.widget, 'invalid', not eval_domain(key_domain, value))
-        for key in set(self.fields.keys()) - set(value.keys()):
-            self._sig_remove(None, key, modified=False)
 
         self._set_button_sensitive()
 

tryton/gui/window/view_form/view/form_gtk/document.py

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

tryton/gui/window/view_form/view/form_gtk/many2many.py

@@ -48,7 +48,6 @@ class Many2Many(Widget):
         self.wid_text.set_placeholder_text(_('Search'))
         self.wid_text.set_property('width_chars', 13)
         self.wid_text.connect('focus-out-event', self._focus_out)
-        self.focus_out = True
         hbox.pack_start(self.wid_text, expand=True, fill=True, padding=0)
 
         if int(self.attrs.get('completion', 1)):
@@ -113,6 +112,8 @@ class Many2Many(Widget):
         self.screen.widget.connect('key_press_event', self.on_keypress)
         self.wid_text.connect('key_press_event', self.on_keypress)
 
+        self._popup = False
+
     def on_keypress(self, widget, event):
         editable = self.wid_text.get_editable()
         activate_keys = [Gdk.KEY_Tab, Gdk.KEY_ISO_Left_Tab]
@@ -161,8 +162,6 @@ class Many2Many(Widget):
         return int(self.attrs.get('create', 1)) and self.get_access('create')
 
     def _sig_add(self, *args):
-        if not self.focus_out:
-            return
         domain = self.field.domain_get(self.record)
         add_remove = self.record.expr_eval(self.attrs.get('add_remove'))
         if add_remove:
@@ -171,15 +170,18 @@ class Many2Many(Widget):
         order = self.field.get_search_order(self.record)
         value = self.wid_text.get_text()
 
-        self.focus_out = False
+        if self._popup:
+            return
+        else:
+            self._popup = True
 
         def callback(result):
-            self.focus_out = True
             if result:
                 ids = [x[0] for x in result]
                 self.screen.load(ids, modified=True)
             self.screen.set_cursor()
             self.wid_text.set_text('')
+            self._popup = False
         win = WinSearch(self.attrs['relation'], callback, sel_multi=True,
             context=context, domain=domain, order=order,
             view_ids=self.attrs.get('view_ids', '').split(','),
@@ -215,6 +217,10 @@ class Many2Many(Widget):
     def _sig_edit(self):
         if not self.screen.current_record:
             return
+        if self._popup:
+            return
+        else:
+            self._popup = True
         # Create a new screen that is not linked to the parent otherwise on the
         # save of the record will trigger the save of the parent
         screen = self._get_screen_form()
@@ -231,22 +237,26 @@ class Many2Many(Widget):
                     self.screen.current_record.modified_fields.setdefault('id')
                 # Force a display to clear the CellCache
                 self.screen.display()
+            self._popup = False
         WinForm(screen, callback)
 
     def _sig_new(self, defaults=None):
+        if self._popup:
+            return
+        else:
+            self._popup = True
         screen = self._get_screen_form()
         defaults = defaults.copy() if defaults is not None else {}
         defaults['rec_name'] = self.wid_text.get_text()
 
         def callback(result):
-            self.focus_out = True
             if result:
                 record = screen.current_record
                 self.screen.load([record.id], modified=True)
             self.wid_text.set_text('')
             self.wid_text.grab_focus()
+            self._popup = False
 
-        self.focus_out = False
         WinForm(
             screen, callback, new=True, save_current=True, defaults=defaults)