diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-03-18 13:40:50 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-03-18 13:40:50 +0100 |
| commit | a2f9619e267a45d0959e7a942ba4e520d91fbb94 (patch) | |
| tree | 3130977e61cfc7ab3afe093716363489ca93cc87 /addons/web/static/src/js/view_form.js | |
| parent | 788708563133720c2833fdf0f67515940f6d4cd9 (diff) | |
| parent | 541a5d3f82e6c2422644caff5b793d96954c2e93 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
Diffstat (limited to 'addons/web/static/src/js/view_form.js')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 91f1875ac5c..3dc148bc7c1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3125,7 +3125,8 @@ instance.web.form.CompletionFieldMixin = { if (self.options.quick_create === undefined || self.options.quick_create) { new instance.web.DataSet(this, this.field.relation, self.build_context()) .name_create(name).done(function(data) { - self.add_id(data[0]); + if (!self.get('effective_readonly')) + self.add_id(data[0]); }).fail(function(error, event) { event.preventDefault(); slow_create(); @@ -5005,7 +5006,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend this.searchview.on('search_data', self, function(domains, contexts, groupbys) { if (self.initial_ids) { self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]), - contexts, groupbys); + contexts.concat(self.context), groupbys); self.initial_ids = undefined; } else { self.do_search(domains.concat([self.domain]), contexts.concat(self.context), groupbys); |