[MERGE] Merge from openerp-web.

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index a5c81d6..3586b11 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -89,6 +89,8 @@ logger.info('initialising distributed objects services')
 if not ( config["stop_after_init"] or \
     config["translate_in"] or \
     config["translate_out"] ):
+    openerp.osv.osv.start_object_proxy()
+    openerp.service.web_services.start_web_services()
     http_server = openerp.service.http_server
     netrpc_server = openerp.service.netrpc_server
     http_server.init_servers()
@@ -150,6 +152,8 @@ if config["translate_in"]:
 if config["stop_after_init"]:
     sys.exit(0)
 
+openerp.netsvc.start_agent()
+
 #----------------------------------------------------------
 # Launch Servers
 #----------------------------------------------------------