[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk

56 files changed, 130 insertions, 182 deletions

diff --git a/addons/plugin_thunderbird/__init__.py b/addons/plugin_thunderbird/__init__.py
index 70ca2fd409a..e1c886f81fa 100644
--- a/addons/plugin_thunderbird/__init__.py
+++ b/addons/plugin_thunderbird/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import installer
+import plugin_thunderbird
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index 04926ea2d32..c135491e398 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -38,9 +38,8 @@ HR Applicant and Project Issue from selected mails.
       """,
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ['thunderbird_installer.xml',
-                    'security/ir.model.access.csv'],
-    "active": False,
+    "update_xml" : ['plugin_thunderbird.xml'],
+    "auto_install": False,
     "installable": True,
     "certificate" : "00899858104035139949",
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
diff --git a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
new file mode 100644
index 00000000000..8a396746b5f
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
@@ -0,0 +1,116 @@
+# #-#-#-#-#  plugin_thunderbird.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* plugin_thunderbird
+#
+# #-#-#-#-#  plugin_thunderbird.pot.web (PROJECT VERSION)  #-#-#-#-#
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"#-#-#-#-#  plugin_thunderbird.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
+"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-08 00:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+"#-#-#-#-#  plugin_thunderbird.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\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"
+"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"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr ""
diff --git a/addons/plugin_thunderbird/i18n/thunderbird.pot b/addons/plugin_thunderbird/i18n/thunderbird.pot
deleted file mode 100644
index c421237b7ed..00000000000
--- a/addons/plugin_thunderbird/i18n/thunderbird.pot
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* thunderbird
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16:12+0000\n"
-"PO-Revision-Date: 2011-01-11 11:16:12+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: thunderbird
-#: field:thunderbird.installer,plugin_file:0
-#: field:thunderbird.installer,thunderbird:0
-msgid "Thunderbird Plug-in"
-msgstr ""
-
-#. module: thunderbird
-#: help:thunderbird.installer,plugin_file:0
-msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
-msgstr ""
-
-#. module: thunderbird
-#: help:thunderbird.installer,thunderbird:0
-msgid "Allows you to select an object that you would like to add to your email and its attachments."
-msgstr ""
-
-#. module: thunderbird
-#: help:thunderbird.installer,pdf_file:0
-msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_email_server_tools
-msgid "Email Server Tools"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "_Close"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,pdf_file:0
-msgid "Installation Manual"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,description:0
-msgid "Description"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "title"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
-#: view:thunderbird.installer:0
-msgid "Thunderbird Plug-In"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
-msgid "Thunderbird Interface"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_thunderbird_installer
-msgid "thunderbird.installer"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,name:0
-#: field:thunderbird.installer,pdf_name:0
-msgid "File name"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Installation and Configuration Steps"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
-#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
-#: view:thunderbird.installer:0
-msgid "Thunderbird Plug-In Configuration"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_thunderbird_partner
-msgid "Thunderbid Plugin Tools"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Configure"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Skip"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.module.module,description:thunderbird.module_meta_information
-msgid "\n"
-"      This module is required for the thuderbird plug-in to work\n"
-"      properly.\n"
-"      The Plugin allows you archive email and its attachments to the selected \n"
-"      OpenERP objects. You can select a partner, a task, a project, an analytical\n"
-"      account,or any other object and attach selected mail as eml file in \n"
-"      attachment of selected record. You can create Documents for crm Lead,\n"
-"      HR Applicant and project issue from selected mails.\n"
-"\n"
-"      "
-msgstr ""
-
diff --git a/addons/plugin_thunderbird/installer.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index d0ba1dfd845..7e9b5626e5b 100644
--- a/addons/plugin_thunderbird/installer.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -22,11 +22,8 @@
 from osv import fields
 from osv import osv
 
-import base64
-import addons
-
-class thunderbird_installer(osv.osv_memory):
-    _name = 'thunderbird.installer'
+class plugin_thunderbird_installer(osv.osv_memory):
+    _name = 'plugin_thunderbird.installer'
     _inherit = 'res.config.installer'
 
     _columns = {
@@ -42,24 +39,16 @@ class thunderbird_installer(osv.osv_memory):
         'thunderbird' : True,
         'name' : 'openerp_plugin.xpi',
         'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        'plugin_file' : 'https://addons.mozilla.org/en-US/thunderbird/addon/openerp-plugin/',
+        'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
         'description' : """
 Thunderbird plugin installation:
-    1.  Save the Thunderbird plug-­in.
-    2.  From the menu bar of Thunderbird, open Tools ­> Add-ons.
-    3.  Click "Install".
+    1.  Save the Thunderbird plug-in.
+    2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
     4.  Select the plug-in (the file named openerp_plugin.xpi).
     5.  Click "Install Now".
     6.  Restart Thunderbird.
-
-Configure OpenERP in Thunderbird:
-    1.  Go to Tools > OpenERP Configuration.
-    2.  Check the data (configured by default).
-    3.  Click "Connect".
-    4.  A message appears with the state of your connection.
-    5.  If the connection fails, check if your database is opened, and check the data again.
-    6.  If the connection succeeds, start to archive e-mails in OpenERP.
+    7.  From the Thunderbird menubar: OpenERP -> Configuration.
+    8.  Configure your openerp server.
 """
     }
 
-thunderbird_installer()
diff --git a/addons/plugin_thunderbird/thunderbird_installer.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 0bd7f42a49a..3b4107c8358 100644
--- a/addons/plugin_thunderbird/thunderbird_installer.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -2,8 +2,8 @@
   <data>
 
     <record id="view_thunderbird_installer" model="ir.ui.view">
-      <field name="name">thunderbird.installer.view</field>
-      <field name="model">thunderbird.installer</field>
+      <field name="name">plugin_thunderbird.installer.view</field>
+      <field name="model">plugin_thunderbird.installer</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
@@ -48,13 +48,12 @@
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
       <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
-      <field name="res_model">thunderbird.installer</field>
+      <field name="res_model">plugin_thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
     </record>
-
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
@@ -62,20 +61,8 @@
         <field name="type">automatic</field>
     </record>
 
-
-    <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Install Thunderbird Plug-In</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">thunderbird.installer</field>
-      <field name="view_id" ref="view_thunderbird_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-      <field name="context">{'menu':True}</field>
-    </record>
-
     <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config_plugins" sequence="10"/>
 
   </data>
 </openerp>
diff --git a/addons/plugin_thunderbird/security/ir.model.access.csv b/addons/plugin_thunderbird/security/ir.model.access.csv
deleted file mode 100644
index 6c3e9555132..00000000000
--- a/addons/plugin_thunderbird/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_thunderbird_ir_actions_todo","ir.actions.todo.thunderbird.installer","base.model_ir_actions_todo","base.group_sale_manager",1,0,0,0
diff --git a/addons/plugin_thunderbird/static/openerp_plugin.xpi b/addons/plugin_thunderbird/static/openerp_plugin.xpi
new file mode 100644
index 00000000000..f2800f6cae3
--- /dev/null
+++ b/addons/plugin_thunderbird/static/openerp_plugin.xpi
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome.manifest
index a587ab54181..a587ab54181 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome.manifest
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome.manifest
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar
index de15f57d606..d6ff77f76e0 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config.xul
index 86e55537054..86e55537054 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config_change.xul
index 00a4869b68f..00a4869b68f 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config_change.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
index cc47b895a3e..cc47b895a3e 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/config.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/config.js
index f0f2d750bd0..f0f2d750bd0 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/config.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/config.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/create.js
index 9a549137fa6..9a549137fa6 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/create.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/dialog.js
index 3a402959c46..3a402959c46 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/dialog.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/overlay.js
index a271f72c491..a271f72c491 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/overlay.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/push.js
index be345b2ab3e..be345b2ab3e 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/push.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
index 0b26a8ed7cb..0b26a8ed7cb 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tools.js
index 36cfc51a189..36cfc51a189 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tools.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/overlay.xul
index bf825d91084..bf825d91084 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/overlay.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push.xul
index b57ad68e11b..b57ad68e11b 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_dialog.xul
index 72bc7295ffe..72bc7295ffe 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_dialog.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_new.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_new.xul
index e1d22c875ad..e1d22c875ad 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_new.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_new.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/selectpartner.xul
index db1839ba156..db1839ba156 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/selectpartner.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/style.css b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/style.css
index 59972304145..59972304145 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/style.css
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/style.css
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
index 3dd37445ada..3dd37445ada 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
index 711190962a6..711190962a6 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
index 19558a9f077..19558a9f077 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
index bb5f2c34be6..bb5f2c34be6 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
index 33845423f7d..33845423f7d 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index e649eb92ced..e649eb92ced 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
index cd00045c22a..cd00045c22a 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
index d568b96a4ca..d568b96a4ca 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Archive.png
index 5aa6a958d37..5aa6a958d37 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Archive.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Create.png
index 1ab240c32cb..1ab240c32cb 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Create.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Error.gif
index 38c3523781b..38c3523781b 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Error.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Move.gif
index 401bf861213..401bf861213 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Move.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveDown.png
index 3761ff1e747..3761ff1e747 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveDown.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveLeft.png
index 031d7532673..031d7532673 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveLeft.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Search.gif
index b29c3cf1054..b29c3cf1054 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Search.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Success.gif
index fb3bff729c5..fb3bff729c5 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Success.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/developped_by.png
index e4004e3d178..e4004e3d178 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/developped_by.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/logo.png
index d6dbd9d83d1..d6dbd9d83d1 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/logo.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/openerp.png
index 326798df2ec..326798df2ec 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/openerp.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/overlay.css
index 1f71b8fdcbe..1f71b8fdcbe 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/overlay.css
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/perform.gif
index 16cc3873858..16cc3873858 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/perform.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/settings.png
index ad0298af667..ad0298af667 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/settings.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
index 0057dc4c879..0057dc4c879 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/plugin_thunderbird/static/thunderbird_plugin/components/nsXmlRpcClient.js
index cf702b4141f..cf702b4141f 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/components/nsXmlRpcClient.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt
index 8e59aa20c85..8e59aa20c85 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/plugin_thunderbird/static/thunderbird_plugin/defaults/preferences/tiny.js
index 9a21e9a6f6c..9a21e9a6f6c 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/defaults/preferences/tiny.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.js b/addons/plugin_thunderbird/static/thunderbird_plugin/install.js
index 50e4b301e32..50e4b301e32 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/install.js
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.rdf b/addons/plugin_thunderbird/static/thunderbird_plugin/install.rdf
index e922f790b1c..e922f790b1c 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/install.rdf
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.rdf
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.sh b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
index e1103b30acf..e1103b30acf 100755
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/install.sh
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/makefile b/addons/plugin_thunderbird/static/thunderbird_plugin/makefile
index 17ed0319bcc..17ed0319bcc 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/makefile
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/makefile