[IMP] account,base_setup,crm,thunderbird: Improvements in Configuration wizards.

bzr revid: uco@tinyerp.com-20100624125105-ral7r6f3oynz7yeh

6 files changed, 16 insertions, 16 deletions

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 50e431935bc..0bce735f1b3 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -17,7 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
+            <attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 46c4dbc6e0b..6608cea061b 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -13,9 +13,7 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
-                       >Now that OpenERP is installed, We have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules).
-
-If you don't think you need any of these right now, you can easily install them later on.</attribute>
+                       >The most common applications have been pre selected. You can directly install them. You can either choose generic modules, or select modules for specific business sectors and industries. If you do not think you need any of these right now, you can easily install them later.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 5ec9be53d76..0bf0fbb09be 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -26,9 +26,9 @@
                     <field name="company_id" invisible="1"/>
                     <field name="name" required="True"/><field name="account_no"/>
                     <field name="currency" widget="selection"/><field name="street"/>
-                    <field name="zip"/>
                     <field name="street2"/>
                     <field name="country_id"/>
+                    <field name="zip"/>
                     <field name="state_id"/>
                     <field name="city"/>
                     <field name="email"/>
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index 41711032bf0..fcbaa9867e7 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -11,7 +11,7 @@
             <attribute name="string">Contact Information</attribute>
           </form>
 		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute>
+	            <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="title"]' position='attributes'>
 	          	  <attribute name='string'>Would you like more information or documentation ?</attribute>
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 9d92f6f1b95..6d8f4b7120f 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -25,26 +25,25 @@
           <xpath expr="//button[@string='Install Modules']" position="attributes">
             <attribute name="string">Configure</attribute>
           </xpath>
-		  <group colspan="8">
+	  	  <group colspan="8">
+			<group colspan="4" col="4" groups="base.group_extended" name="other">
+		  		<field name="crm_claim" />
+		  		<field name="crm_helpdesk" />
+		  		<field name="crm_fundraising" />
+        	  	<field name="wiki_sale_faq"/>
+  		  		<field name="sale_crm" invisible="1"/>
+			</group>
 			<group colspan="2" col="2">
 				<separator string="Synchronization" colspan="4" />
           		<field name="crm_caldav" />
           		<field name="fetchmail" />
           	</group>
           	<group colspan="2" col="2">
-				<separator string="Plugins" colspan="4" />
+			<separator string="Plugins" colspan="4" />
           		<field name="thunderbird" />
           		<label string="*Outlook*" />
 <!--    TODO      		<field name="outlook" />-->
           	</group>
-			<group colspan="4" col="4" groups="base.group_extended" name="other">
-				<separator string="Additional features" colspan="4" />
-	          	<field name="crm_claim" />
-	          	<field name="crm_helpdesk" />
-	          	<field name="crm_fundraising" />
-                <field name="wiki_sale_faq"/>
-  	          	<field name="sale_crm" invisible="1"/>
-          </group>
           </group>
         </data>
       </field>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 17b7db6f71d..7b50b70fba5 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -17,6 +17,9 @@
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This module is required for the thuderbird plug-in to work properly.This allows you to select an object that you had like to add to your email and its attachments. You can select a partner, a task, a project, an analytical account, or any other object and attach selected mail as .eml file in attachment of selected record.</attribute>
               </xpath>
+	      <xpath expr="//button[@string='Install Modules']" position="attributes">
+	        <attribute name="string">Configure</attribute>
+	      </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
 		  		<attribute name='string'></attribute>
 		  		<attribute name='rowspan'>15</attribute>