summaryrefslogtreecommitdiff
path: root/openerp/__init__.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /openerp/__init__.py
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'openerp/__init__.py')
-rw-r--r--openerp/__init__.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/openerp/__init__.py b/openerp/__init__.py
index 995822c9cb0..24a193bf759 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -67,9 +67,7 @@ def registry(database_name):
# Imports
#----------------------------------------------------------
import addons
-import cli
import conf
-import http
import loglevels
import modules
import netsvc
@@ -82,5 +80,18 @@ import sql_db
import tools
import workflow
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+#----------------------------------------------------------
+# Model classes, fields, api decorators, and translations
+#----------------------------------------------------------
+from . import models
+from . import fields
+from . import api
+from openerp.tools.translate import _
+#----------------------------------------------------------
+# Other imports, which may require stuff from above
+#----------------------------------------------------------
+import cli
+import http
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: