[IMP] Improvements in Configuration wizard

bzr revid: vir@tinyerp.com-20100604062145-2d23i9y84ticq0cg

9 files changed, 31 insertions, 9 deletions

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 97c9ea0d301..2d6b400d2c5 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -28,9 +28,9 @@
 		            <field name="currency" widget="selection"/><field name="street"/>
 		            <field name="zip"/>
 		            <field name="street2"/>
-		            <field name="city"/>
 		            <field name="country_id"/>
 		            <field name="state_id"/>
+		            <field name="city"/>
 		            <field name="email"/>
 		            <field name="phone"/>
 		            <field name="website"/>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index a9fde39ffde..c62951b13b7 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -71,7 +71,6 @@ class base_gtkcontactform(osv.osv_memory):
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
              'updates':fields.boolean('Updates'),
-             'contact_me':fields.boolean('Contact Me'),
              }
     def execute(self, cr, uid, ids, context=None):
         if context is None:
@@ -81,10 +80,10 @@ class base_gtkcontactform(osv.osv_memory):
         company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
         company_data = company_data and company_data[0] or {}
         country = ''
-        
+
         if company_data.get('country_id', False):
             country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
-        
+
         for res in self.read(cr, uid, ids, context=context):
             email = res.get('email','')
             result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c5578f9bc9a..41711032bf0 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -24,9 +24,7 @@
           <group string="res_config_contents" position="replace">
           	<group colspan="4" height="450" width="600">
           	 	<group colspan="4">
-          	 	 	<field name="contact_me" nolabel="1"/>
-		            <label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/>
-		            <field name="ebook" nolabel="1"/>
+ 		            <field name="ebook" nolabel="1"/>
 		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
 		            <field name="updates" nolabel="1"/>
 		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index e0d84c6eed2..9d92f6f1b95 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -18,6 +18,13 @@
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
           </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+              <attribute name='rowspan'>13</attribute>
+              <attribute name='string'></attribute>
+          </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+            <attribute name="string">Configure</attribute>
+          </xpath>
 		  <group colspan="8">
 			<group colspan="2" col="2">
 				<separator string="Synchronization" colspan="4" />
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index cc6200537cf..78f5a742bb6 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	   
+
         <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
@@ -21,6 +21,13 @@
                          position="attributes">
                     <attribute name="string">OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.</attribute>
                   </xpath>
+                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                       <attribute name='rowspan'>13</attribute>
+                       <attribute name='string'></attribute>
+                 </xpath>
+                  <xpath expr="//button[@string='Install Modules']" position="attributes">
+                            <attribute name="string">Configure</attribute>
+                  </xpath>
                   <group colspan="8">
                         <field name="marketing_campaign" />
                         <field name="crm_profiling" />
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index fe4fb6b8348..c3929df10af 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -21,6 +21,9 @@
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
       			<attribute name='string'></attribute>
   		  </xpath>
+  		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="stock_location"/>
             <field name="mrp_jit"/>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index a127333544f..f7c46066178 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -22,6 +22,9 @@
                  position="attributes">
             <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="project_crm"/>
             <field name="project_long_term" groups="base.group_extended"/>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index b105b6ba3aa..635297d0f21 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -22,7 +22,9 @@
 	                 position="attributes">
 	            <attribute name="string">After having installed the core purchase application, you can extend it with more modules on needs of your organization</attribute>
 	          </xpath>
-
+              <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+               </xpath>
                 <group colspan="8">
                   <field name="purchase_requisition"/>
                 </group>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index bcd0250fb7e..6a48c919460 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -22,6 +22,9 @@
             <attribute name="string"
                        >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>