summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/boot.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2011-09-26 13:26:23 +0200
committerChristophe Simonis <chs@openerp.com>2011-09-26 13:26:23 +0200
commit4261f1ad11fbe4772319190e59df80e504849bc4 (patch)
tree60c7b786c7851e12c1e92729450bf69554b449a5 /addons/web/static/src/js/boot.js
parent01eff42ca26c312c75a1eee8d86a986a21c7d9a8 (diff)
parent47094e8adb39696638ecb7f4882812a47d0038e1 (diff)
merge upstream
bzr revid: chs@openerp.com-20110926112623-q68d3tebr80qt6l9
Diffstat (limited to 'addons/web/static/src/js/boot.js')
-rw-r--r--addons/web/static/src/js/boot.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 27dc4dcda5e..447b6d92746 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -58,7 +58,7 @@ openerp.web = function(instance) {
openerp.web.formats(instance);
openerp.web.chrome(instance);
openerp.web.data(instance);
- var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"];
+ var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"];
for(var i=0; i<files.length; i++) {
if(openerp.web[files[i]]) {
openerp.web[files[i]](instance);