diff options
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/js/boot.js | 5 | ||||
| -rw-r--r-- | addons/base/static/src/js/form.js | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js index dd451efb0c3..5ae30611195 100644 --- a/addons/base/static/src/js/boot.js +++ b/addons/base/static/src/js/boot.js @@ -54,15 +54,12 @@ openerp.base = function(instance) { openerp.base.formats(instance); openerp.base.chrome(instance); openerp.base.data(instance); - files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"]; + files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; for(i=0; i<files.length; i++) { if(openerp.base[files[i]]) { openerp.base[files[i]](instance); } } - if (openerp.base.data_import){ - openerp.base.data_import(instance); - } }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index e1db5761e1c..ce480b5d367 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -582,6 +582,7 @@ openerp.base.form.Widget = openerp.base.Widget.extend({ this.$element = $('#' + this.element_id); }, stop: function() { + this.$element = $('#' + this.element_id); this.$element.remove(); }, process_modifiers: function() { |