[MERGE] main config wizard usability

bzr revid: qdp-launchpad@openerp.com-20110628160733-aof3fqfpyd00tnxl

5 files changed, 1 insertions, 13 deletions

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index ca8eb6d01e5..dd106e75afb 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -53,7 +53,6 @@
                     <xpath expr="//group[@name='account_accountant']" position="replace">
                     <newline/>
                     <separator  string="Accounting &amp; Finance Features" colspan="4" />
-                    <field name="account_voucher"/>
                     <field name="account_followup"/>
                     <field name="account_payment"/>
                     <field name="account_analytic_plans"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 26027573c27..c70821c1eee 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -257,18 +257,11 @@ class account_installer_modules(osv.osv_memory):
             help="Helps you generate reminder letters for unpaid invoices, "
                  "including multiple levels of reminding and customized "
                  "per-partner policies."),
-        'account_voucher': fields.boolean('Voucher Management',
-            help="Account Voucher module includes all the basic requirements of "
-                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
         'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
             help="This module will support the Anglo-Saxons accounting methodology by "
                 "changing the accounting logic with stock transactions."),
     }
 
-    _defaults = {
-        'account_voucher': True,
-    }
-
 account_installer_modules()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 6aa3ebdd13d..8a528177a30 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -28,9 +28,6 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
-        'project':fields.boolean('Project Management', 
-                              help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
         'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 9147fd4ebc7..12222ecbd90 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -11,7 +11,6 @@
                 <xpath expr="//group[@name='association']" position="replace">
                     <newline/>
                     <separator  string="Associations Features" colspan="4" />
-                    <field name="project" />
                     <field name="project_gtd" />
                     <field name="wiki" />
                     <field name="event_project" />
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e946d3d1b2c..daae87b5eb0 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -167,7 +167,7 @@
             </xpath>
             <xpath expr="//label[@string='description']"
                position="attributes">
-              <attribute name="string">Specify default values.This will set the default values for each new user, each user is free to change his own preferences.</attribute>
+              <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>