[FIX] account: several fixes on the new bank statement reconciliation widget
[odoo/odoo.git] / addons / account / res_config_view.xml
index 88c304a..9803183 100644 (file)
@@ -13,9 +13,8 @@
         <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">
+                <form string="Configure Accounting" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
@@ -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,7 +42,7 @@
                             </div>
                         </div>
                     </group>
-                    <separator string="Chart of Account and Fiscal Year" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
+                    <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="Chart of Account"/>
                         <div>
                             </div>
                         </div>
                     </group>
+                    <separator string="Accounting &amp; Finance"/>
+                    <group>
+                        <label for="id" string="Options"/>
+                        <div name="account_config">
+                            <div>
+                                <label for="currency_id"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <label for="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <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" on_change="onchange_multi_currency(group_multi_currency)"/>
+                                <label for="group_multi_currency"/>
+                                <group attrs="{'invisible': [('group_multi_currency', '&lt;&gt;', True)]}" col="2">
+                                    <group>
+                                        <field name="income_currency_exchange_account_id"/>
+                                        <field name="expense_currency_exchange_account_id"/>
+                                    </group>
+                                    <group>
+                                    </group>
+                                </group>
+                            </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" on_change="onchange_analytic_accounting(group_analytic_accounting, context)"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
+                            <div>
+                                <field name="module_account_asset" class="oe_inline"/>
+                                <label for="module_account_asset"/>
+                            </div>
+                            <div>
+                                <field name="module_account_budget" class="oe_inline"/>
+                                <label for="module_account_budget"/>
+                            </div>
+                        </div>
+                    </group>
                     <separator string="eInvoicing &amp; Payments"/>
                     <group>
                         <label for="id" string="Customer"/>
                                 <field name="module_account_followup" class="oe_inline"/>
                                 <label for="module_account_followup"/>
                             </div>
+                            <div>
+                                <field name="module_product_email_template" class="oe_inline"/>
+                                <label for="module_product_email_template"/>
+                            </div>
                         </div>
                     </group>
                     <group>
                                 <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 your bank accounts"/>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure"
-                                    icon="gtk-go-forward"
-                                    type="action"
+                            <div name='company_footer'>
+                                <label for="company_footer"/>
+                                <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 style="color:grey">
-                                <label for="company_footer"/>:
-                                <field name="company_footer" class="oe_inline"/>
-                            </div>
-                            <div>
+                            <div name='payment_acquirer'>
                                 <label for="paypal_account"/>
-                                <field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
-                    <separator string="Accounting &amp; Finance"/>
-                    <group>
-                        <label for="id" string="Options"/>
-                        <div name="account_config">
-                            <div>
-                                <label for="currency_id"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="decimal_precision"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="tax_calculation_rounding_method"/>
-                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
-                            </div>
-                        </div>
-                        <label for="id" string="Features"/>
-                        <div>
-                            <div>
-                                <field name="module_account_accountant" class="oe_inline"/>
-                                <label for="module_account_accountant"/>
-                            </div>
-                            <div>
-                                <field name="module_account_asset" class="oe_inline"/>
-                                <label for="module_account_asset"/>
-                            </div>
-                            <div>
-                                <field name="module_account_budget" class="oe_inline"/>
-                                <label for="module_account_budget"/>
+                                <field name="paypal_account" placeholder="e.g. sales@odoo.com" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
-                    <group name="analytic_account" invisible="1">
+                    <group name="analytic_account_sale" invisible="1">
                         <label for="id" string="Sale"/>
-                        <div name="analytic_account_sale"></div>
+                        <div/>
+                    </group>
+                    <group name="analytic_account_purchase" invisible="1">
                         <label for="id" string="Purchase"/>
-                        <div name="analytic_account_purchase"></div>
+                        <div/>
                     </group>
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
             <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>