[IMP] Generic: configuration menus reorganization

10 files changed, 67 insertions, 53 deletions

diff --git a/addons/account/account_analytic_view.xml b/addons/account/account_analytic_view.xml
index c73e0cbfd73..7077b73d66f 100644
--- a/addons/account/account_analytic_view.xml
+++ b/addons/account/account_analytic_view.xml
@@ -120,7 +120,7 @@
             groups="analytic.group_analytic_accounting"/>
         <menuitem action="analytic.action_account_analytic_account_form" id="account_analytic_def_account"
             parent="menu_analytic_accounting"
-            groups="analytic.group_analytic_accounting"/>
+            groups="analytic.group_analytic_accounting" sequence="0"/>
             
         <menuitem groups="analytic.group_analytic_accounting" action="analytic.action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
     </data>
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 426309e0c34..fedb13c9524 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -35,7 +35,7 @@
 
 
     <record id="action_bank_tree" model="ir.actions.act_window">
-        <field name="name">Setup your Bank Accounts</field>
+        <field name="name">Bank Accounts</field>
         <field name="res_model">res.partner.bank</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -53,8 +53,8 @@
         </field>
     </record>
     <menuitem
-        sequence="0"
-        parent="account.account_account_menu"
+        sequence="99"
+        parent="account.menu_journals"
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 250c8e26fdf..4e0d952cf7f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -576,7 +576,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables" sequence="1"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -632,7 +632,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables" sequence="2"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index f7bf33476bf..a4483174a46 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -18,22 +18,29 @@
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
+        <menuitem id="periodical_processing_bank_statements" name="Bank Statements" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="9"/>
         <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
-        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
-        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user" sequence="8"/>
+        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="10" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" sequence="1"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="40"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="5"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="5"/>
+
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
-        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
+        <menuitem id="menu_journals" sequence="3" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_recurrent_entries" name="Reccuring Entries" parent="menu_finance_configuration" sequence="54"/>
+        <menuitem id="menu_config_multi_currency" name="Multi-Currencies" parent="menu_finance_configuration" sequence="9" groups="base.group_multi_currency"/>
+
+        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_config_multi_currency" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="6" groups="group_account_user,group_account_manager"/>
+
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem id="menu_account_reports" name="Reports" parent="account.account_account_menu" sequence="4" />
 
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
             parent="menu_finance_periodical_processing" sequence="15"/>
@@ -45,6 +52,7 @@
 
         <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
         <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
+
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="final_accounting_reports"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 639c6994e98..3a766a0d781 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -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 -->
@@ -258,8 +258,8 @@
               </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"
@@ -684,7 +684,7 @@
         </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>
@@ -740,7 +740,7 @@
             </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>
@@ -754,7 +754,20 @@
               </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">
@@ -814,7 +827,7 @@
               </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">
@@ -924,8 +937,8 @@
               </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"
@@ -1060,7 +1073,7 @@
             <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>
@@ -1653,7 +1666,7 @@
         </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">
@@ -1722,8 +1735,10 @@
             <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">
@@ -1829,7 +1844,7 @@
         <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>
@@ -1864,21 +1879,12 @@
         </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>
@@ -1942,7 +1948,8 @@
             <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>
@@ -2040,7 +2047,7 @@
             <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">
@@ -2173,7 +2180,7 @@
             </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>
@@ -2295,7 +2302,7 @@
         </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>
@@ -2508,7 +2515,7 @@
 
         <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">
@@ -2573,7 +2580,7 @@
             <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>
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 766db9e1a99..92b906cd4f5 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -12,8 +12,6 @@
             <field name="context">{'search_default_model_id':'account.invoice'}</field>
             <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
         </record>
-        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
-
     </data>
 
     <!-- Mail template are declared in a NOUPDATE block
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 679baa8ee50..71d17ca9857 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -102,7 +102,7 @@
         <menuitem
             action="action_account_fiscal_position_form"
             id="menu_action_account_fiscal_position_form"
-            parent="next_id_27" sequence="20"/>
+            parent="next_id_27" sequence="3"/>
 
         <!--
         Partners Extension
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 8275f0a52c6..8c8b82ce31a 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -29,7 +29,7 @@
 
         <menuitem action="action_account_fiscalyear_close_state"
             id="menu_wizard_fy_close_state"
-            sequence="20"
+            sequence="3"
             parent="menu_account_end_year_treatments" />
 
     </data>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 0da94ee0232..20a424c13fb 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -36,7 +36,8 @@
 
         <menuitem action="action_account_fiscalyear_close"
             id="menu_wizard_fy_close"
-            parent="menu_account_end_year_treatments" />
+            parent="menu_account_end_year_treatments" 
+            sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 6f3eb91de09..0cb3692fb4c 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -33,7 +33,7 @@ This wizard will remove the end of year journal entries of selected fiscal year.
 
         <menuitem action="action_account_open_closed_fiscalyear"
             id="menu_wizard_account_open_closed_fiscalyear"
-            sequence="18"
+            sequence="2"
             parent="menu_account_end_year_treatments" />
 
     </data>