[MERGE] Merge with trunk upto revision no 1184.

[odoo/odoo.git] / addons / web / __openerp__.py

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 1f83634..d304825 100644 (file)
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,8 +1,9 @@
 {
     "name" : "web",
+    "category" : "Hidden",
     "depends" : [],
     'active': True,
-    'web_auto_load': True,
+    'post_load' : 'wsgi_postload',
     'js' : [
         "static/lib/datejs/globalization/en-US.js",
         "static/lib/datejs/core.js",
@@ -26,6 +27,7 @@
         "static/lib/underscore/underscore.js",
         "static/lib/underscore/underscore.string.js",
         "static/lib/labjs/LAB.src.js",
+        "static/lib/py.parse/lib/py.js",
         "static/src/js/boot.js",
         "static/src/js/core.js",
         "static/src/js/dates.js",
@@ -40,6 +42,7 @@
         "static/src/js/view_list.js",
         "static/src/js/view_list_editable.js",
         "static/src/js/view_tree.js",
+        "static/src/js/view_editor.js"
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",
@@ -49,5 +52,4 @@
         "static/src/css/data_export.css",
         "static/src/css/data_import.css",
     ],
-    'post_load' : 'wsgi_postload',
 }