[MERGE] forward port of branch 8.0 up to e883193

6 files changed, 57 insertions, 48 deletions

diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 57e029f3aee..b076087d036 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 19:45+0000\n"
-"Last-Translator: Mario Gielissen (Openworx) <Unknown>\n"
+"PO-Revision-Date: 2014-09-17 08:32+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 08:24+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-19 08:23+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -85,7 +85,7 @@ msgstr "Lijndiagram"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:49
 #, python-format
 msgid "Measures"
-msgstr "Afmetingen"
+msgstr "Eenheden"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 8a476817d42..846b70af3db 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -8,42 +8,43 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 16:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-09-16 13:44+0000\n"
+"Last-Translator: Ricardo Opencloud - Portugal "
+"<ricardo.nbs.martins@opencloud.pro>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 08:24+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-17 08:29+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Bar Chart"
-msgstr ""
+msgstr "Gráfico de Barras"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:70
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:38
 #, python-format
 msgid "Expand All"
-msgstr ""
+msgstr "Expandir Tudo"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:44
 #, python-format
 msgid "Export Data"
-msgstr ""
+msgstr "Exportar Dados"
 
 #. module: web_graph
 #. openerp-web
@@ -57,42 +58,42 @@ msgstr "Gráfico"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:23
 #, python-format
 msgid "Heat Map"
-msgstr ""
+msgstr "Gráfico Termal"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:29
 #, python-format
 msgid "Heat Map (columns)"
-msgstr ""
+msgstr "Gráfico Termal"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Heat Map (rows)"
-msgstr ""
+msgstr "Gráfico Termal"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Line Chart"
-msgstr ""
+msgstr "Gráfico de Linhas"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:49
 #, python-format
 msgid "Measures"
-msgstr ""
+msgstr "Medidas"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:72
 #, python-format
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: web_graph
 #. openerp-web
@@ -103,20 +104,24 @@ msgid ""
 "                    that there is at least one measure and no active filter "
 "in the search bar."
 msgstr ""
+"Não há dados disponíveis para este gráfico. Tente adicionar alguns "
+"registros, ou certifique-se \n"
+"                     que há pelo menos uma medida e sem filtro ativos na "
+"barra de pesquisa."
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:92
 #, python-format
 msgid "No data to display."
-msgstr ""
+msgstr "Sem dados a mostrar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:17
 #, python-format
 msgid "Pie Chart"
-msgstr ""
+msgstr "Gráfico Circular"
 
 #. module: web_graph
 #. openerp-web
@@ -124,35 +129,35 @@ msgstr ""
 #: code:addons/web_graph/static/src/js/pivot_table.js:20
 #, python-format
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:73
 #, python-format
 msgid "Quarter"
-msgstr ""
+msgstr "Trimestre"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:41
 #, python-format
 msgid "Reload Data"
-msgstr ""
+msgstr "Recarregar Dados"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:35
 #, python-format
 msgid "Swap Axis"
-msgstr ""
+msgstr "Trocar Eixos"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:8
 #, python-format
 msgid "Table Mode"
-msgstr ""
+msgstr "Modo de Tabela"
 
 #. module: web_graph
 #. openerp-web
@@ -162,7 +167,7 @@ msgstr ""
 #: code:addons/web_graph/static/src/js/pivot_table.js:331
 #, python-format
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: web_graph
 #. openerp-web
@@ -178,18 +183,18 @@ msgstr ""
 #: code:addons/web_graph/static/src/js/pivot_table.js:429
 #, python-format
 msgid "Undefined"
-msgstr ""
+msgstr "Não definido"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:71
 #, python-format
 msgid "Week"
-msgstr ""
+msgstr "Semana"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:74
 #, python-format
 msgid "Year"
-msgstr ""
+msgstr "Ano"
diff --git a/addons/web_graph/i18n/web_graph.pot b/addons/web_graph/i18n/web_graph.pot
index 12ab898f6c2..805e6611846 100644
--- a/addons/web_graph/i18n/web_graph.pot
+++ b/addons/web_graph/i18n/web_graph.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-09-23 16:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -152,26 +152,26 @@ msgstr ""
 
 #. module: web_graph
 #. openerp-web
-#: code:addons/web_graph/static/src/js/graph_widget.js:463
-#: code:addons/web_graph/static/src/js/graph_widget.js:686
-#: code:addons/web_graph/static/src/js/graph_widget.js:687
-#: code:addons/web_graph/static/src/js/pivot_table.js:331
+#: code:addons/web_graph/static/src/js/graph_widget.js:474
+#: code:addons/web_graph/static/src/js/graph_widget.js:707
+#: code:addons/web_graph/static/src/js/graph_widget.js:708
+#: code:addons/web_graph/static/src/js/pivot_table.js:335
 #, python-format
 msgid "Total"
 msgstr ""
 
 #. module: web_graph
 #. openerp-web
-#: code:addons/web_graph/static/src/js/graph_widget.js:601
-#: code:addons/web_graph/static/src/js/graph_widget.js:702
-#: code:addons/web_graph/static/src/js/graph_widget.js:711
-#: code:addons/web_graph/static/src/js/graph_widget.js:715
-#: code:addons/web_graph/static/src/js/graph_widget.js:720
-#: code:addons/web_graph/static/src/js/graph_widget.js:725
-#: code:addons/web_graph/static/src/js/graph_widget.js:728
-#: code:addons/web_graph/static/src/js/graph_widget.js:773
-#: code:addons/web_graph/static/src/js/graph_widget.js:802
-#: code:addons/web_graph/static/src/js/pivot_table.js:429
+#: code:addons/web_graph/static/src/js/graph_widget.js:615
+#: code:addons/web_graph/static/src/js/graph_widget.js:723
+#: code:addons/web_graph/static/src/js/graph_widget.js:732
+#: code:addons/web_graph/static/src/js/graph_widget.js:736
+#: code:addons/web_graph/static/src/js/graph_widget.js:741
+#: code:addons/web_graph/static/src/js/graph_widget.js:746
+#: code:addons/web_graph/static/src/js/graph_widget.js:749
+#: code:addons/web_graph/static/src/js/graph_widget.js:794
+#: code:addons/web_graph/static/src/js/graph_widget.js:823
+#: code:addons/web_graph/static/src/js/pivot_table.js:433
 #, python-format
 msgid "Undefined"
 msgstr ""
diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js
index 8ae99849bab..646a730b51b 100644
--- a/addons/web_graph/static/src/js/graph_view.js
+++ b/addons/web_graph/static/src/js/graph_view.js
@@ -85,6 +85,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
             measures = groupbys.measures;
 
         if (!this.graph_widget) {
+            this.widget_config.context = _.clone(context);
+            this.widget_config.context.group_by_no_leaf = true;
             if (group_by.length) {
                 this.widget_config.row_groupby = group_by;
             }
diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index 060eb70b514..97a5ad66d4e 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -389,7 +389,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
                 var rows = self.build_rows(header.children);
                 var doc_fragment = $(document.createDocumentFragment());
                 rows.map(function (row) {
-                    doc_fragment.append(self.draw_row(row));
+                    doc_fragment.append(self.draw_row(row, 0));
                 });
                 self.$row_clicked.after(doc_fragment);
             } else {
diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js
index b66bc41e98c..a46203faff5 100644
--- a/addons/web_graph/static/src/js/pivot_table.js
+++ b/addons/web_graph/static/src/js/pivot_table.js
@@ -13,6 +13,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	init: function (model, domain, fields, options) {
 		this.cells = [];
 		this.domain = domain;
+        this.context = options.context;
 		this.no_data = true;
 		this.updating = false;
 		this.model = model;
@@ -412,6 +413,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
         var self = this;
         return this.model.query(_.without(fields, '__count'))
             .filter(domain)
+            .context(this.context)
             .lazy(false)
             .group_by(groupbys)
             .then(function (groups) {