diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-12-01 15:33:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-12-01 15:33:48 +0100 |
| commit | e1e7dc0af90d2241e9ca88dbe02ec3ceb4c2d202 (patch) | |
| tree | 5bf21c7824bfdc8f0292aecc05c01696f95d8578 /addons | |
| parent | ec30b2133680246d407ee75fd1fe8361100ca194 (diff) | |
| parent | 419d934143423c524fa5d5f9c6257ee4231b8502 (diff) | |
[MERGE] forward port of branch 7.0 up to 419d934
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/stock/stock_view.xml | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index dbfe5130345..89452740ce6 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -781,7 +781,7 @@ <group> <field name="partner_id" on_change="onchange_partner_in(partner_id)"/> <field name="backorder_id" readonly="1" attrs="{'invisible': [('backorder_id','=',False)]}"/> - <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice" attrs="{'invisible':[('invoice_state', '=', 'none')]}"/> + <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/> <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/> </group> <group> diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 5929be79136..4694b405d14 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -533,6 +533,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi }, reload_record: function (record) { var self = this; + var fields = this.fields_view.fields; return this.dataset.read_ids( [record.get('id')], _.pluck(_(this.columns).filter(function (r) { @@ -546,7 +547,8 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi return; } _.each(values, function (value, key) { - record.set(key + '__display', false, {silent: true}); + if (fields[key] && fields[key].type === 'many2many') + record.set(key + '__display', false, {silent: true}); record.set(key, value, {silent: true}); }); record.trigger('change', record); |