projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MERGE] latest trunk
[odoo/odoo.git]
/
openerp
/
__init__.py
diff --git
a/openerp/__init__.py
b/openerp/__init__.py
index
c5f7732
..
7e723c4
100644
(file)
--- a/
openerp/__init__.py
+++ b/
openerp/__init__.py
@@
-19,9
+19,16
@@
#
##############################################################################
#
##############################################################################
+""" OpenERP core library.
+
+"""
+# The hard-coded super-user id (a.k.a. administrator, or root user).
+SUPERUSER_ID = 1
+
import addons
import addons
-import ir
+import conf
import loglevels
import loglevels
+import modules
import netsvc
import osv
import pooler
import netsvc
import osv
import pooler
@@
-36,6
+43,7
@@
import tiny_socket
import tools
import wizard
import workflow
import tools
import wizard
import workflow
+import wsgi
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: