From 46b262732a0ea41107101366772dafdc39c44fe9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 12:35:04 +0100
Subject: [PATCH 01/42] [fix] account, base_setup, hr, knowledge, misc_tools,
 mrp, project, report_designer: remove placeholder labels in installers

bzr revid: xmo@tinyerp.com-20100120113504-gkgu9tygog9bgdkx
---
 addons/account/account_installer.xml                | 13 +------------
 addons/base_setup/base_setup_installer.xml          | 13 +------------
 addons/hr/hr_installer.xml                          | 13 +------------
 addons/knowledge/knowledge_installer.xml            | 13 +------------
 addons/misc_tools/misc_tools_installer.xml          | 13 +------------
 addons/mrp/mrp_installer.xml                        | 13 +------------
 addons/project/project_installer.xml                | 13 +------------
 .../report_designer/report_designer_installer.xml   | 13 +------------
 8 files changed, 8 insertions(+), 96 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4a1a1274e9f..09f2ff78070 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Configure Your Accounting System" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Accounting" colspan="4"/>
               <field name="account_analytic_default"/>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index b01e19a4a84..d59f1929e57 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Install Modules" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Generic Modules" colspan="4"/>
               <field name="crm"/> <field name="sale"/>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 4f7c1993963..05e47c946dd 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Configure Human Resources" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Human Resources Management" colspan="4"/>
               <field name="hr_holidays"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 5f8c19e568c..40121381784 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -16,18 +16,7 @@
                        colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Knowledge Management" colspan="4"/>
               <field name="document_ftp"/>
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index a8e98312ffc..ba3d66eb184 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Select Tools To Install" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Tools" colspan="4"/>
               <field name="lunch"/>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index a6b2f7ed1b6..b02dfaac709 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Configure Your Manufacturing" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Manufacturing Resource Planning" colspan="4"/>
               <!-- Advanced Routes -->
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 4d8b40103c1..000ad1b038f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -16,18 +16,7 @@
                        colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Project Management" colspan="4"/>
               <field name="project_long_term"/>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 6fe998410ad..a1e2290f254 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -15,18 +15,7 @@
             <separator string="Select Reporting Tools To Install" colspan="4"/>
             <image name="gtk-dialog-info"/>
             <newline/>
-            <label align="0.0" string=" Lorem ipsum dolor
-                sit amet, consectetur adipiscing elit. Cras metus
-                augue, ultricies et vehicula id, fringilla quis
-                mauris. Vestibulum fringilla ipsum sit amet est
-                adipiscing eget euismod velit semper. Proin non mauris
-                velit. Donec malesuada nisi sed augue viverra commodo
-                sagittis nisi rutrum. Cras vitae libero nunc, a
-                molestie sapien. Proin et augue sit amet est egestas
-                fermentum ut eu lacus. Etiam nisi orci, volutpat
-                aliquam viverra interdum, vehicula iaculis
-                lectus. Mauris ligula sapien, auctor in pharetra non,
-                ultrices quis odio."/>
+            <label align="0.0" string=""/>
             <group>
               <separator string="Reporting" colspan="4"/>
               <field name="base_report_designer"/>

From bdb680e7327f57aec8dff6c61397ae98c7980a91 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 15:02:37 +0100
Subject: [PATCH 02/42] [fix] set installer sequence numbers to 3, except
 base_setup to 2

bzr revid: xmo@tinyerp.com-20100120140237-iepmd78l4o25y63l
---
 addons/account/account_installer.xml                 | 2 +-
 addons/base_setup/base_setup_installer.xml           | 2 +-
 addons/hr/hr_installer.xml                           | 2 +-
 addons/knowledge/knowledge_installer.xml             | 2 +-
 addons/misc_tools/misc_tools_installer.xml           | 2 +-
 addons/mrp/mrp_installer.xml                         | 2 +-
 addons/project/project_installer.xml                 | 2 +-
 addons/report_designer/report_designer_installer.xml | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 09f2ff78070..4da0d74cf28 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -46,7 +46,7 @@
 
     <record id="account_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_account_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index d59f1929e57..62b90a500b2 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -54,7 +54,7 @@
 
     <record id="base_setup_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_base_setup_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">2</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 05e47c946dd..41a4d0f5759 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -48,7 +48,7 @@
 
     <record id="hr_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_hr_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 40121381784..361be404840 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -48,7 +48,7 @@
 
     <record id="knowledge_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_knowledge_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index ba3d66eb184..8633e9eca91 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -45,7 +45,7 @@
 
     <record id="misc_tools_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_misc_tools_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index b02dfaac709..49e4437457a 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -46,7 +46,7 @@
 
     <record id="mrp_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_mrp_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 000ad1b038f..242825e137f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -52,7 +52,7 @@
 
     <record id="project_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_project_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index a1e2290f254..6eff216b98c 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -44,7 +44,7 @@
 
     <record id="report_designer_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="sequence">1</field>
+      <field name="sequence">3</field>
     </record>
   </data>
 </openerp>

From 939e6aae5961bfac585272da85f1ab78ad34a642 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 15:05:35 +0100
Subject: [PATCH 03/42] [fix] second heading in base_setup installer was wrong

bzr revid: xmo@tinyerp.com-20100120140535-x2pjmlwcel2bwtmi
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 62b90a500b2..0f4ead634b7 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -26,7 +26,7 @@
               <field name="purchase"/> <field name="hr"/>
               <field name="point_of_sale"/> <field name="marketing"/>
               <field name="misc_tools"/> <field name="report_designer"/>
-              <separator string="Generic Modules" colspan="4"/>
+              <separator string="Vertical Modules" colspan="4"/>
               <field name="profile_association"/>
               <field name="profile_training"/>
               <field name="profile_auction"/>

From baecab0ef50311b49cd09bf407a79c1c4626ab0b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 15:52:43 +0100
Subject: [PATCH 04/42] [imp] remove profile selection from base_setup wizard

bzr revid: xmo@tinyerp.com-20100120145243-z473yroo2aio5fzr
---
 addons/base_setup/__terp__.py                 |  4 +-
 addons/base_setup/wizard/wizard_base_setup.py | 84 ++-----------------
 2 files changed, 10 insertions(+), 78 deletions(-)

diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 6f7f4337740..25b0b8a393a 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 0dd9175129d..ab7211095c6 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -25,22 +25,6 @@ import time
 import tools
 import os
 
-view_form_profit = """<?xml version="1.0"?>
-<form string="Setup">
-    <image name="gtk-dialog-info"/>
-    <group>
-        <separator string="Select a Profile" colspan="2"/>
-        <newline/>
-        <field align="0.0" name="profile"/>
-        <newline/>
-        <label string="A profile sets a pre-selection of modules for specific needs. These profiles have been setup to help you discover the different aspects of OpenERP. This is just an overview, we have 300+ available modules." colspan="2" align="0.0"/>
-        <newline/>
-        <label string="You'll be able to install more modules later through the Administration menu." colspan="2" align="0.0"/>
-    </group>
-</form>"""
-
-
-
 view_form_company = """<?xml version="1.0"?>
 <form string="Setup">
     <notebook colspan="4">
@@ -80,8 +64,6 @@ view_form_update = """<?xml version="1.0"?>
     <group>
         <separator string="Summary" colspan="2"/>
         <newline/>
-        <field name="profile" align="0.0" readonly="1"/>
-        <newline/>
         <field name="name" align="0.0" readonly="1"/>
     </group>
 </form>
@@ -100,15 +82,6 @@ view_form_finish = """<?xml version="1.0"?>
 
 class wizard_base_setup(wizard.interface):
 
-    def _get_profiles(self, cr, uid, context):
-        module_obj=pooler.get_pool(cr.dbname).get('ir.module.module')
-        ids=module_obj.search(cr, uid, [('category_id', '=', 'Profile'),
-            ('state', '<>', 'uninstallable')])
-        res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids, context=context)]
-        res.append((-1, 'Minimal Profile'))
-        res.sort()
-        return res
-
     def _get_company(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         company_obj = pool.get('res.company')
@@ -116,7 +89,7 @@ class wizard_base_setup(wizard.interface):
         if not ids:
             return {}
         company = company_obj.browse(cr, uid, ids)[0]
-        
+
         res = {'currency': company.currency_id.id}
 
         for field in 'name logo rml_header1 rml_footer1 rml_footer2'.split():
@@ -131,13 +104,12 @@ class wizard_base_setup(wizard.interface):
                 if address[field]:
                     res[field] = address[field].id
 
-        serv_pro_id = pool.get('ir.module.module').search(cr, uid, [('name','=','profile_service')]) or False
+        serv_pro_id = pool.get('ir.module.module').search(cr, uid, [('name','=','profile_service')])
         if serv_pro_id:
             res['profile'] = serv_pro_id[0]
-        
+
         return res
-    
-    
+
     def _get_all(self, cr, uid, context, model):
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(model)
@@ -159,9 +131,6 @@ class wizard_base_setup(wizard.interface):
     def _update(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
         form=data['form']
-        if 'profile' in data['form'] and data['form']['profile'] > 0:
-            module_obj=pool.get('ir.module.module')
-            module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
 
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
@@ -231,14 +200,10 @@ class wizard_base_setup(wizard.interface):
         }
 
     def _next(self, cr, uid, data, context):
-        if not data['form']['profile'] or data['form']['profile'] <= 0:
-            return 'company'
-        return 'charts'
+        return 'company'
 
     def _previous(self, cr, uid, data, context):
-        if 'profile' not in data['form'] or data['form']['profile'] <= 0:
-            return 'init'
-        return 'charts'
+        return 'init'
 
     def _config(self, cr, uid, data, context=None):
         pool = pooler.get_pool(cr.dbname)
@@ -256,13 +221,6 @@ class wizard_base_setup(wizard.interface):
         return pool.get('res.config').next(cr, uid, [], context=context)
 
     fields={
-        'profile':{
-            'string':'Profile',
-            'type':'selection',
-            'selection':_get_profiles,
-            'required': True,
-        },
-
         'name':{
             'string': 'Company Name',
             'type': 'char',
@@ -346,44 +304,18 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
     states={
         'init':{
             'actions': [_get_company],
-            'result': {'type': 'form', 'arch': view_form_profit, 'fields': fields,
-                'state': [
-                    ('menu', 'Cancel', 'gtk-cancel'),
-                    ('company', 'Next', 'gtk-go-forward', True)
-                ]
-            }
-        },
-#        'next': {
-#            'actions': [],
-#            'result': {'type': 'choice', 'next_state': _next}
-#        },
-#        'charts':{
-#            'actions': [],
-#            'result': {'type': 'form', 'arch': view_form_charts, 'fields': fields,
-#                'state':[
-#                    ('init', 'Previous', 'gtk-go-back'),
-#                    ('company', 'Next', 'gtk-go-forward', True)
-#                ]
-#            }
-#        },
-        'company':{
-            'actions': [],
             'result': {'type': 'form', 'arch': view_form_company, 'fields': fields,
                 'state': [
-                    ('init', 'Previous', 'gtk-go-back'),
+                    ('menu', 'Cancel', 'gtk-cancel'),
                     ('update', 'Next', 'gtk-go-forward', True)
                 ]
             }
         },
-#        'previous':{
-#            'actions': [],
-#            'result': {'type': 'choice', 'next_state': _previous}
-#        },
         'update':{
             'actions': [],
             'result': {'type': 'form', 'arch': view_form_update, 'fields': fields,
                 'state': [
-                    ('company', 'Previous', 'gtk-go-back'),
+                    ('init', 'Previous', 'gtk-go-back'),
                     ('finish', 'Install', 'gtk-ok', True)
                 ]
             }

From 2028ac6dd7e2c2982061a9c92d39457a3c91e372 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 15:56:47 +0100
Subject: [PATCH 05/42] [imp] remove recapitulation step of the base_setup
 wizard

bzr revid: xmo@tinyerp.com-20100120145647-23ffnj9quwhd1c0d
---
 addons/base_setup/wizard/wizard_base_setup.py | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index ab7211095c6..5701adb7325 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -58,17 +58,6 @@ view_form_company = """<?xml version="1.0"?>
     </notebook>
 </form>"""
 
-view_form_update = """<?xml version="1.0"?>
-<form string="Setup">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group>
-        <separator string="Summary" colspan="2"/>
-        <newline/>
-        <field name="name" align="0.0" readonly="1"/>
-    </group>
-</form>
-"""
-
 view_form_finish = """<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
@@ -307,16 +296,7 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'result': {'type': 'form', 'arch': view_form_company, 'fields': fields,
                 'state': [
                     ('menu', 'Cancel', 'gtk-cancel'),
-                    ('update', 'Next', 'gtk-go-forward', True)
-                ]
-            }
-        },
-        'update':{
-            'actions': [],
-            'result': {'type': 'form', 'arch': view_form_update, 'fields': fields,
-                'state': [
-                    ('init', 'Previous', 'gtk-go-back'),
-                    ('finish', 'Install', 'gtk-ok', True)
+                    ('finish', 'Next', 'gtk-go-forward', True)
                 ]
             }
         },

From 35e2357517627c153a26a893cca9da9fc027331a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 16:05:31 +0100
Subject: [PATCH 06/42] [rem] unused prev & next methods

bzr revid: xmo@tinyerp.com-20100120150531-sp16juggw0dhn8zf
---
 addons/base_setup/wizard/wizard_base_setup.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 5701adb7325..459e2380adb 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -25,7 +25,7 @@ import time
 import tools
 import os
 
-view_form_company = """<?xml version="1.0"?>
+view_form_company = '''<?xml version="1.0"?>
 <form string="Setup">
     <notebook colspan="4">
     <page string="General Information">
@@ -56,9 +56,9 @@ view_form_company = """<?xml version="1.0"?>
         <field colspan="4" name="logo" widget="image"/>
     </page>
     </notebook>
-</form>"""
+</form>'''
 
-view_form_finish = """<?xml version="1.0"?>
+view_form_finish = '''<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
     <group colspan="2" col="4">
@@ -67,7 +67,7 @@ view_form_finish = """<?xml version="1.0"?>
         <label align="0.0" colspan="4" string="You can start configuring the system or connect directly to the database using the default setup."/>
     </group>
 </form>
-"""
+'''
 
 class wizard_base_setup(wizard.interface):
 
@@ -188,12 +188,6 @@ class wizard_base_setup(wizard.interface):
             'views': menu.views,
         }
 
-    def _next(self, cr, uid, data, context):
-        return 'company'
-
-    def _previous(self, cr, uid, data, context):
-        return 'init'
-
     def _config(self, cr, uid, data, context=None):
         pool = pooler.get_pool(cr.dbname)
         users_obj=pool.get('res.users')

From 77818d1c02504636d7b2c131002c9384aa019eef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 16:22:45 +0100
Subject: [PATCH 07/42] [rem] selection of default profile, as profile
 selection is not part of the base_setup wizard anymore

bzr revid: xmo@tinyerp.com-20100120152245-94kh2n8d1c4m3f8l
---
 addons/base_setup/wizard/wizard_base_setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 459e2380adb..d9b08beaf06 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -93,10 +93,6 @@ class wizard_base_setup(wizard.interface):
                 if address[field]:
                     res[field] = address[field].id
 
-        serv_pro_id = pool.get('ir.module.module').search(cr, uid, [('name','=','profile_service')])
-        if serv_pro_id:
-            res['profile'] = serv_pro_id[0]
-
         return res
 
     def _get_all(self, cr, uid, context, model):

From 132e65a01c3db9c9e9a6cd8d7c49d29949ec6cf3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 13:13:11 +0100
Subject: [PATCH 08/42] [add] base transformation of main company setup from
 base_setup wizard to in-memory res.config

bzr revid: xmo@tinyerp.com-20100121121311-wi8j7g9q5xu2ptzm
---
 addons/base_setup/__init__.py         |   1 +
 addons/base_setup/__terp__.py         |   3 +-
 addons/base_setup/base_setup_data.xml |   5 +-
 addons/base_setup/base_setup_todo.xml |  62 ++++++++++++++
 addons/base_setup/todo.py             | 111 ++++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 4 deletions(-)
 create mode 100644 addons/base_setup/base_setup_todo.xml
 create mode 100644 addons/base_setup/todo.py

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 2e2da2196e5..4c0b9e0b934 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import installer
+import todo
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 25b0b8a393a..7166450fdaa 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -43,7 +43,8 @@
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
                    'base_setup_wizard.xml',
-                   'base_setup_installer.xml'],
+                   'base_setup_installer.xml',
+                   'base_setup_todo.xml',],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index c715dbb6992..16639396d44 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <record id="action_wizard_setup" model="ir.actions.wizard">
             <field name="name">Setup</field>
             <field name="type">ir.actions.wizard</field>
             <field name="wiz_name">base_setup.base_setup</field>
         </record>
-        
+
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="action_wizard_setup"/>
             <field name="menu_id" ref="action_wizard_setup"/>
         </record>
-        
     </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
new file mode 100644
index 00000000000..04ada79d192
--- /dev/null
+++ b/addons/base_setup/base_setup_todo.xml
@@ -0,0 +1,62 @@
+<openerp>
+  <data>
+    <record id="view_base_setup_company" model="ir.ui.view">
+      <field name="name">Setup company information</field>
+      <field name="model">base.setup.company</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">Main Company Setup</attribute>
+          </form>
+
+          <group string="res_config_contents" position="replace">
+            <image name="gtk-dialog-info"/>
+            <field name="company_id" invisible="1"/>
+
+            <separator string="Define Main Company" colspan="4"/>
+            <field name="name" colspan="4" required="True"/>
+            <newline/>
+            <field name="street"/>
+            <field name="street2"/>
+            <field name="zip"/>
+            <field name="city"/>
+            <field name="country_id"/>
+            <field name="state_id"/>
+            <field name="email"/>
+            <field name="phone"/>
+            <field name="currency"/>
+
+            <separator string="Report Information" colspan="4"/>
+            <field name="rml_header1" colspan="4"/>
+            <field name="rml_footer1" colspan="4"/>
+            <field name="rml_footer2" colspan="4"/>
+
+            <separator colspan="4"
+                       string="Your Logo - Use a size of about 450x150 pixels."/>
+            <field colspan="4" name="logo" widget="image"
+                   nolabel="True"/>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_base_setup_company" model="ir.actions.act_window">
+      <field name="name">Setup company information</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base.setup.company</field>
+      <field name="view_id" ref="view_base_setup_company"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="targer">new</field>
+    </record>
+
+    <record id="base_setup_company_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_base_setup_company"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
new file mode 100644
index 00000000000..4d80d367172
--- /dev/null
+++ b/addons/base_setup/todo.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from operator import itemgetter
+
+from osv import osv, fields
+import netsvc
+import tools
+
+class base_setup_company(osv.osv_memory):
+    """
+    """
+    _name = 'base.setup.company'
+    _inherit = 'res.config'
+    logger = netsvc.Logger()
+
+    def _get_all(self, cr, uid, model, context=None):
+        models = self.pool.get(model)
+        all_model_ids = models.search(cr, uid, [])
+
+        output = [(-1, None)]
+        output.extend(
+            sorted([(o.id, o.name)
+                    for o in models.browse(cr, uid, all_model_ids,
+                                           context=context)],
+                   key=itemgetter(1)))
+        return output
+
+    def _get_all_states(self, cr, uid, context=None):
+        return self._get_all(
+            cr, uid, 'res.country.state', context=context)
+    def _get_all_countries(self, cr, uid, context=None):
+        return self._get_all(cr, uid, 'res.country', context=context)
+    def _get_all_currencies(self, cr, uid, context=None):
+        return self._get_all(cr, uid, 'res.currency', context=context)
+
+    def default_get(self, cr, uid, fields_list=None, context=None):
+        """ get default company if any, and the various other fields
+        from the company's fields
+        """
+        defaults = super(base_setup_company, self)\
+              .default_get(cr, uid, fields_list=fields_list, context=context)
+
+        companies = self.pool.get('res.company')
+        company_id = companies.search(cr, uid, [], limit=1, order="id")
+        if not company_id or 'company_id' in defaults: return defaults
+        company = companies.browse(cr, uid, company_id[0])
+
+        defaults['company_id'] = company.id
+        defaults['currency'] = company.currency_id.id
+        for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
+            defaults[field] = company[field]
+
+        if company.partner_id.address:
+            address = company.partner_id.address[0]
+            for field in ['street','street2','zip','city','email','phone']:
+                defaults[field] = address[field]
+            for field in ['country_id','state_id']:
+                if address[field]:
+                    defaults[field] = address[field].id
+
+        return defaults
+
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company'),
+        'name':fields.char('Company Name', size=64, required=True),
+        'street':fields.char('Street', size=128),
+        'street2':fields.char('Street 2', size=128),
+        'zip':fields.char('Zip Code', size=24),
+        'city':fields.char('City', size=128),
+        'state_id':fields.selection(_get_all_states, 'States'),
+        'country_id':fields.selection(_get_all_countries, 'Countries'),
+        'email':fields.char('E-mail', size=64),
+        'phone':fields.char('Phone', size=64),
+        'currency':fields.selection(_get_all_currencies, 'Currency', required=True),
+        'rml_header1':fields.char('Report Header', size=200,
+            help='''This sentence will appear at the top right corner of your reports.
+We suggest you to put a slogan here:
+"Open Source Business Solutions".'''),
+        'rml_footer1':fields.char('Report Footer 1', size=200,
+            help='''This sentence will appear at the bottom of your reports.
+We suggest you to write legal sentences here:
+Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07'''),
+        'rml_footer2':fields.char('Report Footer 2', size=200,
+            help='''This sentence will appear at the bottom of your reports.
+We suggest you to put bank information here:
+IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
+        'logo':fields.binary('Logo'),
+    }
+
+base_setup_company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e7ea0b40d1a997e435a07cff87a52af32bf71cb2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 13:23:58 +0100
Subject: [PATCH 09/42] [fix] base_setup: typo in target field; correct nolabel
 value

bzr revid: xmo@tinyerp.com-20100121122358-glmk7s2bib1noddf
---
 addons/base_setup/base_setup_todo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 04ada79d192..9a88ef80c84 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -36,7 +36,7 @@
             <separator colspan="4"
                        string="Your Logo - Use a size of about 450x150 pixels."/>
             <field colspan="4" name="logo" widget="image"
-                   nolabel="True"/>
+                   nolabel="1"/>
           </group>
 
           <xpath expr='//button[@name="action_skip"]' position='replace'/>
@@ -51,7 +51,7 @@
       <field name="view_id" ref="view_base_setup_company"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
-      <field name="targer">new</field>
+      <field name="target">new</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">

From 7e7392abec5cfe9ab84aab5012d5aea4eb9f54e1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 15:17:41 +0100
Subject: [PATCH 10/42] [imp] base_setup: better sentinel value for selection
 lists returned by base.setup.company._get_all

bzr revid: xmo@tinyerp.com-20100121141741-j3triweqjc45u5ux
---
 addons/base_setup/todo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 4d80d367172..8299d6e3873 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -35,7 +35,7 @@ class base_setup_company(osv.osv_memory):
         models = self.pool.get(model)
         all_model_ids = models.search(cr, uid, [])
 
-        output = [(-1, None)]
+        output = [(False, '')]
         output.extend(
             sorted([(o.id, o.name)
                     for o in models.browse(cr, uid, all_model_ids,

From 3d2d2478a1d9e1534183367ebef2559b4c339ea5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 15:19:02 +0100
Subject: [PATCH 11/42] [fix] base_setup: fix broken default_get override which
 didn't take 'fields_list' in account

bzr revid: xmo@tinyerp.com-20100121141902-9mg1o3ts3j9vi8uo
---
 addons/base_setup/todo.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 8299d6e3873..fac32b4b22e 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -60,7 +60,8 @@ class base_setup_company(osv.osv_memory):
 
         companies = self.pool.get('res.company')
         company_id = companies.search(cr, uid, [], limit=1, order="id")
-        if not company_id or 'company_id' in defaults: return defaults
+        if not company_id or 'company_id' not in fields_list:
+            return defaults
         company = companies.browse(cr, uid, company_id[0])
 
         defaults['company_id'] = company.id

From ff0b7b67d1e5e940d42d4fa8d6e76d0fe16df38c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 15:19:46 +0100
Subject: [PATCH 12/42] [add] base_setup: implement execute method on
 base.setup.company

bzr revid: xmo@tinyerp.com-20100121141946-rpfggejgqzk8jlby
---
 addons/base_setup/todo.py | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index fac32b4b22e..f1c55c1de83 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -106,6 +106,46 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
         'logo':fields.binary('Logo'),
     }
 
+    def execute(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, "We should only get one object from the form"
+        payload = self.browse(cr, uid, ids[0], context=context)
+        if not getattr(payload, 'company_id', None):
+            raise ValueError('Case where no default main company is setup '
+                             'not handled yet')
+
+        company = payload.company_id
+        company.write({
+            'name':payload.name,
+            'rml_header1':payload.rml_header1,
+            'rml_footer1':payload.rml_footer1,
+            'rml_footer2':payload.rml_footer2,
+            'logo':payload.logo,
+        })
+
+        company.partner_id.write({
+            'name':payload.name,
+        })
+
+        address_data = {
+            'name':payload.name,
+            'street':payload.street,
+            'street2':payload.street2,
+            'zip':payload.zip,
+            'city':payload.city,
+            'email':payload.email,
+            'phone':payload.phone,
+            'country_id':int(payload.country_id),
+            'state_id':int(payload.country_id),
+        }
+
+        if company.partner_id.address:
+            company.partner_id.address[0].write(
+                address_data)
+        else:
+            self.pool.get('res.partner.address').create(cr, uid,
+                    dict(address_data,
+                         partner_id=int(company.partner_id)),
+                    context=context)
 base_setup_company()
 
 

From b3d3e23201e2303cef290899eab6855559b6c82b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 15:34:10 +0100
Subject: [PATCH 13/42] [rem] base_setup: remove company configuration from
 base_setup wizard

bzr revid: xmo@tinyerp.com-20100121143410-g24zlawsrbqy3vp2
---
 addons/base_setup/wizard/wizard_base_setup.py | 212 ------------------
 1 file changed, 212 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index d9b08beaf06..b59e346882d 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -25,39 +25,6 @@ import time
 import tools
 import os
 
-view_form_company = '''<?xml version="1.0"?>
-<form string="Setup">
-    <notebook colspan="4">
-    <page string="General Information">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group>
-        <separator string="Define Main Company" colspan="4"/>
-        <newline/>
-        <field name="name" align="0.0" colspan="4" required="True"/>
-        <newline/>
-        <field name="street" align="0.0"/>
-        <field name="street2" align="0.0"/>
-        <field name="zip" align="0.0"/>
-        <field name="city" align="0.0"/>
-        <field name="country_id" align="0.0"/>
-        <field name="state_id" align="0.0"/>
-        <field name="email" align="0.0"/>
-        <field name="phone" align="0.0"/>
-        <field name="currency" align="0.0"/>
-    </group>
-    </page>
-    <page string="Report Information">
-        <separator string="Report header" colspan="4"/>
-        <newline/>
-        <field name="rml_header1" align="0.0" colspan="4"/>
-        <field name="rml_footer1" align="0.0" colspan="4"/>
-        <field name="rml_footer2" align="0.0" colspan="4"/>
-        <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
-        <field colspan="4" name="logo" widget="image"/>
-    </page>
-    </notebook>
-</form>'''
-
 view_form_finish = '''<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
@@ -71,94 +38,6 @@ view_form_finish = '''<?xml version="1.0"?>
 
 class wizard_base_setup(wizard.interface):
 
-    def _get_company(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        company_obj = pool.get('res.company')
-        ids=company_obj.search(cr, uid, [])
-        if not ids:
-            return {}
-        company = company_obj.browse(cr, uid, ids)[0]
-
-        res = {'currency': company.currency_id.id}
-
-        for field in 'name logo rml_header1 rml_footer1 rml_footer2'.split():
-            res[field] = company[field]
-
-        if company.partner_id.address:
-            address = company.partner_id.address[0]
-            for field in 'street street2 zip city email phone'.split():
-                res[field] = address[field]
-
-            for field in 'country_id state_id'.split():
-                if address[field]:
-                    res[field] = address[field].id
-
-        return res
-
-    def _get_all(self, cr, uid, context, model):
-        pool = pooler.get_pool(cr.dbname)
-        obj = pool.get(model)
-        ids = obj.search(cr, uid, [])
-        res = [(o.id, o.name) for o in obj.browse(cr, uid, ids, context=context)]
-        res.append((-1, ''))
-        res.sort(key=lambda x: x[1])
-        return res
-
-    def _get_states(self, cr, uid, context):
-        return self._get_all(cr, uid, context, 'res.country.state')
-
-    def _get_countries(self, cr, uid, context):
-        return self._get_all(cr, uid, context, 'res.country')
-
-    def _get_currency(self, cr, uid, context):
-        return self._get_all(cr, uid, context, 'res.currency')
-
-    def _update(self, cr, uid, data, context):
-        pool=pooler.get_pool(cr.dbname)
-        form=data['form']
-
-        company_obj=pool.get('res.company')
-        partner_obj=pool.get('res.partner')
-        address_obj=pool.get('res.partner.address')
-        ids=company_obj.search(cr, uid, [])
-        company=company_obj.browse(cr, uid, ids)[0]
-        company_obj.write(cr, uid, [company.id], {
-                'name': form['name'],
-                'rml_header1': form['rml_header1'],
-                'rml_footer1': form['rml_footer1'],
-                'rml_footer2': form['rml_footer2'],
-                'currency_id': form['currency'],
-                'logo': form['logo'],
-            })
-        partner_obj.write(cr, uid, [company.partner_id.id], {
-                'name': form['name'],
-            })
-        values={
-                    'name': form['name'],
-                    'street': form['street'],
-                    'street2': form['street2'],
-                    'zip': form['zip'],
-                    'city': form['city'],
-                    'email': form['email'],
-                    'phone': form['phone'],
-                }
-        # we can do this, or set res.append((False, '')) in _get_all()
-        if form['country_id'] > 0:
-            values['country_id'] = form['country_id']
-        if form['state_id'] > 0:
-            values['state_id'] = form['state_id']
-        if company.partner_id.address:
-            address=company.partner_id.address[0]
-            address_obj.write(cr, uid, [address.id], values)
-        else:
-            values['partner_id']=company.partner_id.id
-            add_id=address_obj.create(cr, uid, values)
-
-        cr.commit()
-        (db, pool)=pooler.restart_pool(cr.dbname, update_module=True)
-
-        return {}
-
     def _menu(self, cr, uid, data, context):
         users_obj=pooler.get_pool(cr.dbname).get('res.users')
         action_obj=pooler.get_pool(cr.dbname).get('ir.actions.act_window')
@@ -199,99 +78,8 @@ class wizard_base_setup(wizard.interface):
 
         return pool.get('res.config').next(cr, uid, [], context=context)
 
-    fields={
-        'name':{
-            'string': 'Company Name',
-            'type': 'char',
-            'size': 64,
-        },
-        'street':{
-            'string': 'Street',
-            'type': 'char',
-            'size': 128,
-        },
-        'street2':{
-            'string': 'Street2',
-            'type': 'char',
-            'size': 128,
-        },
-        'zip':{
-            'string': 'Zip code',
-            'type': 'char',
-            'size': 24,
-        },
-        'city':{
-            'string': 'City',
-            'type': 'char',
-            'size': 128,
-        },
-        'state_id':{
-            'string': 'State',
-            'type': 'selection',
-            'selection':_get_states,
-        },
-        'country_id':{
-            'string': 'Country',
-            'type': 'selection',
-            'selection':_get_countries,
-        },
-        'email':{
-            'string': 'E-mail',
-            'type': 'char',
-            'size': 64,
-        },
-        'phone':{
-            'string': 'Phone',
-            'type': 'char',
-            'size': 64,
-        },
-        'currency': {
-            'string': 'Currency',
-            'type': 'selection',
-            'selection':_get_currency,
-            'required': True,
-        },
-        'rml_header1':{
-            'string': 'Report Header',
-            'type': 'char',
-            'help': """This sentence will appear at the top right corner of your reports.
-We suggest you to put a slogan here:
-"Open Source Business Solutions".""",
-            'size': 200,
-        },
-        'rml_footer1':{
-            'string': 'Report Footer 1',
-            'type': 'char',
-            'help': """This sentence will appear at the bottom of your reports.
-We suggest you to write legal sentences here:
-Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07""",
-            'size': 200,
-        },
-        'rml_footer2':{
-            'string': 'Report Footer 2',
-            'help': """This sentence will appear at the bottom of your reports.
-We suggest you to put bank information here:
-IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
-            'type': 'char',
-            'size': 200,
-        },
-        'logo':{
-            'string': 'Logo',
-            'type': 'binary',
-        },
-    }
     states={
         'init':{
-            'actions': [_get_company],
-            'result': {'type': 'form', 'arch': view_form_company, 'fields': fields,
-                'state': [
-                    ('menu', 'Cancel', 'gtk-cancel'),
-                    ('finish', 'Next', 'gtk-go-forward', True)
-                ]
-            }
-        },
-        'finish':{
-            'actions': [_update],
             'result': {'type': 'form', 'arch': view_form_finish, 'fields': {},
                 'state': [
                     ('menu', 'Use Directly', 'gtk-ok'),

From f4b8f2776bfac105b2f02e5f56c7d352c22d50c0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 15:39:11 +0100
Subject: [PATCH 14/42] [fix] base_setup: setting up the state_id to a state id
 rather than a country id might be a smart move

bzr revid: xmo@tinyerp.com-20100121143911-be1r8l8xzw9fmw2a
---
 addons/base_setup/todo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index f1c55c1de83..d23ac71d60b 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -135,7 +135,7 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
             'email':payload.email,
             'phone':payload.phone,
             'country_id':int(payload.country_id),
-            'state_id':int(payload.country_id),
+            'state_id':int(payload.state_id),
         }
 
         if company.partner_id.address:

From a27c08272ac0f2238ee6b7b80a2bd05af8d30723 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 11:14:27 +0100
Subject: [PATCH 15/42] [imp] base_config: replace last remaining step of
 wizard by regular osv_memory-based view

bzr revid: xmo@tinyerp.com-20100122101427-ukvw32usb2zfkjn4
---
 addons/base_setup/__init__.py         | 62 +++++++++++++++++++++++++++
 addons/base_setup/base_setup_data.xml | 47 +++++++++++++++-----
 addons/base_setup/base_setup_demo.xml |  2 +-
 3 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 4c0b9e0b934..405742d5a34 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -23,5 +23,67 @@ import installer
 import todo
 import wizard
 
+from osv import osv
+import netsvc
+
+class base_setup_config_choice(osv.osv_memory):
+    """
+    """
+    _name = 'base.setup.config'
+    logger = netsvc.Logger()
+
+    def set_default_menu(self, cr, uid, menu, context=None):
+        users = self.pool.get('res_users')
+        users.write(cr, uid,
+                    users.search(cr, uid,
+                                 [('action_id','=','Setup')],
+                                 context=context),
+                    {'action_id': menu.id},
+                    context=context)
+        users.write(cr, uid,
+                    users.search(cr, uid,
+                                 [('menu_id','=','Setup')],
+                                 context=context),
+                    {'menu_id': menu.id},
+                    context=context)
+
+    def get_default_menu(self, cr, uid, context=None):
+        actions = self.pool.get('ir.actions.act_window')
+
+        current_menu_id = actions.search(cr, uid, [('name','=','Menu')],
+                                         context=context)
+        assert len(current_menu_id) == 1,\
+               'A given user should only have menu item'
+        return actions.browse(cr, uid, current_menu_id[0], context=context)
+
+    def menu(self, cr, uid, ids, context=None):
+        menu = self.get_default_menu(cr, uid, context=context)
+        self.set_default_menu(cr, uid, menu, context=context)
+
+        if menu.view_id.id:
+            view_id = (menu.view_id.id, menu.view_id.name)
+        else:
+            view_id = False
+
+        return {
+            'name': menu.name,
+            'type': menu.type,
+            'view_id': view_id,
+            'domain': menu.domain,
+            'res_users': menu.res_model,
+            'src_model': menu.src_model,
+            'view_type': menu.view_type,
+            'view_mode': menu.view_mode,
+            'views': menu.views,
+        }
+    def config(self, cr, uid, ids, context=None):
+        menu = self.get_default_menu(cr, uid, context=context)
+        self.set_default_menu(cr, uid, menu, context=context)
+
+        return self.pool.get('res.config').next(cr, uid, [], context=context)
+
+base_setup_config_choice()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 16639396d44..a28c7744158 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+  <data noupdate="1">
+    <record id="view_base_setup" model="ir.ui.view">
+      <field name="name">Setup</field>
+      <field name="model">base.setup.config</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Setup">
+          <group colspan="4">
+            <image name="gtk-dialog-info"/>
+            <group colspan="2" col="4">
+              <separator colspan="4" string="Installation Done"/>
+              <label align="0.0" colspan="4"
+                     string="Your new database is now fully installed."/>
+              <label align="0.0" colspan="4"
+                     string="You can start configuring the system or connect directly to the database using the default setup."/>
+            </group>
+          </group>
+          <button name="menu" icon="gtk-ok" type="object"
+                  string="Use Directly"/>
+          <button name="config" icon="gtk-go-forward" type="object"
+                  string="Start Configuration"/>
+        </form>
+      </field>
+    </record>
 
-        <record id="action_wizard_setup" model="ir.actions.wizard">
-            <field name="name">Setup</field>
-            <field name="type">ir.actions.wizard</field>
-            <field name="wiz_name">base_setup.base_setup</field>
-        </record>
+    <record id="action_base_setup" model="ir.actions.act_window">
+      <field name="name">Setup</field>
+      <field name="res_model">base.setup.config</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="view_id" ref="view_base_setup"/>
+      <field name="target">new</field>
+    </record>
 
-        <record id="base.user_root" model="res.users">
-            <field name="action_id" ref="action_wizard_setup"/>
-            <field name="menu_id" ref="action_wizard_setup"/>
-        </record>
-    </data>
+    <record id="base.user_root" model="res.users">
+      <field name="action_id" ref="action_base_setup"/>
+      <field name="menu_id" ref="action_base_setup"/>
+    </record>
+  </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
index 4255606e3f1..364a0773a4c 100644
--- a/addons/base_setup/base_setup_demo.xml
+++ b/addons/base_setup/base_setup_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         
         <record id="base.user_demo" model="res.users">
-            <field name="action_id" ref="action_wizard_setup"/>
+            <field name="action_id" ref="action_base_setup"/>
         </record>
         
     </data>

From c6a32c9b1bb17d16b233f600da631a32cee365d2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 11:35:36 +0100
Subject: [PATCH 16/42] [fix] base_setup: typo

bzr revid: xmo@tinyerp.com-20100122103536-eafkuia2bxaukm1m
---
 addons/base_setup/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 405742d5a34..5c89388aa93 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -33,7 +33,7 @@ class base_setup_config_choice(osv.osv_memory):
     logger = netsvc.Logger()
 
     def set_default_menu(self, cr, uid, menu, context=None):
-        users = self.pool.get('res_users')
+        users = self.pool.get('res.users')
         users.write(cr, uid,
                     users.search(cr, uid,
                                  [('action_id','=','Setup')],

From e4a76df9a851e8e1ba203eecd16197bdac52a1c3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 11:42:47 +0100
Subject: [PATCH 17/42] [rem] base_setup: old wizard, been replaced by
 osv_memory-based views and res.config objects

bzr revid: xmo@tinyerp.com-20100122104247-kjlg7qxez3zlyaiw
---
 addons/base_setup/__terp__.py                 |   1 -
 addons/base_setup/base_setup_wizard.xml       |   6 -
 addons/base_setup/wizard/__init__.py          |  26 -----
 addons/base_setup/wizard/wizard_base_setup.py | 106 ------------------
 4 files changed, 139 deletions(-)
 delete mode 100644 addons/base_setup/base_setup_wizard.xml
 delete mode 100644 addons/base_setup/wizard/__init__.py
 delete mode 100644 addons/base_setup/wizard/wizard_base_setup.py

diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 7166450fdaa..c6dd64d7bcc 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -42,7 +42,6 @@
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
-                   'base_setup_wizard.xml',
                    'base_setup_installer.xml',
                    'base_setup_todo.xml',],
     'demo_xml': ['base_setup_demo.xml'],
diff --git a/addons/base_setup/base_setup_wizard.xml b/addons/base_setup/base_setup_wizard.xml
deleted file mode 100644
index 9a48bf41f6c..00000000000
--- a/addons/base_setup/base_setup_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <wizard id="wizard_base_setup" model="base_setup.base_setup" name="base_setup.base_setup" string="Setup"/>
-    </data>
-</openerp>
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
deleted file mode 100644
index a322ae346b3..00000000000
--- a/addons/base_setup/wizard/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard_base_setup
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
deleted file mode 100644
index b59e346882d..00000000000
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-import tools
-import os
-
-view_form_finish = '''<?xml version="1.0"?>
-<form string="Setup">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group colspan="2" col="4">
-        <separator colspan="4" string="Installation Done"/>
-        <label align="0.0" colspan="4" string="Your new database is now fully installed."/>
-        <label align="0.0" colspan="4" string="You can start configuring the system or connect directly to the database using the default setup."/>
-    </group>
-</form>
-'''
-
-class wizard_base_setup(wizard.interface):
-
-    def _menu(self, cr, uid, data, context):
-        users_obj=pooler.get_pool(cr.dbname).get('res.users')
-        action_obj=pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-
-        ids=action_obj.search(cr, uid, [('name', '=', 'Menu')])
-        menu=action_obj.browse(cr, uid, ids)[0]
-
-        ids=users_obj.search(cr, uid, [('action_id', '=', 'Setup')])
-        users_obj.write(cr, uid, ids, {'action_id': menu.id})
-        ids=users_obj.search(cr, uid, [('menu_id', '=', 'Setup')])
-        users_obj.write(cr, uid, ids, {'menu_id': menu.id})
-
-        return {
-            'name': menu.name,
-            'type': menu.type,
-            'view_id': (menu.view_id and\
-                    (menu.view_id.id, menu.view_id.name)) or False,
-            'domain': menu.domain,
-            'res_model': menu.res_model,
-            'src_model': menu.src_model,
-            'view_type': menu.view_type,
-            'view_mode': menu.view_mode,
-            'views': menu.views,
-        }
-
-    def _config(self, cr, uid, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        users_obj=pool.get('res.users')
-        action_obj=pool.get('ir.actions.act_window')
-
-        ids=action_obj.search(cr, uid, [('name', '=', 'Menu')])
-        menu=action_obj.browse(cr, uid, ids)[0]
-
-        ids=users_obj.search(cr, uid, [('action_id', '=', 'Setup')])
-        users_obj.write(cr, uid, ids, {'action_id': menu.id})
-        ids=users_obj.search(cr, uid, [('menu_id', '=', 'Setup')])
-        users_obj.write(cr, uid, ids, {'menu_id': menu.id})
-
-        return pool.get('res.config').next(cr, uid, [], context=context)
-
-    states={
-        'init':{
-            'result': {'type': 'form', 'arch': view_form_finish, 'fields': {},
-                'state': [
-                    ('menu', 'Use Directly', 'gtk-ok'),
-                    ('config', 'Start Configuration', 'gtk-go-forward', True)
-                ]
-            }
-        },
-        'config': {
-            'result': {
-                'type': 'action',
-                'action': _config,
-                'state': 'end',
-            },
-        },
-        'menu': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _menu, 'state': 'end'}
-        },
-    }
-
-wizard_base_setup('base_setup.base_setup')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 8d3a1aa9dee8b6c18158874b1b332deaea0f069c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 12:40:07 +0100
Subject: [PATCH 18/42] [fix] installer titles broken in gtk client due to
 broken handling of whitespaces

bzr revid: xmo@tinyerp.com-20100122114007-0a5s6qyjsqo2mpsc
---
 addons/account/account_installer.xml                 | 6 +++---
 addons/base_setup/base_setup_installer.xml           | 6 +++---
 addons/hr/hr_installer.xml                           | 6 +++---
 addons/knowledge/knowledge_installer.xml             | 6 +++---
 addons/misc_tools/misc_tools_installer.xml           | 6 +++---
 addons/mrp/mrp_installer.xml                         | 6 +++---
 addons/project/project_installer.xml                 | 6 +++---
 addons/report_designer/report_designer_installer.xml | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4da0d74cf28..04873adcdc0 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Accounting Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Accounting Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Configure Your Accounting System" colspan="4"/>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 0f4ead634b7..30f2a053988 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Base Setup Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Base Setup Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Install Modules" colspan="4"/>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 41a4d0f5759..5578a17739c 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Human Resources Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Human Resources Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Configure Human Resources" colspan="4"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 361be404840..2839cd76818 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Knowledge Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Knowledge Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Configure Your Knowledge Management System"
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index 8633e9eca91..ee72b8fdbba 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Tools Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Tools Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Select Tools To Install" colspan="4"/>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 49e4437457a..3a945ff66ae 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              MRP Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">MRP Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Configure Your Manufacturing" colspan="4"/>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 242825e137f..b504236958d 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Project Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Project Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Configure Your Project Management"
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 6eff216b98c..99aa637153f 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -7,9 +7,9 @@
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes"><attribute name="string">
-              Report Modules Installation
-          </attribute></form>
+          <form position="attributes">
+            <attribute name="string">Report Modules Installation</attribute>
+          </form>
 
           <group string="res_config_contents" position="replace">
             <separator string="Select Reporting Tools To Install" colspan="4"/>

From d6359d577210da8c9f972341dc0fa20c1a8e700e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 21:44:10 +0100
Subject: [PATCH 19/42] [fix] extraneous fill-paragraph-type whitespace and the
 GTK client don't agree with each other. Remove the whitespace

bzr revid: xmo@tinyerp.com-20100121204410-0vs5m5fycgr62pxz
---
 addons/account/account_view.xml                     |  6 +++---
 addons/account/company_view.xml                     |  8 ++++----
 addons/document_ftp/document_ftp_view.xml           |  9 ++++-----
 addons/document_ics/document_ics_config_wizard.xml  | 11 +++++------
 addons/l10n_ch/account_journal_view.xml             | 11 +++++------
 addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml  | 13 ++++++-------
 addons/profile_accounting/profile_accounting.xml    | 12 +++++-------
 addons/profile_association/profile_association.xml  | 11 ++++-------
 .../profile_manufacturing/profile_manufacturing.xml |  6 +++---
 addons/profile_service/profile_service.xml          | 13 +++++--------
 addons/sale/sale_view.xml                           |  5 ++---
 11 files changed, 46 insertions(+), 59 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 82f49d83cae..2f8bb76a255 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1450,9 +1450,9 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Account Configure
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Account Configure</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
                     <separator col="4" colspan="4" string="Create a Fiscal Year"/>
                     <field name="name"/>
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 31f8e03a6b3..9627bc8e572 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -25,11 +25,11 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Overdue Payment Report Message
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Overdue Payment Report Message</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" select="1" 
+                    <field name="company_id" select="1"
                            on_change="onchange_company_id(company_id)"
                            groups="base.group_multi_company"/>
                     <separator string="Message" colspan="4"/>
diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 135ed2ea151..6a2e2475264 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -21,14 +21,13 @@
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
-            <form position="attributes"><attribute name="string">
-              Auto Configure
-            </attribute></form>
+            <form position="attributes">
+              <attribute name="string">Auto Configure</attribute>
+            </form>
             <group string="res_config_contents" position="replace">
                 <separator string="FTP Server Configuration." colspan="4"/>
                 <label align="0.0" colspan="4"
-                       string="Choose the address and port for the Document
-                               Management System's FTP server."/>
+                       string="Choose the address and port for the Document Management System's FTP server."/>
                 <field name="host"/>
             </group>
             <xpath expr='//button[@name="action_skip"]' position="replace"/>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 2f25ccce5db..ea7e5926868 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -8,13 +8,12 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Configure Calendars for CRM Sections
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Configure Calendars for CRM Sections</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    OpenERP can create and pre-configure a series of integrated
-                    calendar for you."/>
+                  <label colspan="4" align="0.0"
+                         string="OpenERP can create and pre-configure a series of integrated calendar for you."/>
                   <separator string="Create Pre-Configured Calendars"
                              colspan="4"/>
                   <newline/>
diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index 120bb1565ea..3636cc971a1 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -7,13 +7,12 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Account Journal
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Account Journal</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    Set accounts on financial journals defined by CamptoCamp
-                    l10n_ch module"/>
+                  <label colspan="4" align="0.0"
+                         string="Set accounts on financial journals defined by CamptoCamp l10n_ch module"/>
                   <separator colspan="4"/>
                   <group colspan="4" col="6">
                     <field name="name" select="1"/>
diff --git a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
index 4ebda575962..8cccce03fc5 100755
--- a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
@@ -14,13 +14,12 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Account tax template
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Account tax template</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    Set account on financial taxes defined by 
-                    Camptocamp l10n_ch_c2c_pcg module"/>
+                  <label colspan="4" align="0.0"
+                         string="Set account on financial taxes defined by Camptocamp l10n_ch_c2c_pcg module"/>
                   <group colspan="4" col="6">
                     <field name="name" select="1"/>
                   </group>
@@ -47,4 +46,4 @@
             <field name="sequence">5</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index e3d3c973405..74ec101d231 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -8,14 +8,12 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Install Extra Modules
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Install Extra Modules</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    Install more modules. A few modules are proposed according
-                    to the Account Profile you selected. You will be able to
-                    install them based on our requirements."/>
+                  <label colspan="4" align="0.0"
+                         string="Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."/>
                   <separator string="Accounting Management" colspan="4"/>
                   <field name="account_analytic_analysis"/>
                   <field name="account_analytic_plans"/>
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index e23af3fdbe5..573e6d25450 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -8,14 +8,11 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Install Extra Modules
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Install Extra Modules</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    Install more modules. A few modules are proposed according
-                    to the Account Profile you selected. You will be able to
-                    install them based on our requirements."/>
+                  <label colspan="4" align="0.0" string="Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."/>
                   <separator string="Project Management" colspan="4"/>
                   <field name="project"/>
                   <field name="project_gtd"/>
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index b0bb0301773..1f944de7fa8 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -8,9 +8,9 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Manufacturing Profile: Install Extra Modules
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Manufacturing Profile: Install Extra Modules</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0" string="Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately."/>
                   <separator string="Stock &amp; Manufacturing" colspan="4"/>
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 94a967d1840..5521cafa9b6 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -8,15 +8,12 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Install Extra Modules
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Install Extra Modules</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    A few modules are proposed according to the
-                    'service profile' you selected. You will be able to
-                    install them or more modules later through the
-                    Administration menu."/>
+                  <label colspan="4" align="0.0"
+                         string="A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu."/>
                   <separator string="Services Management" colspan="4"/>
                   <field name="project_timesheet"/>
                   <field name="hr_timesheet_invoice"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f8a388cc561..2f12781c1dd 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -451,9 +451,8 @@
                   Sales Configuration
                 </attribute></form>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="
-                    Set the policies selected by default when creating a new
-                    sale order."/>
+                  <label colspan="4" align="0.0"
+                         string="Set the policies selected by default when creating a new sale order."/>
                   <separator colspan="4"
                        string="Configure Sale Order Logistic"/>
                   <newline/>

From e624ac4a37861fcb059bc128bb3e68434bce2c84 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 16:15:14 +0100
Subject: [PATCH 20/42] [imp] re-enable skip buttons in installers

bzr revid: xmo@tinyerp.com-20100122151514-wkufw4fndb4evhr7
---
 addons/account/account_installer.xml                 | 1 -
 addons/base_setup/base_setup_installer.xml           | 1 -
 addons/hr/hr_installer.xml                           | 1 -
 addons/knowledge/knowledge_installer.xml             | 1 -
 addons/misc_tools/misc_tools_installer.xml           | 1 -
 addons/mrp/mrp_installer.xml                         | 1 -
 addons/project/project_installer.xml                 | 1 -
 addons/report_designer/report_designer_installer.xml | 1 -
 8 files changed, 8 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 04873adcdc0..b1e6dd8725c 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -26,7 +26,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 30f2a053988..6f89a654d46 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -34,7 +34,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 5578a17739c..8125775f0c8 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -28,7 +28,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 2839cd76818..567c1b5a18e 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -28,7 +28,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index ee72b8fdbba..20c151e4ab5 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -25,7 +25,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 3a945ff66ae..49d561b487b 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -26,7 +26,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index b504236958d..e504230f900 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -32,7 +32,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 99aa637153f..2db8e221b75 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -24,7 +24,6 @@
             </group>
           </group>
 
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
           <xpath expr='//button[@name="action_next"]' position='attributes'>
             <attribute name='string'>Install Modules</attribute>
           </xpath>

From 0a841e246a6c1280832a9b444e9e0db257f759f9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 16:34:37 +0100
Subject: [PATCH 21/42] [fix] paragraph fills not fixed in
 xmo@tinyerp.com-20100121204410-7pi9u2xw0p9ft33i

bzr revid: xmo@tinyerp.com-20100122153437-s9wfr452r3ogfaes
---
 addons/account/account_view.xml | 12 +++++-------
 addons/sale/sale_view.xml       |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2f8bb76a255..ee2047bca88 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1733,16 +1733,14 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Generate Chart of Accounts from a Chart Template
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
                   <separator col="4" colspan="4" string="
                     Generate Chart of Accounts from a Chart Template"/>
-                  <label align="0.0" colspan="4" string="
-                    This will automatically configure your chart of accounts,
-                    bank accounts, taxes and journals according to the selected
-                    template"/>
+                  <label align="0.0" colspan="4"
+                         string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"/>
                   <field name="company_id"  widget="selection"
                          groups="base.group_multi_company"/>
                   <field name ="code_digits" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2f12781c1dd..a05654b4b08 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -447,9 +447,9 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes"><attribute name="string">
-                  Sales Configuration
-                </attribute></form>
+                <form position="attributes">
+                  <attribute name="string">Sales Configuration</attribute>
+                </form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0"
                          string="Set the policies selected by default when creating a new sale order."/>

From dda93d798d027c8b7ff5f7236055396ba71134ec Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 17:45:51 +0100
Subject: [PATCH 22/42] [fix] broken chart of accounts selector, couldn't
 switch to readable when enabling Financial & Accounting

bzr revid: xmo@tinyerp.com-20100122164551-5rabdmovgryot1we
---
 addons/base_setup/installer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index cb3dbdfdb9e..9e2a93f2a48 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -57,8 +57,7 @@ class base_setup_installer(osv.osv_memory):
         'stock':fields.boolean('Warehouse Management'),
         'mrp':fields.boolean('Manufacturing'),
         'account':fields.boolean('Financial & Accounting'),
-        'charts':fields.selection(_get_charts, 'Chart of Accounts',
-                                  readonly=True),
+        'charts':fields.selection(_get_charts, 'Chart of Accounts'),
         'purchase':fields.boolean('Purchase Management'),
         'hr':fields.boolean('Human Resources'),
         'point_of_sale':fields.boolean('Point of Sales'),

From 1050ee55d1e47bbdad7eddf8b611f1b91212408a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 17:33:01 +0100
Subject: [PATCH 23/42] [rem] account: todo item for the initial configuration
 of the overdue payment message

bzr revid: xmo@tinyerp.com-20100123163301-j2inxvabl7diqg6f
---
 addons/account/company.py                   | 49 ---------------------
 addons/account/company_view.xml             | 40 -----------------
 addons/account/security/ir.model.access.csv |  3 --
 3 files changed, 92 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index e3a1979daf2..2301cc16d9a 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -33,52 +33,3 @@ out after this mail was sent, please consider the present one as \
 void. Do not hesitate to contact our accounting department'
     }
 res_company()
-
-class company_setup(osv.osv_memory):
-    """
-    Insert Information for a company.
-    Wizard asks for:
-        * A Company with its partner
-        * Insert a suitable message for Overdue Payment Report.
-    """
-    _name='wizard.company.setup'
-    _inherit = 'res.config'
-
-    _columns = {
-        'company_id':fields.many2one('res.company','Company',required=True),
-        'overdue_msg': fields.text('Overdue Payment Message'),
-    }
-    def get_message(self,cr,uid,context={}):
-        company =self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
-        msg = company.overdue_msg
-        phone = company.partner_id.address and (company.partner_id.address[0].phone and ' at ' + str(company.partner_id.address[0].phone) + '.' or '.') or '.'
-        msg += str(phone)
-        return msg
-
-    _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
-        'overdue_msg': get_message,
-    }
-
-    def onchange_company_id(self, cr, uid, ids, company, context=None):
-        if not company:
-            return {}
-        comp_obj = self.pool.get('res.company').browse(cr,uid,company)
-        partner_address = comp_obj.partner_id.address
-        if partner_address and partner_address[0].phone:
-            msg_tail = ' at %s.'%(partner_address[0].phone)
-        else:
-            msg_tail = '.'
-
-        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail } }
-
-    def execute(self, cr, uid, ids, context=None):
-        content_wiz = self.pool.get('wizard.company.setup')\
-            .read(cr,uid,ids,['company_id','overdue_msg'])
-        if content_wiz:
-            wiz_data = content_wiz[0]
-            self.pool.get('res.company').write(
-                cr, uid,
-                [wiz_data['company_id']],
-                {'overdue_msg':wiz_data['overdue_msg']})
-company_setup()
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 9627bc8e572..7892fceee91 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,45 +15,5 @@
              </notebook>
             </field>
         </record>
-        
-        <!-- Wizard for Configuration of Overdue Payments -->
-        
-        <record model="ir.ui.view" id="wizard_company_setup_form">
-            <field name="name">wizard.company.setup.form</field>
-            <field name="model">wizard.company.setup</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">Overdue Payment Report Message</attribute>
-                </form>
-                <group string="res_config_contents" position="replace">
-                    <field name="company_id" select="1"
-                           on_change="onchange_company_id(company_id)"
-                           groups="base.group_multi_company"/>
-                    <separator string="Message" colspan="4"/>
-                    <field name="overdue_msg" nolabel="1" colspan="4"/>
-                </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
-              </data>
-            </field>
-        </record>
-
-        <record id="action_wizard_company_setup_form" model="ir.actions.act_window">
-            <field name="name">Overdue Payment Report Message</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.company.setup</field>
-            <field name="view_id" ref="wizard_company_setup_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <!-- register configuration wizard -->
-
-        <record id="config_wizard_account_base_setup_form" model="ir.actions.todo">
-            <field name="action_id" ref="action_wizard_company_setup_form"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index bb7ffbae946..e4806d436d0 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -87,6 +87,3 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_wizard_company_setup_manager","wizard.company.setup manager","model_wizard_company_setup","account.group_account_manager",1,1,1,1
-"access_wizard_company_setup","wizard.company.setup","model_wizard_company_setup","account.group_account_user",1,0,0,0
-"access_wizard_company_setup_user","wizard.company.setup user","model_wizard_company_setup","base.group_user",1,0,0,0

From 92b37c47e1c588b7784d3a5a5e7388368b24cbef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 23:54:49 +0100
Subject: [PATCH 24/42] [imp] inherit installer view instead of config one in
 installers

bzr revid: xmo@tinyerp.com-20100123225449-gq4w32jsuol0dkff
---
 addons/account/account_installer.xml          | 36 ++++++-------
 addons/base_setup/base_setup_installer.xml    | 51 +++++++++----------
 addons/hr/hr_installer.xml                    | 33 +++++-------
 addons/knowledge/knowledge_installer.xml      | 33 +++++-------
 addons/misc_tools/misc_tools_installer.xml    | 27 ++++------
 addons/mrp/mrp_installer.xml                  | 29 ++++-------
 addons/project/project_installer.xml          | 41 +++++++--------
 .../report_designer_installer.xml             | 26 ++++------
 8 files changed, 116 insertions(+), 160 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b1e6dd8725c..b2583a81f46 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -4,31 +4,31 @@
       <field name="name">account.installer.view</field>
       <field name="model">account.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Accounting Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Configure Your Accounting System" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Accounting" colspan="4"/>
-              <field name="account_analytic_default"/>
-              <field name="account_analytic_plans"/>
-              <!-- insert suppliers payment management here -->
-              <field name="account_followup"/>
-              <field name="account_asset"/>
-            </group>
-          </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Configure Your Accounting System</attribute>
+          </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string"
+                       ></attribute>
           </xpath>
+
+          <group colspan="8">
+            <separator string="Accounting" colspan="4"/>
+            <field name="account_analytic_default"/>
+            <field name="account_analytic_plans"/>
+            <!-- insert suppliers payment management here -->
+            <field name="account_followup"/>
+            <field name="account_asset"/>
+          </group>
         </data>
       </field>
     </record>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 6f89a654d46..3b18df6fb71 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -4,39 +4,36 @@
       <field name="name">base.setup.installer.view</field>
       <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Base Setup Modules Installation</attribute>
           </form>
-
-          <group string="res_config_contents" position="replace">
-            <separator string="Install Modules" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Generic Modules" colspan="4"/>
-              <field name="crm"/> <field name="sale"/>
-              <field name="project"/> <field name="knowledge"/>
-              <field name="stock"/> <field name="mrp"/>
-              <field name="account"/>
-              <field name="charts" attrs="{'readonly':[('account','=',False)]}"/>
-              <field name="purchase"/> <field name="hr"/>
-              <field name="point_of_sale"/> <field name="marketing"/>
-              <field name="misc_tools"/> <field name="report_designer"/>
-              <separator string="Vertical Modules" colspan="4"/>
-              <field name="profile_association"/>
-              <field name="profile_training"/>
-              <field name="profile_auction"/>
-              <field name="profile_bookstore"/>
-            </group>
-          </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
+          <separator string="title" position="attributes">
+            <attribute name="string">Install Modules</attribute>
+          </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string"
+                       ></attribute>
           </xpath>
+          <group colspan="8">
+            <separator string="Generic Modules" colspan="4"/>
+            <field name="crm"/> <field name="sale"/>
+            <field name="project"/> <field name="knowledge"/>
+            <field name="stock"/> <field name="mrp"/>
+            <field name="account"/>
+            <field name="charts" attrs="{'readonly':[('account','=',False)]}"/>
+            <field name="purchase"/> <field name="hr"/>
+            <field name="point_of_sale"/> <field name="marketing"/>
+            <field name="misc_tools"/> <field name="report_designer"/>
+            <separator string="Vertical Modules" colspan="4"/>
+            <field name="profile_association"/>
+            <field name="profile_training"/>
+            <field name="profile_auction"/>
+            <field name="profile_bookstore"/>
+          </group>
         </data>
       </field>
     </record>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 8125775f0c8..d097e853aaa 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -4,33 +4,26 @@
       <field name="name">hr.installer.view</field>
       <field name="model">hr.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Human Resources Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Configure Human Resources" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Human Resources Management" colspan="4"/>
-              <field name="hr_holidays"/>
-              <field name="hr_expense"/>
-              <field name="hr_jobs"/>
-              <field name="hr_timesheet_sheet"/>
-              <field name="hr_contract"/>
-              <field name="hr_evaluation"/>
-              <field name="hr_attendance"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string">Configure Human Resources"</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Human Resources Management" colspan="4"/>
+            <field name="hr_holidays"/>
+            <field name="hr_expense"/>
+            <field name="hr_jobs"/>
+            <field name="hr_timesheet_sheet"/>
+            <field name="hr_contract"/>
+            <field name="hr_evaluation"/>
+            <field name="hr_attendance"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 567c1b5a18e..6ae61ae9873 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -4,33 +4,26 @@
       <field name="name">knowledge.installer.view</field>
       <field name="model">knowledge.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Knowledge Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Configure Your Knowledge Management System"
-                       colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Knowledge Management" colspan="4"/>
-              <field name="document_ftp"/>
-              <field name="document_webdav"/>
-              <field name="wiki"/>
-              <separator string="Templates of Content" colspan="4"/>
-              <field name="wiki_faq"/>
-              <field name="wiki_quality_manual"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Configure Your Knowledge Management System</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Knowledge Management" colspan="4"/>
+            <field name="document_ftp"/>
+            <field name="document_webdav"/>
+            <field name="wiki"/>
+            <separator string="Templates of Content" colspan="4"/>
+            <field name="wiki_faq"/>
+            <field name="wiki_quality_manual"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index 20c151e4ab5..e8cf6802904 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -4,30 +4,23 @@
       <field name="name">misc_tools.installer.view</field>
       <field name="model">misc_tools.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Tools Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Select Tools To Install" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Tools" colspan="4"/>
-              <field name="lunch"/>
-              <field name="subscription"/>
-              <field name="survey"/>
-              <field name="audittrail"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string">Select Tools To Install</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Tools" colspan="4"/>
+            <field name="lunch"/>
+            <field name="subscription"/>
+            <field name="survey"/>
+            <field name="audittrail"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 49d561b487b..a010377bd78 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -4,31 +4,24 @@
       <field name="name">mrp.installer.view</field>
       <field name="model">mrp.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">MRP Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Configure Your Manufacturing" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Manufacturing Resource Planning" colspan="4"/>
-              <!-- Advanced Routes -->
-              <field name="mrp_jit"/>
-              <field name="mrp_operations"/>
-              <field name="mrp_subproduct"/>
-              <field name="mrp_repair"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string">Configure Your Manufacturing</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Manufacturing Resource Planning" colspan="4"/>
+            <!-- Advanced Routes -->
+            <field name="mrp_jit"/>
+            <field name="mrp_operations"/>
+            <field name="mrp_subproduct"/>
+            <field name="mrp_repair"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index e504230f900..ebe4fee93d8 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -4,37 +4,30 @@
       <field name="name">project.installer.view</field>
       <field name="model">project.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Project Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Configure Your Project Management"
-                       colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Project Management" colspan="4"/>
-              <field name="project_long_term"/>
-              <field name="project_wiki"/>
-              <field name="hr_timesheet_sheet"/>
-              <field name="hr_timesheet_invoice"/>
-              <field name="account_budget"/>
-              <field name="project_messages"/>
-              <field name="project_crm"/>
-              <separator string="Methodologies" colspan="4"/>
-              <field name="scrum"/>
-              <field name="project_gtd"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Configure Your Project Management</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Project Management" colspan="4"/>
+            <field name="project_long_term"/>
+            <field name="project_wiki"/>
+            <field name="hr_timesheet_sheet"/>
+            <field name="hr_timesheet_invoice"/>
+            <field name="account_budget"/>
+            <field name="project_messages"/>
+            <field name="project_crm"/>
+            <separator string="Methodologies" colspan="4"/>
+            <field name="scrum"/>
+            <field name="project_gtd"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 2db8e221b75..13d36e22ad5 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -4,29 +4,23 @@
       <field name="name">report_designer.installer.view</field>
       <field name="model">report_designer.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
             <attribute name="string">Report Modules Installation</attribute>
           </form>
 
-          <group string="res_config_contents" position="replace">
-            <separator string="Select Reporting Tools To Install" colspan="4"/>
-            <image name="gtk-dialog-info"/>
-            <newline/>
-            <label align="0.0" string=""/>
-            <group>
-              <separator string="Reporting" colspan="4"/>
-              <field name="base_report_designer"/>
-              <field name="base_report_creator"/>
-              <field name="olap"/>
-            </group>
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Select Reporting Tools To Install</attribute>
+          </separator>
+          <group colspan="8">
+            <separator string="Reporting" colspan="4"/>
+            <field name="base_report_designer"/>
+            <field name="base_report_creator"/>
+            <field name="olap"/>
           </group>
-
-          <xpath expr='//button[@name="action_next"]' position='attributes'>
-            <attribute name='string'>Install Modules</attribute>
-          </xpath>
         </data>
       </field>
     </record>

From ff12e428c7d511feebf19a398a8fd5032a949c1f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 14:02:59 +0100
Subject: [PATCH 25/42] [imp] migrate installers in profiles to
 res.config.installer

bzr revid: xmo@tinyerp.com-20100124130259-0i6230y4ll78bic5
---
 .../profile_accounting/profile_accounting.py  | 19 +++------------
 .../profile_accounting/profile_accounting.xml | 13 ++++++----
 .../profile_association.py                    | 12 +---------
 .../profile_association.xml                   | 15 ++++++++----
 .../profile_manufacturing.py                  | 12 +---------
 .../profile_manufacturing.xml                 | 18 +++++++++-----
 addons/profile_service/profile_service.py     | 12 +---------
 addons/profile_service/profile_service.xml    | 24 +++++++++++--------
 8 files changed, 51 insertions(+), 74 deletions(-)

diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index b067beea049..b8c3cf7b0fe 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,10 +24,9 @@ import pooler
 
 class profile_accounting_config_install_modules_wizard(osv.osv_memory):
     _name='profile.accounting.config.install_modules_wizard'
-    _inherit = 'res.config'
+    _inherit = 'res.config.installer'
 
     _columns = {
-        'name':fields.char('Name', size=64),
         'account_analytic_analysis':fields.boolean('Analytic Accounting'),
         'account_analytic_plans':fields.boolean('Multiple Analytic Plans'),
         'account_payment':fields.boolean('Suppliers Payment Management'),
@@ -36,18 +35,6 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
         'account_budget':fields.boolean('Budgets', help="Helps you to manage financial and analytic budgets."),
         'board_document':fields.boolean('Document Management',help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
     }
-
-    def execute(self, cr, uid, ids, context=None):
-        result = self.read(cr, uid, ids)
-        mod_obj = self.pool.get('ir.module.module')
-        for res in result:
-            for r in res:
-                if r != 'id' and res[r]:
-                    ids += mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr, uid, ids, context=context)
-        cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_accounting_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index 74ec101d231..6423901941d 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -5,15 +5,19 @@
             <field name="name">Accounting Profile : Install extra modules</field>
             <field name="model">profile.accounting.config.install_modules_wizard</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
                   <attribute name="string">Install Extra Modules</attribute>
                 </form>
-                <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."/>
+                <xpath expr="//label[@string='descrition']"
+                       position="attrobites">
+                  <attribute name="string"
+                             >Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</attribute>
+                </xpath>
+                <separator string="title" position="replace"/>
+                <group colspan="8">
                   <separator string="Accounting Management" colspan="4"/>
                   <field name="account_analytic_analysis"/>
                   <field name="account_analytic_plans"/>
@@ -42,6 +46,7 @@
         <record model="ir.actions.todo"
                 id="profile_accounting.config_install_wizard">
           <field name="action_id" ref="action_config_install_module"/>
+          <field name="sequence">3</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 013052222e7..586ed3f8639 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -25,7 +25,7 @@ import pooler
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
     _name='profile.association.config.install_modules_wizard'
-    _inherit = 'res.config'
+    _inherit = 'res.config.installer'
 
     _columns = {
         'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
@@ -38,15 +38,5 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         'wiki': fields.boolean('Wiki', 
             help="An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc.")
     }
-    def execute(self, cr, uid, ids, context=None):
-        result = self.read(cr,uid,ids)
-        mod_obj = self.pool.get('ir.module.module')
-        for res in result:
-            for r in res:
-                if r != 'id' and res[r]:
-                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr, uid, ids, context=context)
-        cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_association_config_install_modules_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index 573e6d25450..0f376ea4069 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -5,14 +5,18 @@
             <field name="name">Association Profile : Install extra modules</field>
             <field name="model">profile.association.config.install_modules_wizard</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
                   <attribute name="string">Install Extra Modules</attribute>
                 </form>
-                <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."/>
+                <xpath expr="//label[@string='description']"
+                       position="attributes">
+                  <attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
+                </xpath>
+                <separator string="title" position="replace"/>
+                <group colspan="8">
                   <separator string="Project Management" colspan="4"/>
                   <field name="project"/>
                   <field name="project_gtd"/>
@@ -38,7 +42,8 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-        </record>
+        <field name="action_id" ref="action_config_install_module"/>
+        <field name="sequence">3</field>
+      </record>
     </data>
 </openerp>
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 11276af8c96..40bace350a7 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -25,7 +25,7 @@ import pooler
 
 class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
     _name='profile.manufacturing.config.install_modules_wizard'
-    _inherit = 'res.config'
+    _inherit = 'res.config.installer'
 
     _columns = {
         'mrp_jit':fields.boolean('Just in Time Scheduling',
@@ -78,16 +78,6 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="Allows to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
 
     }
-    def execute(self, cr, uid, ids, context=None):
-        result = self.read(cr,uid,ids)
-        mod_obj = self.pool.get('ir.module.module')
-        for res in result:
-            for r in res:
-                if r != 'id' and res[r]:
-                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr, uid, ids, context=context)
-        cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_manufacturing_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 1f944de7fa8..ae659245907 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -5,14 +5,20 @@
             <field name="name">Manufacturing Profile: Install Extra Modules</field>
             <field name="model">profile.manufacturing.config.install_modules_wizard</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
                   <attribute name="string">Manufacturing Profile: Install Extra Modules</attribute>
                 </form>
-                <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately."/>
+                <xpath expr="//label[@string='description']"
+                       position="attributes">
+                  <attribute name="string">Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately.</attribute>
+                </xpath>
+                <separator string="title" position="attributes">
+                  <attribute name="string">Manufacturing Modules</attribute>
+                </separator>
+                <group colspan="8">
                   <separator string="Stock &amp; Manufacturing" colspan="4"/>
                   <field name="stock_location"/>
                   <field name="mrp_jit"/>
@@ -29,7 +35,6 @@
                   <field name="warning"/>
                   <field name="portal"/>
                 </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>
@@ -44,7 +49,8 @@
         </record>
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-        </record>
+        <field name="action_id" ref="action_config_install_module"/>
+        <field name="sequence">3</field>
+      </record>
     </data>
 </openerp>
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 5aee039bc09..f228656a220 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -24,7 +24,7 @@ import pooler
 
 class profile_service_config_install_modules_wizard(osv.osv_memory):
     _name='profile.service.config.install_modules_wizard'
-    _inherit = 'res.config'
+    _inherit = 'res.config.installer'
     _rec_name = 'crm_configuration'
     _columns = {
         'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
@@ -47,16 +47,6 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
             help="An integrated wiki content management system. This is really "\
                 "useful to manage FAQ, quality manuals, etc.")
     }
-    def execute(self, cr, uid, ids, context=None):
-        result = self.read(cr, uid, ids)
-        mod_obj = self.pool.get('ir.module.module')
-        for res in result:
-            for r in res:
-                if r != 'id' and res[r]:
-                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr, uid, ids, context=context)
-        cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_service_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 5521cafa9b6..b8c51325cb3 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -5,16 +5,21 @@
             <field name="name">Service Profile : Install extra modules</field>
             <field name="model">profile.service.config.install_modules_wizard</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Install Extra Modules</attribute>
+                  <attribute name="string">Install Extra Service Profile Modules</attribute>
                 </form>
-                <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu."/>
-                  <separator string="Services Management" colspan="4"/>
+                <xpath expr="//label[@string='description']"
+                       posititon="attributes">
+                  <attribute name="string"
+                             >A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu.</attribute>
+                </xpath>
+                <separator string="title" position="attributes">
+                  <attribute name="string">Services Management</attribute>
+                </separator>
+                <group colspan="8">
                   <field name="project_timesheet"/>
                   <field name="hr_timesheet_invoice"/>
                   <field name="project_gtd"/>
@@ -48,9 +53,8 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-        </record>
-
-
+        <field name="action_id" ref="action_config_install_module"/>
+        <field name="sequence">3</field>
+      </record>
     </data>
 </openerp>

From d91a35a9808045ae710de1bfc19c214c1e24161c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 16:16:38 +0100
Subject: [PATCH 26/42] [fix] project: reduce length of issues tracker label in
 order not to break gtk interface

bzr revid: xmo@tinyerp.com-20100124151638-kypqut7r3qlika1r
---
 addons/project/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/installer.py b/addons/project/installer.py
index d6a56bd453c..6d622b89c4d 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -32,7 +32,7 @@ class project_installer(osv.osv_memory):
         'hr_timesheet_invoice':fields.boolean('Invoice Based on Hours'),
         'account_budget':fields.boolean('Budgets'),
         'project_messages':fields.boolean('Project Messages'),
-        'project_crm':fields.boolean('Issues Tracker & Features Requests'),
+        'project_crm':fields.boolean('Issues Tracker'),
         # Methodologies
         'scrum':fields.boolean('SCRUM'),
         'project_gtd':fields.boolean('Getting Things Done'),

From 0e13cdac8af3b79c327c19fc8a531a950a907315 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 18:34:04 +0100
Subject: [PATCH 27/42] [rem] redundant terp metadata

bzr revid: xmo@tinyerp.com-20100124173404-p19vujspufadriaf
---
 addons/base_setup/base_setup_installer.xml |  7 ++++++-
 addons/base_setup/installer.py             | 22 +++++++++++++++++-----
 addons/mrp/__terp__.py                     |  3 ---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3b18df6fb71..b2472665f0b 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -16,7 +16,12 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
-                       ></attribute>
+                       >Now that OpenERP is installed, we have selected a set
+of applications tailored towards common needs, as well as sets of applications
+for more specific types or groups of businesse (the vertical modules).
+
+If you don't think you need any of these right now, don't worry you can
+easily install them later on..</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Generic Modules" colspan="4"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9e2a93f2a48..7e964ebcdf0 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -50,11 +50,23 @@ class base_setup_installer(osv.osv_memory):
         }
     _columns = {
         # Generic modules
-        'crm':fields.boolean('Customer Relationship Management'),
-        'sale':fields.boolean('Sales Management'),
-        'project':fields.boolean('Project Management'),
-        'knowledge':fields.boolean('Knowledge Management'),
-        'stock':fields.boolean('Warehouse Management'),
+        'crm':fields.boolean('Customer Relationship Management',
+            help="Helps you track and manage relations with customers such as"
+                 " leads, requests or issues. Can automatically send "
+                 "reminders, escalate requests or trigger business-specific "
+                 "actions based on standard events."),
+        'sale':fields.boolean('Sales Management',
+            help="Helps you handle your quotations, sale orders and invoicing"
+                 "."),
+        'project':fields.boolean('Project Management',
+            help="Helps you manage your projects and tasks by tracking them, "
+                 "generating planings, etc..."),
+        'knowledge':fields.boolean('Knowledge Management',
+            help="Lets you install addons geared towards sharing knowledge "
+                 "with and between your employees."),
+        'stock':fields.boolean('Warehouse Management',
+            help="Helps you manage your stocks and stocks locations, as well "
+                 "as the flow of stock between warehouses."),
         'mrp':fields.boolean('Manufacturing'),
         'account':fields.boolean('Financial & Accounting'),
         'charts':fields.selection(_get_charts, 'Chart of Accounts'),
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 686cc1154ee..3bf2410cff9 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -54,9 +54,6 @@
     * Print a production order
     * Stock forecasts
     """,
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['stock', 'hr', 'purchase', 'product', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/mrp_security.xml',

From 21b5c146e740d5d53ba1cb6964ea0438fcf8e47e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 19:05:52 +0100
Subject: [PATCH 28/42] [imp] base_setup: add a bunch of help text and
 descriptions

bzr revid: xmo@tinyerp.com-20100124180552-hc6qijzyzj9art9g
---
 addons/base_setup/base_setup_installer.xml | 11 ++--
 addons/base_setup/installer.py             | 60 +++++++++++++++++-----
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index b2472665f0b..bbe78ceb7f2 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -16,12 +16,13 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
-                       >Now that OpenERP is installed, we have selected a set
-of applications tailored towards common needs, as well as sets of applications
-for more specific types or groups of businesse (the vertical modules).
+                       >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
+ businesse (the vertical modules).
 
-If you don't think you need any of these right now, don't worry you can
-easily install them later on..</attribute>
+If you don't think you need any of these right now, you can easily
+ install them later on.</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Generic Modules" colspan="4"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 7e964ebcdf0..3bdc34c48fa 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -60,27 +60,59 @@ class base_setup_installer(osv.osv_memory):
                  "."),
         'project':fields.boolean('Project Management',
             help="Helps you manage your projects and tasks by tracking them, "
-                 "generating planings, etc..."),
+                 "generating plannings, etc..."),
         'knowledge':fields.boolean('Knowledge Management',
             help="Lets you install addons geared towards sharing knowledge "
                  "with and between your employees."),
         'stock':fields.boolean('Warehouse Management',
             help="Helps you manage your stocks and stocks locations, as well "
                  "as the flow of stock between warehouses."),
-        'mrp':fields.boolean('Manufacturing'),
-        'account':fields.boolean('Financial & Accounting'),
-        'charts':fields.selection(_get_charts, 'Chart of Accounts'),
-        'purchase':fields.boolean('Purchase Management'),
-        'hr':fields.boolean('Human Resources'),
-        'point_of_sale':fields.boolean('Point of Sales'),
-        'marketing':fields.boolean('Marketing'),
-        'misc_tools':fields.boolean('Miscellaneous Tools'),
-        'report_designer':fields.boolean('Advanced Reporting'),
+        'mrp':fields.boolean('Manufacturing',
+            help="Helps you manage your manufacturing processes and generate "
+                 "reports on those processes."),
+        'account':fields.boolean('Financial & Accounting',
+            help="Helps you handle your accounting needs, as well as create "
+                 "and track your budgets."),
+        'charts':fields.selection(_get_charts, 'Chart of Accounts',
+            help="Installs localized accounting charts to match as closely as "
+                 "possible the accounting needs of your company based on your "
+                 "country."),
+        'purchase':fields.boolean('Purchase Management',
+            help="Helps you manage your purchase-related processes such as "
+                 "requests for quotations, supplier invoices, etc..."),
+        'hr':fields.boolean('Human Resources',
+            help="Helps you manage your human resources by encoding your "
+                 "employee structure, generating work sheets, tracking "
+                 "attendance and more."),
+        'point_of_sale':fields.boolean('Point of Sales',
+            help="Helps you get the most out of your points of sales with "
+                 "fast sale encoding, simplified payment mode encoding, "
+                 "automatic picking lists generation and more."),
+        'marketing':fields.boolean('Marketing',
+            help="Helps you manage your marketing campaigns step by step."),
+        'misc_tools':fields.boolean('Miscellaneous Tools',
+            help="Lets you install various interesting but non-essential "
+                 "tools."),
+        'report_designer':fields.boolean('Advanced Reporting',
+            help="Lets you install various tools to simplify and enhance "
+                 "OpenERP's report creation."),
         # Vertical modules
-        'profile_association':fields.boolean('Associations'),
-        'profile_training':fields.boolean('Training Centers'),
-        'profile_auction':fields.boolean('Auction Houses'),
-        'profile_bookstore':fields.boolean('Book Stores'),
+        'profile_association':fields.boolean('Associations',
+            help="Installs a preselected set of OpenERP "
+                 "applications which will help you manage your association "
+                 "more efficiently."),
+        'profile_training':fields.boolean('Training Centers',
+            help="Helps you manage your training sessions and "
+                 "centers, from the conception of a training project to the "
+                 "gathering of trainee feedback."),
+        'profile_auction':fields.boolean('Auction Houses',
+            help="Installs a preselected set of OpenERP "
+                 "applications selected to help you manage your auctions "
+                 "as well as the business processes around them."),
+        'profile_bookstore':fields.boolean('Book Stores',
+            help="Installs a preselected set of OpenERP "
+                 "applications which will help you manage your book store "
+                 "or your library."),
         }
     _defaults = {
         'crm': True,

From 38ec2626c1ac01a4f1aa80c5168e0d3a3930f301 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 19:20:52 +0100
Subject: [PATCH 29/42] [imp] knowledge: add a bunch of help text and
 descriptions

bzr revid: xmo@tinyerp.com-20100124182052-hd28ydinab5icnk0
---
 addons/knowledge/installer.py            | 23 ++++++++++++++++++-----
 addons/knowledge/knowledge_installer.xml |  6 ++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index 71c54de8d99..f3ee456944d 100644
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -26,12 +26,25 @@ class knowledge_installer(osv.osv_memory):
 
     _columns = {
         # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)'),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)'),
-        'wiki':fields.boolean('Collaborative Content (Wiki)'),
+        'document_ftp':fields.boolean('Shared Repositories (FTP)',
+            help="Provides an FTP access to your OpenERP's Document "
+                 "Management System. Lets you access attachments and "
+                 "virtual documents through a standard FTP client."),
+        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
+            help="Provides a WebDAV access to your OpenERP's Document "
+                 "Management System. Lets you access attachments and "
+                 "virtual documents through your standard file browser."),
+        'wiki':fields.boolean('Collaborative Content (Wiki)',
+            help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
         # Templates of Content
-        'wiki_faq':fields.boolean('Internal FAQ'),
-        'wiki_quality_manual':fields.boolean('Quality Manual'),
+        'wiki_faq':fields.boolean('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',
+            help="Creates an example skeleton for a standard quality manual."),
         }
     _defaults = {
         'document_ftp':True,
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 6ae61ae9873..00048df4d4b 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -15,6 +15,12 @@
             <attribute name="string"
                        >Configure Your Knowledge Management System</attribute>
           </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">From this screen, you can select various
+OpenERP applications which will help employees store information, distribute
+it and share it with one another.</attribute>
+          </xpath>
           <group colspan="8">
             <separator string="Knowledge Management" colspan="4"/>
             <field name="document_ftp"/>

From d01ede58d5b18c059d6dba76b73f6ebac77ab1de Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 20:12:50 +0100
Subject: [PATCH 30/42] [imp] hr: add a bunch of help text and descriptions to
 the installer view

bzr revid: xmo@tinyerp.com-20100124191250-ld8ez0h8gix2md4d
---
 addons/hr/hr_installer.xml |  6 ++++++
 addons/hr/installer.py     | 28 +++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index d097e853aaa..9b6370cf6d0 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -14,6 +14,12 @@
           <separator string="title" position="attributes">
             <attribute name="string">Configure Human Resources"</attribute>
           </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">The base Human Resources addon will help 
+you manage your employee roster, but your can enhance it even further by 
+installing a few HR-related applications.</attribute>
+          </xpath>
           <group colspan="8">
             <separator string="Human Resources Management" colspan="4"/>
             <field name="hr_holidays"/>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 69346199ddb..1d879902d5b 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -26,13 +26,27 @@ class hr_installer(osv.osv_memory):
 
     _columns = {
         # Human Resources Management
-        'hr_holidays':fields.boolean('Holidays / Leaves Management'),
-        'hr_expense':fields.boolean('Expenses'),
-        'hr_jobs':fields.boolean('Recruitement Process'),
-        'hr_timesheet_sheet':fields.boolean('Timesheets'),
-        'hr_contract':fields.boolean("Employee's Contracts"),
-        'hr_evaluation':fields.boolean('Periodic Evaluations'),
-        'hr_attendance':fields.boolean('Attendances (Sign In/Out)'),
+        'hr_holidays':fields.boolean('Holidays / Leaves Management',
+            help="Tracks employee leaves allocations, requests and planning."
+                 "\n\nCan also plug into OpenERP's agendas and calendars "
+                 "applications in order to display accepted leaves requests on"
+                 " OpenERP's calendars."),
+        'hr_expense':fields.boolean('Expenses',
+            help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'hr_jobs':fields.boolean('Recruitment Process',
+            help="Helps you manage and streamline your recruitment process."),
+        'hr_timesheet_sheet':fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendance."),
+        'hr_contract':fields.boolean("Employee's Contracts",
+            help="Extends employee profiles to help manage their contracts."),
+        'hr_evaluation':fields.boolean('Periodic Evaluations',
+            help="Lets you create and manage the periodic evaluation and "
+                 "performance review of employees."),
+        'hr_attendance':fields.boolean('Attendances (Sign In/Out)',
+            help="Simplifies the management of employee attendances."),
         }
     _defaults = {
         'hr_holidays': True,

From 0d4417c5164d5e4ffd14592e3485a97a472ef015 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 22:01:36 +0100
Subject: [PATCH 31/42] [imp] account: add a bunch of help text and
 descriptions to the installer view

bzr revid: xmo@tinyerp.com-20100124210136-odbcxhnnd711cn0z
---
 addons/account/account_installer.xml |  6 +++---
 addons/account/installer.py          | 21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b2583a81f46..fc96db128cf 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -17,15 +17,15 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string"
-                       ></attribute>
+            <attribute name="string">You can enhance OpenERP's basic
+ accounting support with a few additional OpenERP applications</attribute>
           </xpath>
 
           <group colspan="8">
             <separator string="Accounting" colspan="4"/>
             <field name="account_analytic_default"/>
             <field name="account_analytic_plans"/>
-            <!-- insert suppliers payment management here -->
+            <field name="account_payment"/>
             <field name="account_followup"/>
             <field name="account_asset"/>
           </group>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 2e7ebb5ed44..3122fe77350 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -26,11 +26,22 @@ class account_installer(osv.osv_memory):
 
     _columns = {
         # Accounting
-        'account_analytic_default':fields.boolean('Analytic Accounting'),
-        'account_analytic_plans':fields.boolean('Multiple Analytic Plans'),
-        'account_payment':fields.boolean('Suppliers Payment Management'),
-        'account_followup':fields.boolean('Followups Management'),
-        'account_asset':fields.boolean('Assets Management')
+        'account_analytic_default':fields.boolean('Analytic Accounting',
+            help="Automatically selects analytic accounts based on various "
+                 "criteria."),
+        'account_analytic_plans':fields.boolean('Multiple Analytic Plans',
+            help="Allows invoice lines to impact multiple analytic accounts "
+                 "simultaneously."),
+        'account_payment':fields.boolean('Suppliers Payment Management',
+            help="Streamlines invoice payment and creates hooks to plug "
+                 "automated payment systems in."),
+        'account_followup':fields.boolean('Followups Management',
+            help="Helps you generate reminder letters for unpaid invoices, "
+                 "including multiple levels of reminding and customized "
+                 "per-partner policies."),
+        'account_asset':fields.boolean('Assets Management',
+            help="Enables asset management in the accounting application, "
+                 "including asset categories and usage periods.")
         }
     _defaults = {
         'account_analytic_default':True,

From b4e977fbb546f03eaf101bf5c5e03886cf6e402b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 22:12:44 +0100
Subject: [PATCH 32/42] [imp] project: add a bunch of help text and
 descriptions to the installer view

bzr revid: xmo@tinyerp.com-20100124211244-w736naj286duobtg
---
 addons/project/installer.py          | 33 ++++++++++++++++++++--------
 addons/project/project_installer.xml |  6 +++++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/addons/project/installer.py b/addons/project/installer.py
index 6d622b89c4d..1848d1e300e 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -26,15 +26,30 @@ class project_installer(osv.osv_memory):
 
     _columns = {
         # Project Management
-        'project_long_term':fields.boolean('Long Term Planning'),
-        'project_wiki':fields.boolean('Specifications in a Wiki'),
-        'hr_timesheet_sheet':fields.boolean('Timesheets'),
-        'hr_timesheet_invoice':fields.boolean('Invoice Based on Hours'),
-        'account_budget':fields.boolean('Budgets'),
-        'project_messages':fields.boolean('Project Messages'),
-        'project_crm':fields.boolean('Issues Tracker'),
+        'project_long_term':fields.boolean('Long Term Planning',
+            help="Enables long-term projects tracking, including "
+                 "multiple-phase projects and resource allocation handling."),
+        'project_wiki':fields.boolean('Specifications in a Wiki',
+            help=""),
+        'hr_timesheet_sheet':fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendance."),
+        'hr_timesheet_invoice':fields.boolean('Invoice Based on Hours',
+            help="Helps generate invoice based on based on human resources "
+                 "costs and general expenses."),
+        'account_budget':fields.boolean('Budgets',
+            help="Helps accountants manage analytic and crossover budgets."),
+        'project_messages':fields.boolean('Project Messages',
+            help="Lets employees send messages to other members of the "
+                 "projects they're working on."),
+        'project_crm':fields.boolean('Issues Tracker',
+            help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
-        'scrum':fields.boolean('SCRUM'),
-        'project_gtd':fields.boolean('Getting Things Done'),
+        'scrum':fields.boolean('SCRUM',
+            help="Implements and tracks the concepts and task types defined "
+                 "in the SCRUM methodology."),
+        'project_gtd':fields.boolean('Getting Things Done',
+            help="Embeds the Getting Things Done concepts into OpenERP's "
+                 "project management."),
         }
 project_installer()
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index ebe4fee93d8..3a796999477 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -15,6 +15,12 @@
             <attribute name="string"
                        >Configure Your Project Management</attribute>
           </separator>
+          <xpath expr="//label[@string='description']"
+                 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>
           <group colspan="8">
             <separator string="Project Management" colspan="4"/>
             <field name="project_long_term"/>

From e0163736ae0131a6b9f067b92be69034cd42b62e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 22:30:57 +0100
Subject: [PATCH 33/42] [imp] mrp: add a bunch of help text and descriptions to
 the installer view

bzr revid: xmo@tinyerp.com-20100124213057-66g649n5t3njej9x
---
 addons/mrp/installer.py      | 24 +++++++++++++++++++-----
 addons/mrp/mrp_installer.xml |  8 +++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index 4d7936c91c2..d595860ba39 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -26,10 +26,24 @@ class mrp_installer(osv.osv_memory):
 
     _columns = {
         # Manufacturing Resource Planning
-        'stock_location':fields.boolean('Advanced Routes'),
-        'mrp_jit':fields.boolean('Just In Time Scheduling'),
-        'mrp_operations':fields.boolean('Manufacturing Operations'),
-        'mrp_subproduct':fields.boolean('MRP Subproducts'),
-        'mrp_repair':fields.boolean('Repairs'),
+        'stock_location':fields.boolean('Advanced Routes',
+            help="Manages product routes and paths within and between "
+                 "locations (e.g. warehouses)"),
+        'mrp_jit':fields.boolean('Just In Time Scheduling',
+            help="Enables Just In Time computation of procurement orders."
+                 "\n\nWhile it's more resource intensive than the default "
+                 "setup, the JIT computer avoids having to wait for the "
+                 "procurement scheduler to run or having to run the "
+                 "procurement scheduler manually."),
+        'mrp_operations':fields.boolean('Manufacturing Operations',
+            help="Enhances production orders with readiness states as well "
+                 "as the dates of start and end of execution of the order."),
+        'mrp_subproduct':fields.boolean('MRP Subproducts',
+            help="Enables multiple product output from a single production "
+                 "order: without this, a productio order can have only one "
+                 "output product."),
+        'mrp_repair':fields.boolean('Repairs',
+            help="Enables warranty and repair management (and their impact "
+                 "on stocks and invoicing)."),
         }
 mrp_installer()
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index a010377bd78..86e824bb2a8 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -14,9 +14,15 @@
           <separator string="title" position="attributes">
             <attribute name="string">Configure Your Manufacturing</attribute>
           </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">After having installed the core
+ manufacturing application, you can extend it with a few more depending on the
+ needs of your organization</attribute>
+          </xpath>
           <group colspan="8">
             <separator string="Manufacturing Resource Planning" colspan="4"/>
-            <!-- Advanced Routes -->
+            <field name="stock_location"/>
             <field name="mrp_jit"/>
             <field name="mrp_operations"/>
             <field name="mrp_subproduct"/>

From 349c2471aef6aea429464c62ccdb85f6c1411c09 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 25 Jan 2010 12:23:54 +0100
Subject: [PATCH 34/42] [fix] base_setup: fix newlines in description

bzr revid: xmo@tinyerp.com-20100125112354-w9zuof6uxjcfj608
---
 addons/base_setup/base_setup_installer.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index bbe78ceb7f2..bf359ec306e 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -16,13 +16,9 @@
           <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
- businesse (the vertical modules).
+                       >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  businesse (the vertical modules).
 
-If you don't think you need any of these right now, you can easily
- install them later on.</attribute>
+If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Generic Modules" colspan="4"/>

From 2e49aaa7ce33b601b983ec6bb368535426cdc148 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:08:30 +0100
Subject: [PATCH 35/42] [imp] account, base_setup: move chart of accounts
 selection from base_setup installer to account's

Also remove it from account's config item as it's redundant

Rationale: account can be installed due to dependency chains, not just
direct installation from base_setup: project, stock, purchase and
profile_auction all depend on account, mrp depends on stock which
depends on account, so from base_setup's installer alone there are 5
different ways to end up with account installed and need to configure
charts of accounts.

Therefore having chart of accounts config in base_setup's installer is
dumb (as we need a second one anyway), and since it's (in a way) a
problem of module installation, the most coherent way is to move it to
account/installer.py, and remove it from the config screen where it
was (which becomes redundant).

Made it required, because it was required in the config item, not sure
it's actually mandatory to install a chart of accounts but whatever.

bzr revid: xmo@tinyerp.com-20100126140830-h4c7hlvmzzos69ls
---
 addons/account/account.py                  | 19 --------------
 addons/account/account_installer.xml       |  1 +
 addons/account/account_view.xml            |  2 --
 addons/account/installer.py                | 29 ++++++++++++++++++++++
 addons/base_setup/base_setup_installer.xml |  9 +++----
 addons/base_setup/installer.py             | 23 -----------------
 6 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 3772a660de9..47c00ddb21a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1749,15 +1749,6 @@ class account_config_wizard(osv.osv_memory):
     _name = 'account.config.wizard'
     _inherit = 'res.config'
 
-    def _get_charts(self, cr, uid, context):
-        module_obj=self.pool.get('ir.module.module')
-        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account Charts'),
-                                        ('state', '<>', 'installed')])
-        res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)]
-        res.append((-1, 'None'))
-        res.sort(key=lambda x: x[1])
-        return res
-
     _columns = {
         'name':fields.char(
             'Name', required=True, size=64,
@@ -1769,7 +1760,6 @@ class account_config_wizard(osv.osv_memory):
         'date2': fields.date('End Date', required=True),
         'period':fields.selection([('month','Month'), ('3months','3 Months')],
                                   'Periods', required=True),
-        'charts' : fields.selection(_get_charts, 'Charts of Account',required=True)
     }
     _defaults = {
         'code': lambda *a: time.strftime('%Y'),
@@ -1778,14 +1768,6 @@ class account_config_wizard(osv.osv_memory):
         'date2': lambda *a: time.strftime('%Y-12-31'),
         'period':lambda *a:'month',
     }
-    def install_account_chart(self, cr, uid, ids, context=None):
-        for res in self.read(cr,uid,ids):
-            chart_id = res['charts']
-            if chart_id > 0:
-                mod_obj = self.pool.get('ir.module.module')
-                mod_obj.button_install(cr, uid, [chart_id], context=context)
-        cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
     def execute(self, cr, uid, ids, context=None):
         for res in self.read(cr,uid,ids):
@@ -1805,7 +1787,6 @@ class account_config_wizard(osv.osv_memory):
                     res_obj.create_period(cr,uid,[new_id])
                 elif res['period']=='3months':
                     res_obj.create_period3(cr,uid,[new_id])
-        self.install_account_chart(cr,uid,ids)
 account_config_wizard()
 
 
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index fc96db128cf..d943bb452c7 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -23,6 +23,7 @@
 
           <group colspan="8">
             <separator string="Accounting" colspan="4"/>
+            <field name="charts"/>
             <field name="account_analytic_default"/>
             <field name="account_analytic_plans"/>
             <field name="account_payment"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ee2047bca88..c3b059950ad 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1460,8 +1460,6 @@
                     <field name="date1"/>
                     <field name="date2"/>
                     <field name="period" colspan="4"/>
-                    <separator col="4" colspan="4" string="Select Chart of Accounts"/>
-                    <field name="charts"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position="replace"/>
               </data>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 3122fe77350..35a09406891 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -18,14 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from operator import itemgetter
+
 from osv import fields, osv
+import netsvc
 
 class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
 
+    def _get_charts(self, cr, uid, context=None):
+        modules = self.pool.get('ir.module.module')
+        ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
+        return list(
+            sorted(((m.name, m.shortdesc)
+                    for m in modules.browse(cr, uid, ids)),
+                   key=itemgetter(1)))
+
     _columns = {
         # Accounting
+        'charts':fields.selection(_get_charts, 'Chart of Accounts',
+            required=True,
+            help="Installs localized accounting charts to match as closely as "
+                 "possible the accounting needs of your company based on your "
+                 "country."),
         'account_analytic_default':fields.boolean('Analytic Accounting',
             help="Automatically selects analytic accounts based on various "
                  "criteria."),
@@ -46,4 +62,17 @@ class account_installer(osv.osv_memory):
     _defaults = {
         'account_analytic_default':True,
         }
+
+    def modules_to_install(self, cr, uid, ids, context=None):
+        modules = super(account_installer, self).modules_to_install(
+            cr, uid, ids, context=context)
+
+        chart = self.read(cr, uid, ids, ['charts'],
+                          context=context)[0]['charts']
+        self.logger.notifyChannel(
+            'installer', netsvc.LOG_DEBUG,
+            'Installing chart of accounts %s'%chart)
+        return modules | set([chart])
+
+
 account_installer()
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index bf359ec306e..f9b490c2e98 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -25,11 +25,10 @@ If you don't think you need any of these right now, you can easily install them
             <field name="crm"/> <field name="sale"/>
             <field name="project"/> <field name="knowledge"/>
             <field name="stock"/> <field name="mrp"/>
-            <field name="account"/>
-            <field name="charts" attrs="{'readonly':[('account','=',False)]}"/>
-            <field name="purchase"/> <field name="hr"/>
-            <field name="point_of_sale"/> <field name="marketing"/>
-            <field name="misc_tools"/> <field name="report_designer"/>
+            <field name="account"/> <field name="purchase"/>
+            <field name="hr"/> <field name="point_of_sale"/>
+            <field name="marketing"/> <field name="misc_tools"/>
+            <field name="report_designer"/>
             <separator string="Vertical Modules" colspan="4"/>
             <field name="profile_association"/>
             <field name="profile_training"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 3bdc34c48fa..2c1ba113e47 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -19,31 +19,12 @@
 #
 ##############################################################################
 from osv import fields, osv
-from itertools import chain
-from operator import itemgetter
 import netsvc
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
     _inherit = 'res.config.installer'
 
-    def _get_charts(self, cr, uid, context=None):
-        modules = self.pool.get('ir.module.module')
-        ids = modules.search(cr, uid, [('category_id','=','Account Charts'),
-                                       ('state','!=','installed')])
-        return list(
-            sorted(((m.name, m.shortdesc)
-                    for m in modules.browse(cr, uid, ids)),
-                   key=itemgetter(1)))
-
-    def _if_account(self, cr, uid, ids, context=None):
-        chart = self.read(cr, uid, ids, ['charts'],
-                          context=context)[0]['charts']
-        self.logger.notifyChannel(
-            'installer', netsvc.LOG_DEBUG,
-            'Addon "account" selected, installing chart of accounts %s'%chart)
-        return [chart]
-
     _install_if = {
         ('sale','crm'): ['sale_crm'],
         ('sale','project'): ['project_mrp'],
@@ -73,10 +54,6 @@ class base_setup_installer(osv.osv_memory):
         'account':fields.boolean('Financial & Accounting',
             help="Helps you handle your accounting needs, as well as create "
                  "and track your budgets."),
-        'charts':fields.selection(_get_charts, 'Chart of Accounts',
-            help="Installs localized accounting charts to match as closely as "
-                 "possible the accounting needs of your company based on your "
-                 "country."),
         'purchase':fields.boolean('Purchase Management',
             help="Helps you manage your purchase-related processes such as "
                  "requests for quotations, supplier invoices, etc..."),

From bedf69d3f01304c66ca07bda475fe77f5dfbb9bb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 20:30:48 +0100
Subject: [PATCH 36/42] [fix] try to fix intermittent error where the user's
 action_id gets set to the wrong item

bzr revid: xmo@tinyerp.com-20100126193048-lxhqvyljnjjjzfx2
---
 addons/base_setup/__init__.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 5c89388aa93..22e81a488b0 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -33,19 +33,11 @@ class base_setup_config_choice(osv.osv_memory):
     logger = netsvc.Logger()
 
     def set_default_menu(self, cr, uid, menu, context=None):
-        users = self.pool.get('res.users')
-        users.write(cr, uid,
-                    users.search(cr, uid,
-                                 [('action_id','=','Setup')],
-                                 context=context),
-                    {'action_id': menu.id},
-                    context=context)
-        users.write(cr, uid,
-                    users.search(cr, uid,
-                                 [('menu_id','=','Setup')],
-                                 context=context),
-                    {'menu_id': menu.id},
-                    context=context)
+        user = self.pool.get('res.users')\
+                        .browse(cr, uid, uid, context=context)
+
+        user.write({'action_id': menu.id,
+                    'menu_id': menu.id})
 
     def get_default_menu(self, cr, uid, context=None):
         actions = self.pool.get('ir.actions.act_window')
@@ -53,7 +45,7 @@ class base_setup_config_choice(osv.osv_memory):
         current_menu_id = actions.search(cr, uid, [('name','=','Menu')],
                                          context=context)
         assert len(current_menu_id) == 1,\
-               'A given user should only have menu item'
+               'A given user should only have one menu item'
         return actions.browse(cr, uid, current_menu_id[0], context=context)
 
     def menu(self, cr, uid, ids, context=None):

From 17cbf1e2b8d0a7dc11ea6311e85905b40358782c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 10:12:14 +0100
Subject: [PATCH 37/42] [fix] base_setup: typo in description

bzr revid: xmo@tinyerp.com-20100127091214-vlehsg4dsknqb3v8
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index f9b490c2e98..df2c5908de9 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -16,7 +16,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  businesse (the vertical modules).
+                       >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>
           </xpath>

From 3d6093e008d75852e4055ed39f4c806e72453edd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 10:14:43 +0100
Subject: [PATCH 38/42] [fix] document_ftp: remove reference to port as port
 isn't configurable anymore

bzr revid: xmo@tinyerp.com-20100127091443-9h7fy7qi23m5az8k
---
 addons/document_ftp/document_ftp_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 6a2e2475264..9cec3715bae 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -1,5 +1,5 @@
 <openerp>
-  <data>    
+  <data>
     <record model="ir.actions.url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
@@ -27,10 +27,10 @@
             <group string="res_config_contents" position="replace">
                 <separator string="FTP Server Configuration." colspan="4"/>
                 <label align="0.0" colspan="4"
-                       string="Choose the address and port for the Document Management System's FTP server."/>
+                       string="Choose the address for the Document Management System's FTP server."/>
                 <field name="host"/>
             </group>
-            <xpath expr='//button[@name="action_skip"]' position="replace"/>
+            <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
         </field>
     </record>
@@ -50,4 +50,3 @@
     </record>
   </data>
 </openerp>
-

From bf7d53c607dbb3604197f51d622f994f62e302b0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 10:17:46 +0100
Subject: [PATCH 39/42] [imp] base_setup: remove top image in define main
 company screen

bzr revid: xmo@tinyerp.com-20100127091746-4d1rmmyqbg5kmzno
---
 addons/base_setup/base_setup_todo.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 9a88ef80c84..c6baf194c6e 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -12,7 +12,6 @@
           </form>
 
           <group string="res_config_contents" position="replace">
-            <image name="gtk-dialog-info"/>
             <field name="company_id" invisible="1"/>
 
             <separator string="Define Main Company" colspan="4"/>
@@ -59,4 +58,4 @@
       <field name="sequence">1</field>
     </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

From fb4aba6d01eee37c06c00aa78bd85781f971db47 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 11:05:19 +0100
Subject: [PATCH 40/42] [fix] installer descriptions (formatting & wording, add
 missing descriptions in report_designer and misc_tools)

bzr revid: xmo@tinyerp.com-20100127100519-45baercg41ys5pwu
---
 addons/account/account_installer.xml                 | 3 +--
 addons/hr/hr_installer.xml                           | 4 +---
 addons/knowledge/knowledge_installer.xml             | 4 +---
 addons/misc_tools/misc_tools_installer.xml           | 5 +++++
 addons/mrp/mrp_installer.xml                         | 4 +---
 addons/profile_accounting/profile_accounting.xml     | 4 ++--
 addons/project/project_installer.xml                 | 4 +---
 addons/report_designer/report_designer_installer.xml | 5 +++++
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index d943bb452c7..4c9742fd127 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -17,8 +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">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications</attribute>
           </xpath>
 
           <group colspan="8">
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 9b6370cf6d0..327fa039386 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -16,9 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">The base Human Resources addon will help 
-you manage your employee roster, but your can enhance it even further by 
-installing a few HR-related applications.</attribute>
+            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Human Resources Management" colspan="4"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 00048df4d4b..cd991ac3459 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -17,9 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">From this screen, you can select various
-OpenERP applications which will help employees store information, distribute
-it and share it with one another.</attribute>
+            <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Knowledge Management" colspan="4"/>
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
index e8cf6802904..6f4a7aa9e9e 100644
--- a/addons/misc_tools/misc_tools_installer.xml
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -14,6 +14,11 @@
           <separator string="title" position="attributes">
             <attribute name="string">Select Tools To Install</attribute>
           </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string"
+                       >Here are a few useful applications which, while they don't directly contribute to your business, can improve on it or improve your OpenERP experience</attribute>
+          </xpath>
           <group colspan="8">
             <separator string="Tools" colspan="4"/>
             <field name="lunch"/>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 86e824bb2a8..3e42ec2840e 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -16,9 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core
- manufacturing application, you can extend it with a few more depending on the
- needs of your organization</attribute>
+            <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Manufacturing Resource Planning" colspan="4"/>
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index 6423901941d..bf1ba9fdf24 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -11,8 +11,8 @@
                 <form position="attributes">
                   <attribute name="string">Install Extra Modules</attribute>
                 </form>
-                <xpath expr="//label[@string='descrition']"
-                       position="attrobites">
+                <xpath expr="//label[@string='description']"
+                       position="attributes">
                   <attribute name="string"
                              >Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</attribute>
                 </xpath>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 3a796999477..d7ca8c43989 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -17,9 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Various OpenERP applications are available
-to bring your project management to the next levels of control and flexibility.
-</attribute>
+            <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
           </xpath>
           <group colspan="8">
             <separator string="Project Management" colspan="4"/>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 13d36e22ad5..bbef853ed79 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -15,6 +15,11 @@
             <attribute name="string"
                        >Select Reporting Tools To Install</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>
           <group colspan="8">
             <separator string="Reporting" colspan="4"/>
             <field name="base_report_designer"/>

From 204742fd8afaecc4fa2ebc7946732da1c6acc0aa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 31 Jan 2010 19:49:52 +0100
Subject: [PATCH 41/42] [fix] hr: hr_jobs is actually called crm_hr

And I don't have the courage to try to rename it and every object within it

bzr revid: xmo@tinyerp.com-20100131184952-y3h7ep5pj0rdgwl3
---
 addons/hr/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1d879902d5b..74047345656 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -35,7 +35,7 @@ class hr_installer(osv.osv_memory):
             help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
-        'hr_jobs':fields.boolean('Recruitment Process',
+        'crm_hr':fields.boolean('Recruitment Process',
             help="Helps you manage and streamline your recruitment process."),
         'hr_timesheet_sheet':fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "

From 493b04e09a46bd4fb214fffd7fa1c883b9b08ff6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 1 Feb 2010 12:54:39 +0100
Subject: [PATCH 42/42] [fix] forgot to fix hr_jobs name in installer view

bzr revid: xmo@tinyerp.com-20100201115439-3qpblmb2pqtaalss
---
 addons/hr/hr_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 327fa039386..72202caa24f 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -22,7 +22,7 @@
             <separator string="Human Resources Management" colspan="4"/>
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
-            <field name="hr_jobs"/>
+            <field name="crm_hr"/>
             <field name="hr_timesheet_sheet"/>
             <field name="hr_contract"/>
             <field name="hr_evaluation"/>