From fa7124920de8ab4e51d9b88191ad14b9386e2e38 Mon Sep 17 00:00:00 2001
From: Nicolas Bayet <nicolas.bayet@gmail.com>
Date: Thu, 2 Aug 2018 11:30:13 +0200
Subject: [PATCH] [IMP] account: Reorganize menuitems

- Resequence menuitem to improve the structure.
- Relabel some menuitems to improve readability

TaskID: 1850716
---
 .../report/account_invoice_report_view.xml    |  2 +-
 .../account/views/account_analytic_view.xml   |  4 +--
 addons/account/views/account_invoice_view.xml | 18 +++++------
 addons/account/views/account_menuitem.xml     | 19 ++++--------
 addons/account/views/account_payment_view.xml |  4 +--
 addons/account/views/account_view.xml         | 30 ++++++++++---------
 addons/account/views/tax_adjustments.xml      |  3 +-
 .../views/account_asset_views.xml             |  2 +-
 ...depreciation_confirmation_wizard_views.xml |  2 +-
 .../views/account_budget_views.xml            |  2 +-
 .../views/account_voucher_views.xml           |  8 ++---
 .../analytic/views/analytic_account_views.xml |  2 +-
 12 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c263b253d9b..5c539b396fc 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -118,7 +118,7 @@
         <field name="help">From this report, you can have an overview of the amount invoiced to your customers. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
     </record>
 
-    <menuitem name="Invoices" action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.account_reports_management_menu" sequence="18"/>
+    <menuitem name="Invoices" action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.account_reports_management_menu" sequence="25"/>
 
 </data>
 </odoo>
diff --git a/addons/account/views/account_analytic_view.xml b/addons/account/views/account_analytic_view.xml
index e3d0dddcf7e..ab2ffa7563c 100644
--- a/addons/account/views/account_analytic_view.xml
+++ b/addons/account/views/account_analytic_view.xml
@@ -67,8 +67,8 @@
         </record>
 
         <menuitem
-            name="Analytic Entries"
-            parent="menu_finance_entries_accounting_entries"
+            name="Analytic Items"
+            parent="account.menu_finance_entries_accounting_entries"
             action="analytic.account_analytic_line_action_entries"
             id="menu_action_analytic_lines_tree"
             sequence="35"
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 233d3a2c583..4d22d4d9a93 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -726,7 +726,7 @@
         </record>
 
         <record id="action_invoice_tree1" model="ir.actions.act_window">
-            <field name="name">Customer Invoices</field>
+            <field name="name">Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph</field>
@@ -757,10 +757,10 @@
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
 
-        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables_documents" sequence="1"/>
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_receivables" sequence="1"/>
 
         <record id="action_invoice_out_refund" model="ir.actions.act_window">
-            <field name="name">Customer Credit Notes</field>
+            <field name="name">Credit Notes</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph</field>
@@ -794,7 +794,7 @@
 
         <menuitem action="action_invoice_out_refund"
                   id="menu_action_invoice_out_refund"
-                  parent="menu_finance_receivables_documents"
+                  parent="account.menu_finance_receivables"
                   sequence="1"/>
 
         <record id="action_vendor_bill_template" model="ir.actions.act_window">
@@ -816,7 +816,7 @@
             server action opening the vendor bills and returning the right help tooltip
         -->
         <record id="action_invoice_tree2" model="ir.actions.server">
-            <field name="name">Vendor Bills</field>
+            <field name="name">Bills</field>
             <field name="model_id" ref="model_account_invoice"/>
             <field name="state">code</field>
             <field name="code">
@@ -841,11 +841,11 @@ action = action_values
             <field name="act_window_id" ref="action_vendor_bill_template"/>
         </record>
 
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables_documents" sequence="1"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_payables" sequence="1"/>
 
 
         <record id="action_invoice_in_refund" model="ir.actions.act_window">
-            <field name="name">Vendor Credit Notes</field>
+            <field name="name">Refund</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph</field>
@@ -878,8 +878,8 @@ action = action_values
 
         <menuitem action="action_invoice_in_refund"
                   id="menu_action_invoice_in_refund"
-                  parent="menu_finance_payables_documents"
-                  sequence="1"/>
+                  parent="account.menu_finance_payables"
+                  sequence="5"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 3de92d67644..a6ff04f5405 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -9,29 +9,22 @@
             web_icon="account,static/description/icon.png"
             sequence="40"/>
 
-        <menuitem id="menu_finance_receivables" name="Sales" parent="menu_finance" sequence="2"/>
-            <!--Sales sub-menus-->
-            <menuitem id="menu_finance_receivables_documents" name="Documents" parent="menu_finance_receivables" sequence="1"/>
-            <menuitem id="menu_finance_receivables_follow_up" name="Follow-up" parent="menu_finance_receivables" sequence="2"/>
-            <menuitem id="menu_finance_receivables_master_data" name="Master Data" parent="menu_finance_receivables" sequence="3"/>
-        <menuitem id="menu_finance_payables" name="Purchases" parent="menu_finance" sequence="3"/>
-            <!--Purchases sub-menus-->
-            <menuitem id="menu_finance_payables_documents" name="Documents" parent="menu_finance_payables" sequence="1"/>
-            <menuitem id="menu_finance_payables_master_data" name="Master Data" parent="menu_finance_payables" sequence="2"/>
-        <menuitem id="menu_finance_entries" name="Adviser" parent="menu_finance" sequence="4" groups="account.group_account_user"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4" groups="account.group_account_user"/>
             <!-- Adviser sub-menus -->
             <menuitem id="menu_finance_entries_accounting_entries" name="Accounting Entries" parent="account.menu_finance_entries"/>
-            <menuitem id="menu_finance_entries_management" name="Management" parent="account.menu_finance_entries"/>
+            <menuitem id="menu_finance_entries_management" name="Management" parent="menu_finance_entries" sequence="10" groups="account.group_account_invoice"/>
             <menuitem id="menu_finance_entries_actions" name="Actions" parent="account.menu_finance_entries"/>
             <menuitem id="menu_finance_entries_generate_entries" name="Generate Entries" parent="account.menu_finance_entries"/>
-        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="5" groups="account.group_account_manager"/>
+        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="20" groups="account.group_account_manager"/>
             <!-- Reporting sub-menus -->
             <menuitem id="account_reports_management_menu" name="Management" parent="account.menu_finance_reports" sequence="4"/>
             <menuitem id="account_reports_legal_statements_menu" name="Generic Statements" parent="account.menu_finance_reports" sequence="1" groups="account.group_account_user"/>
             <menuitem id="account_reports_business_intelligence_menu" name="Business Intelligence" parent="account.menu_finance_reports" sequence="5" groups="account.group_account_invoice"/>
             <menuitem id="menu_finance_legal_statement" name="PDF Reports" parent="account.menu_finance_reports"/>
 
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="account.group_account_manager"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="35" groups="account.group_account_manager"/>
             <!-- Configuration Sub-Menu -->
             <menuitem id="account_account_menu" name="Accounting" parent="account.menu_finance_configuration" sequence="2" groups="account.group_account_invoice"/>
             <menuitem id="account_management_menu" name="Management" parent="account.menu_finance_configuration" sequence="3" groups="account.group_account_manager"/>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 318844bc247..87a012a887b 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -236,8 +236,8 @@
             </field>
         </record>
 
-        <menuitem action="action_account_payments" id="menu_action_account_payments_receivable" parent="menu_finance_receivables_documents" sequence="20"/>
-        <menuitem action="action_account_payments_payable" id="menu_action_account_payments_payable" parent="menu_finance_payables_documents" sequence="20"/>
+        <menuitem action="action_account_payments" id="menu_action_account_payments_receivable" parent="account.menu_finance_receivables" sequence="15"/>
+        <menuitem action="action_account_payments_payable" id="menu_action_account_payments_payable" parent="account.menu_finance_payables" sequence="20"/>
 
         <record id="view_account_payment_invoice_form" model="ir.ui.view">
             <field name="name">account.payment.invoice.form</field>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 7284cad6f4e..ca183f384f6 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -170,7 +170,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" groups="account.group_account_user" sequence="0"/>
+        <menuitem action="action_account_form" id="menu_action_account_form" parent="account.account_account_menu" groups="account.group_account_user" sequence="2"/>
 
         <act_window
             id="act_account_acount_move_line_open_unreconciled"
@@ -962,6 +962,8 @@
               </p>
             </field>
         </record>
+        <menuitem id="action_account_reconcile_model_menu" parent="account.account_account_menu"
+                action="account.action_account_reconcile_model" sequence="100" />
 
         <menuitem
             id="account_report_folder"
@@ -1194,7 +1196,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="account_account_menu" sequence="1"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="account_account_menu" sequence="2"/>
 
         <!-- Journal Items -->
         <record id="view_move_line_form" model="ir.ui.view">
@@ -1425,7 +1427,7 @@
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="view_mode">tree,pivot,graph,form,kanban</field>
         </record>
-        <menuitem action="action_account_moves_all_a" id="menu_action_account_moves_all" parent="account.menu_finance_entries_accounting_entries" sequence="1" groups="group_account_manager" />
+        <menuitem action="action_account_moves_all_a" id="menu_action_account_moves_all" parent="account.menu_finance_entries_accounting_entries" sequence="10" groups="group_account_manager" />
         <record id="action_account_moves_all_tree" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -1660,7 +1662,7 @@
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries_accounting_entries"
             groups="account.group_account_user"
-            sequence="2"/>
+            sequence="1"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
             <field name="name">Entries</field>
@@ -2159,8 +2161,8 @@
         </record>
 
         <menuitem id="menu_account_customer" name="Customers"
-            parent="menu_finance_receivables_master_data"
-            action="base.action_partner_customer_form" sequence="100"/>
+            parent="account.menu_finance_receivables"
+            action="base.action_partner_customer_form" sequence="110"/>
 
         <record id="product_product_view_tree" model="ir.ui.view">
             <field name="name">product.product.tree</field>
@@ -2187,7 +2189,7 @@
         </record>
 
         <record id="product_product_action_sellable" model="ir.actions.act_window">
-            <field name="name">Sellable Products</field>
+            <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -2202,7 +2204,7 @@
         </record>
 
         <record id="product_product_action_purchasable" model="ir.actions.act_window">
-            <field name="name">Purchasable Products</field>
+            <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -2216,13 +2218,13 @@
             </field>
         </record>
 
-        <menuitem id="product_product_menu_sellable" name="Sellable Products" action="product_product_action_sellable" parent="account.menu_finance_receivables_master_data" sequence="100"/>
+        <menuitem id="product_product_menu_sellable" name="Products" action="product_product_action_sellable" parent="account.menu_finance_receivables" sequence="100"/>
 
-        <menuitem id="product_product_menu_purchasable" name="Purchasable Products" action="product_product_action_purchasable" parent="account.menu_finance_payables_master_data" sequence="101"/>
+        <menuitem id="product_product_menu_purchasable" name="Products" action="product_product_action_purchasable" parent="account.menu_finance_payables" sequence="100"/>
 
         <menuitem id="menu_account_supplier" name="Vendors"
-            parent="menu_finance_payables_master_data"
-            action="base.action_partner_supplier_form" sequence="100"/>
+            parent="account.menu_finance_payables"
+            action="base.action_partner_supplier_form" sequence="200"/>
 
         <!-- Account Financial Report -->
 
@@ -2297,11 +2299,11 @@
 
         <!-- Manual reconciliation -->
         <record id="action_manual_reconciliation" model="ir.actions.client">
-            <field name="name">Manual Reconciliation</field>
+            <field name="name">Reconciliation</field>
             <field name="tag">manual_reconciliation_view</field>
         </record>
 
-        <menuitem id="menu_action_manual_reconciliation" parent="menu_finance_entries_actions" action="action_manual_reconciliation" sequence="25"/>
+        <menuitem id="menu_action_manual_reconciliation" parent="account.menu_finance_entries_actions" action="action_manual_reconciliation" sequence="25"/>
 
         <record id="view_account_group_form" model="ir.ui.view">
             <field name="name">account.group.form</field>
diff --git a/addons/account/views/tax_adjustments.xml b/addons/account/views/tax_adjustments.xml
index 06a40882fbe..fb3db8e2648 100644
--- a/addons/account/views/tax_adjustments.xml
+++ b/addons/account/views/tax_adjustments.xml
@@ -7,5 +7,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="tax_adjustments_form" id="menu_action_tax_adjustment" parent="account.menu_finance_entries_actions" sequence="30"/>
+        <!-- TODO: debug -->
+        <menuitem action="tax_adjustments_form" id="menu_action_tax_adjustment" parent="account.menu_finance_entries_actions" sequence="45" groups="account.group_account_manager" />
 </odoo>
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index b707e1c3139..cc1de28907e 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -324,7 +324,7 @@
         <field name="domain">[('category_id.type', '=', 'purchase')]</field>
     </record>
 
-    <menuitem parent="account.menu_finance_entries_management" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form" sequence="101" groups="account.group_account_user"/>
+    <menuitem parent="account.menu_finance_entries_management" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form" sequence="101" groups="account.group_account_manager"/>
 
 
     <!-- Configuration -->
diff --git a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
index 6eafdd5ee2b..58a1c7ffb06 100644
--- a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
+++ b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
@@ -34,6 +34,6 @@
 
     <menuitem name="Generate Assets Entries" action="action_asset_depreciation_confirmation_wizard"
         id="menu_asset_depreciation_confirmation_wizard"
-        parent="account.menu_finance_entries_generate_entries" sequence="111" groups="base.group_no_one"/>
+        parent="account.menu_finance_entries_generate_entries" sequence="111" groups="account.group_account_manager"/>
 
 </odoo>
diff --git a/addons/account_budget/views/account_budget_views.xml b/addons/account_budget/views/account_budget_views.xml
index 952a069444b..ad4e3d64f44 100644
--- a/addons/account_budget/views/account_budget_views.xml
+++ b/addons/account_budget/views/account_budget_views.xml
@@ -251,7 +251,7 @@ Budgets
               id="menu_act_crossovered_budget_view"
               name="Budgets"
               action="act_crossovered_budget_view" sequence="60"
-              groups="account.group_account_user"/>
+              groups="account.group_account_manager"/>
 
     <record id="view_crossovered_budget_line_search" model="ir.ui.view">
         <field name="name">account.budget.line.search</field>
diff --git a/addons/account_voucher/views/account_voucher_views.xml b/addons/account_voucher/views/account_voucher_views.xml
index b5376f2e0ea..10fdd754165 100644
--- a/addons/account_voucher/views/account_voucher_views.xml
+++ b/addons/account_voucher/views/account_voucher_views.xml
@@ -293,7 +293,7 @@
 
         <!-- Sales Voucher -->
         <record id="action_sale_receipt" model="ir.actions.act_window">
-            <field name="name">Sales Receipts</field>
+            <field name="name">Receipts</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban</field>
@@ -325,7 +325,7 @@
 
         <menuitem id="menu_action_sale_receipt"
             action="action_sale_receipt"
-            parent="account.menu_finance_receivables_documents"
+            parent="account.menu_finance_receivables"
             sequence="10"/>
 
         <!--  Purchase Vouchers -->
@@ -411,7 +411,7 @@
             </field>
         </record>
         <record id="action_purchase_receipt" model="ir.actions.act_window">
-            <field name="name">Purchase Receipts</field>
+            <field name="name">Receipts</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban</field>
@@ -442,5 +442,5 @@
         </record>
 
         <menuitem id="menu_action_purchase_receipt"
-            action="action_purchase_receipt" parent="account.menu_finance_payables_documents" sequence="4"/>
+            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
 </odoo>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index ce4f8b11435..bfd7e19f800 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -374,7 +374,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="account_analytic_line_action_entries">
-            <field name="name">Analytic Entries</field>
+            <field name="name">Analytic Items</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_mode">tree,kanban,form,graph,pivot</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>