diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index c798c703f37..06a53bb9548 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -33,6 +33,20 @@ class followup(osv.osv):
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
     }
+    
+    def check_company_uniq(self, cr, uid, ids, context=None):
+        sr_id = self.search(cr,uid,[],context=context)
+        lines = self.browse(cr, uid, sr_id, context=context)
+        company = []
+        for l in lines:
+            if l.company_id.id in company:
+                return False
+            if l.company_id.id not in company:
+                company.append(l.company_id.id)
+        return True
+    _constraints = [
+        (check_company_uniq, 'Only One Folllowup by Company.',['company_id'] )
+        ]
 
 followup()
 
@@ -47,6 +61,9 @@ class followup_line(osv.osv):
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),
         'description': fields.text('Printed Message', translate=True),
     }
+    _defaults = {
+        'start': 'days',
+    }
 
 followup_line()
 
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 326264ffdcd..50c0fbcf222 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -8,10 +8,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-Up Lines">
-                    <field name="sequence"/>
                     <field name="name"/>
                     <field name="delay"/>
-                    <field name="start"/>
+                    <field name="start" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -22,12 +21,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
-                    <field name="sequence"/>
                     <field name="name" />
                     <field name="delay" />
-                    <field name="start" />
+                    <field name="start" groups="base.group_extended"/>
                     <newline/>
-                    <field colspan="4" name="description" />
+                    <separator string="" colspan="4"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                     <separator string="Legend" colspan="4"/>
                     <label string="%%(partner_name)s: Partner Name" colspan="2"/>
                     <label string="%%(date)s: Current Date" colspan="2"/>
@@ -45,9 +44,7 @@
                 <form string="Follow-Up">
                     <field name="name" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1" />
-                    <separator colspan="4" string="Followup Lines"/>
+                    <separator colspan="4" string="" />
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -75,6 +72,10 @@
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By...">
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -170,6 +171,27 @@
                 </field>
             </field>
         </record>
+        
+        <!--   Configure Follow-Ups  Wizard    -->
+        
+          <record id="action_view_account_followup_followup_form" model="ir.actions.act_window">
+            <field name="name">Configure Follow-Ups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account_followup.followup</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_account_followup_followup_form"/>
+        </record>
+        
+         <!--      register configuration wizard -->
+        <record id="config_wizard_view_account_followup_followup_form" model="ir.actions.todo">
+            <field name="action_id" ref="action_view_account_followup_followup_form"/>
+            <field name="target">current</field>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
+        </record>
+        
+        
 
     </data>
 </openerp>
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index c69fdb112c6..b43ca32d200 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,8 +1,12 @@
 -
   In order to test account followup module in OpenERP I create a FollowUp structure
+-
+  !record {model: res.company, id: ymltest_company_2}:
+        name: Acme 2
 -
   !record {model: account_followup.followup, id: account_followup_followup_testfollowups0}:
     description: First letter after 15 net days, 30 net days and 45 days end of month levels.
+    company_id: ymltest_company_2
     followup_line:
       - delay: 15
         name: 'level 0: 15 days'
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index a8608c2fdd0..18b0fc1b874 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -171,7 +171,7 @@ class account_followup_print_all(osv.osv_memory):
             "SELECT * "\
             "FROM account_followup_followup_line "\
             "WHERE followup_id=%s "\
-            "ORDER BY sequence", (fup_id,))
+            "ORDER BY delay", (fup_id,))
         for result in cr.dictfetchall():
             delay = datetime.timedelta(days=result['delay'])
             fups[old] = (current_date - delay, result['id'])
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 2b73dd69885..6aa3ebdd13d 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -22,17 +22,16 @@
 from osv import fields, osv
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _name='profile.association.config.install_modules_wizard'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
-        'hr_expense':fields.boolean('Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
         'project':fields.boolean('Project Management', 
                               help="Helps you manage your projects and tasks by tracking them, "
                  "generating plannings, etc..."),
-        'event_project':fields.boolean('Events', help="Helps you to manage and organize your events."),
+        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index bc155733595..e693bf6ae99 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -3,56 +3,23 @@
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Association Application Configuration</field>
-            <field name="model">profile.association.config.install_modules_wizard</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes">
-                  <attribute name="string">Association Application Configuration</attribute>
-                </form>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                  </xpath>
-                <xpath expr="//label[@string='description']"
-                       position="attributes">
-                  <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
+                <xpath expr="//field[@name='product_expiry']" position="after">
+                    <newline/>
+                    <separator  string="Associations Details" colspan="4" />
+                    <field name="project" />
+                    <field name="project_gtd" />
+                    <field name="wiki" />
+                    <field name="event_project" />
+                    <field name="hr_expense" />
                 </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <separator string="title" position="replace"/>
-                <group colspan="8">
-                  <separator string="Project Management" colspan="4"/>
-                  <field name="project"/>
-                  <field name="project_gtd"/>
-                  <field name="wiki"/>
-                  <separator string="Event Management" colspan="4"/>
-                  <field name="event_project"/>
-                  <separator string="Resources Management" colspan="4"/>
-                  <field name="hr_expense"/>
-                </group>
               </data>
             </field>
         </record>
-
-        <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Association Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">profile.association.config.install_modules_wizard</field>
-            <field name="view_id" ref="view_confirm_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-      <record model="ir.actions.todo"
-            id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-            <field name="sequence">3</field>
-            <field name="type">special</field>
-      </record>
-
         <menuitem
             name="Association"
             id="base.menu_association"
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3fb9eaeb287..286aa817289 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -116,52 +116,22 @@
   </record>
   
           <!-- Import or create customers configartion view  -->
-
-	 <record id="view_import_create_installer" model="ir.ui.view">
-	     <field name="name">Import or create customers </field>
-	     <field name="model">product.installer</field>
-	     <field name="type">form</field>
-	     <field name="inherit_id" ref="base.res_config_view_base"/>
-	     <field name="arch" type="xml">
-	       <data>
-	         <form position="attributes">
-	           <attribute name="string">Import or create customers </attribute>
-	         </form>
-	         <separator string="title" position="attributes">
-	         <attribute name="string">Import or create customers </attribute>
-	           </separator>
-	         <xpath expr="//label[@string='description']"
-                 position="attributes">
-                <attribute name="string">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</attribute>
-              </xpath>
-	         <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	               <attribute name='rowspan'>15</attribute>
-	               <attribute name='string'></attribute>
-	          </xpath>
-	           
-	           <group string="res_config_contents" position="replace">
-	               <group colspan="4">
-	                   <field colspan="4" name="customers" width="200"/>
-	             </group>
-	         </group>
-	       </data>
-	     </field>
-	 </record>
 	
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
 	     <field name="name">Import or create customers </field>
 	     <field name="type">ir.actions.act_window</field>
-	     <field name="res_model">product.installer</field>
-	     <field name="view_id" ref="view_import_create_installer"/>
+	     <field name="res_model">res.partner</field>
 	     <field name="view_type">form</field>
-	     <field name="view_mode">form</field>
-	     <field name="target">new</field>
+	     <field name="view_mode">tree,form</field>
+	     <field name="view_id" ref="base.view_partner_tree"/>
+	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
 	 </record>
 
     <!--          register configuration wizard -->
-	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
+	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
 	    <field name="type">normal</field>
+	    <field name="target">current</field>
 	    <field name="state">skip</field>
 	</record>
 	
@@ -182,7 +152,7 @@
             </xpath>
             <xpath expr="//label[@string='description']"
                position="attributes">
-              <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
+              <attribute name="string">Specify default values.This will set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
@@ -218,10 +188,10 @@
           <field name="state">skip</field>
       </record>
       
-      <!--     Config Wiz   Give access to others users   -->
+      <!--     Config Wiz   Create New User's Login   -->
         
       <record id="action_config_access_other_user" model="ir.actions.act_window">
-          <field name="name">Give access to others users</field>
+          <field name="name">Create New User's Login</field>
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">res.users</field>
           <field name="view_type">form</field>
@@ -251,13 +221,19 @@
                      <newline/>
                      <separator string="" colspan="4"/>
                      <group colspan="4" col="2">
-                     <button name="%(action_res_company_logo)d"
-                        string="Upload/Change Logo" type="action" icon="gtk-open"/>
                      <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
                      </group>
                 </field>
           </field>
       </record>
+
+      <!--   register Upload Logo configuration wizard  -->
+
+      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
+          <field name="action_id" ref="action_res_company_logo"/>
+          <field name="type">normal</field>
+          <field name="state">cancel</field>
+      </record>      
        
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 1a148c517c3..aa39f270e64 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -52,7 +52,7 @@
     <record id="action_base_setup_company" model="ir.actions.act_window">
       <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.company</field>
+      <field name="res_model">res.company</field>
       <field name="view_id" ref="base.view_company_form"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
@@ -64,5 +64,6 @@
         <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
+ 
   </data>
 </openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 0309318aea0..fdd28950094 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -221,8 +221,8 @@ class user_preferences_config(osv.osv_memory):
                  "translations are available"),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
-                                 'Interface', required=True ),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
                                  
     }
     _defaults={
@@ -230,6 +230,15 @@ class user_preferences_config(osv.osv_memory):
                'context_lang' : 'en_US',
                'menu_tips' : True
     }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
+        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
+        for id, field, value in res_default:
+            res.update({field: value})
+        return res
 
     def execute(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids, context=context):
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
index df8ace2895c..2e1b4b6e2aa 100644
--- a/addons/base_setup/wizard/res_company_logo.py
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -37,10 +37,9 @@ class res_company_logo(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        record_id = context.get('active_id', False) or False
-        comp_obj = self.pool.get("res.company")
+        user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         get_val = self.browse(cr, uid, ids)[0]
-        comp_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context)
+        user_comp.write({'logo': get_val.logo}, context=context)
         return {'type': 'ir.actions.act_window_close'}
     
 res_company_logo()
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
index c15810ff3d1..c0ed2485752 100644
--- a/addons/base_setup/wizard/res_company_logo_view.xml
+++ b/addons/base_setup/wizard/res_company_logo_view.xml
@@ -7,7 +7,7 @@
             <field name="model">res.company.logo</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Upload Logo">
+                <form string="Upload Your Company Logo">
                     <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
                     <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
                     <separator colspan="4"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="action_res_company_logo" model="ir.actions.act_window">
-            <field name="name">Set Logo</field>
+            <field name="name">Upload Your Company Logo</field>
             <field name="res_model">res.company.logo</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 32551d438c4..9d32ff93ea5 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -23,19 +23,18 @@ from lxml import etree
 from osv import fields, osv
 
 class crm_installer(osv.osv_memory):
-    _name = 'crm.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'name': fields.char('Name', size=64),
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'crm_caldav': fields.boolean('Synchronization: Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird', help="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."),
-        'outlook': fields.boolean('MS-Outlook', help="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."),
+        'fetchmail': fields.boolean('Synchronization: Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Plug-In: Thunderbird', help="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."),
+        'outlook': fields.boolean('Plug-In: MS-Outlook', help="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."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
     }
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 7b7717a1fe1..9d77e8108b8 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -2,82 +2,43 @@
   <data>
     <record id="view_crm_installer" model="ir.ui.view">
       <field name="name">crm.installer.view</field>
-      <field name="model">crm.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">CRM Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your CRM Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Customer Relationship Management Details" colspan="4" />
+            <field name="crm_claim" groups="base.group_extended" />
+            <field name="crm_helpdesk" groups="base.group_extended" />
+            <field name="crm_fundraising" groups="base.group_extended" />
+            <field name="wiki_sale_faq" groups="base.group_extended" />
+            <field name="sale_crm" invisible="1" groups="base.group_extended" />
+            <field name="crm_caldav" />
+            <field name="fetchmail" />
+            <field name="thunderbird" />
+            <field name="outlook" />
           </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="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="Plug-In" colspan="4" />
-                  <field name="thunderbird" />
-                  <field name="outlook" />
-              </group>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_crm_installer" model="ir.actions.act_window">
-      <field name="name">CRM Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">crm.installer</field>
-      <field name="view_id" ref="view_crm_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="crm_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_crm_installer"/>
-        <field name="sequence">3</field>
-        <field name="type">special</field>
-        <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
-    </record>
-
+    
     <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
-        <field name="name">Create sales team</field>
+        <field name="name">Create Sales Team</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">crm.case.section</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm.crm_case_section_view_form"/>
+        <field name="view_id" ref="crm.crm_case_section_view_tree"/>
+        <field name="help">Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team.</field>
     </record>
 
     <record id="crm_case_section_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="crm_case_section_view_form_installer"/>
         <field name="sequence">10</field>
-        <field name="type">special</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
     </record>
 
     <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
@@ -86,13 +47,15 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm.crm_case_stage_form"/>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
 
     <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="crm_case_stage_form_installer"/>
         <field name="sequence">10</field>
-        <field name="type">special</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
     </record>
 
   </data>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 21855b21ede..3c39f6a7fb2 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -46,6 +46,7 @@
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="type">special</field>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 151e2ce49c6..e93153e25fe 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -48,6 +48,7 @@
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 41f84cfdedd..9aeddd7ba9b 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -59,9 +59,9 @@ class email_server(osv.osv):
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
-        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."),
+        'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
-        'user_id':fields.many2one('res.users', 'User', required=False),
+        'user_id':fields.many2one('res.users', 'User', required=False,  help="This is the user that runs the cron"),
         'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
     }
     _defaults = {
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 60bf243300a..86103b5f233 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -4,73 +4,26 @@
 
     <record id="view_hr_installer" model="ir.ui.view">
       <field name="name">hr.installer.view</field>
-      <field name="model">hr.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-            <form position="attributes">
-                <attribute name="string">Human Resources Application Configuration</attribute>
-            </form>
-            <separator string="title" position="attributes">
-                <attribute name="string">Configure Your Human Resources Application</attribute>
-            </separator>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the base HR Application by installing few HR-related functionalities.</attribute>
-            </xpath>
-          <group colspan="8">
+           <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Human Resources Details" colspan="4" />
             <field name="hr_holidays"/>
-            <field name="hr_expense"/>
-            <field name="hr_recruitment"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="hr_contract"/>
-            <field name="hr_attendance"/>
-            <field name="hr_evaluation" groups="base.group_extended"/>
-            <field name="hr_payroll" groups="base.group_extended"/>
-            <field name="hr_payroll_account" groups="base.group_extended"/>
-          </group>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
+            <field name="hr_expense" />
+            <field name="hr_recruitment" />
+            <field name="hr_timesheet_sheet" />
+            <field name="hr_contract" />
+            <field name="hr_attendance" />
+            <field name="hr_evaluation" />
+            <field name="hr_payroll" />
+            <field name="hr_payroll_account" groups="base.group_extended" />
+           </xpath>
         </data>
       </field>
     </record>
-
-    <record id="action_hr_installer" model="ir.actions.act_window">
-      <field name="name">Human Resources Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">hr.installer</field>
-      <field name="view_id" ref="view_hr_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="hr_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_hr_installer"/>
-      <field name="sequence">3</field>
-      <field name="type">special</field>
-    </record>
-
-         <record model="ir.actions.act_window" id="view_employee_form_installer">
-           <field name="name">Create Your Employees</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">hr.employee</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="hr.view_employee_form"/>
-       </record>
-
-       <record id="view_employee_form_todo" model="ir.actions.todo">
-           <field name="action_id" ref="view_employee_form_installer"/>
-           <field name="sequence">3</field>
-           <field name="type">normal</field>
-           <field name="state">skip</field>
-       </record>
-
-
   </data>
 </openerp>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index cdeb2ca77a3..93f920f3cb8 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class hr_installer(osv.osv_memory):
-    _name = 'hr.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         # Human Resources Management
         'hr_holidays': fields.boolean('Holidays / Leaves Management',
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
index 5b2e149b8d2..94a48ae774c 100644
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml
@@ -7,7 +7,8 @@
            <field name="res_model">hr.department</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="hr.view_department_form"/>
+           <field name="view_id" ref="hr.view_department_tree"/>
+           <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
        </record>
 
        <record id="view_department_form_todo" model="ir.actions.todo">
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 340aea6ad17..d8605f297b0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -322,3 +322,41 @@ class resource_calendar_leaves(osv.osv):
 
 resource_calendar_leaves()
 
+
+class hr_employee(osv.osv):
+   _inherit="hr.employee"
+
+   def _set_remaining_days(self, cr, uid, empl_id, name, value, arg, context=None):
+        employee = self.browse(cr, uid, empl_id, context=context)
+        diff = value - employee.remaining_leaves
+        type_obj = self.pool.get('hr.holidays.status')
+        holiday_obj = self.pool.get('hr.holidays')
+        # Find for holidays status
+        status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context)
+        status_id = status_ids and status_ids[0] or False
+        if not status_id or diff <= 0:
+            return False
+        leave_id = holiday_obj.create(cr, uid, {'name': 'Allocation for ' + employee.name,'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'add', 'holiday_type': 'employee', 'number_of_days_temp': diff}, context=context)
+        holiday_obj.holidays_confirm(cr, uid, [leave_id])
+        holiday_obj.holidays_validate2(cr, uid, [leave_id])
+        return True
+
+   def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
+        cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False  group by h.employee_id")
+        res = cr.dictfetchall()
+        remaining = {}
+        for r in res:
+            remaining[r['employee_id']] = r['days']
+        for employee_id in ids:
+            if not remaining.get(employee_id):
+                remaining[employee_id] = 0.0
+        return remaining
+
+
+   _columns = {
+        'remaining_leaves': fields.function(_get_remaining_days, method=True, string='Remaining Leaves', fnct_inv=_set_remaining_days, type="float", help='Remaining Leaves', store=True),
+    }
+
+hr_employee()
+
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2e5e9b97771..56fb7faddfc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -441,6 +441,35 @@
             src_model="hr.employee"
             view_id ="view_holiday"
             id="act_hr_employee_holiday_request"/>
+            
+       <!--  Assing leave       -->
+        
+        <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
+            <field name="name">hr.employee.leave.tree</field>
+            <field name="model">hr.employee</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Assign Leaves" editable="top">
+                    <field name="name" string="Employee"/>
+                    <field name="remaining_leaves"/>
+                </tree>
+            </field>
+        </record>  
+
+        <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal">
+           <field name="name">Assign Legal Leaves to Employees</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">hr.employee</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
+       </record>
+
+       <record id="hr_holidays_leaves_assign_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="hr_holidays_leaves_assign_legal"/>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>        
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
index cd2bb285f03..9cf78aebb66 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
@@ -43,6 +43,41 @@
 	        <field name="type">normal</field>
 	        <field name="state">skip</field>
     </record>
+ 
+        <!--  Configure Your Services Config Wiz  -->
+
+        <record id="product_timesheet_invoice_tree_view" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
+                    <field name="name"/>
+                    <field name="standard_price"/>
+                    <field name="lst_price"/>
+                    <field name="uom_id" string="UoM"/>
+                </tree>
+            </field>
+        </record>       
+
+        <record model="ir.actions.act_window" id="product_services_form_view_installer">
+           <field name="name">Configure Your Services</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.product</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="domain">[('type','=','service')]</field>
+           <field name="context" eval="'{\'default_type\':\'service\', \'default_sale_ok\':True, \'default_hr_expense_ok\':False,}'"/>
+           <field name="view_id" ref="product_timesheet_invoice_tree_view"/>
+       </record>
+
+       <record id="product_services_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="product_services_form_view_installer"/>
+           <field name="sequence">3</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index e74c37f80d0..0f6b29597de 100644
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class knowledge_installer(osv.osv_memory):
-    _name = 'knowledge.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Knowledge Management
@@ -39,11 +38,11 @@ class knowledge_installer(osv.osv_memory):
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
         # Content templates
-        'wiki_faq':fields.boolean('Internal FAQ',
+        'wiki_faq':fields.boolean('Template: Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "
                  "System."),
-        'wiki_quality_manual':fields.boolean('Quality Manual',
+        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
             help="Creates an example skeleton for a standard quality manual."),
         }
     _defaults = {
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 1366a211e92..e5fe851fcdd 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -2,59 +2,22 @@
   <data>
     <record id="view_knowledge_installer" model="ir.ui.view">
       <field name="name">knowledge.installer.view</field>
-      <field name="model">knowledge.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Knowledge Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Your Knowledge Application</attribute>
-          </separator>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                      <attribute name='string'></attribute>
-                  </xpath>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Share information within the company with these specific Addons.</attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Knowledge Management Details" colspan="4" />
+            <field name="document_ftp" />
+            <field name="document_webdav" />
+            <field name="wiki" />
+            <field name="wiki_faq" />
+            <field name="wiki_quality_manual" />
           </xpath>
-          <group colspan="8" position="replace">
-          <group colspan="4">
-            <field name="document_ftp"/>
-            <field name="document_webdav"/>
-            <field name="wiki"/>
-            <separator string="Content templates" colspan="4"/>
-            <field name="wiki_faq"/>
-            <field name="wiki_quality_manual"/>
-          </group>
-          </group>
-         <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-         </xpath>
         </data>
       </field>
     </record>
-
-    <record id="action_knowledge_installer" model="ir.actions.act_window">
-      <field name="name">Knowledge Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">knowledge.installer</field>
-      <field name="view_id" ref="view_knowledge_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="knowledge_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_knowledge_installer"/>
-      <field name="sequence">3</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-      <field name="type">special</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a08603b6fa4..20573316915 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -292,7 +292,6 @@
                 <search string="Products">
                     <field name="name" />
                     <field name="category_id" widget="selection"/>
-                    <field name="description" />
                     <field name="price"/>
                 </search>
             </field>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 7acc9806a63..7d3175b9811 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -14,52 +14,20 @@
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
-            <field name="model">marketing.installer</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
                 <data>
-                  <form position="attributes">
-                    <attribute name="string">Marketing Application Configuration</attribute>
-                  </form>
-                  <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Marketing Application</attribute>
-                  </separator>
-                  <xpath expr="//label[@string='description']"
-                         position="attributes">
-                    <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</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">
+                    <xpath expr="//field[@name='product_expiry']" position="after">
+                        <newline/>
+                        <separator  string="Marketing Details" colspan="4" />
                         <field name="marketing_campaign" />
                         <field name="email_template" />
                         <field name="crm_profiling" />
-                  </group>
+                    </xpath>                   
                 </data>
             </field>
         </record>
-
-        <record id="action_marketing_installer" model="ir.actions.act_window">
-            <field name="name">Marketing Applications Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">marketing.installer</field>
-            <field name="view_id" ref="view_marketing_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="marketing_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_marketing_installer"/>
-            <field name="sequence">3</field>
-            <field name="type">special</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index a97d0ca16bc..cedba8151c9 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class marketing_installer(osv.osv_memory):
-    _name = 'marketing.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         'email_template':fields.boolean('Automated E-Mails',
             help="Helps you to design templates of emails and integrate them in your different processes."),
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index 407d401e463..7fc7fea9c1e 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class mrp_installer(osv.osv_memory):
-    _name = 'mrp.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Manufacturing Resource Planning
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 47c7aadfe89..9f80ef733aa 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -2,55 +2,22 @@
   <data>
     <record id="view_mrp_installer" model="ir.ui.view">
       <field name="name">mrp.installer.view</field>
-      <field name="model">mrp.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">MRP Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Add more functionalities to the core Manufacturing Application with the following addons.</attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Manufacturing Details" colspan="4" />
+            <field name="stock_location" />
+            <field name="mrp_jit" />
+            <field name="mrp_operations" />
+            <field name="mrp_subproduct" />
+            <field name="mrp_repair" />            
           </xpath>
-          <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"/>
-            <field name="mrp_operations"/>
-            <field name="mrp_subproduct"/>
-            <field name="mrp_repair"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_mrp_installer" model="ir.actions.act_window">
-      <field name="name">MRP Applications Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">mrp.installer</field>
-      <field name="view_id" ref="view_mrp_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="mrp_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_mrp_installer"/>
-      <field name="sequence">3</field>
-        <field name="type">special</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6f68b63cc02..44258234d11 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class misc_tools_installer(osv.osv_memory):
-    _name = 'misc_tools.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index d1bfcd259c4..6daba8f0650 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -2,54 +2,23 @@
   <data>
     <record id="view_misc_tools_installer" model="ir.ui.view">
       <field name="name">misc_tools.installer.view</field>
-      <field name="model">misc_tools.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Extra Tools Configuration</attribute>
-          </form>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Extra Tools Details" colspan="4" />
+            <field name="share" />
+            <field name="lunch" />
+            <field name="idea" />
+            <field name="survey" />
+            <field name="subscription" />
+            <field name="pad" />            
           </xpath>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Extra Tools</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Extra Tools are applications that can help you improve your organization although they are not key for company management.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="share"/>
-            <field name="lunch"/>
-            <field name="idea"/>
-            <field name="survey"/>
-            <field name="subscription" groups="base.group_extended"/>
-            <field name="pad"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_misc_tools_installer" model="ir.actions.act_window">
-      <field name="name">Tools Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">misc_tools.installer</field>
-      <field name="view_id" ref="view_misc_tools_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="misc_tools_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_misc_tools_installer"/>
-        <field name="type">special</field>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..36b458da296 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class project_installer(osv.osv_memory):
-    _name = 'project.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Project Management
@@ -41,10 +40,10 @@ class project_installer(osv.osv_memory):
         'project_issue': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
-        'project_scrum': fields.boolean('SCRUM',
+        'project_scrum': fields.boolean('Methodology: SCRUM',
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Getting Things Done',
+        'project_gtd': fields.boolean('Methodology: Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
     }
 project_installer()
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index c704a980000..47021df8c7f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -3,56 +3,25 @@
 
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
-      <field name="model">project.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
           <data>
-          <form position="attributes">
-            <attribute name="string">Project Application Configuration</attribute>
-          </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Project Management Application</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-             </xpath>
-          <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Various OpenERP applications are available to manage your projects with different level 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_issue"/>
-            <field name="project_long_term" groups="base.group_extended"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="project_timesheet"/>
-            <field name="account_budget" groups="base.group_extended"/>
+          <xpath expr="//field[@name='product_expiry']" position="after">
             <newline/>
-            <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum"/>
-            <field name="project_gtd"/>
-          </group>
+            <separator  string="Project Management Details" colspan="4" />
+            <field name="project_issue" />
+            <field name="project_long_term" />
+            <field name="hr_timesheet_sheet" />
+            <field name="project_timesheet" />
+            <field name="account_budget" />
+            <field name="project_scrum" />
+            <field name="project_gtd" />
+          </xpath>
         </data>
       </field>
     </record>
 
-    <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">project.installer</field>
-      <field name="view_id" ref="view_project_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="project_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_project_installer"/>
-        <field name="type">special</field>
-        <field name="sequence">3</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index bf106adc3ac..be99a41a3cc 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class purchase_installer(osv.osv_memory):
-    _name = 'purchase.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 7c6864a8d5b..bb759a60b00 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -3,51 +3,19 @@
     <data>
         <record id="view_purchase_install_module_form" model="ir.ui.view">
             <field name="name">Purchases Application Configuration</field>
-            <field name="model">purchase.installer</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-              <form position="attributes">
-                <attribute name="string">Purchases Application Configuration</attribute>
-              </form>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                  </xpath>
-              <separator string="title" position="attributes">
-                <attribute name="string"
-                           >Configure Your Purchases Management Application</attribute>
-              </separator>
-              <xpath expr="//label[@string='description']"
-                     position="attributes">
-                <attribute name="string">Extend your Purchases Management Application with additional functionalities.</attribute>
-              </xpath>
-              <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
-               </xpath>
-                <group colspan="8">
-                  <field name="purchase_requisition"/>
-                  <field name="purchase_analytic_plans"/>
-                </group>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Purchase Management Details" colspan="4" />
+            <field name="purchase_requisition" />
+            <field name="purchase_analytic_plans" />
+          </xpath>
               </data>
             </field>
         </record>
-
-        <record id="action_purchase_install_module" model="ir.actions.act_window">
-            <field name="name">Purchases Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.installer</field>
-            <field name="view_id" ref="view_purchase_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    <record id="purchase_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_purchase_install_module"/>
-      <field name="sequence">3</field>
-      <field name="type">special</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
     </data>
 </openerp>
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index f849392d328..e4bbc4ffa93 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class report_designer_installer(osv.osv_memory):
-    _name = 'report_designer.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Reporting
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index fc720c8d466..18505a95930 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -2,52 +2,19 @@
   <data>
     <record id="view_report_designer_installer" model="ir.ui.view">
       <field name="name">report_designer.installer.view</field>
-      <field name="model">report_designer.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Reporting Tools Configuration</attribute>
-          </form>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Advanced Reporting Details" colspan="4" />
+            <field name="base_report_designer" />
+            <field name="base_report_creator" />
           </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Reporting Tools</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <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"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_report_designer_installer" model="ir.actions.act_window">
-      <field name="name">Reporting Tools Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">report_designer.installer</field>
-      <field name="view_id" ref="view_report_designer_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="report_designer_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="type">normal</field>
-      <field name="state">skip</field>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0758fac6c19..4040ca8cc13 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1180,7 +1180,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
-        ], 'Invoice Method', required=True,
+        ], 'Invoicing Method', required=True,
            help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index a8cc5432020..fa7dffc9d6d 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class sale_installer(osv.osv_memory):
-    _name = 'sale.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'delivery': fields.boolean('Delivery Costs', 
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 6d67b105578..d0abc57f548 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -2,55 +2,22 @@
   <data>
     <record id="view_sale_installer" model="ir.ui.view">
       <field name="name">sale.installer.view</field>
-      <field name="model">sale.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Sales Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Sales Management Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Enhance your core Sales Application with additional functionalities.</attribute>
-          </xpath>
-          <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="delivery"/>
-            <field name="sale_journal"/>
-            <field name="sale_layout"/>
-            <field name="sale_margin"/>
-            <field name="sale_order_dates"/>
-          </group>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <separator  string="Sales Management Details" colspan="4" />
+            <field name="delivery" />
+            <field name="sale_journal" />
+            <field name="sale_layout" />
+            <field name="sale_margin" />
+            <field name="sale_order_dates" />               
+          </xpath>           
         </data>
       </field>
     </record>
-
-    <record id="action_sale_installer" model="ir.actions.act_window">
-      <field name="name">Sales Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">sale.installer</field>
-      <field name="view_id" ref="view_sale_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="sale_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_sale_installer"/>
-      <field name="type">special</field>
-      <field name="sequence">3</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2024bac8dda..d08681e8d36 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -521,7 +521,7 @@
         <act_window
         context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
         id="action_order_line_product_tree"
-        name="Sales order line"
+        name="Sales Order Lines"
         res_model="sale.order.line"
         src_model="product.product"
         groups="base.group_sale_salesman"/>
@@ -532,7 +532,7 @@
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
-            <field name="name">Setup your sales flow</field>
+            <field name="name">Set Up Your Invoicing Method</field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
@@ -562,7 +562,7 @@
         </record>
 
         <record id="action_config_picking_policy" model="ir.actions.act_window">
-            <field name="name">Setup your sales flow</field>
+            <field name="name">Set Up Your Invoicing Method</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
             <field name="view_id" ref="view_config_picking_policy"/>
@@ -574,7 +574,8 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
-            <field name="type">special</field>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
             <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         </record>