summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/data_import.js
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
committerVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
commit3203d264aecd751a8c261cea4f72fa323a3098be (patch)
tree93cdf7c89795b809963ef08a68d84d293cf41a7a /addons/web/static/src/js/data_import.js
parent1497062ba1dbfd814c69fa4250c4eb6a09a5206a (diff)
parent064a50bcde5f1c65a17f4feb42348b5809081085 (diff)
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22
Diffstat (limited to 'addons/web/static/src/js/data_import.js')
-rw-r--r--addons/web/static/src/js/data_import.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 2b252454869..18870ca2157 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -83,7 +83,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
'fields_get', [], function (fields) {
self.graft_fields(fields);
self.ready.push(new openerp.web.DataSet(self, self.model)
- .default_get(_.pluck(self.fields, 'id'), function (fields) {
+ .default_get(_.pluck(self.fields, 'id')).then(function (fields) {
_.each(fields, function(val, key) {
if (val) {
self.fields_with_defaults.push(key);