From 69b421050aa313192bc612ae89bf0dcb3784f903 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Tue, 29 Aug 2017 10:22:58 +0200
Subject: [PATCH] [IMP] account: revamp the sale/purchase menus' structure

---
 addons/account/models/account_config_settings.py       | 2 +-
 addons/account/views/account_invoice_view.xml          | 8 ++++----
 addons/account/views/account_menuitem.xml              | 7 +++++++
 addons/account/views/account_payment_view.xml          | 4 ++--
 addons/account/views/account_view.xml                  | 8 ++++----
 addons/account_voucher/views/account_voucher_views.xml | 4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/addons/account/models/account_config_settings.py b/addons/account/models/account_config_settings.py
index 2cc8568e049..9e633d040f2 100644
--- a/addons/account/models/account_config_settings.py
+++ b/addons/account/models/account_config_settings.py
@@ -143,7 +143,7 @@ class AccountConfigSettings(models.TransientModel):
     def create(self, values):
         # Optimisation purpose, saving a res_config even without changing any values will trigger the write of all
         # related values, including the currency_id field on res_company. This in turn will trigger the recomputation
-        # of account_move_line related field company_currency_id which can be slow depending on the number of entries 
+        # of account_move_line related field company_currency_id which can be slow depending on the number of entries
         # in the database. Thus, if we do not explicitely change the currency_id, we should not write it on the company
         # Same for the field `code_digits` which will trigger a write on all the account.account to complete the
         # code the missing characters to complete the desired number of digit, leading to a sql_constraint.
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 95b1a53463a..c016e912c4f 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -687,7 +687,7 @@
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
 
-        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables" sequence="1"/>
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables_documents" sequence="1"/>
 
         <record id="action_invoice_out_refund" model="ir.actions.act_window">
             <field name="name">Customer Credit Notes</field>
@@ -724,7 +724,7 @@
 
         <menuitem action="action_invoice_out_refund"
                   id="menu_action_invoice_out_refund"
-                  parent="menu_finance_receivables"
+                  parent="menu_finance_receivables_documents"
                   sequence="1"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
@@ -760,7 +760,7 @@
             <field name="act_window_id" ref="action_invoice_tree2"/>
         </record>
 
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables" sequence="1"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables_documents" sequence="1"/>
 
 
         <record id="action_invoice_in_refund" model="ir.actions.act_window">
@@ -795,7 +795,7 @@
 
         <menuitem action="action_invoice_in_refund"
                   id="menu_action_invoice_in_refund"
-                  parent="menu_finance_payables"
+                  parent="menu_finance_payables_documents"
                   sequence="1"/>
 
         <act_window
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 80bba939921..67919a6bed5 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -14,7 +14,14 @@
         </record>
 
         <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_reports" name="Reporting" parent="menu_finance" sequence="5" groups="account.group_account_manager"/>
             <!-- Reporting sub-menus -->
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 242fce7bb74..5e463112b3f 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -214,8 +214,8 @@
             </field>
         </record>
 
-        <menuitem action="action_account_payments" id="menu_action_account_payments_receivable" parent="menu_finance_receivables" sequence="20"/>
-        <menuitem action="action_account_payments_payable" id="menu_action_account_payments_payable" parent="menu_finance_payables" sequence="20"/>
+        <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"/>
 
         <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 27c1a7c0857..1f78b86b9bd 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -1994,7 +1994,7 @@
         </record>
 
         <menuitem id="menu_account_customer" name="Customers"
-            parent="menu_finance_receivables"
+            parent="menu_finance_receivables_master_data"
             action="base.action_partner_customer_form" sequence="100"/>
 
         <record id="product_product_view_tree" model="ir.ui.view">
@@ -2041,14 +2041,14 @@
             <field name="view_id" ref="product_product_view_tree"/>
         </record>
 
-        <menuitem id="product_product_menu_sellable" name="Sellable Products" action="product_product_action_sellable" parent="account.menu_finance_receivables" sequence="100"/>
+        <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_purchasable" name="Purchasable Products" action="product_product_action_purchasable" parent="account.menu_finance_payables" sequence="101"/>
+        <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_configuration_menu" name="Products" parent="account.menu_finance_configuration" sequence="1"/>
 
         <menuitem id="menu_account_supplier" name="Vendors"
-            parent="menu_finance_payables"
+            parent="menu_finance_payables_master_data"
             action="base.action_partner_supplier_form" sequence="100"/>
 
         <!-- Account Financial Report -->
diff --git a/addons/account_voucher/views/account_voucher_views.xml b/addons/account_voucher/views/account_voucher_views.xml
index bcf399d407f..c0bec72cc58 100644
--- a/addons/account_voucher/views/account_voucher_views.xml
+++ b/addons/account_voucher/views/account_voucher_views.xml
@@ -317,7 +317,7 @@
 
         <menuitem id="menu_action_sale_receipt"
             action="action_sale_receipt"
-            parent="account.menu_finance_receivables"
+            parent="account.menu_finance_receivables_documents"
             sequence="10"/>
 
         <!--  Purchase Vouchers -->
@@ -431,5 +431,5 @@
         </record>
 
         <menuitem id="menu_action_purchase_receipt"
-            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="4"/>
+            action="action_purchase_receipt" parent="account.menu_finance_payables_documents" sequence="4"/>
 </odoo>