tryton 6.6.8__py3-none-any.whl → 6.8.1__py3-none-any.whl

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

@@ -422,10 +422,7 @@ class Screen:
             self.filter_widget = None
             self.order = None
         self.__group.add_fields(fields)
-        if len(group):
-            self.current_record = group[0]
-        else:
-            self.current_record = None
+        self.current_record = None
         for name, views in fields_views.items():
             self.__group.fields[name].views.update(views)
         self.__group.exclude_field = self.exclude_field
@@ -452,14 +449,14 @@ class Screen:
     def record_notify(self, notifications):
         for window in self.windows:
             if isinstance(window, InfoBar):
-                window.info_bar_refresh()
+                window.info_bar_refresh('notification')
                 for type_, message in notifications:
                     type_ = {
                         'info': Gtk.MessageType.INFO,
                         'warning': Gtk.MessageType.WARNING,
                         'error': Gtk.MessageType.ERROR,
                         }.get(type_, Gtk.MessageType.WARNING)
-                    window.info_bar_add(message, type_)
+                    window.info_bar_add(message, type_, 'notification')
 
     def record_message(self, position, size, max_size, record_id):
         for window in self.windows:
@@ -486,7 +483,7 @@ class Screen:
         return self.__current_record
 
     def __set_current_record(self, record):
-        if self.__current_record == record:
+        if self.__current_record == record and record:
             return
         self.__current_record = record
         if record:
@@ -789,11 +786,6 @@ class Screen:
             if not self.group.delete(records):
                 return False
 
-        top_record = records[0]
-        top_group = top_record.group
-        idx = top_group.index(top_record)
-        path = top_record.get_path(self.group)
-
         for record in records:
             # set current model to None to prevent __select_changed
             # to save the previous_model as it can be already deleted.
@@ -815,15 +807,7 @@ class Screen:
                     record.parent.save(force_reload=False)
                 record.destroy()
 
-        if idx > 0:
-            record = top_group[idx - 1]
-            path = path[:-1] + ((path[-1][0], record.id,),)
-        else:
-            path = path[:-1]
-        if path:
-            self.current_record = self.group.get_by_path(path)
-        elif len(self.group):
-            self.current_record = self.group[0]
+        self.current_record = None
         self.set_cursor()
         self.display()
         return True
@@ -840,40 +824,43 @@ class Screen:
 
     def set_tree_state(self):
         view = self.current_view
-        if view.view_type not in ('tree', 'form'):
+        if view.view_type not in {'tree', 'form', 'list-form'}:
             return
         if id(view) in self.tree_states_done:
             return
         if view.view_type == 'form' and self.tree_states_done:
             return
-        if (view.view_type == 'tree'
-                and not view.attributes.get('tree_state', False)):
+        if (view.view_type in {'tree', 'list-form'}
+                and not int(view.attributes.get('tree_state', False))):
             # Mark as done to not set later when the view_type change
             self.tree_states_done.add(id(view))
         parent = self.parent.id if self.parent else None
         if parent is not None and parent < 0:
             return
         expanded_nodes, selected_nodes = [], []
-        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']:
-            json_domain = self.get_tree_domain(parent)
-            try:
-                expanded_nodes, selected_nodes = RPCExecute('model',
-                    'ir.ui.view_tree_state', 'get',
-                    self.model_name, json_domain,
-                    view.children_field)
-                expanded_nodes = json.loads(expanded_nodes)
-                selected_nodes = json.loads(selected_nodes)
-            except RPCException:
-                logger.warn(
-                    'Unable to get view tree state for %s',
-                    self.model_name)
-            self.tree_states[parent][view.children_field] = (
-                expanded_nodes, selected_nodes)
-        if view.view_type == 'tree':
-            view.expand_nodes(expanded_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))):
+                json_domain = self.get_tree_domain(parent)
+                try:
+                    expanded_nodes, selected_nodes = RPCExecute('model',
+                        'ir.ui.view_tree_state', 'get',
+                        self.model_name, json_domain,
+                        view.children_field)
+                    expanded_nodes = json.loads(expanded_nodes)
+                    selected_nodes = json.loads(selected_nodes)
+                except RPCException:
+                    logger.warn(
+                        'Unable to get view tree state for %s',
+                        self.model_name)
+                self.tree_states[parent][view.children_field] = (
+                    expanded_nodes, selected_nodes)
+            if view.view_type == 'tree':
+                view.expand_nodes(expanded_nodes)
             view.select_nodes(selected_nodes)
         else:
             if selected_nodes:
@@ -909,9 +896,12 @@ class Screen:
                             self.current_record)
                     self.tree_states[parent][view.children_field] = (
                         [], [[path]])
-            elif view.view_type == 'tree':
-                view.save_width()
-                paths = view.get_expanded_paths()
+            elif view.view_type in {'tree', 'list-form'}:
+                if view.view_type == 'tree':
+                    view.save_width()
+                    paths = view.get_expanded_paths()
+                else:
+                    paths = []
                 selected_paths = view.get_selected_paths()
                 self.tree_states[parent][view.children_field] = (
                     paths, selected_paths)
@@ -959,7 +949,7 @@ class Screen:
             if (self.current_record
                     and self.current_record in self.current_record.group):
                 pass
-            elif self.group and self.current_view.view_type != 'calendar':
+            elif self.group and self.current_view.view_type == 'form':
                 self.current_record = self.group[0]
             else:
                 self.current_record = None
@@ -986,19 +976,7 @@ class Screen:
 
     def _get_next_record(self, test=False):
         view = self.current_view
-        if view.view_type == 'tree' and len(self.group):
-            range_ = view.treeview.get_visible_range()
-            if range_ and not test:
-                start, end = range_
-                vadjustment = view.treeview.get_vadjustment()
-                vadjustment.set_value(
-                    vadjustment.props.value + vadjustment.props.page_increment)
-                model = view.treeview.get_model()
-                iter_ = model.get_iter(end)
-                return model.get_value(iter_, 0)
-            else:
-                return self.group[-1]
-        elif (view.view_type == 'form'
+        if (view.view_type in {'tree', 'form'}
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1073,19 +1051,7 @@ class Screen:
 
     def _get_prev_record(self, test=False):
         view = self.current_view
-        if view.view_type == 'tree' and len(self.group):
-            range_ = view.treeview.get_visible_range()
-            if range_ and not test:
-                start, end = range_
-                vadjustment = view.treeview.get_vadjustment()
-                vadjustment.set_value(
-                    vadjustment.props.value - vadjustment.props.page_increment)
-                model = view.treeview.get_model()
-                iter_ = model.get_iter(start)
-                return model.get_value(iter_, 0)
-            else:
-                return self.group[0]
-        elif (view.view_type == 'form'
+        if (view.view_type in {'tree', 'form'}
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1183,7 +1149,9 @@ class Screen:
 
     @property
     def listed_records(self):
-        if self.current_view and self.current_view.view_type == 'tree':
+        if (self.current_view
+                and self.current_view.view_type in {
+                    'tree', 'calendar', 'list-form'}):
             return self.current_view.listed_records
         elif self.current_record:
             return [self.current_record]
@@ -1209,7 +1177,8 @@ class Screen:
     def get_buttons(self):
         'Return active buttons for the current view'
         def is_active(record, button):
-            if button.attrs.get('type', 'class') == 'instance':
+            if (record.readonly
+                    or button.attrs.get('type', 'class') == 'instance'):
                 return False
             states = record.expr_eval(button.attrs.get('states', {}))
             return not (states.get('invisible') or states.get('readonly'))

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

@@ -41,21 +41,10 @@ class CalendarXMLViewParser(XMLViewParser):
             self.parse(child)
         goocalendar = Calendar_(
             self.view.attributes, self.view, self.calendar_fields)
-        scrolledwindow = Gtk.ScrolledWindow()
-        scrolledwindow.add(goocalendar)
         toolbar = Toolbar(goocalendar)
-        self.view.widget.pack_start(
-            toolbar, expand=False, fill=False, padding=0)
-        self.view.widget.pack_start(
-            scrolledwindow, expand=True, fill=True, padding=0)
         self.view.widgets['goocalendar'] = goocalendar
         self.view.widgets['toolbar'] = toolbar
 
-        if attributes.get('height') or attributes.get('width'):
-            scrolledwindow.set_size_request(
-                int(attributes.get('width', -1)),
-                int(attributes.get('height', -1)))
-
     def _parse_field(self, node, attributes):
         self.calendar_fields.append(attributes)
 
@@ -85,6 +74,25 @@ class ViewCalendar(View):
         goocalendar.connect('day-pressed', self.on_day_pressed)
         goocalendar.connect('day-activated', self.on_day_activated)
 
+        self.widget.pack_start(toolbar, expand=False, fill=False, padding=0)
+        vp = Gtk.Viewport()
+        vp.set_shadow_type(Gtk.ShadowType.NONE)
+        vp.add(goocalendar)
+        self.scroll = scroll = Gtk.ScrolledWindow()
+        scroll.add(vp)
+        scroll.set_policy(
+            Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        scroll.set_placement(Gtk.CornerType.TOP_LEFT)
+        viewport = Gtk.Viewport()
+        viewport.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
+        viewport.add(scroll)
+        self.widget.pack_start(viewport, expand=True, fill=True, padding=0)
+
+        if self.attributes.get('height') or self.attributes.get('width'):
+            scroll.set_size_request(
+                int(self.attributes.get('width', -1)),
+                int(self.attributes.get('height', -1)))
+
     def on_page_changed(self, goocalendar, day, toolbar):
         toolbar.update_displayed_date()
         if goocalendar.update_domain():
@@ -170,3 +178,8 @@ class ViewCalendar(View):
 
     def get_fields(self):
         return []
+
+    @property
+    def listed_records(self):
+        event_store = self.widgets['goocalendar'].event_store
+        return [e.record for e in event_store.get_events()]

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

@@ -108,28 +108,29 @@ class Toolbar(Gtk.Toolbar):
         self.insert(blank_widget, -1)
 
         day_button = Gtk.RadioToolButton()
-        day_button.set_label(_('Day View'))
+        day_button.set_label(_("Day"))
         day_button.connect("clicked", self.on_day_button_clicked)
         day_button.add_accelerator(
             "clicked", self.accel_group, Gdk.KEY_d,
             Gdk.ModifierType.MODIFIER_MASK, Gtk.AccelFlags.VISIBLE)
-        self.insert(day_button, -1)
 
         week_button = Gtk.RadioToolButton.new_from_widget(day_button)
-        week_button.set_label(_('Week View'))
+        week_button.set_label(_("Week"))
         week_button.connect("clicked", self.on_week_button_clicked)
         week_button.add_accelerator(
             "clicked", self.accel_group, Gdk.KEY_w,
             Gdk.ModifierType.MODIFIER_MASK, Gtk.AccelFlags.VISIBLE)
-        self.insert(week_button, -1)
 
         month_button = Gtk.RadioToolButton.new_from_widget(week_button)
-        month_button.set_label_widget(Gtk.Label(label=_('Month View')))
+        month_button.set_label_widget(Gtk.Label(label=_("Month")))
         month_button.connect("clicked", self.on_month_button_clicked)
         month_button.add_accelerator(
             "clicked", self.accel_group, Gdk.KEY_m,
             Gdk.ModifierType.MODIFIER_MASK, Gtk.AccelFlags.VISIBLE)
+
         self.insert(month_button, -1)
+        self.insert(week_button, -1)
+        self.insert(day_button, -1)
         buttons = {
             'month': month_button,
             'week': week_button,

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

@@ -279,13 +279,18 @@ class FormXMLViewParser(XMLViewParser):
             return
         vbox = VBox(attrs=attributes)
         if attributes.get('string'):
+            attributes.setdefault('xexpand', 0)
+            attributes.setdefault('xalign', 0)
+            attributes.setdefault('yalign', 0.5)
             label = Label(label=attributes['string'], attrs=attributes)
             label.set_halign(get_align(
-                    attributes.get('xalign', 0.0),
-                    bool(attributes.get('xexpand', True))))
+                    attributes['xalign'],
+                    bool(attributes.get('xexpand'))))
             label.set_valign(get_align(
-                    attributes.get('yalign', 0.5),
-                    bool(attributes.get('yexpand', False))))
+                    attributes['yalign'],
+                    bool(attributes.get('yexpand'))))
+            label.props.xalign = float(attributes['xalign'])
+            label.props.yalign = float(attributes['yalign'])
             vbox.pack_start(label, expand=True, fill=True, padding=0)
             self.view.state_widgets.append(label)
             if name:
@@ -303,13 +308,17 @@ class FormXMLViewParser(XMLViewParser):
             attributes['xalign'] = 0.0
 
         attributes.setdefault('xexpand', 0)
+        attributes.setdefault('xalign', 1)
+        attributes.setdefault('yalign', 0.5)
         label = Label(label=attributes.get('string', ''), attrs=attributes)
         label.set_halign(get_align(
-                attributes.get('xalign', 1.0),
+                attributes['xalign'],
                 bool(attributes.get('xexpand'))))
         label.set_valign(get_align(
                 attributes.get('yalign', 0.5),
                 bool(attributes.get('yexpand'))))
+        label.props.xalign = float(attributes['xalign'])
+        label.props.yalign = float(attributes['yalign'])
         label.set_angle(int(attributes.get('angle', 0)))
         self.view.state_widgets.append(label)
         self.container.add(label, attributes)

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

@@ -72,6 +72,9 @@ class Many2Many(Widget):
         self.but_add.set_relief(Gtk.ReliefStyle.NONE)
         hbox.pack_start(self.but_add, expand=False, fill=False, padding=0)
 
+        self.label = Gtk.Label(label='(_/0)')
+        hbox.pack_start(self.label, expand=False, fill=False, padding=0)
+
         self.but_remove = Gtk.Button(can_focus=False)
         tooltips.set_tip(self.but_remove, _('Remove selected record'))
         self.but_remove.connect('clicked', self._sig_remove)
@@ -279,8 +282,14 @@ class Many2Many(Widget):
                 not self._readonly
                 and self._position))
 
-    def record_message(self, position, *args):
+    def record_message(self, position, size, *args):
         self._position = position
+        name = str(position) if position else '_'
+        selected = len(self.screen.selected_records)
+        if selected > 1:
+            name += '#%i' % selected
+        name = '(%s/%s)' % (name, common.humanize(size))
+        self.label.set_text(name)
         self._set_button_sensitive()
 
     def display(self):

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

@@ -19,6 +19,7 @@ _ = gettext.gettext
 
 
 class Many2One(Widget):
+    default_width_chars = 12
 
     def __init__(self, view, attrs):
         super(Many2One, self).__init__(view, attrs)

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

@@ -62,7 +62,7 @@ class One2Many(Widget):
         self.but_pre.set_relief(Gtk.ReliefStyle.NONE)
         hbox.pack_start(self.but_pre, expand=False, fill=False, padding=0)
 
-        self.label = Gtk.Label(label='(0,0)')
+        self.label = Gtk.Label(label='(_/0)')
         hbox.pack_start(self.label, expand=False, fill=False, padding=0)
 
         self.but_next = Gtk.Button(can_focus=False)
@@ -511,12 +511,12 @@ class One2Many(Widget):
     def record_message(self, position, size, *args):
         self._position = position
         self._length = size
-        if self._position:
-            name = str(self._position)
-        else:
-            name = '_'
-        line = '(%s/%s)' % (name, self._length)
-        self.label.set_text(line)
+        name = str(position) if position else '_'
+        selected = len(self.screen.selected_records)
+        if selected > 1:
+            name += '#%i' % selected
+        name = '(%s/%s)' % (name, common.humanize(size))
+        self.label.set_text(name)
         self._set_button_sensitive()
 
     def display(self):

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

@@ -94,8 +94,6 @@ class TextBox(Widget, TranslateMixin):
     def _readonly_set(self, value):
         super(TextBox, self)._readonly_set(value)
         self.textview.set_editable(not value)
-        if self.button:
-            self.button.set_sensitive(not value)
 
     @property
     def modified(self):

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

@@ -16,7 +16,7 @@ _ = gettext.gettext
 
 class Widget(object):
     expand = False
-    default_width_chars = 25
+    default_width_chars = 8
 
     def __init__(self, view, attrs):
         super(Widget, self).__init__()
@@ -204,17 +204,15 @@ class TranslateDialog(NoModal):
             widget.set_vexpand(self.widget.expand)
             widget.set_hexpand(True)
             grid.attach(widget, 1, i, 1, 1)
-            editing = Gtk.CheckButton()
+            editing = Gtk.ToggleButton(label=_("Edit"))
             editing.connect('toggled', self.editing_toggled, widget)
             editing.props.sensitive = not readonly
-            tooltips.set_tip(editing, _('Edit'))
             grid.attach(editing, 2, i, 1, 1)
-            fuzzy = Gtk.CheckButton()
-            fuzzy.set_active(value != fuzzy_value)
-            fuzzy.props.sensitive = False
-            tooltips.set_tip(fuzzy, _('Fuzzy'))
-            grid.attach(fuzzy, 4, i, 1, 1)
-            self.widgets[language['code']] = (widget, editing, fuzzy)
+            if value != fuzzy_value:
+                fuzzy = Gtk.Label(_("Fuzzy"))
+                widget_class(fuzzy, 'warning', True)
+                grid.attach(fuzzy, 4, i, 1, 1)
+            self.widgets[language['code']] = (widget, editing)
 
         tooltips.enable()
         vbox = Gtk.VBox()
@@ -241,7 +239,7 @@ class TranslateDialog(NoModal):
     def response(self, win, response):
         if response == Gtk.ResponseType.OK:
             for code, widget in self.widgets.items():
-                widget, editing, fuzzy = widget
+                widget, editing = widget
                 if not editing.get_active():
                     continue
                 value = self.widget.translate_widget_get(widget)

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

@@ -1,6 +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.
-from gi.repository import Gio, GObject, Gtk
+from gi.repository import Gio, GLib, GObject, Gtk
 
 from tryton.common import common
 
@@ -119,6 +119,10 @@ class ViewListForm(View):
         return [
             self._model.get_item(r.get_index()).record for r in selected_rows]
 
+    @property
+    def listed_records(self):
+        return list(self._model.group)
+
     def group_list_changed(self, group, action, *args):
         if action == 'record-added':
             record, position = args
@@ -135,17 +139,69 @@ class ViewListForm(View):
                 self._select_show_row(idx)
                 break
 
-    def _row_selected(self, listbox, row):
-        if not row:
+    def get_selected_paths(self):
+        return [[r.id] for r in self.selected_records]
+
+    def select_nodes(self, nodes):
+        if not nodes:
             return
-        self.record = self._model.get_item(row.get_index()).record
+        nodes = {n[0] for n in nodes}
+        self.listbox.handler_block_by_func(self.select_nodes)
+        self.listbox.unselect_all()
+        for idx, view_form in enumerate(self._view_forms):
+            if view_form.record.id in nodes:
+                row = self.listbox.get_row_at_index(idx)
+                if not row:
+                    continue
+                self.listbox.select_row(row)
+        self.listbox.handler_unblock_by_func(self.select_nodes)
+
+    def _row_selected(self, listbox, row):
+        previous_record = self.record
+        if (previous_record
+                and previous_record not in previous_record.group):
+            previous_record = None
+
+        if row:
+            self.record = self._model.get_item(row.get_index()).record
+        else:
+            self.record = None
+
+        def go_previous():
+            self.record = previous_record
+            self.set_cursor()
+
+        def save():
+            if not previous_record.destroyed:
+                if not previous_record.save():
+                    go_previous()
+
+        def pre_validate():
+            if not previous_record.destroyed:
+                if not previous_record.pre_validate():
+                    go_previous()
+
+        if previous_record and previous_record != self.record:
+            if not self.screen.parent:
+                if not previous_record.validate(self.get_fields()):
+                    go_previous()
+                    return True
+                GLib.idle_add(save)
+            elif self.screen.pre_validate:
+                GLib.idle_add(pre_validate)
 
     @common.idle_add
     def _select_show_row(self, index):
         # translate_coordinates requires that both widgets are realized
         if not self.listbox.get_realized():
             return
-        self.listbox.unselect_all()
+        # unselect_all triggers a loop in _row_selected if the record is not
+        # valid
+        self.listbox.handler_block_by_func(self._select_show_row)
+        try:
+            self.listbox.unselect_all()
+        finally:
+            self.listbox.handler_unblock_by_func(self._select_show_row)
         row = self.listbox.get_row_at_index(index)
         if not row or not row.get_realized():
             return

tryton/gui/window/view_form/view/list_gtk/editabletree.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 gettext
+import logging
 from itertools import chain, cycle, islice
 
 from gi.repository import Gdk, GLib, Gtk
@@ -9,6 +10,7 @@ from tryton.common import MODELACCESS
 from tryton.common.datetime_ import Date, Time
 
 _ = gettext.gettext
+logger = logging.getLogger(__name__)
 
 
 def focusable_cells(column, editable=True):
@@ -51,7 +53,14 @@ class TreeView(Gtk.TreeView):
             if not column.name:
                 continue
             widget = self.view.get_column_widget(column)
-            field = record[column.name]
+            try:
+                record.load(column.name, process_exception=False)
+            except Exception:
+                logger.error(
+                    f"Error loading '{column.name}' for {record}",
+                    exc_info=True)
+                return (None, None)
+            field = record.group.fields[column.name]
             field.state_set(record, states=('readonly', 'invisible'))
             invisible = field.get_state_attrs(record).get('invisible', False)
             if not column.get_visible():
@@ -83,7 +92,8 @@ class EditableTreeView(TreeView):
 
     def on_quit_cell(
             self, current_record, column, renderer, value, callback=None):
-        field = current_record[column.name]
+        current_record.load(column.name, process_exception=False)
+        field = current_record.group.fields[column.name]
         widget = self.view.get_column_widget(column)
 
         # The value has not changed and is valid ... do nothing.
@@ -271,7 +281,7 @@ class EditableTreeView(TreeView):
                 create=(event.keyval == Gdk.KEY_F3), value=value,
                 callback=callback)
         else:
-            field = record[column.name]
+            field = record.group.fields[column.name]
             if isinstance(entry, Gtk.Entry):
                 entry.set_max_length(int(field.attrs.get('size', 0)))
             record.modified_fields.setdefault(column.name)