[Fix] sale,crm: remove res.partner.address

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index ff0e294..b9fcfb3 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -207,6 +207,12 @@ def quit_on_signals():
     openerp.service.stop_services()
     sys.exit(0)
 
+def configure_babel_localedata_path():
+    # Workaround: py2exe and babel.
+    if hasattr(sys, 'frozen'):
+        import babel
+        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
+
 if __name__ == "__main__":
 
     os.environ["TZ"] = "UTC"
@@ -220,6 +226,8 @@ if __name__ == "__main__":
 
     config = openerp.tools.config
 
+    configure_babel_localedata_path()
+
     setup_signal_handlers()
 
     if config["test_file"]:
@@ -241,11 +249,7 @@ if __name__ == "__main__":
 
     for m in openerp.conf.server_wide_modules:
         try:
-            __import__(m)
-            # Call any post_load hook.
-            info = openerp.modules.module.load_information_from_description_file(m)
-            if info['post_load']:
-                getattr(sys.modules[m], info['post_load'])()
+            openerp.modules.module.load_openerp_module(m)
         except Exception:
             msg = ''
             if m == 'web':