From 6e5270d4e319e7057c4939c7224e45a82b0221f7 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 23 Jul 2010 16:16:25 +0530
Subject: [PATCH] [MOD] Improvements in Configuration wizard

bzr revid: vir@tinyerp.com-20100723104625-79wfk8os49ovocls
---
 addons/account/installer.py       | 5 +++--
 addons/base_setup/__openerp__.py  | 4 +++-
 addons/base_setup/todo.py         | 2 +-
 addons/crm/crm_installer_view.xml | 2 +-
 addons/hr/installer.py            | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 2865b591df1..a49396c2649 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -33,8 +33,9 @@ class account_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'cash'},
-                    {'acc_name':'Deposit','account_type':'cash'}]
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
         return accounts
 
     def _get_charts(self, cr, uid, context=None):
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index ee0cc6a8f56..6b4df476b4b 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -43,7 +43,9 @@
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
                    'base_setup_installer.xml',
-                   'base_setup_todo.xml','gtk_contact_form.xml'],
+                   'base_setup_todo.xml',
+#                   'gtk_contact_form.xml'
+                   ],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 8050d220dae..04a20a6f32b 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -88,7 +88,7 @@ class base_setup_company(osv.osv_memory):
         'city':fields.char('City', size=128),
         'state_id':fields.selection(_get_all_states, 'State'),
         'country_id':fields.selection(_get_all_countries, 'Country'),
-        'email':fields.char('E-mail', size=64, required=True),
+        'email':fields.char('E-mail', size=64),
         'phone':fields.char('Phone', size=64),
         'currency':fields.many2one('res.currency', 'Currency', required=True),
         'rml_header1':fields.char('Report Header', size=200,
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 6d8f4b7120f..20e430b5e88 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -41,7 +41,7 @@
           	<group colspan="2" col="2">
 			<separator string="Plugins" colspan="4" />
           		<field name="thunderbird" />
-          		<label string="*Outlook*" />
+<!--          		<label string="*Outlook*" />-->
 <!--    TODO      		<field name="outlook" />-->
           	</group>
           </group>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 2c300b0496b..7d6ade35d2c 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -46,9 +46,9 @@ class hr_installer(osv.osv_memory):
                  "performance review of employees."),
         'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
             help="Simplifies the management of employee attendances."),
-        'hr_payroll': fields.boolean('Payroll' ,
+        'hr_payroll': fields.boolean('Payroll',
             help="Generic Payroll system"),
-        'hr_payroll_account': fields.boolean('Payroll with Accounting',
+        'hr_payroll_account': fields.boolean('Payroll',
             help="Generic Payroll system Integrated with Accountings."),
         }
     _defaults = {