merge

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

@@ -40,7 +40,7 @@ class Screen(SignalEvent):
         if domain is None:
             domain = []
 
-        self.limit = limit or 1000
+        self.limit = limit or int(CONFIG['client.limit'])
         self.offset = 0
         super(Screen, self).__init__()
 
@@ -144,7 +144,7 @@ class Screen(SignalEvent):
     def search_filter(self, search_string=None, only_ids=False):
         domain = []
 
-        if self.domain_parser:
+        if self.domain_parser and not self.parent:
             if search_string is not None:
                 domain = self.domain_parser.parse(search_string or '').domain()
             else:

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

@@ -59,11 +59,12 @@ def sort_model(column, treeview, screen):
             column.arrow.hide()
     store = treeview.get_model()
     unsaved_records = [x for x in store.group if x.id < 0]
+    search_string = screen.screen_container.get_text() or None
     if screen.search_count == len(store):
-        ids = screen.search_filter(only_ids=True)
+        ids = screen.search_filter(search_string=search_string, only_ids=True)
         store.sort(ids)
     else:
-        screen.search_filter()
+        screen.search_filter(search_string=search_string)
     for record in unsaved_records:
         store.group.append(record)