diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js
index cb9e4b8d02b..c874a87665f 100644
--- a/addons/web/static/src/js/views/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot_view.js
@@ -188,8 +188,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;
diff --git a/doc/cla/individual/celm1990.md b/doc/cla/individual/celm1990.md
new file mode 100644
index 00000000000..245c0e93869
--- /dev/null
+++ b/doc/cla/individual/celm1990.md
@@ -0,0 +1,11 @@
+Ecuador, 2017-05-19
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Carlos Lopez celm1990@hotmail.com https://github.com/celm1990