[MERGE] Merge with trunk upto revision no 1400.

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

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 85464e7..adf61f5 100644 (file)
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,7 +1,9 @@
 {
     "name" : "web",
+    "category" : "Hidden",
     "depends" : [],
     'active': True,
+    'post_load' : 'wsgi_postload',
     'js' : [
         "static/lib/datejs/globalization/en-US.js",
         "static/lib/datejs/core.js",
@@ -9,6 +11,7 @@
         "static/lib/datejs/sugarpak.js",
         "static/lib/datejs/extras.js",
         "static/lib/jquery/jquery-1.6.2.js",
+        "static/lib/jquery.MD5/jquery.md5.js",
         "static/lib/jquery.form/jquery.form.js",
         "static/lib/jquery.validate/jquery.validate.js",
         "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
@@ -19,11 +22,13 @@
         "static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js",
         "static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js",
         "static/lib/jquery.ui.notify/js/jquery.notify.js",
+        "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
         "static/lib/json/json2.js",
         "static/lib/qweb/qweb2.js",
         "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",
@@ -32,6 +37,7 @@
         "static/src/js/views.js",
         "static/src/js/data.js",
         "static/src/js/data_export.js",
+        "static/src/js/data_import.js",
         "static/src/js/search.js",
         "static/src/js/view_form.js",
         "static/src/js/view_list.js",
@@ -45,6 +51,6 @@
         "static/lib/jquery.ui.notify/css/ui.notify.css",
         "static/src/css/base.css",
         "static/src/css/data_export.css",
+        "static/src/css/data_import.css",
     ],
-    'post_load' : 'wsgi_postload',
 }