From dc594ee21c74aeef88bd23231201ce68d203738d Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Wed, 15 Dec 2021 16:04:15 +0100
Subject: [PATCH] [update] reorder menus

---
 __manifest__.py              |  2 ++
 views/account_invoice.xml    |  8 --------
 views/menus.xml              | 32 ++++++++++++++++++++++++++++++++
 views/scop_bordereau_cg.xml  |  8 --------
 views/scop_cotisation_cg.xml |  7 -------
 5 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 views/menus.xml

diff --git a/__manifest__.py b/__manifest__.py
index 4eb8bf1..fb76d4a 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -43,5 +43,7 @@
         "wizard/scop_bordereau_validate_confirm_view.xml",
         # Wizard dependency view
         "views/scop_bordereau_cg.xml",
+        # Menus
+        "views/menus.xml",
     ]
 }
diff --git a/views/account_invoice.xml b/views/account_invoice.xml
index 59350d0..0c01505 100644
--- a/views/account_invoice.xml
+++ b/views/account_invoice.xml
@@ -91,13 +91,5 @@
             <field name="act_window_id" ref="action_scop_cg_appel_cotisation"/>
         </record>
 
-        <!-- MENUS -->
-        <menuitem id="menu_scop_cotisation_cg_appel_cotisation"
-                  name="Appels de cotisations"
-                  parent="cgscop_cotisation.menu_scop_cotisation"
-                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
-                  action="action_scop_cg_appel_cotisation"
-                  sequence="20"/>
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/views/menus.xml b/views/menus.xml
new file mode 100644
index 0000000..cf83ae6
--- /dev/null
+++ b/views/menus.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- Copyright 2019 Le Filament
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <data>
+        <!-- MENUS -->
+        <menuitem id="menu_scop_cotisation_cg_main"
+                  parent="cgscop_cotisation.menu_scop_cotisation"
+                  name="Gestion des cotisations CG Scop"
+                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
+                  sequence="10"/>
+        <menuitem id="menu_scop_cotisation_cg_calcul"
+                  name="Campagnes de cotisations"
+                  parent="cgscop_cotisation_cg.menu_scop_cotisation_cg_main"
+                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
+                  action="action_scop_cotisation_cg"
+                  sequence="10"/>
+        <menuitem name="Bordereaux"
+                  id="scop_bordereau_menu"
+                  parent="cgscop_cotisation_cg.menu_scop_cotisation_cg_main"
+                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
+                  action="scop_bordereau_act_window"
+                  sequence="20"/>
+        <menuitem id="menu_scop_cotisation_cg_appel_cotisation"
+                  name="Appels de cotisations"
+                  parent="cgscop_cotisation_cg.menu_scop_cotisation_cg_main"
+                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
+                  action="action_scop_cg_appel_cotisation"
+                  sequence="30"/>
+    </data>
+</odoo>
diff --git a/views/scop_bordereau_cg.xml b/views/scop_bordereau_cg.xml
index c2134d9..b1388fa 100644
--- a/views/scop_bordereau_cg.xml
+++ b/views/scop_bordereau_cg.xml
@@ -235,13 +235,5 @@
             <field name="context">{'search_default_current_year': 1}</field>
         </record>
 
-        <!-- Menu -->
-        <menuitem name="Bordereaux"
-                  id="scop_bordereau_menu"
-                  parent="cgscop_cotisation.menu_scop_cotisation"
-                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
-                  action="scop_bordereau_act_window"
-                  sequence="30"/>
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/views/scop_cotisation_cg.xml b/views/scop_cotisation_cg.xml
index 58b288d..cead779 100644
--- a/views/scop_cotisation_cg.xml
+++ b/views/scop_cotisation_cg.xml
@@ -155,12 +155,5 @@
             <field name="help">Affiche les bases de calcul des cotisations</field>
         </record>
 
-
-        <!-- MENUS -->
-        <menuitem id="menu_scop_cotisation_cg_calcul"
-                  parent="cgscop_cotisation.menu_scop_cotisation"
-                  groups="cgscop_cotisation_cg.group_cotisation_cg_administrative"
-                  action="action_scop_cotisation_cg"
-                  sequence="10"/>
     </data>
 </odoo>
-- 
GitLab