[MERGE] from master
[odoo/odoo.git] / addons / account / account_view.xml
index f904c96..e4d0e9c 100644 (file)
@@ -7,7 +7,7 @@
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
             <field name="arch" type="xml">
-                <form string="Fiscal year" version="7.0">
+                <form string="Fiscal year">
                 <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
@@ -26,7 +26,7 @@
                         </group>
                     </group>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period" version="7.0">
+                        <form string="Period">
                             <group col="4">
                                 <field name="name"/>
                                 <field name="code"/>
@@ -86,7 +86,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="1" />
         <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
 
         <!-- Period -->
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
             <field name="arch" type="xml">
-                <form string="Account Period" version="7.0">
+                <form string="Account Period">
                     <header>
                         <button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
                         <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="fiscalyear_id" widget="selection"/>
-                                <label for="date_start" string="Duration"/>
-                                <div>
-                                    <field name="date_start" class="oe_inline" nolabel="1"/> -
-                                    <field name="date_stop" nolabel="1" class="oe_inline"/>
-                                </div>
-                            </group>
-                            <group>
-                                <field name="code"/>
-                                <field name="special"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                            <field name="name"/>
+                            <field name="fiscalyear_id" widget="selection"/>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <field name="date_start" class="oe_inline" nolabel="1"/> -
+                                <field name="date_stop" nolabel="1" class="oe_inline"/>
+                            </div>
                         </group>
-                    </sheet>
+                        <group>
+                            <field name="code"/>
+                            <field name="special"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
             <field name="arch" type="xml">
-                <form string="Account" version="7.0">
+                <form string="Account">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
                         <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
               </p>
             </field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
-        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" sequence="1"/>
 
         <act_window
             id="act_account_acount_move_line_open_unreconciled"
         <act_window
             id="action_account_items"
             name="Journal Items"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'fiscalyear': context.get('fiscalyear')}"
             res_model="account.move.line"
             src_model="account.account"
             key2="tree_but_open"/>
             <field name="model">account.journal</field>
             <field name="arch" type="xml">
                 <tree string="Account Journal">
+                    <field name='sequence' widget='handle'/>
                     <field name="code"/>
                     <field name="name"/>
                     <field name="type"/>
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
             <field name="arch" type="xml">
-                <form string="Account Journal" version="7.0">
+                <form string="Account Journal">
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
                                     <field name="internal_account_id" domain="[('type','!=','view')]"/>
                                 </group>
                                 <group string="Miscellaneous">
-                                    <field name="with_last_closing_balance"/>
+                                    <field name="with_last_closing_balance" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
                                     <field name="cash_control" attrs="{'invisible':[('type','not in', ('cash',))]}"/>
                                 </group>
                             </group>
         <record id="action_bank_reconcile_bank_statements" model="ir.actions.client">
             <field name="name">Reconciliation on Bank Statements</field>
             <field name="tag">bank_statement_reconciliation_view</field>
-            <field name="context">{'statement_id': active_id}</field>
+            <field name="context">{'statement_ids': [active_id]}</field>
         </record>
         
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="model">account.bank.statement</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement" version="7.0">
+                <form string="Bank Statement">
                 <header>
                     <field name="all_lines_reconciled" invisible="1" />
                     <span attrs="{'invisible':['|',('all_lines_reconciled','=',True),('line_ids','=',[])]}">
                         <button class="oe_inline oe_stat_button" name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoice" type="action"
                             attrs="{'invisible':[('state','=','confirm')]}" widget="statinfo" icon="fa-pencil-square-o"/>
+                        <button class="oe_inline oe_stat_button" name="button_journal_entries"
+                                string="Journal Items" type="object"
+                                attrs="{'invisible':[('move_line_ids','=',[])]}" icon="fa-bars"/>
+                        <field name="move_line_ids" invisible="1"/>
                     </div>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': [('move_line_ids', '!=', [])]}" widget="selection"/>
                             <label for="date" string="Date / Period"/>
                             <div>
                                 <field name="date" on_change="onchange_date(date, company_id)" class="oe_inline"/>
             </field>
         </record>
 
-        <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
-            <field name="name">account.bank.statement.journal.items.form.inherit</field>
-            <field name="model">account.bank.statement</field>
-            <field name="inherit_id" ref="view_bank_statement_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
-                    <button name="button_journal_entries"
-                            string="Journal Items" type="object"
-                            attrs="{'invisible':[('state','!=','confirm')]}"/>
-                </xpath>
-            </field>
-        </record>
-
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
                 occurring over a given period of time on a bank account. You
                 should receive this periodicaly from your bank.
               </p><p>
-                OpenERP allows you to reconcile a statement line directly with
+                Odoo allows you to reconcile a statement line directly with
                 the related sale or puchase invoices.
               </p>
             </field>
         </record>
         
         <!-- because of the needaction badge, groups needs to be specified -->
-        <menuitem id="menu_bank_reconcile_bank_statements" name="Reconciliation on Bank Statements" parent="account.periodical_processing_reconciliation" groups="group_account_user" action="action_bank_reconcile" sequence="20"/>
+        <menuitem id="menu_bank_reconcile_bank_statements" name="Reconcile" parent="account.periodical_processing_bank_statements" groups="group_account_user" action="action_bank_reconcile" sequence="20"/>
 
         <record id="view_account_statement_operation_template_form" model="ir.ui.view">
             <field name="name">account.statement.operation.template.form</field>
             <field name="model">account.statement.operation.template</field>
             <field name="arch" type="xml">
-                <form string="Statement Operation Templates" version="7.0">
+                <form string="Statement Operation Templates">
                     <sheet>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                         </div>
                         <group>
                             <group>
-                                <field name="account_id"/>
+                                <field name="account_id" domain="[('company_id', '=', company_id)]"/>
                                 <field name="amount_type"/>
-                                <field name="tax_id"/>
+                                <field name="tax_id" domain="[('company_id', '=', company_id)]"/>
                             </group>
                             <group>
                                 <field name="label"/>
                                     <field name="amount" class="oe_inline" />
                                     <label string="%" class="oe_inline" attrs="{'invisible':[('amount_type','not in',('percentage_of_total', 'percentage_of_balance'))]}" />
                                 </div>
-                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', company_id)]"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                         </group>
                     </sheet>
             </field>
         </record>
         <record id="action_account_statement_operation_template" model="ir.actions.act_window">
-            <field name="name">Statement Operation Templates</field>
+            <field name="name">Statement Operations</field>
             <field name="res_model">account.statement.operation.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
               </p>
             </field>
         </record>
-        <menuitem action="action_account_statement_operation_template" id="menu_action_account_statement_operation_template" parent="menu_configuration_misc" name="Statement Operation Templates" sequence="22"/>
+
+        <menuitem
+            id="account_template_folder"
+            name="Templates"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="3"/>
+        <menuitem
+            id="account_report_folder"
+            name="Reports"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="4"/>
+        <menuitem action="action_account_statement_operation_template" id="menu_action_account_statement_operation_template" parent="account_template_folder" name="Statement Operation Templates" sequence="22"/>
 
         <!-- Account Types -->
         <record id="view_account_type_search" model="ir.ui.view">
             <field name="name">account.account.type.form</field>
             <field name="model">account.account.type</field>
             <field name="arch" type="xml">
-                <form string="Account Type" version="7.0">
+                <form string="Account Type">
                     <group>
                         <group>
                             <field name="name"/>
               </p>
             </field>
         </record>
-        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
+        <menuitem action="action_account_type_form" sequence="2" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
 
         <!-- Entries -->
         <record id="view_account_move_tree" model="ir.ui.view">
             <field name="name">account.move.reconcile.form</field>
             <field name="model">account.move.reconcile</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Reconcile" version="7.0">
+                <form string="Journal Entry Reconcile">
                     <group col="4">
                         <field name="name"/>
                         <field name="create_date"/>
             <field name="name">account.tax.code.form</field>
             <field name="model">account.tax.code</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code" version="7.0">
+                <form string="Account Tax Code">
                     <group>
                         <group col="4" colspan="2">
                             <field name="name"/>
                 Click to define a new tax code.
               </p><p>
                 Depending on the country, a tax code is usually a cell to fill
-                in your legal tax statement. OpenERP allows you to define the
+                in your legal tax statement. Odoo allows you to define the
                 tax structure and each tax computation will be registered in
                 one or several tax code.
               </p>
             </field>
         </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="4"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="2" groups="base.group_no_one"/>
 
         <act_window
             id="action_tax_code_line_open"
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
             <field name="arch" type="xml">
-                <form string="Account Tax" version="7.0">
+                <form string="Account Tax">
                     <group>
                         <group>
                             <field name="name"/>
             <field name="view_id" ref="view_tax_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27" sequence="1"/>
 
         <record id="action_tax_code_tree" model="ir.actions.act_window">
             <field name="name">Chart of Taxes</field>
             <field name="model">account.move.line</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item" version="7.0">
+                <form string="Journal Item">
                     <sheet>
                         <group>
                             <group>
             <field name="model">account.move.line</field>
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item" version="7.0">
+                <form string="Journal Item">
                     <notebook colspan="4">
                         <page string="Information">
                             <group col="4">
             <field name="model">account.move.line</field>
             <field eval="1" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" editable="top">
                     <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
                     <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
                     <field name="date"/>
                     <field name="debit" sum="Total Debit"/>
                     <field name="credit" sum="Total Credit"/>
                     <field name="date_maturity" invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund']"/>
-                    <field name="reconcile"/>
+                    <field name="reconcile_ref"/>
                     <field name="invoice" invisible="1"/>
                     <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
                     <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
                 Select the period and the journal you want to fill.
               </p><p>
                 This view can be used by accountants in order to quickly record
-                entries in OpenERP. If you want to record a supplier invoice,
-                start by recording the line of the expense account. OpenERP
+                entries in Odoo. If you want to record a supplier invoice,
+                start by recording the line of the expense account. Odoo
                 will propose to you automatically the Tax related to this
                 account and the counterpart "Account Payable".
               </p>
             <field eval="24" name="priority"/>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
             <field name="name">account.move.form</field>
             <field name="model">account.move</field>
             <field name="arch" type="xml">
-                <form string="Account Entry" version="7.0">
+                <form string="Account Entry">
                     <header>
                         <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
                         <button name="button_cancel" states="posted" string="Cancel Entry" type="object" groups="account.group_account_invoice"/>
                         <page string="Journal Items">
                             <field name="line_id" widget="one2many_list"
                               context="{'line_id': line_id , 'journal_id': journal_id }">
-                                <form string="Journal Item" version="7.0">
+                                <form string="Journal Item">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
                 A journal entry consists of several journal items, each of
                 which is either a debit or a credit transaction.
               </p><p>
-                OpenERP automatically creates one journal entry per accounting
+                Odoo automatically creates one journal entry per accounting
                 document: invoice, refund, supplier payment, bank statements,
                 etc. So, you should record journal entries manually only/mainly
                 for miscellaneous operations.
             <field name="name">account.model.line.form</field>
             <field name="model">account.model.line</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model Line" version="7.0">
+                <form string="Journal Entry Model Line">
                     <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
             <field name="name">account.model.form</field>
             <field name="model">account.model</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model" version="7.0">
+                <form string="Journal Entry Model">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
         </record>
         <menuitem
             action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <!-- Payment Terms -->
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Term">
                     <group>
                         <group string="Amount Computation">
-                            <field name="value"/>
+                            <field name="value" widget="radio" nolabel="1" colspan="4"/>
                             <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
                             <div attrs="{'invisible':[('value','=','balance')]}">
                                 <field name="value_amount" class="oe_inline"/>
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Term">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
+        <menuitem id="account_followup_main_menu" parent="menu_finance_configuration" name="Follow-ups" sequence="6"/>
+
         <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
+            id="menu_action_payment_term_form" parent="account_followup_main_menu" sequence="0"/>
 
         <!-- 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>
             <field name="arch" type="xml">
-                <form string="Subscription lines" version="7.0">
+                <form string="Subscription lines">
                     <group>
                         <field name="date"/>
                         <field name="move_id"/>
             <field name="name">account.subscription.form</field>
             <field name="model">account.subscription</field>
             <field name="arch" type="xml">
-                <form string="Recurring" version="7.0">
+                <form string="Recurring">
                     <header>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                         <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_highlight"/>
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
             id="menu_action_subscription_form" sequence="1"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
             <field name="model">account.subscription.line</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Subscription lines" version="7.0">
+                <form string="Subscription lines">
                     <group col="4">
                         <field name="subscription_id"/>
                         <field name="date"/>
         </record>
 
         <!-- Account Templates -->
-        <menuitem
-            id="account_template_folder"
-            name="Templates"
-            parent="account_account_menu"
-            groups="account.group_account_manager"/>
+
         <menuitem
             id="account_template_taxes"
-            name="Taxes"
-            parent="account_template_folder"
-            sequence="2"/>
-        <menuitem
-            id="account_template_accounts"
-            name="Accounts"
-            parent="account_template_folder"
-            sequence="1"/>
+            name="Templates"
+            parent="next_id_27"
+            sequence="4"/>
 
         <record id="view_account_template_form" model="ir.ui.view">
             <field name="name">account.account.template.form</field>
             <field name="model">account.account.template</field>
             <field name="arch" type="xml">
-                <form string="Account Template" version="7.0">
+                <form string="Account Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                    <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <field name="parent_id"/>
                     <field name="user_type"/>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_template_search"/>
         </record>
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder" 
+        sequence="2"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
             <field name="arch" type="xml">
-                <form string="Create Account" version="7.0">
+                <form string="Create Account">
                     <header>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"  />
                     </header>
             <field name="name">account.chart.template.form</field>
             <field name="model">account.chart.template</field>
             <field name="arch" type="xml">
-                <form string="Chart of Accounts Template" version="7.0">
+                <form string="Chart of Accounts Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_folder" sequence="1"/>
 
         <!-- Account Tax Templates -->
         <record id="view_account_tax_template_form" model="ir.ui.view">
             <field name="name">account.tax.template.form</field>
             <field name="model">account.tax.template</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Template" version="7.0">
+                <form string="Account Tax Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code Template" version="7.0">
+                <form string="Account Tax Code Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
             </field>
         </record>
         <record id="action_account_tax_code_template_form" model="ir.actions.act_window">
-            <field name="name">Tax Code Templates</field>
+            <field name="name">Tax Code</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="model">wizard.multi.charts.accounts</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form position="attributes" version="7.0">
+                <form position="attributes">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position Template" version="7.0">
+                <form string="Fiscal Position Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="chart_template_id"/>
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Taxes Mapping" version="7.0">
+                        <form string="Taxes Mapping">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Accounts Mapping" version="7.0">
+                        <form string="Accounts Mapping">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Position Templates</field>
+            <field name="name">Fiscal Position</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="model">account.bank.statement</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Statement" version="7.0">
+                <form string="Statement">
                 <header>
                     <field name="all_lines_reconciled" invisible="1" />
                     <span attrs="{'invisible':['|',('all_lines_reconciled','=',True),('line_ids','=',[])]}">
                                     <field name="partner_id"/>
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines" version="7.0">
+                                <form string="Statement lines">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
 
         <menuitem id="menu_account_supplier" name="Suppliers"
             parent="menu_finance_payables"
-            action="base.action_partner_supplier_form" sequence="100"/>
+            action="base.action_partner_supplier_form" sequence="7"/>
 
         <!-- Account Reports -->
         <record id="view_account_financial_report_form" model="ir.ui.view">
             <field name="name">account.financial.report.form</field>
             <field name="model">account.financial.report</field>
             <field name="arch" type="xml">
-                <form string="Account Report" version="7.0">
+                <form string="Account Report">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
             <field name="search_view_id" ref="view_account_financial_report_search"/>
             <field name="view_id" ref="view_account_financial_report_tree"/>
         </record>
-        <menuitem id="menu_account_financial_reports_tree" name="Account Reports" parent="menu_account_reports" action="action_account_financial_report_tree"/>
+        <menuitem id="menu_account_financial_reports_tree" name="Account Reports Types" parent="menu_account_reports" action="action_account_financial_report_tree"/>
 
         <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
             <field name="name">account.report.hierarchy</field>