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

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

@@ -75,7 +75,6 @@ class One2Many(Widget):
 
         hbox.pack_start(Gtk.VSeparator(), expand=False, fill=True, padding=0)
 
-        self.focus_out = True
         self.wid_completion = None
         if attrs.get('add_remove'):
 
@@ -182,6 +181,8 @@ class One2Many(Widget):
         if self.attrs.get('add_remove'):
             self.wid_text.connect('key_press_event', self.on_keypress)
 
+        self._popup = False
+
     def get_access(self, type_):
         model = self.attrs['relation']
         if model:
@@ -370,12 +371,17 @@ class One2Many(Widget):
             self._new_single(defaults)
 
     def _new_single(self, defaults=None):
+        if self._popup:
+            return
+        else:
+            self._popup = True
         sequence = self._sequence()
 
         def update_sequence():
             if sequence:
                 self.screen.group.set_sequence(
                     field=sequence, position=self.screen.new_position)
+            self._popup = False
 
         if self.screen.current_view.creatable:
             self.screen.new()
@@ -392,6 +398,10 @@ class One2Many(Widget):
         fields = self.attrs['product'].split(',')
         product = {}
 
+        if self._popup:
+            return
+        else:
+            self._popup = True
         first = self.screen.new(default=False)
         default = first.default_get(defaults=defaults)
         first.set_default(default)
@@ -420,6 +430,7 @@ class One2Many(Widget):
             win_search.show()
 
         def make_product():
+            self._popup = False
             self.screen.group.remove(first, remove=True)
             if not product:
                 return
@@ -448,7 +459,14 @@ class One2Many(Widget):
             return
         record = self.screen.current_record
         if record:
-            WinForm(self.screen, lambda a: None)
+            if self._popup:
+                return
+            else:
+                self._popup = True
+
+            def callback(result):
+                self._popup = False
+            WinForm(self.screen, callback)
 
     def _sig_next(self, widget):
         if not self._validate():
@@ -475,8 +493,6 @@ class One2Many(Widget):
         self.screen.unremove()
 
     def _sig_add(self, *args):
-        if not self.focus_out:
-            return
         if not self.write_access or not self.read_access:
             return
         self.view.set_value()
@@ -487,12 +503,14 @@ class One2Many(Widget):
         domain = ['OR', domain, ('id', 'in', removed_ids)]
         text = self.wid_text.get_text()
 
-        self.focus_out = False
+        if self._popup:
+            return
+        else:
+            self._popup = True
 
         sequence = self._sequence()
 
         def callback(result):
-            self.focus_out = True
             if result:
                 ids = [x[0] for x in result]
                 self.screen.load(ids, modified=True)
@@ -501,6 +519,7 @@ class One2Many(Widget):
                         field=sequence, position=self.screen.new_position)
             self.screen.set_cursor()
             self.wid_text.set_text('')
+            self._popup = False
 
         order = self.field.get_search_order(self.record)
         win = WinSearch(self.attrs['relation'], callback, sel_multi=True,

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

@@ -50,6 +50,8 @@ class Label(StateMixin, Gtk.Label):
         readonly = ((field and field.attrs.get('readonly'))
                 or state_changes.get('readonly', not bool(field)))
         common.apply_label_attributes(self, readonly, required)
+        self.set_max_width_chars(80)
+        self.set_line_wrap(True)
 
 
 class VBox(StateMixin, Gtk.VBox):
@@ -187,14 +189,16 @@ class Link(StateMixin, Gtk.Button):
                         ['AND', domain, tab_domain], 0, 100, context=context,
                         callback=functools.partial(
                             self._set_count, idx=i, current=self._current,
-                            counter=counter, label=label))
+                            counter=counter, label=label),
+                        process_exception=False)
             else:
                 common.RPCExecute(
                     'model', action['res_model'], 'search_count',
                     domain, 0, 100, context=context,
                     callback=functools.partial(
                         self._set_count, current=self._current,
-                        counter=counter, label=label))
+                        counter=counter, label=label),
+                    process_exception=False)
 
     def _set_count(self, value, idx=0, current=None, counter=None, label=''):
         if current != self._current or not self.get_parent():

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

@@ -1,10 +1,12 @@
 # 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 csv
 import gettext
 import json
 import locale
 import sys
 from functools import wraps
+from io import StringIO
 
 from gi.repository import Gdk, GLib, GObject, Gtk
 from pygtkcompat.generictreemodel import GenericTreeModel
@@ -333,7 +335,7 @@ class TreeXMLViewParser(XMLViewParser):
 
         self.view.treeview.append_column(column)
 
-        if 'optional' in attributes and name != self.exclude_field:
+        if 'optional' in attributes:
             self.view.optionals.append(column)
 
     def _parse_button(self, node, attributes):
@@ -720,48 +722,42 @@ class ViewTree(View):
                 record.cancel()
             iter_ = model.iter_next(iter_)
 
-    def on_copy(self):
+    def on_copy(self, columns=None):
+        if columns is None:
+            columns = self.treeview.get_columns()
+
+        def copy_foreach(treemodel, path, iter, add):
+            record = treemodel.get_value(iter, 0)
+            values = []
+            for col in columns:
+                if not col.get_visible() or not col.name:
+                    continue
+                widget = self.get_column_widget(col)
+                values.append(widget.get_textual_value(record))
+            add(values)
+
         for clipboard_type in [
                 Gdk.SELECTION_CLIPBOARD, Gdk.SELECTION_PRIMARY]:
             clipboard = self.treeview.get_clipboard(clipboard_type)
             selection = self.treeview.get_selection()
-            data = []
-            selection.selected_foreach(self.copy_foreach, data)
-            clipboard.set_text('\n'.join(data), -1)
-
-    def copy_foreach(self, treemodel, path, iter, data):
-        record = treemodel.get_value(iter, 0)
-        values = []
-        for col in self.treeview.get_columns():
-            if not col.get_visible() or not col.name:
-                continue
-            widget = self.get_column_widget(col)
-            values.append('"'
-                + str(widget.get_textual_value(record)).replace('"', '""')
-                + '"')
-        data.append('\t'.join(values))
-        return
+            data = StringIO()
+            writer = csv.writer(data, delimiter='\t', lineterminator='\n')
+            selection.selected_foreach(copy_foreach, writer.writerow)
+            clipboard.set_text(data.getvalue(), -1)
 
     def on_paste(self):
         if not self.editable:
             return
 
-        def unquote(value):
-            if value[:1] == '"' and value[-1:] == '"':
-                return value[1:-1]
-            return value
-        data = []
+        reader = None
         for clipboard_type in [
                 Gdk.SELECTION_CLIPBOARD, Gdk.SELECTION_PRIMARY]:
             clipboard = self.treeview.get_clipboard(clipboard_type)
             text = clipboard.wait_for_text()
             if not text:
                 continue
-            data = [[unquote(v) for v in l.split('\t')]
-                for l in text.splitlines()]
+            reader = csv.reader(StringIO(text), delimiter='\t')
             break
-        else:
-            return
         col = self.treeview.get_cursor()[1]
         columns = [c for c in self.treeview.get_columns()
             if c.get_visible() and c.name]
@@ -776,7 +772,7 @@ class ViewTree(View):
             group = self.group
             idx = len(group)
         default = None
-        for line in data:
+        for line in reader:
             if idx >= len(group):
                 record = group.new(default=False)
                 if default is None:
@@ -787,25 +783,13 @@ class ViewTree(View):
             for col, value in zip(columns, line):
                 widget = self.get_column_widget(col)
                 if widget.get_textual_value(record) != value:
-                    if hasattr(widget, 'search_remote'):
-                        field = record.group.fields[widget.attrs['name']]
-                        win = widget.search_remote(record, field, value)
-                        if len(win.screen.group) == 1:
-                            target, = win.screen.group
-                            field.set_client(
-                                record, (target.id, target.rec_name()))
-                        else:
-                            field.set_client(record, (None, ''))
-                        win.response(win, Gtk.ResponseType.CANCEL)
-                    else:
-                        widget.value_from_text(record, value)
+                    widget.value_from_text(record, value)
                     if value and not widget.get_textual_value(record):
                         # Stop setting value if a value is correctly set
                         idx = len(group)
                         break
             if not record.validate():
                 break
-            record.save()
             idx += 1
         self.record = record
         self.screen.display(set_cursor=True)
@@ -914,12 +898,27 @@ class ViewTree(View):
             except TypeError:
                 # Outside row
                 return False
+            selection = treeview.get_selection()
             menu = Gtk.Menu()
-            copy_item = Gtk.MenuItem(label=_('Copy'))
-            copy_item.connect('activate', lambda x: self.on_copy())
-            menu.append(copy_item)
+            if selection.count_selected_rows():
+                if selection.count_selected_rows() == 1:
+                    copy_item = Gtk.MenuItem(label=_("Copy"))
+                    copy_item.connect(
+                        'activate', lambda x: self.on_copy([col]))
+                    menu.append(copy_item)
+                    copy_row_label = _("Copy Row")
+                else:
+                    copy_row_label = _("Copy Rows")
+                    if col:
+                        copy_column_item = Gtk.MenuItem(label=_("Copy Column"))
+                        copy_column_item.connect(
+                            'activate', lambda x: self.on_copy(columns=[col]))
+                        menu.append(copy_column_item)
+                copy_row_item = Gtk.MenuItem(label=copy_row_label)
+                copy_row_item.connect('activate', lambda x: self.on_copy())
+                menu.append(copy_row_item)
             if self.editable:
-                paste_item = Gtk.MenuItem(label=_('Paste'))
+                paste_item = Gtk.MenuItem(label=_("Paste Rows"))
                 paste_item.connect('activate', lambda x: self.on_paste())
                 menu.append(paste_item)
 
@@ -953,7 +952,6 @@ class ViewTree(View):
                         menu, model, record_id, title=label, field=field,
                         context=context)
 
-            selection = treeview.get_selection()
             if selection.count_selected_rows() == 1:
                 group = self.group
                 if selection.get_mode() == Gtk.SelectionMode.SINGLE:
@@ -1055,12 +1053,9 @@ class ViewTree(View):
         elif tree_sel.get_mode() == Gtk.SelectionMode.MULTIPLE:
             model, paths = tree_sel.get_selected_rows()
             if model and paths:
-                records = []
-                for path in paths:
-                    iter_ = model.get_iter(path)
-                    records.append(model.get_value(iter_, 0))
-                if self.record not in records:
-                    self.record = records[0]
+                iter_ = model.get_iter(paths[0])
+                record = model.get_value(iter_, 0)
+                self.record = record
             else:
                 self.record = None
 
@@ -1100,10 +1095,6 @@ class ViewTree(View):
     def display(self, force=False):
         self.treeview.display_counter += 1
         current_record = self.record
-        if current_record and current_record not in current_record.group:
-            # current record may have been removed by on_change calls without
-            # changing the current record of screen before the display
-            current_record = None
         if (force
                 or not self.treeview.get_model()
                 or self.group != self.treeview.get_model().group):

tryton/gui/window/view_form/view/list_gtk/widget.py

@@ -215,8 +215,12 @@ class Affix(Cell):
             else:
                 value = self.icon
             if self.attrs.get('icon_type') == 'url':
+                def callback(pixbuf):
+                    self.display_counters.pop(record.id, None)
+                    self.view.treeview.queue_resize()  # trigger a redraw
                 pixbuf = common.IconFactory.get_pixbuf_url(
-                    value, size_param=self.attrs.get('url_size'))
+                    value, size_param=self.attrs.get('url_size'),
+                    callback=callback)
             else:
                 pixbuf = common.IconFactory.get_pixbuf(
                     value, Gtk.IconSize.BUTTON)
@@ -410,19 +414,19 @@ class Int(GenericText):
         self.symbol = attrs.get('symbol')
         self.grouping = bool(int(attrs.get('grouping', 1)))
         if self.symbol:
-            self.renderer_prefix = Symbol(view, attrs, 0)
-            self.renderer_suffix = Symbol(view, attrs, 1)
+            self._cell_prefix = Symbol(view, attrs, 0)
+            self._cell_suffix = Symbol(view, attrs, 1)
 
     @property
     def prefixes(self):
         if self.symbol:
-            return [self.renderer_prefix]
+            return [self._cell_prefix]
         return []
 
     @property
     def suffixes(self):
         if self.symbol:
-            return [self.renderer_suffix]
+            return [self._cell_suffix]
         return []
 
     @catch_errors()
@@ -574,20 +578,20 @@ class Binary(GenericText):
         super(Binary, self).__init__(view, attrs, renderer=renderer)
         self.renderer.set_property('editable', False)
         self.renderer.set_property('xalign', self.align)
-        self.renderer_save = _BinarySave(self)
-        self.renderer_select = _BinarySelect(self)
+        self._cell_save = _BinarySave(self)
+        self._cell_select = _BinarySelect(self)
         if self.attrs.get('filename'):
-            self.renderer_open = _BinaryOpen(self)
+            self._cell_open = _BinaryOpen(self)
         else:
-            self.renderer_open = None
+            self._cell_open = None
 
     @property
     def prefixes(self):
-        return filter(None, [self.renderer_open])
+        return filter(None, [self._cell_open])
 
     @property
     def suffixes(self):
-        return [self.renderer_save, self.renderer_select]
+        return [self._cell_save, self._cell_select]
 
     @catch_errors()
     def get_textual_value(self, record):
@@ -738,7 +742,7 @@ class _BinarySelect(_BinaryIcon):
         invisible = field.get_state_attrs(record).get('invisible', False)
         readonly = self.attrs.get('readonly',
             field.get_state_attrs(record).get('readonly', False))
-        if readonly or size:
+        if readonly and size:
             cell.set_property('visible', False)
         else:
             cell.set_property('visible', not invisible)
@@ -822,6 +826,7 @@ class M2O(GenericText):
         if renderer is None and int(attrs.get('completion', 1)):
             renderer = partial(CellRendererTextCompletion, self.set_completion)
         super(M2O, self).__init__(view, attrs, renderer=renderer)
+        self._popup = False
 
     def get_model(self, record, field):
         return self.attrs['relation']
@@ -850,7 +855,8 @@ class M2O(GenericText):
         if model and common.get_toplevel_window().get_focus():
             field = record[self.attrs['name']]
             win = self.search_remote(record, field, text, callback=callback)
-            win.show()
+            if win:
+                win.show()
 
     def editing_started(self, cell, editable, path):
         super(M2O, self).editing_started(cell, editable, path)
@@ -919,7 +925,9 @@ class M2O(GenericText):
         domain = field.domain_get(record)
         context = field.get_context(record)
         if not create and changed:
-            self.search_remote(record, field, text, callback=callback).show()
+            win = self.search_remote(record, field, text, callback=callback)
+            if win:
+                win.show()
             return
         target_id = self.id_from_value(field.get(record))
 
@@ -959,6 +967,11 @@ class M2O(GenericText):
         access = common.MODELACCESS[model]
         create_access = int(self.attrs.get('create', 1)) and access['create']
 
+        if self._popup:
+            return
+        else:
+            self._popup = True
+
         def search_callback(found):
             value = None
             if found:
@@ -966,6 +979,7 @@ class M2O(GenericText):
                 field.set_client(record, value)
             if callback:
                 callback()
+            self._popup = False
         win = WinSearch(model, search_callback, sel_multi=False,
             context=context, domain=domain,
             order=order, view_ids=self.attrs.get('view_ids', '').split(','),
@@ -1253,11 +1267,11 @@ class Reference(M2O):
 
     def __init__(self, view, attrs, renderer=None):
         super(Reference, self).__init__(view, attrs, renderer=renderer)
-        self.renderer_selection = _ReferenceSelection(view, attrs)
+        self._cell_selection = _ReferenceSelection(view, attrs)
 
     @property
     def prefixes(self):
-        return [self.renderer_selection]
+        return [self._cell_selection]
 
     def get_model(self, record, field):
         value = field.get_client(record)
@@ -1405,13 +1419,12 @@ class Button(Cell):
         cell.set_property('visible', not invisible)
         readonly = states.get('readonly', False)
         cell.set_property('sensitive', not readonly)
-        if self.attrs.get('type', 'class') == 'class':
-            parent = record.parent if record else None
-            while parent:
-                if parent.modified:
-                    cell.set_property('sensitive', False)
-                    break
-                parent = parent.parent
+        parent = record.parent if record else None
+        while parent:
+            if parent.modified:
+                cell.set_property('sensitive', False)
+                break
+            parent = parent.parent
         # TODO icon
         self._set_visual(cell, record)
 

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

@@ -185,8 +185,7 @@ class Selection(Gtk.ScrolledWindow):
 
 class ScreenContainer(object):
 
-    def __init__(self, screen, tab_domain):
-        self.screen = screen
+    def __init__(self, tab_domain):
         self.viewport = Gtk.Viewport()
         self.viewport.set_shadow_type(Gtk.ShadowType.NONE)
         self.vbox = Gtk.VBox(spacing=3)
@@ -352,9 +351,12 @@ class ScreenContainer(object):
     def widget_get(self):
         return self.vbox
 
-    def show_filter(self):
+    def set_screen(self, screen):
+        self.screen = screen
         self.but_bookmark.set_sensitive(bool(list(self.bookmarks())))
         self.bookmark_match()
+
+    def show_filter(self):
         if self.filter_vbox:
             self.filter_vbox.show()
         if self.notebook:

tryton/gui/window/win_export.py

@@ -7,7 +7,6 @@ import gettext
 import json
 import locale
 import os
-import tempfile
 import urllib.parse
 from itertools import zip_longest
 from numbers import Number
@@ -15,7 +14,7 @@ from numbers import Number
 from gi.repository import Gdk, GObject, Gtk
 
 import tryton.common as common
-from tryton.common import RPCException, RPCExecute
+from tryton.common import RPCException, RPCExecute, tempfile
 from tryton.config import CONFIG
 from tryton.gui.window.win_csv import WinCSV
 from tryton.jsonrpc import JSONEncoder

tryton/gui/window/win_form.py

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

tryton/gui/window/wizard.py

@@ -150,16 +150,17 @@ class Wizard(InfoBar):
 
     def end(self, callback=None):
         def end_callback(action):
-            self.destroy(action=action())
-            if callback:
-                callback()
-        try:
-            RPCExecute('wizard', self.action, 'delete', self.session_id,
-                process_exception=False, callback=end_callback)
-        except Exception:
-            logger.warn(
-                "Unable to delete session %s of wizard %s",
-                self.session_id, self.action, exc_info=True)
+            try:
+                self.destroy(action=action())
+                if callback:
+                    callback()
+            except RPCException:
+                logger.warn(
+                    "Unable to delete session %s of wizard %s",
+                    self.session_id, self.action, exc_info=True)
+        RPCExecute(
+            'wizard', self.action, 'delete', self.session_id,
+            process_exception=False, callback=end_callback)
 
     def clean(self):
         for widget in self.widget.get_children():