summaryrefslogtreecommitdiff
path: root/addons/base_import/static
diff options
context:
space:
mode:
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-10-23 10:49:57 +0530
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-10-23 10:49:57 +0530
commit74ee6c9c8f2fe3d87c8e5cfce81a30e2152a8ad8 (patch)
tree7d116c42424dd56469997d981e7ebbf074d6743d /addons/base_import/static
parent3d9e153cd088943b3595c21a405e2232ffd79711 (diff)
parentc55438e695d03854ebf1b82aa0d6b33b3dc278f0 (diff)
[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121023051957-v8mdl714cnne8y2y
Diffstat (limited to 'addons/base_import/static')
-rw-r--r--addons/base_import/static/src/js/import.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 043630afc48..407d38dacd7 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -38,7 +38,7 @@ openerp.base_import = function (instance) {
// if true, the 'Import', 'Export', etc... buttons will be shown
instance.web.ListView.prototype.defaults.import_enabled = true;
instance.web.ListView.include({
- on_loaded: function () {
+ load_list: function () {
var self = this;
var add_button = false;
if (!this.$buttons) {