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

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)
 

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/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/graph_gtk/graph.py

@@ -12,6 +12,7 @@ from dateutil.relativedelta import relativedelta
 from gi.repository import Gdk, Gtk
 
 import tryton.rpc as rpc
+from tryton import common
 from tryton.action import Action
 from tryton.common import COLOR_SCHEMES, generateColorscheme, hex2rgb
 from tryton.config import CONFIG
@@ -386,7 +387,8 @@ class Graph(Gtk.DrawingArea):
                     if isinstance(value, datetime.timedelta):
                         value = value.total_seconds()
                     self.datas[x][key] += float(value or 0)
-        date_format = self.view.screen.context.get('date_format', '%x')
+        date_format = common.date_format(
+            self.view.screen.context.get('date_format'))
         datetime_format = date_format + ' %X'
         if isinstance(minx, datetime.datetime):
             date = minx

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:
+        if 'optional' in attributes and name != self.exclude_field:
             self.view.optionals.append(column)
 
     def _parse_button(self, node, attributes):
@@ -720,46 +722,44 @@ 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]
@@ -774,7 +774,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:
@@ -785,13 +785,25 @@ class ViewTree(View):
             for col, value in zip(columns, line):
                 widget = self.get_column_widget(col)
                 if widget.get_textual_value(record) != value:
-                    widget.value_from_text(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)
                     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)
@@ -900,12 +912,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)
 
@@ -939,7 +966,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:
@@ -1041,9 +1067,12 @@ class ViewTree(View):
         elif tree_sel.get_mode() == Gtk.SelectionMode.MULTIPLE:
             model, paths = tree_sel.get_selected_rows()
             if model and paths:
-                iter_ = model.get_iter(paths[0])
-                record = model.get_value(iter_, 0)
-                self.record = record
+                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]
             else:
                 self.record = None
 
@@ -1083,6 +1112,10 @@ 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/editabletree.py

@@ -163,7 +163,8 @@ class EditableTreeView(TreeView):
         for renderer in column.get_cells():
             if renderer.props.editing:
                 widget = self.view.get_column_widget(column)
-                self.on_editing_done(widget.editable, renderer)
+                editable = widget.get_editable(renderer)
+                self.on_editing_done(editable, renderer)
         return True
 
     def on_keypressed(self, entry, event, renderer):