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

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

@@ -75,7 +75,8 @@ class Screen:
         self.__current_record = None
         self.new_group(context or {})
         self.current_record = None
-        self.screen_container = ScreenContainer(attributes.get('tab_domain'))
+        self.screen_container = ScreenContainer(
+            self, attributes.get('tab_domain'))
         self.screen_container.alternate_view = attributes.get(
             'alternate_view', False)
         self.widget = self.screen_container.widget_get()
@@ -116,11 +117,10 @@ class Screen:
                 return child
 
             # Remove first level Viewport and ScrolledWindow to fill the Vbox
-            for widget in [
-                    self.context_screen.screen_container.viewport,
-                    self.context_screen.current_view.widget.get_children()[0],
-                    ]:
-                remove_bin(widget)
+            remove_bin(self.context_screen.screen_container.viewport)
+            if self.context_screen.current_view:
+                remove_bin(
+                    self.context_screen.current_view.widget.get_children()[0])
 
             self.screen_container.filter_vbox.pack_start(
                 context_widget, expand=False, fill=True, padding=0)
@@ -164,7 +164,6 @@ 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()
@@ -308,7 +307,8 @@ class Screen:
                 try:
                     self.search_count = RPCExecute(
                         'model', self.model_name, 'search_count',
-                        domain, 0, self.count_limit, context=context)
+                        domain, 0, self.count_limit, context=context,
+                        process_exception=False)
                 except RPCException:
                     self.search_count = 0
             else:
@@ -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)
@@ -520,7 +521,8 @@ class Screen:
         self.group.destroy()
 
     def default_row_activate(self):
-        if (self.current_view.view_type == 'tree'
+        if (self.current_view
+                and self.current_view.view_type == 'tree'
                 and int(self.current_view.attributes.get('keyword_open', 0))):
             return Action.exec_keyword('tree_open', {
                 'model': self.model_name,
@@ -536,6 +538,19 @@ class Screen:
     def number_of_views(self):
         return len(self.views) + len(self.view_to_load)
 
+    @property
+    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 next_view and 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:
@@ -642,7 +657,7 @@ class Screen:
 
     def new(self, default=True, defaults=None):
         previous_view = self.current_view
-        if self.current_view.view_type == 'calendar':
+        if self.current_view and self.current_view.view_type == 'calendar':
             selected_date = self.current_view.get_selected_date()
         if self.current_view and not self.current_view.creatable:
             self.switch_view(creatable=True)
@@ -695,16 +710,19 @@ class Screen:
 
     def save_current(self):
         if not self.current_record:
-            if self.current_view.view_type == 'tree' and len(self.group):
+            if (self.current_view
+                    and self.current_view.view_type == 'tree'
+                    and len(self.group)):
                 self.current_record = self.group[0]
             else:
                 return True
-        self.current_view.set_value()
         saved = False
         record_id = None
-        fields = self.current_view.get_fields()
+        if self.current_view:
+            self.current_view.set_value()
+            fields = self.current_view.get_fields()
         path = self.current_record.get_path(self.group)
-        if self.current_view.view_type == 'tree':
+        if self.current_view and self.current_view.view_type == 'tree':
             # False value must be not saved
             saved = all((
                     x is not False and x >= 0
@@ -714,7 +732,7 @@ class Screen:
             record_id = self.current_record.save(force_reload=True)
             # False value must be not saved
             saved = record_id is not False and record_id >= 0
-        else:
+        elif self.current_view:
             self.set_cursor()
             self.current_view.display()
             return False
@@ -742,17 +760,19 @@ class Screen:
     def get(self):
         if not self.current_record:
             return None
-        self.current_view.set_value()
+        if self.current_view:
+            self.current_view.set_value()
         return self.current_record.get()
 
     def get_on_change_value(self):
         if not self.current_record:
             return None
-        self.current_view.set_value()
+        if self.current_view:
+            self.current_view.set_value()
         return self.current_record.get_on_change_value()
 
     def modified(self):
-        if self.current_view.view_type != 'tree':
+        if self.current_view and self.current_view.view_type != 'tree':
             if self.current_record:
                 if self.current_record.modified or self.current_record.id < 0:
                     return True
@@ -760,7 +780,7 @@ class Screen:
             for record in self.group:
                 if record.modified or record.id < 0:
                     return True
-        if self.current_view.modified:
+        if self.current_view and self.current_view.modified:
             return True
         return False
 
@@ -782,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)
@@ -795,6 +816,9 @@ 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()
 
@@ -809,7 +833,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
@@ -821,11 +848,16 @@ class Screen:
                 context=self.context)
         except RPCException:
             return False
-        self.load(new_ids, position=self.new_position)
+        self.group.load(new_ids, position=self.new_position)
+        if new_ids:
+            self.current_record = self.group.get(new_ids[0])
+        self.display(set_cursor=True)
         return True
 
     def set_tree_state(self):
         view = self.current_view
+        if not view:
+            return
         if view.view_type not in {'tree', 'form', 'list-form'}:
             return
         if id(view) in self.tree_states_done:
@@ -920,7 +952,7 @@ class Screen:
                             json_paths, json_selected_path,
                             process_exception=False)
                         clear_cache('model.ir.ui.view_tree_state.get')
-                    except Exception:
+                    except RPCException:
                         logger.warn(
                             _('Unable to set view tree state'), exc_info=True)
 
@@ -935,12 +967,13 @@ class Screen:
 
     def load(self, ids, set_cursor=True, modified=False, position=-1):
         self.group.load(ids, modified=modified, position=position)
-        self.current_view.reset()
+        if self.current_view:
+            self.current_view.reset()
         self.current_record = None
         self.display(set_cursor=set_cursor)
 
     def display(self, set_cursor=False):
-        if self.views:
+        if self.views and self.current_view:
             self.search_active(self.current_view.view_type
                 in ('tree', 'graph', 'calendar'))
             for view in self.views:
@@ -972,7 +1005,8 @@ class Screen:
 
     def _get_next_record(self, test=False):
         view = self.current_view
-        if (view.view_type in {'tree', 'form'}
+        if (view
+                and view.view_type in {'tree', 'form'}
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1000,12 +1034,14 @@ class Screen:
                 record = next
                 break
             return record
-        elif (view.view_type == 'list-form' and len(self.group)
+        elif (view
+                and view.view_type == 'list-form'
+                and len(self.group)
                 and self.current_record in self.group):
             idx = self.group.index(self.current_record)
             if 0 <= idx < len(self.group) - 1:
                 return self.group[idx + 1]
-        elif view.view_type == 'calendar':
+        elif view and view.view_type == 'calendar':
             record = self.current_record
             goocalendar = view.widgets.get('goocalendar')
             if goocalendar:
@@ -1039,15 +1075,18 @@ class Screen:
 
     def display_next(self):
         view = self.current_view
-        view.set_value()
+        if view:
+            view.set_value()
         self.set_cursor(reset_view=False)
         self.current_record = self._get_next_record()
         self.set_cursor(reset_view=False)
-        view.display()
+        if view:
+            view.display()
 
     def _get_prev_record(self, test=False):
         view = self.current_view
-        if (view.view_type in {'tree', 'form'}
+        if (view
+                and view.view_type in {'tree', 'form'}
                 and self.current_record
                 and self.current_record.group):
             group = self.current_record.group
@@ -1065,7 +1104,7 @@ class Screen:
                 if parent and record.model_name == parent.model_name:
                     record = parent
             return record
-        elif view.view_type == 'calendar':
+        elif view and view.view_type == 'calendar':
             record = self.current_record
             goocalendar = view.widgets.get('goocalendar')
             if goocalendar:
@@ -1090,7 +1129,9 @@ class Screen:
                             if prev_id >= 0:
                                 return events[prev_id].record
                             break
-        elif (view.view_type == 'list-form' and len(self.group)
+        elif (view
+                and view.view_type == 'list-form'
+                and len(self.group)
                 and self.current_record in self.group):
             idx = self.group.index(self.current_record)
             if 0 < idx <= len(self.group) - 1:
@@ -1104,11 +1145,13 @@ class Screen:
 
     def display_prev(self):
         view = self.current_view
-        view.set_value()
+        if view:
+            view.set_value()
         self.set_cursor(reset_view=False)
         self.current_record = self._get_prev_record()
         self.set_cursor(reset_view=False)
-        view.display()
+        if view:
+            view.display()
 
     def invalid_message(self, record=None):
         if record is None:
@@ -1142,6 +1185,8 @@ class Screen:
     def selected_paths(self):
         if self.current_view and self.current_view.view_type == 'tree':
             return self.current_view.get_selected_paths()
+        else:
+            return []
 
     @property
     def listed_records(self):
@@ -1181,7 +1226,7 @@ class Screen:
         if not self.selected_records:
             return []
 
-        buttons = self.current_view.get_buttons()
+        buttons = self.current_view.get_buttons() if self.current_view else []
 
         for record in self.selected_records:
             buttons = [b for b in buttons if is_active(record, b)]
@@ -1191,8 +1236,9 @@ class Screen:
 
     def button(self, button):
         'Execute button on the selected records'
-        self.current_view.set_value()
-        fields = self.current_view.get_fields()
+        if self.current_view:
+            self.current_view.set_value()
+            fields = self.current_view.get_fields()
         for record in self.selected_records:
             domain = record.expr_eval(
                 button.get('states', {})).get('pre_validate', [])
@@ -1206,9 +1252,9 @@ class Screen:
         if button.get('confirm', False) and not sur(button['confirm']):
             return
         if button.get('type', 'class') == 'class':
-            if not self.current_record.save(force_reload=False):
+            record_id = self.current_record.save(force_reload=False)
+            if record_id is False or record_id < 0:
                 return
-        if button.get('type', 'class') == 'class':
             self._button_class(button)
         else:
             self._button_instance(button)
@@ -1217,6 +1263,7 @@ 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)
@@ -1237,6 +1284,7 @@ class Screen:
         except RPCException:
             action = None
         self.reload(ids, written=True)
+        self.record_saved()
         if isinstance(action, str):
             self.client_action(action)
         elif action:
@@ -1273,7 +1321,9 @@ class Screen:
         elif action.startswith('switch'):
             self.switch_view(*action.split(None, 2)[1:])
         elif action == 'reload':
-            if (self.current_view.view_type in ['tree', 'graph', 'calendar']
+            if (self.current_view
+                    and self.current_view.view_type in [
+                        'tree', 'graph', 'calendar']
                     and not self.parent):
                 self.search_filter()
         elif action == 'reload menu':
@@ -1297,13 +1347,13 @@ class Screen:
         if name:
             query_string.append(
                 ('name', json.dumps(name, separators=(',', ':'))))
-        if self.screen_container.tab_domain:
-            query_string.append(('tab_domain', json.dumps(
-                        self.screen_container.tab_domain,
-                        cls=JSONEncoder, separators=(',', ':'))))
         path = [CONFIG['login.db'], 'model', self.model_name]
         view_ids = [v.view_id for v in self.views] + self.view_ids
-        if self.current_view.view_type != 'form':
+        if self.current_view and self.current_view.view_type != 'form':
+            if self.screen_container.tab_domain:
+                query_string.append(('tab_domain', json.dumps(
+                            self.screen_container.tab_domain,
+                            cls=JSONEncoder, separators=(',', ':'))))
             if self.search_value:
                 search_value = self.search_value
             else:
@@ -1315,8 +1365,9 @@ class Screen:
                             separators=(',', ':'))))
         elif self.current_record and self.current_record.id > -1:
             path.append(str(self.current_record.id))
-            i = view_ids.index(self.current_view.view_id)
-            view_ids = view_ids[i:] + view_ids[:i]
+            if self.current_view:
+                i = view_ids.index(self.current_view.view_id)
+                view_ids = view_ids[i:] + view_ids[:i]
         if view_ids:
             query_string.append(('views', json.dumps(
                         view_ids, separators=(',', ':'))))

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

@@ -63,17 +63,23 @@ class Calendar_(goocalendar.Calendar):
         return False
 
     def current_domain(self):
-        first_datetime, last_datetime = \
-            self.current_domain_period.get_dates(True)
+        start, end = self.current_domain_period.get_dates(True)
         dtstart = self.attrs['dtstart']
         dtend = self.attrs.get('dtend') or dtstart
-        domain = ['OR',
-            ['AND', (dtstart, '>=', first_datetime),
-                (dtstart, '<', last_datetime)],
-            ['AND', (dtend, '>=', first_datetime),
-                (dtend, '<', last_datetime)],
-            ['AND', (dtstart, '<', first_datetime),
-                (dtend, '>', last_datetime)]]
+        fields = self.view_calendar.screen.group.fields
+        if fields[dtstart].attrs['type'] == 'date':
+            start = start.date()
+        if fields[dtend].attrs['type'] == 'date':
+            end = end.date()
+        domain = [
+            (dtstart, '!=', None),
+            (dtend, '!=', None),
+            ['OR',
+                ['AND', (dtstart, '>=', start), (dtstart, '<', end)],
+                ['AND', (dtend, '>=', start), (dtend, '<', end)],
+                ['AND', (dtstart, '<', start), (dtend, '>', end)],
+                ],
+            ]
         return domain
 
     def get_colors(self, record):

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

@@ -230,6 +230,9 @@ class FormXMLViewParser(XMLViewParser):
             self.container.add(None, attributes)
             return
 
+        if int(attributes.get('visible', 0)):
+            self.field_attrs[name]['visible'] = True
+
         widget = self.WIDGETS[attributes['widget']](self.view, attributes)
         self.view.widgets[name].append(widget)
 
@@ -340,18 +343,7 @@ class FormXMLViewParser(XMLViewParser):
                 int(attributes.get('width', -1)),
                 int(attributes.get('height', -1)))
 
-        # Force to display the first time it switches on a page
-        # This avoids glitch in position of widgets
-        def switch(notebook, page, page_num):
-            if not self.view.widget:
-                # Not yet finish to parse
-                return
-            notebook.grab_focus()
-            self.view.display()
-            notebook.disconnect(handler_id)
-        handler_id = notebook.connect('switch-page', switch)
         self.view.state_widgets.append(notebook)
-
         self.view.notebooks.append(notebook)
         self.container.add(notebook, attributes)
         self.parse_child(node, notebook)
@@ -390,7 +382,6 @@ 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)
@@ -414,6 +405,9 @@ 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/char.py

@@ -171,10 +171,9 @@ class Password(Char):
         self.widget.pack_start(
             self.visibility_checkbox, expand=False, fill=True, padding=0)
 
-    def _readonly_set(self, value):
-        super(Char, self)._readonly_set(value)
-        self.entry.set_editable(not value)
-        self.visibility_checkbox.props.visible = not value
-
     def toggle_visibility(self, button):
-        self.entry.props.visibility = not self.entry.props.visibility
+        if self.autocomplete:
+            entry = self.entry.get_child()
+        else:
+            entry = self.entry
+        entry.props.visibility = not self.entry.props.visibility