From bc862394572977cbd9b8e8f31d2d910bfba99c43 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 16:43:51 +0530
Subject: [PATCH] [IMP]improve configuaration view for account

bzr revid: sgo@tinyerp.com-20120705111351-ohdoe9o26zbi9p4d
---
 addons/account/res_config_view.xml  | 54 +++++++++++------------------
 addons/purchase/res_config_view.xml |  9 ++---
 addons/sale/res_config_view.xml     |  9 ++---
 3 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index c6bd026882a..ffb785380aa 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -34,7 +34,6 @@
                         <field name="expects_chart_of_accounts"/>
                     </group>
 
-                    <div class="oe_form_button_save_dirty">
                     <group string="Select a Chart of Accounts to Install"
                         attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
                         <group>
@@ -51,9 +50,7 @@
                         <button string="Install More Chart Templates" icon="gtk-go-forward"
                             name="%(open_account_charts_modules)d" type="action"/>
                     </group>
-                    </div>
 
-                    <div class="oe_form_button_save_dirty">
                     <group string="No Fiscal Year Defined for This Company"
                         attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
                         <label for="date_start" string="Date Range"/>
@@ -63,77 +60,66 @@
                         </div>
                         <field name="period"/>
                     </group>
-                    </div>
 
-                    <group string="Accounting Configuration">
-                        <group>
+                    <group>
+                        <group name="account_config">
+                            <separator string="Accounting Configuration" colspan="2"/>
                             <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
                             <field name="currency_id"/>
                             <field name="decimal_precision"/>
-                        </group>
-                        <group>
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                        </group>
-                    </group>
-
-                    <field name="sale_journal_id" invisible="1"/>
-                    <field name="sale_refund_journal_id" invisible="1"/>
-                    <field name="purchase_journal_id" invisible="1"/>
-                    <field name="purchase_refund_journal_id" invisible="1"/>
-                    <group>
-                        <group string="Customer Invoices">
+                            <separator string="Customer Invoices" colspan="2"/>
                             <label for="sale_sequence_next"/>
                             <group>
                                 <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                                <field name="sale_sequence_next" class="oe_inline" nolabel="1"  attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
                             </group>
                             <label for="sale_refund_sequence_next"/>
                             <group>
-                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1" 
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                                <field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                             </group>
                             <field name="module_account_voucher"/>
                             <field name="module_account_followup"/>
                             <field name="group_proforma_invoices"/>
+                            <separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                         </group>
-
-                        <group string="Supplier Invoices">
+                        <group name="other_cofing">
+                            <separator string="Supplier Invoices" colspan="2"/>
                              <label for="purchase_sequence_next"/>
                             <group>
                                 <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                                <field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
                             </group>
                             <label for="purchase_refund_sequence_next"/>
                             <group>
-                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1" 
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
-                                  attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
+                                <field name="purchase_refund_sequence_next" class="oe_inline"
+                                  attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
                             </group>
                             <field name="module_account_payment"/>
-                        </group>
-
-                        <group string="Electronic Payments">
+                            <separator string="Electronic Payments" colspan="2"/>
                             <field name="paypal_account" placeholder="sales@openerp.com"/>
-                        </group>
-
-                        <group string="Bank &amp; Cash">
+                            <separator string="Bank &amp; Cash" colspan="2"/>
                             <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>
                             <field name="module_account_check_writing"/>
                         </group>
-
-                        <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
+                    <field name="sale_journal_id" invisible="1"/>
+                    <field name="sale_refund_journal_id" invisible="1"/>
+                    <field name="purchase_journal_id" invisible="1"/>
+                    <field name="purchase_refund_journal_id" invisible="1"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index b98eea42ade..301e69e7b75 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -53,13 +53,14 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
-                <group name="analytic_accounting" position="attributes">
+                <separator name="analytic_accounting" position="attributes">
                     <attribute name="invisible">0</attribute>
-                </group>
-                <group name="analytic_accounting" position="inside">
+                    <attribute name="colspan">2</attribute>
+                </separator>
+                <separator name="analytic_accounting" position="after">
                     <field name="group_analytic_account_for_purchases"/>
                     <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
-                </group>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index f81a2818c38..74796bac6fc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -50,13 +50,14 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="16"/>
             <field name="arch" type="xml">
-                <group name="analytic_accounting" position="attributes">
+                <separator name="analytic_accounting" position="attributes">
                     <attribute name="invisible">0</attribute>
-                </group>
-                <group name="analytic_accounting" position="inside">
+                    <attribute name="colspan">2</attribute>
+                </separator>
+                <separator name="analytic_accounting" position="after">
                     <field name="group_analytic_account_for_sales"/>
                     <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
-                </group>
+                </separator>
             </field>
         </record>