[MERGE] from trunk

bzr revid: xmo@openerp.com-20120322143331-iajlifomw1hohbht

9 files changed, 159 insertions, 22 deletions

diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 5a42ea381fe..6c62ffe4ede 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -12,5 +12,5 @@
     'qweb' : [
         "static/src/xml/*.xml",
     ],
-    "active": True
+    "auto_install": True
 }
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
new file mode 100644
index 00000000000..e3123d27c3c
--- /dev/null
+++ b/addons/web_graph/i18n/cs.po
@@ -0,0 +1,23 @@
+# Czech translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-03-04 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@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: 2012-03-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14900)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr ""
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 00b23e0d232..9a2af51e9b1 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -1,24 +1,23 @@
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
+# Spanish (Costa Rica) translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-06 17:33+0100\n"
-"PO-Revision-Date: 2012-02-08 02:27-0600\n"
-"Last-Translator: Carlos Vásquez - CLEARCORP <carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2012-02-17 14:21+0000\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"X-Launchpad-Export-Date: 2012-02-18 05:18+0000\n"
+"X-Generator: Launchpad (build 14814)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
 msgid "Graph"
 msgstr "Gráfico"
-
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
new file mode 100644
index 00000000000..098a9e011cb
--- /dev/null
+++ b/addons/web_graph/i18n/fi.po
@@ -0,0 +1,23 @@
+# Finnish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-03-19 11:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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: 2012-03-20 05:13+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Kuvaaja"
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
new file mode 100644
index 00000000000..a92a1cdc651
--- /dev/null
+++ b/addons/web_graph/i18n/it.po
@@ -0,0 +1,23 @@
+# Italian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-02-16 21:56+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@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: 2012-02-17 05:13+0000\n"
+"X-Generator: Launchpad (build 14814)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Grafico"
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
new file mode 100644
index 00000000000..ba87993d1f1
--- /dev/null
+++ b/addons/web_graph/i18n/ja.po
@@ -0,0 +1,23 @@
+# Japanese translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-02-22 02:21+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@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: 2012-02-23 04:56+0000\n"
+"X-Generator: Launchpad (build 14855)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "グラフ"
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
new file mode 100644
index 00000000000..fbe3bf3f757
--- /dev/null
+++ b/addons/web_graph/i18n/ka.po
@@ -0,0 +1,23 @@
+# Georgian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-03-15 19:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian <ka@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: 2012-03-16 05:14+0000\n"
+"X-Generator: Launchpad (build 14951)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "გრაფიკი"
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
new file mode 100644
index 00000000000..f641d25a628
--- /dev/null
+++ b/addons/web_graph/i18n/pl.po
@@ -0,0 +1,23 @@
+# Polish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-02-28 11:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@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: 2012-02-29 04:54+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Wykres"
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index b7b6063189f..d962c7d6752 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -33,7 +33,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
 
         this.renderer = null;
     },
-    stop: function () {
+    destroy: function () {
         if (this.renderer) {
             clearTimeout(this.renderer);
         }
@@ -97,7 +97,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         this.$element.html(QWeb.render("GraphView", {
             "fields_view": this.fields_view,
             "chart": this.chart,
-            'element_id': this.widget_parent.element_id
+            'element_id': this.getParent().element_id
         }));
 
         var fields = _(this.columns).pluck('name').concat([this.abscissa]);
@@ -272,7 +272,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
             self.renderer = null;
             var charts = new dhtmlXChart({
                 view: view_chart,
-                container: self.widget_parent.element_id+"-"+self.chart+"chart",
+                container: self.getParent().element_id+"-"+self.chart+"chart",
                 value:"#"+group_list[0].group+"#",
                 gradient: (self.chart == "bar") ? "3d" : "light",
                 alpha: (self.chart == "area") ? 0.6 : 1,
@@ -309,8 +309,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
                     }
                 }
             });
-            self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width(
-                self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width()+120);
+            self.$element.find("#"+self.getParent().element_id+"-"+self.chart+"chart").width(
+                self.$element.find("#"+self.getParent().element_id+"-"+self.chart+"chart").width()+120);
 
             for (var m = 1; m<group_list.length;m++){
                 var column = group_list[m];
@@ -333,8 +333,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
                 });
             }
             charts.parse(results, "json");
-            self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height(
-                self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height()+50);
+            self.$element.find("#"+self.getParent().element_id+"-"+self.chart+"chart").height(
+                self.$element.find("#"+self.getParent().element_id+"-"+self.chart+"chart").height()+50);
             charts.attachEvent("onItemClick", function(id) {
                 self.open_list_view(charts.get(id));
             });
@@ -354,7 +354,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
             self.renderer = null;
             var chart =  new dhtmlXChart({
                 view:"pie3D",
-                container:self.widget_parent.element_id+"-piechart",
+                container:self.getParent().element_id+"-piechart",
                 value:"#"+self.ordinate+"#",
                 pieInnerText:function(obj) {
                     var sum = chart.sum("#"+self.ordinate+"#");
@@ -406,8 +406,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         }
 
         var views;
-        if (this.widget_parent.action) {
-            views = this.widget_parent.action.views;
+        if (this.getParent().action) {
+            views = this.getParent().action.views;
             if (!_(views).detect(function (view) {
                     return view[1] === 'list' })) {
                 views = [[false, 'list']].concat(views);