[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 8710b840209..a84bb53fc85 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -5,6 +5,7 @@
 openerp.web_graph = function (instance) {
 
 var _lt = instance.web._lt;
+var _t = instance.web._t;
 
 // removed ``undefined`` values
 var filter_values = function (o) {
@@ -343,7 +344,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
                     var defs = [];
                     _.each(axis, function(x) {
                         var key = x[xaxis[0]]
-                        defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
+                        defs.push(obj.call("read_group", [x['__domain'], yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
                             return [x, key, res];
                         }));
                     });
@@ -365,7 +366,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
         }).then(function() {
             var res = {
                 'data': result,
-                'ticks': _.map(ticks, function(el, key) { return [el, key] })
+                'ticks': _.map(ticks, function(el, key) { return [el, key || _t("Undefined")] })
             };
             return res;
         }));