From 78f52338cf2dbb59e043e24a3fd06e30673a53e9 Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 15 Oct 2019 16:25:43 +0200
Subject: [PATCH] [REF] emc: move menus to menus.xml

---
 easy_my_coop/__manifest__.py                  |  1 +
 easy_my_coop/views/account_invoice_view.xml   |  4 +--
 .../views/cooperator_register_view.xml        |  3 +--
 easy_my_coop/views/email_template_view.xml    |  4 +--
 easy_my_coop/views/menus.xml                  | 27 +++++++++++++++++++
 easy_my_coop/views/operation_request_view.xml |  3 +--
 easy_my_coop/views/product_view.xml           |  3 +--
 easy_my_coop/views/res_partner_view.xml       | 14 +++-------
 .../views/subscription_request_view.xml       | 10 +------
 easy_my_coop_loan/__manifest__.py             |  3 ++-
 easy_my_coop_loan/views/loan_view.xml         |  5 +---
 easy_my_coop_loan/views/term_view.xml         |  3 +--
 12 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 easy_my_coop/views/menus.xml

diff --git a/easy_my_coop/__manifest__.py b/easy_my_coop/__manifest__.py
index aed426e..77751de 100644
--- a/easy_my_coop/__manifest__.py
+++ b/easy_my_coop/__manifest__.py
@@ -43,6 +43,7 @@
         'views/product_view.xml',
         'views/res_company_view.xml',
         'views/account_journal_view.xml',
+        'views/menus.xml',
         'report/easy_my_coop_report.xml',
         'report/layout.xml',
         'report/cooperator_invoice_G002.xml',
diff --git a/easy_my_coop/views/account_invoice_view.xml b/easy_my_coop/views/account_invoice_view.xml
index 80c76c5..ec34b8b 100644
--- a/easy_my_coop/views/account_invoice_view.xml
+++ b/easy_my_coop/views/account_invoice_view.xml
@@ -42,8 +42,6 @@
            <field name="act_window_id" ref="action_invoice_tree_coop"/>
        </record>
        
-       <menuitem action="action_invoice_tree_coop" id="menu_action_invoice_tree_coop" parent="menu_easy_my_coop_main_coop" groups="easy_my_coop.group_easy_my_coop_user"/>
-       
        <record id="account.action_invoice_tree1" model="ir.actions.act_window">
            <field name="name">Customer Invoices</field>
            <field name="res_model">account.invoice</field>
@@ -72,4 +70,4 @@
            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
        </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/easy_my_coop/views/cooperator_register_view.xml b/easy_my_coop/views/cooperator_register_view.xml
index 523da7d..148c29c 100644
--- a/easy_my_coop/views/cooperator_register_view.xml
+++ b/easy_my_coop/views/cooperator_register_view.xml
@@ -74,5 +74,4 @@
            <field name="search_view_id" ref="view_subscription_register_filter"/>
        </record>
 
-	<menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/easy_my_coop/views/email_template_view.xml b/easy_my_coop/views/email_template_view.xml
index a98d189..3b54efb 100644
--- a/easy_my_coop/views/email_template_view.xml
+++ b/easy_my_coop/views/email_template_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-	<menuitem name="Configuration" id="menu_easy_my_coop_config" parent="menu_main_easy_my_coop" sequence="80" />
 
 	<record model="ir.actions.act_window"
 		id="action_easy_my_coop_email_templates">
@@ -12,5 +11,4 @@
 		<field name="search_view_id" ref="mail.view_email_template_search" />
 	</record>
 
-	<menuitem id="menu_easy_my_coop_templates" parent="menu_easy_my_coop_config" action="action_easy_my_coop_email_templates" sequence="10" groups="group_easy_my_coop_manager" />
-</odoo>
+</odoo>
diff --git a/easy_my_coop/views/menus.xml b/easy_my_coop/views/menus.xml
new file mode 100644
index 0000000..be9adb2
--- /dev/null
+++ b/easy_my_coop/views/menus.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright 2019 Coop IT Easy
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+    <menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" groups="easy_my_coop.group_easy_my_coop_user" sequence="40" />
+
+    <menuitem name="Cooperators" id="menu_easy_my_coop_main_coop" parent="menu_main_easy_my_coop" sequence="5" />
+    <menuitem id="menu_action_invoice_tree_coop" parent="menu_easy_my_coop_main_coop" action="action_invoice_tree_coop" groups="easy_my_coop.group_easy_my_coop_user" />
+    <menuitem name="Cooperators" id="menu_easy_my_coop_cooperator" action="action_partner_cooperator_form" parent="menu_easy_my_coop_main_coop" sequence="100" />
+    <menuitem name="Cooperator Candidates" id="menu_easy_my_coop_cooperator_candidate" action="action_partner_cooperator_candidate_form" parent="menu_easy_my_coop_main_coop" sequence="150" />
+    <menuitem name="Company representative" id="menu_easy_my_coop_company_representative" action="action_company_representative_form" parent="menu_easy_my_coop_main_coop" sequence="160" />
+
+    <menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" groups="easy_my_coop.group_easy_my_coop_manager" sequence="10" />
+    <menuitem name="Company Subscription" id="menu_easy_my_coop_company_subscription_request" action="company_subscription_request_action" parent="menu_easy_my_coop_main_subscription" sequence="15" />
+    <menuitem name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request" action="subscription_request_action" parent="menu_easy_my_coop_main_subscription" sequence="10" />
+    <menuitem name="Share lines" id="menu_easy_my_coop_share_line" action="share_line_action" parent="menu_easy_my_coop_main_subscription" groups="group_easy_my_coop_super_manager" sequence="20" />
+    <menuitem name="Share type" id="menu_easy_my_coop_share_product" action="share_product_action" parent="menu_easy_my_coop_main_subscription" sequence="20" />
+    <menuitem name="Subscription Register" id="menu_easy_my_coop_subscription_register" action="subscription_register_action" parent="menu_easy_my_coop_main_subscription" sequence="20" />
+    <menuitem name="Operation request" id="menu_easy_my_coop_operation_request" action="operation_request_action" parent="menu_easy_my_coop_main_subscription" groups="easy_my_coop.group_easy_my_coop_manager" sequence="30" />
+
+    <menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" groups="easy_my_coop.group_easy_my_coop_manager" sequence="40" />
+
+    <menuitem name="Configuration" id="menu_easy_my_coop_config" parent="menu_main_easy_my_coop" sequence="80" />
+    <menuitem id="menu_easy_my_coop_templates" action="action_easy_my_coop_email_templates" parent="menu_easy_my_coop_config" groups="group_easy_my_coop_manager" sequence="10" />
+</odoo>
diff --git a/easy_my_coop/views/operation_request_view.xml b/easy_my_coop/views/operation_request_view.xml
index 4b7ff1f..ecf56b2 100644
--- a/easy_my_coop/views/operation_request_view.xml
+++ b/easy_my_coop/views/operation_request_view.xml
@@ -103,5 +103,4 @@
            <field name="view_id" ref="operation_request_tree"/>
        </record>
 
-	<menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="30" groups="easy_my_coop.group_easy_my_coop_manager"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/easy_my_coop/views/product_view.xml b/easy_my_coop/views/product_view.xml
index 68ddfda..4c23761 100644
--- a/easy_my_coop/views/product_view.xml
+++ b/easy_my_coop/views/product_view.xml
@@ -45,8 +45,7 @@
 		</field>
 	</record>
        
-    <menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
-       
+
        <!-- overriding product views to not display share product in the purchase and sale views-->
        
 	<record id="product.product_normal_action" model="ir.actions.act_window">
diff --git a/easy_my_coop/views/res_partner_view.xml b/easy_my_coop/views/res_partner_view.xml
index dbb4d07..cce636d 100644
--- a/easy_my_coop/views/res_partner_view.xml
+++ b/easy_my_coop/views/res_partner_view.xml
@@ -92,8 +92,6 @@
             </field>
         </record>
         
-        <menuitem name="Cooperators" id="menu_easy_my_coop_main_coop" parent="menu_main_easy_my_coop" sequence="5" />
-        
         <record id="action_partner_cooperator_form" model="ir.actions.act_window">
             <field name="name">Cooperator</field>
             <field name="type">ir.actions.act_window</field>
@@ -113,9 +111,7 @@
               </p>
             </field>
         </record>
-        
-        <menuitem id="menu_easy_my_coop_cooperator" name="Cooperators" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_form" sequence="100"/>
-        
+
         <record id="action_partner_cooperator_candidate_form" model="ir.actions.act_window">
             <field name="name">Cooperator candidates</field>
             <field name="type">ir.actions.act_window</field>
@@ -135,9 +131,7 @@
               </p>
             </field>
         </record>
-        
-        <menuitem id="menu_easy_my_coop_cooperator_candidate" name="Cooperator Candidates" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_candidate_form" sequence="150"/>
-        
+
         <record id="action_company_representative_form" model="ir.actions.act_window">
             <field name="name">Company representative</field>
             <field name="type">ir.actions.act_window</field>
@@ -157,8 +151,6 @@
             </field>
         </record>
         
-        <menuitem id="menu_easy_my_coop_company_representative" name="Company representative" parent="menu_easy_my_coop_main_coop" action="action_company_representative_form" sequence="160"/>
-        
         <record id="remove_partner_follower" model="ir.ui.view">
             <field name="name">res.partner.remove.follower.inherit</field>
             <field name="model">res.partner</field>
@@ -168,4 +160,4 @@
             </field>
         </record>
 	</data>
-</odoo>
+</odoo>
diff --git a/easy_my_coop/views/subscription_request_view.xml b/easy_my_coop/views/subscription_request_view.xml
index 421f097..035606c 100644
--- a/easy_my_coop/views/subscription_request_view.xml
+++ b/easy_my_coop/views/subscription_request_view.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-	<menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_easy_my_coop_user"/>
-	<menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_easy_my_coop_manager"/>
-	<menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_easy_my_coop_manager"/>
 
 	<record id="subscription_request_tree" model="ir.ui.view">
         <field name="name">subscription.request.tree</field>
@@ -129,8 +126,6 @@
         <field name="search_view_id" ref="view_subscription_request_filter"/>
     </record>
 
-	<menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="10"/>
-
 	<record id="company_subscription_request_tree" model="ir.ui.view">
         <field name="name">subscription.request.tree</field>
         <field name="model">subscription.request</field>
@@ -166,8 +161,6 @@
         <field name="search_view_id" ref="view_subscription_request_filter"/>
     </record>
 
-	<menuitem action="company_subscription_request_action" name="Company Subscription" id="menu_easy_my_coop_company_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="15"/>
-
     <record id="share_line_form" model="ir.ui.view">
         <field name="name">share.line.form</field>
         <field name="model">share.line</field>
@@ -234,5 +227,4 @@
         <field name="view_type">form</field>
     </record>
 
-	<menuitem action="share_line_action" name="Share lines" id="menu_easy_my_coop_share_line"  parent="menu_easy_my_coop_main_subscription" sequence="20" groups="group_easy_my_coop_super_manager"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/easy_my_coop_loan/__manifest__.py b/easy_my_coop_loan/__manifest__.py
index d115bb0..92dc59e 100644
--- a/easy_my_coop_loan/__manifest__.py
+++ b/easy_my_coop_loan/__manifest__.py
@@ -21,7 +21,8 @@
         'views/term_view.xml',
         'views/loan_view.xml',
         'views/partner_view.xml',
-        'data/mail_template_data.xml',
+        'views/menus.xml',
+        'data/mail_template_data.xml',
     ],
     'installable': True,
 }
diff --git a/easy_my_coop_loan/views/loan_view.xml b/easy_my_coop_loan/views/loan_view.xml
index defe3d7..f807141 100644
--- a/easy_my_coop_loan/views/loan_view.xml
+++ b/easy_my_coop_loan/views/loan_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-	<menuitem name="Loan Issue" id="menu_easy_my_coop_main_loan_issue" parent="easy_my_coop.menu_main_easy_my_coop" sequence="20" groups="easy_my_coop.group_easy_my_coop_user"/>
 	<record id="view_loan_issue_tree" model="ir.ui.view">
 		<field name="name">loan.issue.tree</field>
 		<field name="model">loan.issue</field>
@@ -106,8 +105,6 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 
-	<menuitem action="action_loan_issue" id="loan_issue_menu" parent="menu_easy_my_coop_main_loan_issue" sequence="25" />
-	
 	<record id="view_loan_issue_line_form" model="ir.ui.view">
 		<field name="name">loan.issue.line.form</field>
 		<field name="model">loan.issue.line</field>
@@ -160,4 +157,4 @@
 			</form>
 		</field>
 	</record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/easy_my_coop_loan/views/term_view.xml b/easy_my_coop_loan/views/term_view.xml
index ef41952..2352fd4 100644
--- a/easy_my_coop_loan/views/term_view.xml
+++ b/easy_my_coop_loan/views/term_view.xml
@@ -36,5 +36,4 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 
-	<menuitem action="action_loan_term" id="loan_term_menu" parent="easy_my_coop.menu_easy_my_coop_config" sequence="5" />
-</odoo>
\ No newline at end of file
+</odoo>