From b6e1745b8a4877884d34a873180900bdcfae1f8e Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 2 Jul 2008 08:42:47 +0000
Subject: [PATCH] configuration wizard : * improvement on user configuration
 wizard * account journal for bank account wizard * remove comment on install
 module wizard on profile_service module

bzr revid: hmo@tinyerp.com-75b7c5c0da946d8842171a692ba65c0ce0e55e89
---
 addons/account/account.py                  |  10 +-
 addons/account/account_view.xml            | 234 ++++++++++-----------
 addons/profile_service/profile_service.py  |   4 +-
 addons/profile_service/profile_service.xml |  17 +-
 4 files changed, 131 insertions(+), 134 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 41fffe4e2f7..9f0ac88ad35 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1552,7 +1552,7 @@ class account_config_fiscalyear(osv.osv_memory):
     }
     _defaults = {
         'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d'),
+        'date2': lambda *a: time.strftime('%Y-12-31'),
     }
     def action_create(self, cr, uid,ids, context=None):
     	res=self.read(cr,uid,ids)[0]
@@ -1596,14 +1596,15 @@ class account_config_journal_bank_accounts(osv.osv_memory):
 		if 'lines_id' in config_res and config_res['lines_id']:
 			lines=line_obj.read(cr,uid,config_res['lines_id'])
 			for res in lines:
-				if 'name' in res and 'bank_account_id' in res and 'view_id'  in res and 'sequence_id' in res:
+				sequence_ids=self.pool.get('ir.sequence').search(cr,uid,[('name','=','Account Journal')])
+				if 'name' in res and 'bank_account_id' in res and 'view_id'  in res and sequence_ids and len(sequence_ids):
 					vals={
 						  'name':res['name'],
 						  'type':'cash',
 						  'view_id':res['view_id'],
 						  'default_credit_account_id':res['bank_account_id'],
 						  'default_debit_account_id':res['bank_account_id'],
-						  'sequence_id':res['sequence_id']
+						  'sequence_id':sequence_ids[0]
 						  }
 					res_obj.create(cr, uid, vals, context=context)
 		return {
@@ -1627,10 +1628,7 @@ class account_config_journal_bank_accounts_line(osv.osv_memory):
 		'name':fields.char('Journal Name', size=64,required=True),
 		'bank_account_id':fields.many2one('account.account', 'Bank Account', required=True, domain=[('type','=','cash')]),
 		'view_id':fields.selection(_journal_view_get, 'Journal View', required=True),
-		'sequence_id':fields.many2one('ir.sequence', 'Sequence', required=True),
 		'journal_id':fields.many2one('account.config.journal.bank.account', 'Journal', required=True),
     }
-
-
 account_config_journal_bank_accounts_line()
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 323eb57151b..acf47668ea5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        
+
         <!--
 	 Fiscal Year
 	-->
-        
+
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
-        
+
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
@@ -57,11 +57,11 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration"/><menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
-        
+
         <!--
 	Period
 	-->
-        
+
         <record id="view_account_period_form" model="ir.ui.view">
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
@@ -99,12 +99,12 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>
-        
-        
+
+
         <!--
 	Accounts
 	-->
-        
+
         <record id="view_account_form" model="ir.ui.view">
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
@@ -121,7 +121,7 @@
                             <field name="code" select="1"/>
                             <field name="shortcut"/>
                             <field name="sign"/>
-                            
+
                             <field name="currency_id" select="2"/>
                             <field name="close_method"/>
                             <field name="reconcile"/>
@@ -143,7 +143,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
-        
+
         <record id="view_account_tree" model="ir.ui.view">
             <field name="name">account.account.tree</field>
             <field name="model">account.account</field>
@@ -168,7 +168,7 @@
             <field name="domain">[('code','=','0')]</field>
         </record>
         <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
-        
+
         <record id="view_account_list" model="ir.ui.view">
             <field name="name">account.account.list</field>
             <field name="model">account.account</field>
@@ -189,13 +189,13 @@
             <field name="view_id" ref="view_account_list"/>
             <field name="domain">[('code','=','0')]</field>
         </record>
-        
+
         <!--
 	Journal
 
 	Account Journal Columns
 	-->
-        
+
         <record id="view_journal_column_form" model="ir.ui.view">
             <field name="name">account.journal.column.form</field>
             <field name="model">account.journal.column</field>
@@ -224,7 +224,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_journal_view_form" model="ir.ui.view">
             <field name="name">account.journal.view.form</field>
             <field name="model">account.journal.view</field>
@@ -236,11 +236,11 @@
                 </form>
             </field>
         </record>
-        
+
         <!--
 	# Account Journal
 	-->
-        
+
         <record id="view_account_journal_tree" model="ir.ui.view">
             <field name="name">account.journal.tree</field>
             <field name="model">account.journal</field>
@@ -252,7 +252,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -293,7 +293,7 @@
         </record>
         <menuitem id="next_id_25" name="Journal" parent="account.menu_finance_configuration"/>
 		<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
-        
+
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -311,7 +311,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -375,7 +375,7 @@
             <field name="view_mode">form,tree</field>
         </record>
         <menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries"/>
-        
+
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft statements</field>
             <field name="res_model">account.bank.statement</field>
@@ -384,9 +384,9 @@
             <field name="domain">[('state','=','draft')]</field>
         </record>
         <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree"/>
-        
-        
-        
+
+
+
         <record id="view_bank_statement_reconcile" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>
@@ -475,11 +475,11 @@
                 </tree>
             </field>
         </record>
-        
+
         <!--
 	Reconcile
 	-->
-        
+
         <record id="view_move_reconcile_form" model="ir.ui.view">
             <field name="name">account.move.reconcile.form</field>
             <field name="model">account.move.reconcile</field>
@@ -495,7 +495,7 @@
                 </form>
             </field>
         </record>
-        
+
         <!--
 	Tax Codes
 	-->
@@ -550,8 +550,8 @@
 		<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
         <menuitem id="next_id_28" name="Taxes" parent="menu_finance_periodical_processing"/>
 		<menuitem action="action_tax_code_tree" id="menu_action_tax_code_tree" parent="next_id_28" sequence="12"/>
-        
-        
+
+
         <!--
 	Tax
 	-->
@@ -599,7 +599,7 @@
                             <field name="base_sign"/>
                             <field name="tax_code_id"/>
                             <field name="tax_sign"/>
-                            
+
                             <separator colspan="4" string="Refund Invoices"/>
                             <field name="ref_base_code_id"/>
                             <field name="ref_base_sign"/>
@@ -624,7 +624,7 @@
             <field name="view_id" ref="view_tax_tree"/>
         </record>
         <menuitem action="action_tax_tree" id="menu_action_tax_tree" parent="account.next_id_27" sequence="12"/>
-        
+
         <record id="action_tax_form" model="ir.actions.act_window">
             <field name="name">Taxes</field>
             <field name="res_model">account.tax</field>
@@ -632,15 +632,15 @@
             <field name="view_id" ref="view_tax_tree"/>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="menu_action_tax_tree"/>
-        
-        
-        
+
+
+
         <!--
 	Entries Journal lines
 	-->
-        
+
         <wizard id="action_move_journal_line_form_select" menu="False" model="account.move.line" name="account.move.journal.select" string="Standard entry"/>
-        
+
         <record id="ir_open_journal_period" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">account.journal.period</field>
@@ -648,10 +648,10 @@
             <field eval="'ir.actions.wizard,%d'%action_move_journal_line_form_select" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Standard Entry"/>
         <menuitem action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard"/>
-        
+
         <record id="action_move_journal_period_line_form" model="ir.actions.act_window">
             <field name="name">Open Journals</field>
             <field name="res_model">account.journal.period</field>
@@ -659,11 +659,11 @@
             <field name="domain">[('state','&lt;&gt;','done')]</field>
         </record>
         <menuitem action="action_move_journal_period_line_form" id="menu_action_move_journal_period_line_form" parent="account.menu_action_move_journal_line_form"/>
-        
+
         <!--
 	Entries lines
 	-->
-        
+
         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
@@ -689,7 +689,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form</field>
             <field name="model">account.move.line</field>
@@ -706,10 +706,10 @@
                             <field name="invoice" select="2"/>
                             <field name="account_id" select="1"/>
                             <field name="partner_id" select="1"/>
-                            
+
                             <field name="debit" select="2"/>
                             <field name="credit" select="2"/>
-                            
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -723,7 +723,7 @@
                             <newline/>
                             <field name="tax_code_id"/>
                             <field name="tax_amount"/>
-                            
+
                             <separator colspan="4" string="State"/>
                             <field name="journal_id" select="2"/>
                             <field name="period_id"/>
@@ -739,8 +739,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>
@@ -760,7 +760,7 @@
                             <newline/>
                             <field name="debit" select="2"/>
                             <field name="credit" select="2"/>
-                            
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -771,7 +771,7 @@
                             <field name="date_created"/>
                             <field name="date_created"/>
                             <field name="blocked" select="3"/>
-                            
+
                             <separator colspan="4" string="State"/>
                             <newline/>
                             <field name="reconcile_id"/>
@@ -785,7 +785,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_move_line_select" model="ir.actions.act_window">
             <field name="name">account.move.line.select</field>
             <field name="res_model">account.move.line</field>
@@ -793,11 +793,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
         </record>
-        
+
         <!--
 	Account.Entry Edition
 	-->
-        
+
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
@@ -808,13 +808,13 @@
                     <field name="name"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
-                    
+
                     <field name="line_id"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">account.move.form</field>
             <field name="model">account.move</field>
@@ -826,7 +826,7 @@
                     <field name="ref" select="1"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
-                    
+
                     <separator colspan="4" string="Entry Lines"/>
                     <field colspan="4" name="line_id" nolabel="1" readonly="1" widget="one2many_list">
                         <form string="Account Entry Line">
@@ -835,10 +835,10 @@
                             <field name="date"/>
                             <field name="account_id"/>
                             <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit)"/>
-                            
+
                             <field name="debit" select="1"/>
                             <field name="credit" select="1"/>
-                            
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -846,7 +846,7 @@
                             <newline/>
                             <field name="date_maturity"/>
                             <field name="date_created"/>
-                            
+
                             <separator colspan="4" string="State"/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
@@ -865,7 +865,7 @@
                             <field name="state"/>
                         </tree>
                     </field>
-                    
+
                     <field name="state" select="1"/>
                     <group col="2" colspan="2">
                         <button name="button_validate" states="draft" string="Validate" type="object"/>
@@ -874,7 +874,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_move_line_form" model="ir.actions.act_window">
             <field name="name">Entries</field>
             <field name="type">ir.actions.act_window</field>
@@ -883,7 +883,7 @@
             <field name="view_id" ref="view_move_tree"/>
         </record>
         <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries"/><menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
-        
+
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Entry lines</field>
             <field name="type">ir.actions.act_window</field>
@@ -903,16 +903,16 @@
             <field name="view_id" ref="view_move_line_form"/>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        
+
         <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
-        
+
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="7"/>
         <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Accounts Charts"/>
         <menuitem action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
         <menuitem action="action_account_tree2" id="menu_action_account_tree3" parent="account.menu_action_account_tree2"/>
-        
-        
-        
+
+
+
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
@@ -976,20 +976,20 @@
         <menuitem id="next_id_30" name="Bank Reconciliation" parent="account.menu_finance_periodical_processing"/><menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
         <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
         <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
-        
+
         <act_window domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
-        
+
         <act_window domain="[('account_id', '=', active_id),('reconcile_id','=',False)]" id="act_account_acount_move_line_open_unreconciled" name="Unreconciled entries" res_model="account.move.line" src_model="account.account"/>
-        
+
         <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
-        
-        
+
+
         <!--
 	TODO:
 		Print Journal (and change state)
 		Close Journal (and verify that there is no draft move lines)
 -->
-        
+
         <record id="view_journal_period_tree" model="ir.ui.view">
             <field name="name">account.journal.period.tree</field>
             <field name="model">account.journal.period</field>
@@ -1008,14 +1008,14 @@
             <field name="view_type">tree</field>
         </record>
         <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/>
-        
+
         <record id="action_account_budget_post_tree" model="ir.actions.act_window">
             <field name="name">Budgets</field>
             <field name="res_model">account.budget.post</field>
             <field name="view_type">tree</field>
         </record>
         <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/>
-        
+
         <!--
 	Budgets
 	-->
@@ -1074,7 +1074,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="open_budget_post_form" model="ir.actions.act_window">
             <field name="name">Master Budgets</field>
             <field name="res_model">account.budget.post</field>
@@ -1082,12 +1082,12 @@
             <field name="view_id" ref="view_budget_post_tree"/>
         </record>
         <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance_configuration"/><menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
-        
-        
+
+
         <!--
 	# Account Models
 -->
-        
+
         <record id="view_model_line_tree" model="ir.ui.view">
             <field name="name">account.model.line.tree</field>
             <field name="model">account.model.line</field>
@@ -1104,8 +1104,8 @@
                 </tree>
             </field>
         </record>
-        
-        
+
+
         <record id="view_model_line_form" model="ir.ui.view">
             <field name="name">account.model.line.form</field>
             <field name="model">account.model.line</field>
@@ -1126,7 +1126,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_model_form" model="ir.ui.view">
             <field name="name">account.model.form</field>
             <field name="model">account.model</field>
@@ -1161,12 +1161,12 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="next_id_32" name="Models" parent="account.menu_finance_configuration"/><menuitem action="action_model_form" id="menu_action_model_form" parent="next_id_32"/>
-        
-        
+
+
         <!--
 	# Payment Terms
 -->
-        
+
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
@@ -1181,8 +1181,8 @@
                 </tree>
             </field>
         </record>
-        
-        
+
+
         <record id="view_payment_term_line_form" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
@@ -1199,7 +1199,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
@@ -1223,11 +1223,11 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="next_id_33" name="Payment Terms" parent="account.menu_finance_configuration"/><menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="next_id_33"/>
-        
+
         <!--
 	# Account Subscriptions
 -->
-        
+
         <record id="view_subscription_line_form" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
@@ -1239,7 +1239,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_subscription_line_tree" model="ir.ui.view">
             <field name="name">account.subscription.line.tree</field>
             <field name="model">account.subscription.line</field>
@@ -1251,7 +1251,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_subscription_tree" model="ir.ui.view">
             <field name="name">account.subscription.tree</field>
             <field name="model">account.subscription</field>
@@ -1273,11 +1273,11 @@
                 <form string="Entry Subscription">
                     <field name="name" select="1"/>
                     <field name="ref" select="1"/>
-                    
+
                     <separator colspan="4" string="Subscription Periods"/>
                     <field name="date_start" select="1"/>
                     <field name="period_total" select="2"/>
-                    
+
                     <field name="period_nbr"/>
                     <field name="period_type"/>
                     <field name="model_id"/>
@@ -1287,7 +1287,7 @@
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
                     <field colspan="4" name="lines_id" widget="one2many_list"/>
-                    
+
                     <separator colspan="4" string="State"/>
                     <field name="state" select="2"/>
                     <group col="1" colspan="2">
@@ -1303,7 +1303,7 @@
             <field name="view_id" ref="view_subscription_form"/>
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_entries"/>
-        
+
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
             <field name="res_model">account.subscription</field>
@@ -1321,7 +1321,7 @@
             <field name="view_id" ref="view_subscription_form"/>
         </record>
         <menuitem action="action_subscription_form_new" id="menu_action_subscription_form_new" parent="menu_action_subscription_form"/>
-          
+
         <record id="view_subscription_line_form_complete" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
@@ -1351,8 +1351,8 @@
             <field eval="'ir.actions.wizard,%d'%wizard_move_line_select" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
-        
+
+
         <record id="view_move_line_tax_tree" model="ir.ui.view">
             <field name="name">account.move.line.tax.tree</field>
             <field name="model">account.move.line</field>
@@ -1374,7 +1374,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_tax_code_line_open" model="ir.actions.act_window">
             <field name="name">account.move.line</field>
             <field name="res_model">account.move.line</field>
@@ -1390,24 +1390,24 @@
             <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
-        
+
+
         <!--
 	# Admin config
 	-->
-        
+
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
-        
+
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
-        
+
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
-        
+
         <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/>
-        
-        
-        
+
+
+
         <!-- configuration wizard view -->
-        
+
         <record id="view_config_fiscalyear_form" model="ir.ui.view">
             <field name="name">Configure Fiscal Year</field>
             <field name="model">account.config.fiscalyear</field>
@@ -1427,7 +1427,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_config_fiscalyear_form" model="ir.actions.act_window">
             <field name="name">Configure Fiscal Year</field>
             <field name="type">ir.actions.act_window</field>
@@ -1436,9 +1436,9 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-        
-        
+
+
+
         <record id="view_config_journal_bank_account" model="ir.ui.view">
             <field name="name">Configure Journal of Bank account</field>
             <field name="model">account.config.journal.bank.account</field>
@@ -1452,13 +1452,11 @@
                             <field name="name"/>
                             <field name="bank_account_id"/>
                             <field name="view_id"/>
-                            <field name="sequence_id"/>
                         </form>
                         <tree editable="bottom" string="Account Journals">
                             <field name="name"/>
                             <field name="bank_account_id"/>
                             <field name="view_id"/>
-                            <field name="sequence_id"/>
                         </tree>
                     </field>
                     <group col="4" colspan="4">
@@ -1468,7 +1466,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_config_journal_bank_account" model="ir.actions.act_window">
             <field name="name">Configure Journal of Bank account</field>
             <field name="type">ir.actions.act_window</field>
@@ -1477,22 +1475,22 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <!-- register configuration wizard -->
-        
+
         <record id="config_fiscalyear" model="ir.module.module.configuration.step">
             <field name="name">Define fiscal years</field>
             <field name="note">Define fiscal years</field>
             <field name="action_id" ref="action_config_fiscalyear_form"/>
             <field name="state">open</field>
         </record>
-        
+
         <record id="config_journal_bank_account" model="ir.module.module.configuration.step">
             <field name="name">Define journal for bank accounts</field>
             <field name="note">Define journal for bank accounts</field>
             <field name="action_id" ref="action_config_journal_bank_account"/>
             <field name="state">open</field>
         </record>
-        
+
     </data>
 </terp>
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 2f78c583355..4bdb1692350 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -98,12 +98,12 @@ class config_install_extra_modules(osv.osv_memory):
             ids = mod_obj.search(cr, uid, [('name', '=', 'hr_timesheet')])
             mod_obj.download(cr, uid, ids, context=context)
             cr.commit()
-            db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+            #db, pool = pooler.restart_pool(cr.dbname, update_module=True)
         if  'hr_holidays_module' in res and res['hr_holidays_module']:
             ids = mod_obj.search(cr, uid, [('name', '=', 'hr_holidays')])
             mod_obj.download(cr, uid, ids, context=context)
             cr.commit()
-            db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+            #db, pool = pooler.restart_pool(cr.dbname, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index eefac225e1f..4c8b5a3da44 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -22,13 +22,13 @@
             	</tree>
             </field>-->
                     <group col="4" colspan="4">
-                        <button special="cancel" string="Cancel"/>
-                        <button name="action_install" string="Install" type="object"/>
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        
+
         <record id="action_config_install_module" model="ir.actions.act_window">
             <field name="name">Install extra modules</field>
             <field name="type">ir.actions.act_window</field>
@@ -37,14 +37,15 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-        <!--<record model="ir.module.module.configuration.step"
+
+      <record model="ir.module.module.configuration.step"
             id="config_install_module">
             <field name="name">Install Extra modules</field>
+            <field name="note">Install Extra modules</field>
             <field name="action_id" ref="action_config_install_module"/>
             <field name="state">open</field>
-        </record>-->
-        
-        
+        </record>
+
+
     </data>
 </terp>
\ No newline at end of file