[Merge]Merge with trunk

bzr revid: vja@tinyerp.com-20130501054129-2ie8kj73yosxbfo8

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css
index a9fff591e39..2fd4b5953cf 100644
--- a/addons/web_graph/static/src/css/graph.css
+++ b/addons/web_graph/static/src/css/graph.css
@@ -1,5 +1,5 @@
 .openerp a.dropdown-menu-icon {
-    z-index: 10;
+    z-index: 1;
     position: absolute;
     color: #4c4c4c;
     right: 8px;
@@ -23,7 +23,7 @@
     padding: 8px;
     border: 1px solid #afafb6;
     background: white;
-    z-index: 900;
+    z-index: 1;
     min-width: 160px;
     overflow-x: hidden;
     -moz-border-radius: 3px;
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 0ae3f7c1508..8710b840209 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -246,7 +246,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
         var result = [];
         var ticks = {};
 
-        return this.alive(obj.call("fields_view_get", [view_id, 'graph']).then(function(tmp) {
+        return this.alive(obj.call("fields_view_get", [view_id, 'graph', context]).then(function(tmp) {
             view_get = tmp;
             fields = view_get['fields'];
             var toload = _.select(group_by, function(x) { return fields[x] === undefined });