diff options
| author | Olivier Dony <odo@openerp.com> | 2017-06-01 00:15:27 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-06-01 00:15:27 +0200 |
| commit | b9e220726730e2e0c25dae9952fa90e783fadc16 (patch) | |
| tree | c083daa90cfa91548a775b53a14c3ededdaa10a6 /addons/web/static/src | |
| parent | bb438a29354048be36fe973cd4eba11cee03ed26 (diff) | |
| parent | 7e44444878760ca44cf1b22bf05d77e26c477cab (diff) | |
[MERGE] Forward-port 10.0 up to 7e44444878760ca44cf1b22bf05d77e26c477cab
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 6beb6a7a044..42987a64af1 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -634,6 +634,7 @@ ListView.include(/** @lends instance.web.ListView# */{ * @return {*} */ _next: function (next_record, options) { + options = options || {}; next_record = next_record || 'succ'; var self = this; return this.save_edition().then(function (saveInfo) { diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 95e8d13e5ff..c40d17b41e2 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -201,8 +201,8 @@ var PivotView = View.extend({ this.initial_col_groupby = context.pivot_col_groupby || this.initial_col_groupby; } this.main_row.groupbys = group_by.length ? group_by : (context.pivot_row_groupby || this.initial_row_groupby.slice(0)); - this.main_col.groupbys = context.pivot_column_groupby || this.initial_col_groupby.slice(0); - this.active_measures = context.pivot_measures || this.active_measures; + this.main_col.groupbys = context.col_group_by || context.pivot_column_groupby || this.initial_col_groupby.slice(0); + this.active_measures = context.measures || context.pivot_measures || this.active_measures; this.domain = domain; this.context = context; |