merge.

tryton/gui/main.py

@@ -19,6 +19,7 @@ from tryton.common import RPCExecute, RPCException
 from tryton.config import CONFIG, TRYTON_ICON, get_config_dir
 import tryton.common as common
 from tryton.pyson import PYSONDecoder
+from tryton.jsonrpc import object_hook
 from tryton.action import Action
 from tryton.exceptions import TrytonServerError, TrytonError, \
     TrytonServerUnavailable
@@ -1435,9 +1436,12 @@ class Main(object):
                 limit = json.loads(params.get('limit', 'null'))
                 auto_refresh = json.loads(params.get('auto_refresh', 'false'))
                 name = json.loads(params.get('window_name', 'false'))
-                search_value = json.loads(params.get('search_value', '{}'))
-                domain = json.loads(params.get('domain', '[]'))
-                context = json.loads(params.get('context', '{}'))
+                search_value = json.loads(params.get('search_value', '{}'),
+                    object_hook=object_hook)
+                domain = json.loads(params.get('domain', '[]'),
+                    object_hook=object_hook)
+                context = json.loads(params.get('context', '{}'),
+                    object_hook=object_hook)
             except ValueError:
                 return
             if path:
@@ -1458,13 +1462,15 @@ class Main(object):
             if not wizard:
                 return
             try:
-                data = json.loads(params.get('data', '{}'))
+                data = json.loads(params.get('data', '{}'),
+                    object_hook=object_hook)
                 direct_print = json.loads(params.get('direct_print', 'false'))
                 email_print = json.loads(params.get('email_print', 'false'))
                 email = json.loads(params.get('email', 'null'))
                 name = json.loads(params.get('name', 'false'))
                 window = json.loads(params.get('window', 'false'))
-                context = json.loads(params.get('context', '{}'))
+                context = json.loads(params.get('context', '{}'),
+                    object_hook=object_hook)
             except ValueError:
                 return
             try:
@@ -1479,11 +1485,12 @@ class Main(object):
             if not report:
                 return
             try:
-                data = json.loads(params.get('data'))
+                data = json.loads(params.get('data'), object_hook=object_hook)
                 direct_print = json.loads(params.get('direct_print', 'false'))
                 email_print = json.loads(params.get('email_print', 'false'))
                 email = json.loads(params.get('email', 'null'))
-                context = json.loads(params.get('context', '{}'))
+                context = json.loads(params.get('context', '{}'),
+                    object_hook=object_hook)
             except ValueError:
                 return
             try:

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

@@ -820,7 +820,7 @@ class Screen(SignalEvent):
                         cls=JSONEncoder)))
         path = [rpc._DATABASE, 'model', self.model_name]
         view_ids = [v.view_id for v in self.views] + self.view_ids
-        if self.current_view.view_type == 'tree':
+        if self.current_view.view_type != 'form':
             search_string = self.screen_container.get_text()
             search_value = self.domain_parser.parse(search_string)
             if search_value:

tryton/gui/window/win_form.py

@@ -389,8 +389,6 @@ class WinForm(NoModal):
         validate = False
         cancel_responses = (gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT)
         self.screen.current_view.set_value()
-        if not self.win.get_focus():
-            return
         if (response_id not in cancel_responses
                 and self.screen.current_record is not None):
             validate = self.screen.current_record.validate(