[MERGE] forward port of branch saas-10 up to 21c7ef8

6 files changed, 30 insertions, 21 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index da478d105f9..df54051e65e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2261,6 +2261,7 @@
 }
 .openerp .oe_list_content td.oe_number {
   text-align: right !important;
+  white-space: nowrap !important;
   max-width: 100px;
 }
 .openerp .oe_list_content td.oe_list_field_date, .openerp .oe_list_content th.oe_list_header_date {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1c2f61a9fea..9d138ce8301 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1943,6 +1943,7 @@ $sheet-padding: 16px
                 border-width: 0
         td.oe_number
             text-align: right !important
+            white-space: nowrap !important
             max-width: 100px
         td.oe_list_field_date, th.oe_list_header_date
             min-width: 6em
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 2f86d200966..7a2cf428400 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -339,20 +339,21 @@ var FormView = View.extend(common.FieldManagerMixin, {
                 self.do_onchange(null);
             }
             self.on_form_changed();
-            self.rendering_engine.init_fields();
-            self.is_initialized.resolve();
-            self.record_loaded.resolve();
-            self.do_update_pager(record.id === null || record.id === undefined);
-            if (self.sidebar) {
-               self.sidebar.do_attachement_update(self.dataset, self.datarecord.id);
-            }
-            if (record.id) {
-                self.do_push_state({id:record.id});
-            } else {
-                self.do_push_state({});
-            }
-            self.$el.removeClass('oe_form_dirty');
-            self.autofocus();
+            self.rendering_engine.init_fields().then(function() {
+                self.is_initialized.resolve();
+                self.record_loaded.resolve();
+                self.do_update_pager(record.id === null || record.id === undefined);
+                if (self.sidebar) {
+                   self.sidebar.do_attachement_update(self.dataset, self.datarecord.id);
+                }
+                if (record.id) {
+                    self.do_push_state({id:record.id});
+                } else {
+                    self.do_push_state({});
+                }
+                self.$el.removeClass('oe_form_dirty');
+                self.autofocus();
+            });
         });
     },
     /**
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index 193f07c6d2d..62ee1e62c23 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -94,6 +94,7 @@ var GraphView = View.extend({
                 groupbys: this.initial_groupbys,
                 context: context,
                 fields: this.fields,
+                stacked: this.fields_view.arch.attrs.stacked !== "False" 
             });
             // append widget
             this.widget.appendTo(this.$el);
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index 340050eb0dc..a86ea35e449 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -4,6 +4,7 @@ odoo.define('web.GraphWidget', function (require) {
 var config = require('web.config');
 var core = require('web.core');
 var Model = require('web.DataModel');
+var formats = require('web.formats');
 var Widget = require('web.Widget');
 
 var _t = core._t;
@@ -24,6 +25,7 @@ return Widget.extend({
         this.groupbys = options.groupbys || [];
         this.mode = options.mode || "bar";
         this.measure = options.measure || "__count__";
+        this.stacked = options.stacked;
     },
     start: function () {
         return this.load_data().then(this.proxy('display_graph'));
@@ -167,12 +169,12 @@ return Widget.extend({
           showXAxis: true,
           showYAxis: true,
           rightAlignYAxis: false,
-          stacked: true,
+          stacked: this.stacked,
           reduceXTicks: false,
           // rotateLabels: 40,
           showControls: (this.groupbys.length > 1)
         });
-        chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });});
+        chart.yAxis.tickFormat(function(d) { return formats.format_value(d, { type : 'float' });});
 
         chart(svg);
         this.to_remove = chart.update;
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 b0d68ea89f6..8937b8bb36f 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -81,17 +81,20 @@ var Editor = Widget.extend({
     is_creating: function () {
         return (this.is_editing() && !this.record.id);
     },
-    edit: function (record, configureField, options) {
+    edit: function (record, configureField) {
+        var self = this;
         // TODO: specify sequence of edit calls
         var loaded;
         if(record) {
-            loaded = this.form.trigger('load_record', _.extend({}, record))
+            this.form.trigger('load_record', _.extend({}, record));
+            loaded = this.form.record_loaded;
         } else {
-            loaded = this.form.load_defaults();
+            loaded = this.form.load_defaults().then(function() {
+                return self.form.record_loaded;
+            });
         }
 
-        var self = this;
-        return $.when(loaded).then(function () {
+        return loaded.then(function () {
             return self.do_show({reload: false});
         }).then(function () {
             self.record = self.form.datarecord;