Merge pull request #648 from odoo-dev/7.0-fix-searchbar-navigation-ged

[odoo/odoo.git] / openerp / __init__.py

diff --git a/openerp/__init__.py b/openerp/__init__.py
index 2fd2a98..02f879c 100644 (file)
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -22,10 +22,22 @@
 """ OpenERP core library.
 
 """
+
+# Make sure the OpenERP server runs in UTC. This is especially necessary
+# under Windows as under Linux it seems the real import of time is
+# sufficiently deferred so that setting the TZ environment variable
+# in openerp.cli.server was working.
+import os
+os.environ['TZ'] = 'UTC' # Set the timezone...
+import time              # ... *then* import time.
+del os
+del time
+
 # The hard-coded super-user id (a.k.a. administrator, or root user).
 SUPERUSER_ID = 1
 
 import addons
+import cli
 import conf
 import loglevels
 import modules
@@ -34,12 +46,9 @@ import osv
 import pooler
 import release
 import report
-import run_tests
 import service
 import sql_db
-import test
 import tools
-import wizard
 import workflow
 # backward compatilbility
 # TODO: This is for the web addons, can be removed later.
@@ -50,7 +59,7 @@ wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler
 # e.g. database update or cache invalidation. Each process has also
 # its own copy of the data structure and we don't need to care about
 # locks between threads.
-multi_process = True
+multi_process = False
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: