X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Faccount%2Fres_config_view.xml;h=7977c0fc505fd270fa50821f9e65de3a0f2562ac;hb=e231045095bd5bbe62f225dc6f72d1217e3e6692;hp=4dfa1d83c02875535a39b0ddc14313aeee82f75e;hpb=b1750a6820979c9b132a66bc59b1097c0cff23ae;p=odoo%2Fodoo.git

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 4dfa1d8..7977c0f 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -13,7 +13,6 @@
         <record id="view_account_config_settings" model="ir.ui.view">
             <field name="name">account settings</field>
             <field name="model">account.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0" class="oe_form_configuration">
                     <header>
@@ -34,7 +33,7 @@
                                 <label for="company_id" string="Select Company"/>
                                 <field name="company_id"
                                     widget="selection"
-                                    on_change="onchange_company_id(company_id)"
+                                    on_change="onchange_company_id(company_id, context)"
                                     class="oe_inline"/>
                             </div>
                             <div>
@@ -43,16 +42,18 @@
                             </div>
                         </div>
                     </group>
+                    <separator string="Chart of Accounts" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
                     <group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label for="id" string="Select Chart"/>
+                        <label for="id" string="Chart of Account"/>
                         <div>
                             <div>
+                                <label for="chart_template_id"/>
                                 <field name="chart_template_id"
                                     widget="selection"
                                     domain="[('visible','=', True)]"
                                     on_change="onchange_chart_template_id(chart_template_id)"
                                     class="oe_inline"/>
-                                <button string="Install More Chart Templates"
+                                <button string="Install more chart templates"
                                     icon="gtk-go-forward"
                                     name="%(open_account_charts_modules)d"
                                     type="action"
@@ -101,15 +102,11 @@
                             </div>
                         </div>
                     </group>
-                    <separator string="Accounting Configuration"/>
+                    <separator string="Accounting &amp; Finance"/>
                     <group>
-                        <label for="id" string="Configuration"/>
+                        <label for="id" string="Options"/>
                         <div name="account_config">
                             <div>
-                                <field name="module_account_accountant" class="oe_inline"/>
-                                <label for="module_account_accountant"/>
-                            </div>
-                            <div>
                                 <label for="currency_id"/>
                                 <field name="currency_id" class="oe_inline"/>
                             </div>
@@ -121,6 +118,21 @@
                                 <label for="tax_calculation_rounding_method"/>
                                 <field name="tax_calculation_rounding_method" class="oe_inline"/>
                             </div>
+                        </div>
+                        <label for="id" string="Features"/>
+                        <div>
+                            <div name="group_multi_currency">
+                                <field name="group_multi_currency" class="oe_inline"/>
+                                <label for="group_multi_currency"/>
+                            </div>
+                            <div>
+                                <field name="module_account_accountant" class="oe_inline"/>
+                                <label for="module_account_accountant"/>
+                            </div>
+                            <div>
+                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
                             <div>
                                 <field name="module_account_asset" class="oe_inline"/>
                                 <label for="module_account_asset"/>
@@ -160,6 +172,10 @@
                                     attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                             </div>
                             <div>
+                                <field name="group_proforma_invoices" class="oe_inline"/>
+                                <label for="group_proforma_invoices"/>
+                            </div>
+                            <div>
                                 <field name="module_account_voucher" class="oe_inline"/>
                                 <label for="module_account_voucher"/>
                             </div>
@@ -167,11 +183,9 @@
                                 <field name="module_account_followup" class="oe_inline"/>
                                 <label for="module_account_followup"/>
                             </div>
-                            <div>
-                                <field name="group_proforma_invoices" class="oe_inline"/>
-                                <label for="group_proforma_invoices"/>
-                            </div>
                         </div>
+                    </group>
+                    <group>
                         <label for="id" string="Supplier"/>
                         <div name="other_cofing">
                             <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
@@ -202,44 +216,41 @@
                                 <field name="module_account_payment" class="oe_inline"/>
                                 <label for="module_account_payment"/>
                             </div>
-                        </div>
-                    </group>
-                    <separator string="Electronic Payments"/>
-                    <group>
-                        <label for="id" string="Payment Settings"/>
-                        <div>
                             <div>
-                                <label for="paypal_account"/>
-                                <field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
+                                <field name="module_account_check_writing" class="oe_inline"/>
+                                <label for="module_account_check_writing"/>
+                            </div>
+                            <div>
+                                <field name="group_check_supplier_invoice_total" class="oe_inline"/>
+                                <label for="group_check_supplier_invoice_total"/>
                             </div>
                         </div>
                     </group>
                     <separator string="Bank &amp; Cash"/>
-                    <group>
+                    <group name="bank_cash">
                         <label for="id" string="Configuration"/>
                         <div>
                             <div>
-                                <label string="Configure Bank Accounts"/>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure"
-                                    icon="gtk-go-forward"
-                                    type="action"
-                                    class="oe_inline oe_link"/>
-                            </div>
-                            <div>
                                 <label for="company_footer"/>
-                                <field name="company_footer" class="oe_inline"/>
+                                <button name="open_company_form" type="object"
+                                    string="Configure your company bank accounts" icon="gtk-go-forward"
+                                    class="oe_inline oe_link"/>
+                                <field name="company_footer"/>
                             </div>
                             <div>
-                                <field name="module_account_check_writing" class="oe_inline"/>
-                                <label for="module_account_check_writing"/>
+                                <label for="paypal_account"/>
+                                <field name="paypal_account" placeholder="e.g. sales@openerp.com" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
-                    <group name="analytic_account" invisible="1">
-                        <label for="id" string="Settings"/>
-                        <div name="analytic_account"/>
+                    <group name="analytic_account_sale" invisible="1">
+                        <label for="id" string="Sale"/>
+                        <div/>
+                    </group>
+                    <group name="analytic_account_purchase" invisible="1">
+                        <label for="id" string="Purchase"/>
+                        <div/>
                     </group>
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
@@ -257,7 +268,7 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
+        <menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
             sequence="14" action="action_account_config"/>
 
     </data>