summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorYogesh (OpenERP) <ysa@tinyerp.com>2011-10-12 13:35:40 +0530
committerYogesh (OpenERP) <ysa@tinyerp.com>2011-10-12 13:35:40 +0530
commit4d4e1a1f0ef7ee363c27451bd403d0db3f7cac30 (patch)
treea23de8c9fbdff4bb3daf1e6f52f56618448b3656 /addons/web/static/src
parent048cfa7804759c6b3fb952983451165fb319bc80 (diff)
[FIX] import :- default value set on required field then remove this field on required fields list.
lp bug: https://launchpad.net/bugs/871625 fixed bzr revid: ysa@tinyerp.com-20111012080540-1m6x6npy7e0jaoif
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/data_import.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 9c686846751..6eee2bd8ded 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -49,12 +49,18 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
});
};
this.ready = $.Deferred.queue().then(function () {
- self.required_fields = _(self.fields).chain()
+ self.required_default_fields = _(self.fields).chain()
.filter(function (field) { return field.required; })
- .pluck('name')
+ .pluck('id')
.value();
- convert_fields(self);
- self.all_fields.sort();
+ dataset.default_get(self.required_default_fields || [], function(res) {
+ self.required_fields = _(self.fields).chain()
+ .filter(function (field) {if( !(field.id in res)) return field.required; })
+ .pluck('name')
+ .value();
+ convert_fields(self);
+ self.all_fields.sort();
+ });
});
},
start: function() {