[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb

2 files changed, 15 insertions, 18 deletions

diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 51e4153e897..5b124af05aa 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -20,12 +20,12 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Interface",
+    "name" : "Thunderbird Plug-In",
     "version" : "1.0",
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
     "depends" : ["base","mail"],
-    "category" : "Tools",
+    "category" : "Customer Relationship Management",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index cf23cdf45c1..2fb5d3177c3 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,26 +9,24 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Load Thunderbird Plug-In</attribute>
+                  <attribute name="string">Install Thunderbird Plug-In</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Load Thunderbird Plug-In</attribute>
+                   <attribute name="string">Install Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">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.</attribute>
               </xpath>
-	          <xpath expr="//button[@string='Install Modules']" position="replace">
-                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
               </xpath>
-              <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Cancel']" position="replace">
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-		  		<attribute name="string"/>
-		  		<attribute name="rowspan">15</attribute>
-		  	  </xpath>
-		  	  <group colspan="8" position="replace">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">15</attribute>
+              </xpath>
+              <group colspan="8" position="replace">
               <group colspan="8" height="450" width="750">
                   <field name="thunderbird" invisible="1"/>
                   <field name="name" invisible="1"/>
@@ -48,7 +46,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <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"/>
@@ -61,11 +59,12 @@
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
         <field name="sequence">3</field>
+        <field name="type">automatic</field>
     </record>
 
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <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"/>
@@ -76,9 +75,7 @@
     </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" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
-    <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem id="menu_base_config_plugins_thunderbird_sales" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_sales" />
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
 
   </data>
 </openerp>