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

tryton/data/locale/zh_CN/LC_MESSAGES/tryton.po

@@ -140,9 +140,9 @@ msgstr "并行操作异常"
 msgid "Could not get a session."
 msgstr "无法获取会话。"
 
-#, python-format
+#, fuzzy, python-format
 msgid "Error: \"%s\". Try again later."
-msgstr ""
+msgstr "请求太多，请稍后重试."
 
 msgid "Too many requests. Try again later."
 msgstr "请求太多，请稍后重试."
@@ -240,8 +240,8 @@ msgstr "报告..."
 msgid "Print..."
 msgstr "打印..."
 
-msgid "E-Mail..."
-msgstr "用电子邮件发送..."
+msgid "Email..."
+msgstr "电子邮件(_E)..."
 
 msgid "Bold"
 msgstr "粗体"
@@ -351,12 +351,6 @@ msgstr "帮助"
 msgid "No result found."
 msgstr "无符合条件的数据."
 
-msgid "Favorites"
-msgstr "收藏(_V)"
-
-msgid "Manage..."
-msgstr "管理..."
-
 msgid "Action"
 msgstr "操作"
 
@@ -587,6 +581,9 @@ msgstr "连接 Tryton 服务器"
 msgid "Profile:"
 msgstr "配置:"
 
+msgid "Manage..."
+msgstr "管理..."
+
 msgid "Host / Database information"
 msgstr "主机/数据库信息"
 
@@ -596,8 +593,8 @@ msgstr "用户名:"
 msgid "Unable to complete email entry"
 msgstr "无法完成电子邮件输入"
 
-#, python-format
-msgid "E-mail %s"
+#, fuzzy, python-format
+msgid "Email %s"
 msgstr "电子邮件 %s"
 
 msgid "To:"
@@ -845,10 +842,12 @@ msgstr "报告(_R)..."
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-msgid "_E-Mail..."
-msgstr "电子邮件发送(_E)..."
+#, fuzzy
+msgid "_Email..."
+msgstr "电子邮件(_E)..."
 
-msgid "Send an e-mail using the record"
+#, fuzzy
+msgid "Send an email using the record"
 msgstr "使用当前记录发送电子邮件"
 
 msgid "_Export Data..."
@@ -900,6 +899,9 @@ msgstr "字段名"
 msgid "CSV Export: %s"
 msgstr "CSV导出：%s"
 
+msgid "Open"
+msgstr "打开"
+
 msgid "_Save Export"
 msgstr "保存导出设置（_S）"
 
@@ -915,12 +917,6 @@ msgstr "<b>预定义导出设置</b>"
 msgid "Name"
 msgstr "名称"
 
-msgid "Open"
-msgstr "打开"
-
-msgid "Save"
-msgstr "保存"
-
 msgid "Listed Records"
 msgstr "已列出记录"
 
@@ -978,6 +974,9 @@ msgstr "保存和新建"
 msgid "Add and New"
 msgstr "添加和新建"
 
+msgid "Save"
+msgstr "保存"
+
 msgid "Add"
 msgstr "添加"
 
@@ -1003,6 +1002,10 @@ msgstr "已选记录取消删除 <Ins>"
 msgid "CSV Import: %s"
 msgstr "CSV导入: %s"
 
+#, fuzzy
+msgid "Import"
+msgstr "报告(_R)"
+
 msgid "_Auto-Detect"
 msgstr "自动设置（_A）"
 
@@ -1206,6 +1209,10 @@ msgstr "添加已存在记录"
 msgid "Remove selected record"
 msgstr "删除所选记录"
 
+#, fuzzy
+msgid "Restore selected record"
+msgstr "删除所选记录"
+
 msgid "Open the record <F2>"
 msgstr "打开记录 <F2>"
 
@@ -1221,6 +1228,10 @@ msgstr "编辑所选记录<F2>"
 msgid "Delete selected record"
 msgstr "删除所选记录"
 
+#, fuzzy
+msgid "Undelete selected record"
+msgstr "删除所选记录"
+
 #, python-format
 msgid "%s%%"
 msgstr "%s%%"

tryton/gui/main.py

@@ -463,10 +463,6 @@ class Main(Gtk.Application):
                         'id': id_,
                         })
 
-        def _manage_favorites(widget):
-            Window.create(self.menu_screen.model_name + '.favorite',
-                mode=['tree', 'form'],
-                name=_("Favorites"))
         try:
             favorites = RPCExecute('model',
                 self.menu_screen.model_name + '.favorite', 'get',
@@ -477,11 +473,6 @@ class Main(Gtk.Application):
             menuitem = Gtk.MenuItem(label=name)
             menuitem.connect('activate', _action_favorite, id_)
             self.menu_favorite.add(menuitem)
-        self.menu_favorite.add(Gtk.SeparatorMenuItem())
-        manage_favorites = Gtk.MenuItem(label=_("Manage..."),
-            use_underline=True)
-        manage_favorites.connect('activate', _manage_favorites)
-        self.menu_favorite.add(manage_favorites)
         self.menu_favorite.show_all()
 
     def favorite_unset(self):
@@ -772,6 +763,9 @@ class Main(Gtk.Application):
             expand=True, fill=True, padding=0)
         treeview = screen.current_view.treeview
         treeview.set_headers_visible(False)
+        for col in treeview.get_columns():
+            if col._type in {'selection', 'optional', 'drag'}:
+                col.set_visible(False)
 
         # Favorite column
         column = Gtk.TreeViewColumn()
@@ -864,7 +858,14 @@ class Main(Gtk.Application):
             halign=Gtk.Align.START)
         self.tooltips.set_tip(label, page.name)
         self.tooltips.enable()
-        hbox.pack_start(label, expand=True, fill=True, padding=0)
+
+        def remove_book_middle_click(widget, event):
+            if event.button == 2:
+                return self._sig_remove_book(widget, page.widget)
+        eventbox = Gtk.EventBox()
+        eventbox.connect('button-press-event', remove_book_middle_click)
+        eventbox.add(label)
+        hbox.pack_start(eventbox, expand=True, fill=True, padding=0)
 
         button = Gtk.Button()
         button.set_relief(Gtk.ReliefStyle.NONE)

tryton/gui/window/about.py

@@ -11,7 +11,7 @@ from tryton.common import get_toplevel_window
 from tryton.config import CONFIG, PIXMAPS_DIR
 
 COPYRIGHT = '''\
-Copyright (C) 2004-2025 Tryton.
+Copyright (C) 2004-2024 Tryton.
 '''
 AUTHORS = [
         'Bertrand Chenal <bertrand.chenal@b2ck.com>',

tryton/gui/window/email_.py

@@ -106,7 +106,7 @@ class Email(NoModal):
         self.dialog.set_default_size(*self.default_size())
         self.dialog.connect('response', self.response)
 
-        self.dialog.set_title(_('E-mail %s') % name)
+        self.dialog.set_title(_('Email %s') % name)
 
         grid = Gtk.Grid(
             column_spacing=3, row_spacing=3,

tryton/gui/window/form.py

@@ -579,6 +579,7 @@ class Form(TabContent):
         name = str(position) if position else '_'
         selected = len(self.screen.selected_records)
         view_type = self.screen.current_view.view_type
+        next_view_type = self.screen.next_view_type
         has_views = self.screen.number_of_views > 1
         if selected > 1:
             name += '#%i' % selected
@@ -594,7 +595,9 @@ class Form(TabContent):
                     for b in self.screen.get_buttons())
             set_sensitive(button_id, bool(position) and can_be_sensitive)
         set_sensitive(
-            'switch', (position or view_type == 'form') and has_views)
+            'switch',
+            (position or view_type == 'form' or next_view_type != 'form')
+            and has_views)
         set_sensitive('remove', self.screen.deletable)
         set_sensitive('previous', self.screen.has_prev())
         set_sensitive('next', self.screen.has_next())

tryton/gui/window/tabcontent.py

@@ -141,8 +141,8 @@ class TabContent(InfoBar):
                 accel_path='<tryton>/Form/Print'),
             ToolbarItem(
                 id='email',
-                label=_("_E-Mail..."),
-                tooltip=_("Send an e-mail using the record"),
+                label=_("_Email..."),
+                tooltip=_("Send an email using the record"),
                 icon_name='tryton-email',
                 accel_path='<tryton>/Form/Email'),
             None,

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

@@ -621,10 +621,12 @@ class O2MField(Field):
         from .group import Group
         parent_name = self.attrs.get('relation_field', '')
         fields = fields or {}
+        context = record.expr_eval(self.attrs.get('context', {}))
         group = Group(self.attrs['relation'], fields,
                 parent=record,
                 parent_name=parent_name,
                 child_name=self.name,
+                context=context,
                 parent_datetime_field=self.attrs.get('datetime_field'))
         if not fields and record.model_name == self.attrs['relation']:
             group.fields = record.group.fields

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

@@ -128,6 +128,7 @@ class Group(list):
         self._group_list_changed('record-removed', record, idx)
         super(Group, self).remove(record)
         del self.__id2record[record.id]
+        record.destroy()
 
     def clear(self):
         # Use reversed order to minimize the cursor reposition as the cursor
@@ -408,7 +409,9 @@ class Group(list):
                 if record not in self.record_deleted:
                     self.record_deleted.append(record)
         record.modified_fields.setdefault('id')
-        if record.id < 0 or force_remove:
+        if (record.id < 0
+                or (self.parent and self.parent.id < 0)
+                or force_remove):
             self._remove(record)
 
         if len(self):

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

@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
 
 
 def get_x2m_sub_fields(f_attrs, prefix):
-    if f_attrs.get('visible') and f_attrs.get('views'):
+    if f_attrs['loading'] == 'eager' and f_attrs.get('views'):
         sub_fields = functools.reduce(
             operator.or_,
             (v.get('fields', {}) for v in f_attrs['views'].values()),
@@ -177,10 +177,10 @@ class Record:
                 for record in id2record.values():
                     record.exception = True
                 if process_exception:
-                    values = [{'id': x} for x in id2record]
+                    values = []
                     default_values = {f: None for f in fnames if f != 'id'}
-                    for value in values:
-                        value.update(default_values)
+                    for id in id2record:
+                        values.append({'id': id, **default_values})
                 else:
                     raise
             id2value = dict((value['id'], value) for value in values)
@@ -299,20 +299,13 @@ class Record:
         return self.group.fields
 
     def _check_load(self, fields=None):
-        if fields is not None:
-            if not self.get_loaded(fields):
-                self.reload(fields)
-                return True
-            return False
-        if not self.loaded:
-            self.reload()
-            return True
-        return False
+        if not self.get_loaded(fields):
+            self.reload(fields)
 
     def get_loaded(self, fields=None):
-        if fields:
-            return set(fields) <= (self._loaded | set(self.modified_fields))
-        return set(self.group.fields.keys()) == self._loaded
+        if fields is None:
+            fields = self.group.fields.keys()
+        return set(fields) <= (self._loaded | set(self.modified_fields))
 
     loaded = property(get_loaded)
 
@@ -413,7 +406,6 @@ class Record:
         return self.id
 
     def default_get(self, defaults=None):
-        vals = {}
         if len(self.group.fields):
             context = self.get_context()
             if defaults is not None:
@@ -423,7 +415,7 @@ class Record:
                 vals = RPCExecute('model', self.model_name, 'default_get',
                     list(self.group.fields.keys()), context=context)
             except RPCException:
-                return vals
+                return
             if (self.parent
                     and self.parent_name in self.group.fields):
                 parent_field = self.group.fields[self.parent_name]
@@ -444,10 +436,7 @@ class Record:
             return ''
 
     def validate(self, fields=None, softvalidation=False, pre_validate=None):
-        if isinstance(fields, list) and fields:
-            self._check_load(fields)
-        elif fields is None:
-            self._check_load()
+        self._check_load(fields)
         res = True
         for field_name, field in list(self.group.fields.items()):
             if fields is not None and field_name not in fields:
@@ -617,7 +606,6 @@ class Record:
             values.update(self._get_on_change_args(on_change))
 
         if values:
-            values['id'] = self.id
             try:
                 if len(fieldnames) == 1 or 'id' not in values:
                     changes = []
@@ -679,7 +667,6 @@ class Record:
                                 'on_change_with_' + fieldname,
                                 values, context=self.get_context()))
                 else:
-                    values['id'] = self.id
                     changed = RPCExecute(
                         'model', self.model_name, 'on_change_with',
                         values, list(fieldnames), context=self.get_context())
@@ -702,7 +689,6 @@ class Record:
                                 'on_change_with_' + fieldname,
                                 values, context=self.get_context()))
                 else:
-                    values['id'] = self.id
                     changed = RPCExecute(
                         'model', self.model_name, 'on_change_with',
                         values, list(later), context=self.get_context())
@@ -734,7 +720,6 @@ class Record:
     def on_scan_code(self, code, depends):
         depends = self.expr_eval(depends)
         values = self._get_on_change_args(depends)
-        values['id'] = self.id
         try:
             changes = RPCExecute(
                 'model', self.model_name, 'on_scan_code', values, code,

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

@@ -75,8 +75,7 @@ class Screen:
         self.__current_record = None
         self.new_group(context or {})
         self.current_record = None
-        self.screen_container = ScreenContainer(
-            self, attributes.get('tab_domain'))
+        self.screen_container = ScreenContainer(attributes.get('tab_domain'))
         self.screen_container.alternate_view = attributes.get(
             'alternate_view', False)
         self.widget = self.screen_container.widget_get()
@@ -164,6 +163,7 @@ class Screen:
 
     def search_active(self, active=True):
         if active and not self.parent:
+            self.screen_container.set_screen(self)
             self.screen_container.show_filter()
         else:
             self.screen_container.hide_filter()
@@ -323,6 +323,7 @@ class Screen:
         if only_ids:
             return ids
         self.clear()
+        GLib.idle_add(self.screen_container.search_entry.grab_focus)
         self.load(ids)
         self.count_tab_domain()
         return bool(ids)
@@ -541,6 +542,15 @@ class Screen:
     def view_index(self):
         return self.__current_view
 
+    @property
+    def next_view_type(self):
+        views = self.views + self.view_to_load
+        next_view_index = (self.view_index + 1) % len(views)
+        next_view = views[next_view_index]
+        if not isinstance(next_view, str):
+            next_view = next_view.view_type
+        return next_view
+
     def switch_view(
             self, view_type=None, view_id=None, creatable=None, display=True):
         if view_id is not None:
@@ -792,6 +802,7 @@ class Screen:
         records = records or self.selected_records
         if not records:
             return
+        current_record = self.current_record
         if delete:
             # Must delete children records before parent
             records.sort(key=lambda r: r.depth, reverse=True)
@@ -805,9 +816,6 @@ class Screen:
             record.group.remove(
                 record, remove=remove, modified=False,
                 force_remove=force_remove)
-        # set current_record to None to prevent __select_changed
-        # to set deleted record as current_record
-        self.current_record = None
         # call only once
         record.set_modified()
 
@@ -822,7 +830,10 @@ class Screen:
                     record.parent.save(force_reload=False)
                 record.destroy()
 
-        self.current_record = None
+        if current_record and not current_record.destroyed:
+            self.current_record = current_record
+        else:
+            self.current_record = None
         self.set_cursor()
         self.display()
         return True
@@ -1249,7 +1260,6 @@ class Screen:
         record = self.current_record
         args = record.expr_eval(button.get('change', []))
         values = record._get_on_change_args(args)
-        values['id'] = record.id
         try:
             changes = RPCExecute('model', self.model_name, button['name'],
                 values, context=self.context)

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

@@ -230,8 +230,8 @@ class FormXMLViewParser(XMLViewParser):
             self.container.add(None, attributes)
             return
 
-        if int(attributes.get('visible', 0)):
-            self.field_attrs[name]['visible'] = True
+        if attributes.get('loading') == 'eager':
+            self.field_attrs[name]['loading'] = 'eager'
 
         widget = self.WIDGETS[attributes['widget']](self.view, attributes)
         self.view.widgets[name].append(widget)
@@ -382,6 +382,7 @@ class FormXMLViewParser(XMLViewParser):
         group = Container.constructor(
             int(attributes.get('col', 4)),
             attributes.get('homogeneous', False))
+        self.parse_child(node, group)
 
         if 'name' in attributes and attributes['name'] == self.exclude_field:
             self.container.add(None, attributes)
@@ -405,9 +406,6 @@ class FormXMLViewParser(XMLViewParser):
                 bool(attributes.get('yexpand'))))
         self.view.state_widgets.append(widget)
         self.container.add(widget, attributes)
-        # Parse the children at the end to preserve the order of the state
-        # widgets
-        self.parse_child(node, group)
 
     def _parse_hpaned(self, node, attributes):
         self._parse_paned(node, attributes, Gtk.HPaned)

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

@@ -224,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)}

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

@@ -1,5 +1,6 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
+import logging
 from pathlib import Path
 
 from gi.repository import Gdk, GLib, Gtk
@@ -15,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
@@ -90,5 +93,8 @@ class Document(BinaryMixin, Widget):
                     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

@@ -82,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()
@@ -130,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()
@@ -166,6 +177,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)]
         context = self.field.get_search_context(self.record)
         order = self.field.get_search_order(self.record)
         value = self.wid_text.get_text()
@@ -194,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()
 
@@ -284,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):
@@ -343,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/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: