[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121001145308-ri5rp2cazxqxcxme

6 files changed, 40 insertions, 19 deletions

diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py
index dc26ecc42ad..b34f96f78b2 100644
--- a/addons/web_tests/__openerp__.py
+++ b/addons/web_tests/__openerp__.py
@@ -1,13 +1,14 @@
 {
-    "name": "Tests",
-    "category": "Hidden",
-    "description":
-        """
-        OpenERP Web test suite.
-        """,
-    "version": "2.0",
-    "depends": [],
-    "js": ["static/src/js/*.js"],
-    "css": ['static/src/css/*.css'],
+    'name': 'Tests',
+    'category': 'Hidden',
+    'description': """
+OpenERP Web test suite.
+=======================
+
+""",
+    'version': '2.0',
+    'depends': [],
+    'js': ['static/src/js/*.js'],
+    'css': ['static/src/css/*.css'],
     'auto_install': True,
 }
diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po
index 37be031fc8c..ea74b090feb 100644
--- a/addons/web_tests/i18n/es_CR.po
+++ b/addons/web_tests/i18n/es_CR.po
@@ -7,14 +7,14 @@ 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"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: 2012-02-16 19:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"X-Launchpad-Export-Date: 2012-06-01 05:37+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-09-28 04:47+0000\n"
+"X-Generator: Launchpad (build 16043)\n"
 
 
diff --git a/addons/web_tests/i18n/fr_CA.po b/addons/web_tests/i18n/fr_CA.po
new file mode 100644
index 00000000000..4fd3296d7c8
--- /dev/null
+++ b/addons/web_tests/i18n/fr_CA.po
@@ -0,0 +1,20 @@
+# French (Canada) 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-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-09-19 12:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_CA@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-09-28 04:47+0000\n"
+"X-Generator: Launchpad (build 16043)\n"
+
+
diff --git a/addons/web_tests/i18n/web_tests.pot b/addons/web_tests/i18n/web_tests.pot
index fa7bd80d130..ab616bf6934 100644
--- a/addons/web_tests/i18n/web_tests.pot
+++ b/addons/web_tests/i18n/web_tests.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/addons/web_tests/static/src/css/web_tests.css b/addons/web_tests/static/src/css/web_tests.css
index b14d6541f43..0d7aec3ae6c 100644
--- a/addons/web_tests/static/src/css/web_tests.css
+++ b/addons/web_tests/static/src/css/web_tests.css
@@ -1,3 +1,3 @@
-.oe-bunchaforms > div {
+.oe_bunchaforms > div {
     float: left;
 }
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index e6e6079ede5..5b9c1d02503 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -2,7 +2,7 @@ openerp.web_tests = function (instance) {
     instance.web.client_actions.add(
         'buncha-forms', 'instance.web_tests.BunchaForms');
     instance.web_tests = {};
-    instance.web_tests.BunchaForms = instance.web.OldWidget.extend({
+    instance.web_tests.BunchaForms = instance.web.Widget.extend({
         init: function (parent) {
             this._super(parent);
             this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations');
@@ -13,12 +13,12 @@ openerp.web_tests = function (instance) {
             this.form.registry = instance.web.form.readonly;
         },
         render: function () {
-            return '<div class="oe-bunchaforms"></div>';
+            return '<div class="oe_bunchaforms"></div>';
         },
         start: function () {
             $.when(
                 this.dataset.read_slice(),
-                this.form.appendTo(this.$element)).then(this.on_everything_loaded);
+                this.form.appendTo(this.$el)).then(this.on_everything_loaded);
         },
         on_everything_loaded: function (slice) {
             var records = slice[0].records;
@@ -29,7 +29,7 @@ openerp.web_tests = function (instance) {
             this.form.on_record_loaded(records[0]);
             _(records.slice(1)).each(function (record, index) {
                 this.dataset.index = index+1;
-                this.form.reposition($('<div>').appendTo(this.$element));
+                this.form.reposition($('<div>').appendTo(this.$el));
                 this.form.on_record_loaded(record);
             }, this);
         }