[MERGE] forward port of branch saas-7 up to 4022493

5 files changed, 14 insertions, 8 deletions

diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index 3ae6ddb6649..7eae8b20a65 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -335,6 +335,11 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
         var self = this;
         options = _.clone(options || {});
         var shadow = options.shadow || false;
+        options.headers = _.extend({}, options.headers)
+        if (odoo.debug) {
+            options.headers["X-Debug-Mode"] = true;
+        }
+
         delete options.shadow;
 
         return self.check_session_id().then(function() {
@@ -350,18 +355,14 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
             if (self.origin_server) {
                 fct = ajax.jsonRpc;
                 if (self.override_session) {
-                    options.headers = _.extend({}, options.headers, {
-                        "X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
-                    });
+                    options.headers["X-Openerp-Session-Id"] = self.session_id || '';
                 }
             } else if (self.use_cors) {
                 fct = ajax.jsonRpc;
                 url = self.url(url, null);
                 options.session_id = self.session_id || '';
                 if (self.override_session) {
-                    options.headers = _.extend({}, options.headers, {
-                        "X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
-                    });
+                    options.headers["X-Openerp-Session-Id"] = self.session_id || '';
                 }
             } else {
                 fct = ajax.jsonpRpc;
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 7c3048ee24b..a4e900c6636 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -759,6 +759,7 @@ var FieldX2Many = AbstractManyField.extend({
             }
             if(view.view_type === "list") {
                 _.extend(view.options, {
+                    action_buttons: false, // to avoid 'Save' and 'Discard' buttons to appear in X2M fields
                     addable: null,
                     selectable: self.multi_selection,
                     sortable: true,
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 5e32d8578e4..3e8a9b1e10e 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -400,7 +400,7 @@ var FormView = View.extend(common.FieldManagerMixin, {
         var keys = _.keys(this.fields_view.fields);
         if (keys.length) {
             return this.dataset.default_get(keys).then(function(r) {
-                self.trigger('load_record', r);
+                self.trigger('load_record', _.clone(r));
             });
         }
         return self.trigger('load_record', {});
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index 8a604640fc9..f8f1bba909a 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -19,6 +19,10 @@ var GraphView = View.extend({
     icon: 'fa-bar-chart',
     view_type: 'graph',
 
+    on_detach_callback: function () {
+        $('body > .nvtooltip').remove();
+    },
+
     init: function(parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
 
diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js
index 72f1ac4bf1d..deb2c16870f 100644
--- a/addons/web/static/src/js/views/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot_view.js
@@ -574,7 +574,7 @@ var PivotView = View.extend({
             i, j, cell, $row, $cell;
 
         var groupby_labels = _.map(this.main_col.groupbys, function (gb) {
-            return self.groupable_fields[gb.split(':')[0]].string;
+            return self.fields[gb.split(':')[0]].string;
         });
 
         for (i = 0; i < headers.length; i++) {