From 31b8b2d8d7172b854b61097777346b8e2ffb157c Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Mon, 26 Aug 2019 15:46:48 +0200
Subject: [PATCH] [FIX] easy_my_coop: reorder menu definitions

---
 easy_my_coop/__openerp__.py                   |  2 ++
 easy_my_coop/view/account_invoice_view.xml    |  5 ++-
 .../view/cooperator_register_view.xml         |  3 +-
 easy_my_coop/view/email_template_view.xml     |  6 ++--
 easy_my_coop/view/menu.xml                    | 35 +++++++++++++++++++
 easy_my_coop/view/operation_request_view.xml  |  3 +-
 easy_my_coop/view/product_view.xml            |  3 +-
 easy_my_coop/view/res_partner_view.xml        | 14 +++-----
 .../view/subscription_request_view.xml        |  9 +----
 .../wizard/cooperative_history_wizard.xml     |  4 +--
 easy_my_coop/wizard/update_partner_info.xml   |  1 -
 11 files changed, 51 insertions(+), 34 deletions(-)
 create mode 100644 easy_my_coop/view/menu.xml

diff --git a/easy_my_coop/__openerp__.py b/easy_my_coop/__openerp__.py
index c0de516..6fa743b 100644
--- a/easy_my_coop/__openerp__.py
+++ b/easy_my_coop/__openerp__.py
@@ -30,6 +30,7 @@
     'data': [
         'security/easy_my_coop_security.xml',
         'security/ir.model.access.csv',
+        # 'wizard/cooperative_history_wizard.xml',   # not loaded, why?
         'wizard/create_subscription_from_partner.xml',
         'wizard/update_partner_info.xml',
         'wizard/validate_subscription_request.xml',
@@ -44,6 +45,7 @@
         'view/product_view.xml',
         'view/res_company_view.xml',
         'view/account_journal_view.xml',
+        'view/menu.xml',
         'data/easy_my_coop_data.xml',
         'report/easy_my_coop_report.xml',
         'report/cooperator_invoice_G002.xml',
diff --git a/easy_my_coop/view/account_invoice_view.xml b/easy_my_coop/view/account_invoice_view.xml
index 10d33ce..5ea6ffc 100644
--- a/easy_my_coop/view/account_invoice_view.xml
+++ b/easy_my_coop/view/account_invoice_view.xml
@@ -49,8 +49,7 @@
             <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_energiris_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>
@@ -86,4 +85,4 @@
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
         </record>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/easy_my_coop/view/cooperator_register_view.xml b/easy_my_coop/view/cooperator_register_view.xml
index 07ce46e..a96a6bc 100644
--- a/easy_my_coop/view/cooperator_register_view.xml
+++ b/easy_my_coop/view/cooperator_register_view.xml
@@ -75,6 +75,5 @@
             <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"/>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/easy_my_coop/view/email_template_view.xml b/easy_my_coop/view/email_template_view.xml
index 907e37b..0bf5db6 100644
--- a/easy_my_coop/view/email_template_view.xml
+++ b/easy_my_coop/view/email_template_view.xml
@@ -1,7 +1,6 @@
 <openerp>
 	<data>
-		<menuitem name="Configuration" id="menu_easy_my_coop_config"  parent="menu_main_easy_my_coop" sequence="20"/>
-		
+
 		<record model="ir.actions.act_window" id="action_easy_my_coop_email_templates">
             <field name="name">Mail Templates</field>
             <field name="res_model">mail.template</field>
@@ -11,6 +10,5 @@
             <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_energiris_manager"/>
 	</data>
-</openerp>
+</openerp>
diff --git a/easy_my_coop/view/menu.xml b/easy_my_coop/view/menu.xml
new file mode 100644
index 0000000..2faeb97
--- /dev/null
+++ b/easy_my_coop/view/menu.xml
@@ -0,0 +1,35 @@
+<?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>
+    <!-- top menus -->
+
+    <menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_user"/>
+    <menuitem name="Cooperators" id="menu_easy_my_coop_main_coop" parent="menu_main_easy_my_coop" sequence="5" />
+    <menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_energiris_manager"/>
+    <menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_manager"/>
+    <menuitem name="Configuration" id="menu_easy_my_coop_config"  parent="menu_main_easy_my_coop" sequence="20"/>
+
+    <!-- views -->
+    <menuitem action="action_invoice_tree_coop" id="menu_action_invoice_tree_coop" parent="menu_easy_my_coop_main_coop" groups="easy_my_coop.group_energiris_user"/>
+    <menuitem id="menu_easy_my_coop_cooperator" name="Cooperators" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_form" sequence="100"/>
+    <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"/>
+    <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"/>
+
+    <menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
+    <menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="easy_my_coop.group_energiris_manager"/>
+    <menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
+    <menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="10"/>
+    <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="12"/>
+    <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_energiris_super_manager"/>
+
+    <menuitem id="menu_easy_my_coop_templates" parent="menu_easy_my_coop_config" action="action_easy_my_coop_email_templates" sequence="10" groups="group_energiris_manager"/>
+
+    <!-- wizards -->
+    <menuitem action="action_view_update_partner_info" name="Update coop partner" id="menu_view_update_partner_info"  parent="menu_easy_my_coop_main_subscription" sequence="60" groups="base.group_system"/>
+<!--    <menuitem id="menu_energiris_reporting" name="Reporting" parent="menu_main_energiris" sequence="20"/>-->
+<!--    <menuitem id="menu_coop_history_wizard_report" name="Cooperative history report" parent="menu_energiris_reporting" action="action_cooperative_history_wizard" sequence="10"/>-->
+
+</odoo>
diff --git a/easy_my_coop/view/operation_request_view.xml b/easy_my_coop/view/operation_request_view.xml
index 422eeaa..c628095 100644
--- a/easy_my_coop/view/operation_request_view.xml
+++ b/easy_my_coop/view/operation_request_view.xml
@@ -102,6 +102,5 @@
             <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="20" groups="easy_my_coop.group_energiris_manager"/>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/easy_my_coop/view/product_view.xml b/easy_my_coop/view/product_view.xml
index dfddcaf..93a9de8 100644
--- a/easy_my_coop/view/product_view.xml
+++ b/easy_my_coop/view/product_view.xml
@@ -54,8 +54,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/view/res_partner_view.xml b/easy_my_coop/view/res_partner_view.xml
index 50bb158..b943df4 100644
--- a/easy_my_coop/view/res_partner_view.xml
+++ b/easy_my_coop/view/res_partner_view.xml
@@ -95,8 +95,7 @@
             </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>
@@ -117,8 +116,7 @@
             </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>
@@ -139,8 +137,7 @@
             </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>
@@ -160,8 +157,7 @@
             </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>
@@ -171,4 +167,4 @@
             </field>
         </record>
 	</data>
-</openerp>
+</openerp>
diff --git a/easy_my_coop/view/subscription_request_view.xml b/easy_my_coop/view/subscription_request_view.xml
index b9cd1fb..20890f0 100644
--- a/easy_my_coop/view/subscription_request_view.xml
+++ b/easy_my_coop/view/subscription_request_view.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_user"/>
-		<menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_energiris_manager"/>
-		<menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_manager"/>
-
 		<record id="subscription_request_tree" model="ir.ui.view">
             <field name="name">subscription.request.tree</field>
             <field name="model">subscription.request</field>
@@ -132,7 +128,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>
@@ -169,7 +164,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="12"/>
 
         <record id="share_line_form" model="ir.ui.view">
             <field name="name">share.line.form</field>
@@ -237,6 +231,5 @@
             <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_energiris_super_manager"/>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/easy_my_coop/wizard/cooperative_history_wizard.xml b/easy_my_coop/wizard/cooperative_history_wizard.xml
index 7fd2d33..6744633 100644
--- a/easy_my_coop/wizard/cooperative_history_wizard.xml
+++ b/easy_my_coop/wizard/cooperative_history_wizard.xml
@@ -35,7 +35,5 @@
             <field name="multi">True</field>
         </record>
 
-		<menuitem id="menu_energiris_reporting" name="Reporting" parent="menu_main_energiris" sequence="20"/>
-		<menuitem id="menu_coop_history_wizard_report" name="Cooperative history report" parent="menu_energiris_reporting" action="action_cooperative_history_wizard" sequence="10"/>
-    </data>
+		</data>
 </openerp>
diff --git a/easy_my_coop/wizard/update_partner_info.xml b/easy_my_coop/wizard/update_partner_info.xml
index 9748023..4161af2 100644
--- a/easy_my_coop/wizard/update_partner_info.xml
+++ b/easy_my_coop/wizard/update_partner_info.xml
@@ -34,6 +34,5 @@
             <field name="target">new</field>
             <field name="groups_id" eval="[(4,ref('easy_my_coop.group_energiris_manager'))]"/>
         </record>
-		<menuitem action="action_view_update_partner_info" name="Update coop partner" id="menu_view_update_partner_info"  parent="menu_easy_my_coop_main_subscription" sequence="60" groups="base.group_system"/>
     </data>
 </openerp>