diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
| commit | 55d2e4b7cf4465be0a56e6748d401ef22c4cc7d6 (patch) | |
| tree | 7a4eb9aea8e03676edfe12ab74793998d86820a3 /addons/web/static/src/js | |
| parent | a13c15fd442bbfc5c283f71c8d349e33bc70cf6a (diff) | |
| parent | bde7f883b79c6f3ae581aea06928a987827c68e4 (diff) | |
[MERGE] forward port branch saas-11 up to bde7f88
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index eea48f9a6b6..362c9a0bab5 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -1435,7 +1435,7 @@ var FieldStatus = common.AbstractField.extend({ }); } } - }, 300), + }, 300, true), }); var FieldMonetary = FieldFloat.extend({ diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 83e75faf9a6..264fa2af985 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -692,7 +692,6 @@ var PivotView = View.extend({ if (width > 1) { var total_cell = {width:nbr_measures, height: depth, title:""}; if (nbr_measures === 1) { - total_cell.title = this.measures[this.active_measures[0]].string; total_cell.total = true; } result[0].push(total_cell); |
