From abced46e7cb2ee9cc1fc3c4c578a9bcf2c901cd2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Jun 2012 10:07:37 +0200
Subject: [PATCH] [IMP] account: clean up wizard forms

bzr revid: rco@openerp.com-20120620080737-vtl4mso2o32pm8ze
---
 addons/account/account_installer.xml | 33 +++++++++++++---------------
 addons/account/account_view.xml      | 24 +++++++++-----------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 060abb675a6..e2d67e7fb55 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -6,31 +6,28 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
-                <form position="attributes">
+                <form position="attributes" version="7.0">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <button name="action_skip" position="replace"/>
                 <button name="action_next" position="attributes">
                     <attribute name="string">Continue</attribute>
-                    <attribute name="class">oe_form_button_save_dirty</attribute>
                 </button>
                 <separator string="title" position="replace">
-                    <group>
-                        <group string="Select an Accounting Setup">
-                            <label colspan="2" string="This will automatically configure your taxes and accounts."/>
-                            <field name="charts"/>
-                        </group>
-                        <group string="Configure your Fiscal Year" groups="account.group_account_user">
-                            <field name="has_default_company" invisible="1" />
-                            <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                            <label for="date_start" string="Date Range"/>
-                            <div>
-                                <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
-                                <field name="date_stop" class="oe_inline"/>
-                            </div>
-                            <field name="period"/>
-                        </group>
-                    </group>                                
+                    <group string="Select an Accounting Setup">
+                        <label colspan="2" string="This will automatically configure your taxes and accounts."/>
+                        <field name="charts"/>
+                    </group>
+                    <group string="Configure your Fiscal Year" groups="account.group_account_user">
+                        <field name="has_default_company" invisible="1" />
+                        <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <label for="date_start" string="Date Range"/>
+                        <div>
+                            <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
+                            <field name="date_stop" class="oe_inline"/>
+                        </div>
+                        <field name="period"/>
+                    </group>
                 </separator>
             </field>
         </record>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7bcb6864d41..882dbb831fa 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2357,9 +2357,6 @@
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <button name="action_skip" position="replace"/>
-                <button name="action_next" position="attributes">
-                    <attribute name="class">oe_form_button_save_dirty</attribute>
-                </button>
                 <group string="res_config_contents" position="replace">
                     <field name="only_one_chart_template" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
@@ -2390,17 +2387,16 @@
                             </div>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="Bank Accounts">
-                            <field name="bank_accounts_id" groups="account.group_account_user">
-                                <tree string="Bank Information" editable="bottom">
-                                    <field name="acc_name"/>
-                                    <field name="account_type"/>
-                                    <field name="currency_id" widget="selection"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
+                    <div groups="account.group_account_user">
+                        <label for="bank_accounts_id" string="Bank Information"/>
+                        <field name="bank_accounts_id">
+                            <tree editable="bottom">
+                                <field name="acc_name"/>
+                                <field name="account_type"/>
+                                <field name="currency_id" widget="selection"/>
+                            </tree>
+                        </field>
+                    </div>
                 </group>
             </field>
         </record>