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

1 files changed, 5 insertions, 1 deletions

diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index e3786408125..e2c92535b23 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -163,7 +163,9 @@ return Widget.extend({
         svg.transition().duration(0);
 
         var chart = nv.models.multiBarChart();
+        var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
+          margin: {left: 12 * String(maxVal && maxVal.y || 0).length},
           delay: 250,
           transition: 10,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
@@ -293,8 +295,9 @@ return Widget.extend({
         svg.transition().duration(0);
 
         var chart = nv.models.lineChart();
+        var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
-          margin: {left: 50, right: 50},
+          margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50},
           useInteractiveGuideline: true,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
           showXAxis: true,
@@ -302,6 +305,7 @@ return Widget.extend({
         });
         chart.xAxis.tickValues(tickValues)
             .tickFormat(tickFormat);
+        chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });});
 
         chart(svg);
         this.to_remove = chart.update;