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

tryton/gui/window/view_form/view/form_gtk/dictionary.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.
 
+import datetime as dt
 import decimal
 import gettext
 import locale
@@ -64,7 +65,7 @@ class DictEntry(object):
         return self.widget.get_text()
 
     def set_value(self, value):
-        self.widget.set_text(value or '')
+        self.widget.set_text(str(value or ''))
         reset_position(self.widget)
 
     def set_readonly(self, readonly):
@@ -223,17 +224,24 @@ class DictMultiSelectionEntry(DictEntry):
             name = str(name)
             model.append((value, name))
 
-        name_column = Gtk.TreeViewColumn()
+        column = Gtk.TreeViewColumn()
+        select_cell = Gtk.CellRendererToggle()
+        select_cell.set_sensitive(False)
+        column.pack_start(select_cell, expand=False)
+        column.set_cell_data_func(select_cell, self._select_data_func)
         name_cell = Gtk.CellRendererText()
-        name_column.pack_start(name_cell, expand=True)
-        name_column.add_attribute(name_cell, 'text', 1)
-        self.tree.append_column(name_column)
+        column.pack_start(name_cell, expand=True)
+        column.add_attribute(name_cell, 'text', 1)
+        self.tree.append_column(column)
 
         return widget
 
+    def _select_data_func(self, column, cell, model, iter_, selection):
+        cell.set_property('active', selection.iter_is_selected(iter_))
+
     def get_value(self):
         model, paths = self.tree.get_selection().get_selected_rows()
-        return [model[path][0] for path in paths]
+        return [model[path][0] for path in paths] or None
 
     def set_value(self, value):
         value2path = {v: idx for idx, (v, _) in enumerate(self.selection)}
@@ -241,9 +249,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)
 
@@ -278,7 +287,7 @@ class DictIntegerEntry(DictEntry):
         return None
 
     def set_value(self, value):
-        if value is not None:
+        if isinstance(value, (int, float, Decimal)):
             txt_val = locale.format_string('%d', value, True)
         else:
             txt_val = ''
@@ -315,7 +324,7 @@ class DictFloatEntry(DictIntegerEntry):
         else:
             self.widget.digits = None
         self.widget.set_width_chars(self.width)
-        if value is not None:
+        if isinstance(value, (int, float, Decimal)):
             txt_val = locale.localize(
                 '{0:.{1}f}'.format(value, digits[1]), True)
         else:
@@ -361,7 +370,8 @@ class DictDateTimeEntry(DictEntry):
         return untimezoned_date(self.widget.props.value)
 
     def set_value(self, value):
-        self.widget.props.value = timezoned_date(value)
+        self.widget.props.value = (
+            timezoned_date(value) if isinstance(value, dt.datetime) else None)
 
     def set_readonly(self, readonly):
         for child in self.widget.get_children():
@@ -396,7 +406,7 @@ class DictDateEntry(DictEntry):
         return self.widget.props.value
 
     def set_value(self, value):
-        self.widget.props.value = value
+        self.widget.props.value = value if isinstance(value, dt.date) else None
 
     def set_readonly(self, readonly):
         super().set_readonly(readonly)
@@ -470,6 +480,7 @@ class DictWidget(Widget):
 
         self._readonly = False
         self._record_id = None
+        self._popup = False
 
     @property
     def _invalid_widget(self):
@@ -491,10 +502,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)
@@ -504,15 +521,14 @@ 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.field.set_client(self.record, value)
+        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()
@@ -558,7 +574,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]
@@ -566,8 +582,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)
@@ -604,6 +620,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
@@ -612,9 +633,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)
@@ -622,8 +644,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,7 +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.
+import logging
 from pathlib import Path
-from tempfile import NamedTemporaryFile
 
 from gi.repository import Gdk, GLib, Gtk
 
@@ -16,6 +16,8 @@ from tryton.common import data2pixbuf, resize_pixbuf
 from .binary import BinaryMixin
 from .widget import Widget
 
+logger = logging.getLogger(__name__)
+
 
 class Document(BinaryMixin, Widget):
     expand = True
@@ -76,20 +78,23 @@ 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)
                 except GLib.GError:
+                    logger.warning(
+                        f"Could not open document {filename}",
+                        exc_info=True)
                     self.evince_view.set_model(EvinceView.DocumentModel())
                     self.evince_scroll.hide()

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)):
@@ -83,6 +82,14 @@ class Many2Many(Widget):
         self.but_remove.set_relief(Gtk.ReliefStyle.NONE)
         hbox.pack_start(self.but_remove, expand=False, fill=False, padding=0)
 
+        self.but_unremove = Gtk.Button(can_focus=False)
+        tooltips.set_tip(self.but_unremove, _("Restore selected record"))
+        self.but_unremove.connect('clicked', self._sig_unremove)
+        self.but_unremove.add(common.IconFactory.get_image(
+                'tryton-undo', Gtk.IconSize.SMALL_TOOLBAR))
+        self.but_unremove.set_relief(Gtk.ReliefStyle.NONE)
+        hbox.pack_start(self.but_unremove, expand=False, fill=False, padding=0)
+
         tooltips.enable()
 
         frame = Gtk.Frame()
@@ -113,6 +120,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]
@@ -129,6 +138,9 @@ class Many2Many(Widget):
             elif event.keyval in remove_keys and editable:
                 self._sig_remove()
                 return True
+            elif event.keyval == Gdk.KEY_Insert:
+                self._sig_unremove()
+                return True
         elif widget == self.wid_text:
             if event.keyval == Gdk.KEY_F3:
                 self._sig_new()
@@ -161,25 +173,29 @@ 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:
             domain = [domain, add_remove]
+        existing_ids = self.field.get_eval(self.record)
+        if existing_ids:
+            domain = [domain, ('id', 'not in', existing_ids)]
         context = self.field.get_search_context(self.record)
         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(','),
@@ -192,6 +208,9 @@ class Many2Many(Widget):
     def _sig_remove(self, *args):
         self.screen.remove(remove=True)
 
+    def _sig_unremove(self, *args):
+        self.screen.unremove()
+
     def _on_activate(self):
         self._sig_edit()
 
@@ -215,6 +234,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 +254,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)
 
@@ -274,11 +301,23 @@ class Many2Many(Widget):
         else:
             size_limit = False
 
+        removable = any(
+            not r.deleted and not r.removed
+            for r in self.screen.selected_records)
+        unremovable = any(
+            r.deleted or r.removed for r in self.screen.selected_records)
+
         self.but_add.set_sensitive(bool(
                 not self._readonly
                 and not size_limit))
         self.but_remove.set_sensitive(bool(
                 not self._readonly
+                and removable
+                and self._position))
+        self.but_unremove.set_sensitive(bool(
+                not self._readonly
+                and not size_limit
+                and unremovable
                 and self._position))
 
     def record_message(self, position, size, *args):
@@ -333,6 +372,9 @@ class Many2Many(Widget):
         add_remove = self.record.expr_eval(self.attrs.get('add_remove'))
         if add_remove:
             domain = [domain, add_remove]
+        existing_ids = self.field.get_eval(self.record)
+        if existing_ids:
+            domain = [domain, ('id', 'not in', existing_ids)]
         update_completion(
             self.wid_text, self.record, self.field, model, domain)
 

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

@@ -37,7 +37,7 @@ class Many2One(Widget):
             lambda x, y: self._focus_out())
         self.wid_text.connect('changed', self.sig_changed)
         self.changed = True
-        self.focus_out = True
+        self._popup = False
 
         if int(self.attrs.get('completion', 1)):
             self.wid_text.connect('changed', self._update_completion)
@@ -103,13 +103,16 @@ class Many2One(Widget):
         model = self.get_model()
         if not model or not common.MODELACCESS[model]['read']:
             return
-        if not self.focus_out or not self.field:
+        if not self.field:
             return
         self.changed = False
         value = self.field.get(self.record)
         model = self.get_model()
 
-        self.focus_out = False
+        if self._popup:
+            return
+        else:
+            self._popup = True
         if model and not self.has_target(value):
             if (not self._readonly
                     and (self.wid_text.get_text()
@@ -126,7 +129,7 @@ class Many2One(Widget):
                             self.value_from_id(*result[0]), force_change=True)
                     else:
                         self.wid_text.set_text('')
-                    self.focus_out = True
+                    self._popup = False
                     self.changed = True
 
                 win = WinSearch(model, callback, sel_multi=False,
@@ -139,7 +142,7 @@ class Many2One(Widget):
                 win.screen.search_filter(quote(text))
                 win.show()
                 return
-        self.focus_out = True
+        self._popup = False
         self.changed = True
         return
 
@@ -164,7 +167,10 @@ class Many2One(Widget):
     def sig_new(self, defaults=None):
         if not self.create_access:
             return
-        self.focus_out = False
+        if self._popup:
+            return
+        else:
+            self._popup = True
         screen = self.get_screen(search=True)
         defaults = defaults.copy() if defaults is not None else {}
         defaults['rec_name'] = self.wid_text.get_text()
@@ -174,7 +180,7 @@ class Many2One(Widget):
                 self.field.set_client(self.record,
                     self.value_from_id(screen.current_record.id,
                         screen.current_record.rec_name()))
-            self.focus_out = True
+            self._popup = False
         WinForm(
             screen, callback, new=True, save_current=True, defaults=defaults)
 
@@ -184,10 +190,9 @@ class Many2One(Widget):
         model = self.get_model()
         if not model or not common.MODELACCESS[model]['read']:
             return
-        if not self.focus_out or not self.field:
+        if not self.field:
             return
         self.changed = False
-        self.focus_out = False
         value = self.field.get(self.record)
 
         if (icon_pos == Gtk.EntryIconPosition.SECONDARY
@@ -196,9 +201,12 @@ class Many2One(Widget):
             self.field.set_client(self.record, self.value_from_id(None, ''))
             self.wid_text.set_text('')
             self.changed = True
-            self.focus_out = True
             return
 
+        if self._popup:
+            return
+        else:
+            self._popup = True
         if self.has_target(value):
             m2o_id = self.id_from_value(self.field.get(self.record))
             screen = self.get_screen()
@@ -211,7 +219,7 @@ class Many2One(Widget):
                         self.value_from_id(screen.current_record.id,
                             screen.current_record.rec_name()),
                         force_change=True)
-                self.focus_out = True
+                self._popup = False
                 self.changed = True
             WinForm(screen, callback, save_current=True)
             return
@@ -225,7 +233,7 @@ class Many2One(Widget):
                 if result:
                     self.field.set_client(self.record,
                         self.value_from_id(*result[0]), force_change=True)
-                self.focus_out = True
+                self._popup = False
                 self.changed = True
             win = WinSearch(model, callback, sel_multi=False,
                 context=context, domain=domain, order=order,
@@ -236,7 +244,7 @@ class Many2One(Widget):
             win.screen.search_filter(quote(text))
             win.show()
             return
-        self.focus_out = True
+        self._popup = False
         self.changed = True
 
     def sig_key_press(self, widget, event, *args):

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

@@ -33,15 +33,23 @@ class MultiSelection(Widget, SelectionMixin):
         selection.set_mode(Gtk.SelectionMode.MULTIPLE)
         selection.connect('changed', self.changed)
         self.widget.add(self.tree)
-        name_column = Gtk.TreeViewColumn()
+        column = Gtk.TreeViewColumn()
+        select_cell = Gtk.CellRendererToggle()
+        select_cell.set_sensitive(False)
+        column.pack_start(select_cell, expand=False)
+        column.set_cell_data_func(
+            select_cell, self._select_data_func, selection)
         name_cell = Gtk.CellRendererText()
-        name_column.pack_start(name_cell, expand=True)
-        name_column.add_attribute(name_cell, 'text', 1)
-        self.tree.append_column(name_column)
+        column.pack_start(name_cell, expand=True)
+        column.add_attribute(name_cell, 'text', 1)
+        self.tree.append_column(column)
 
         self.nullable_widget = False
         self.init_selection()
 
+    def _select_data_func(self, column, cell, model, iter_, selection):
+        cell.set_property('active', selection.iter_is_selected(iter_))
+
     def _readonly_set(self, readonly):
         super(MultiSelection, self)._readonly_set(readonly)
         selection = self.tree.get_selection()
@@ -70,6 +78,8 @@ class MultiSelection(Widget, SelectionMixin):
         self.field.set_client(self.record, self.get_value())
 
     def display(self):
+        def freeze(iter):
+            return list(map(tuple, iter))
         selection = self.tree.get_selection()
         selection.handler_block_by_func(self.changed)
         try:
@@ -77,7 +87,7 @@ class MultiSelection(Widget, SelectionMixin):
             # it will be set back in the super call
             selection.set_select_function(lambda *a: True)
             self.update_selection(self.record, self.field)
-            new_model = self.selection != [list(row) for row in self.model]
+            new_model = freeze(self.selection) != freeze(self.model)
             if new_model:
                 self.model.clear()
             if not self.field: