From a1a5ece6018fc5b47a37f2259b9c47ee07b5f380 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 5 May 2026 14:37:36 +0800
Subject: [PATCH 1/3] fix(spp_gis): own the GIS Configuration menu so Raster +
 Data Layer are reachable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Installing spp_gis alone left every Raster / Data Layer / Color Scheme
action orphaned: spp_gis defines all three models, views and actions but
shipped no `<menuitem>` records. The "GIS Configuration" root menu lived
in spp_gis_indicators, so installing only spp_gis showed nothing under
Settings, and installing spp_gis_indicators on top exposed only its own
Indicator Layers and Color Scales submenus — Raster and Data Layer
remained unreachable from the UI.

Move ownership of the menu hierarchy back to spp_gis where the actions
live. New `spp_gis/views/menu.xml` declares:

- `menu_gis_config_root` — "GIS Configuration" under
  base.menu_administration (Settings), restricted to base.group_system
- Raster Layers (seq 10), Data Layers (seq 20), Color Schemes (seq 30)

spp_gis_indicators retargets its two submenus to
`spp_gis.menu_gis_config_root` (Indicator Layers seq 40, Color Scales
seq 50) and drops its now-duplicate root declaration.

Net effect:
- spp_gis alone → Settings → GIS Configuration → Raster Layers / Data
  Layers / Color Schemes appear immediately
- spp_gis + spp_gis_indicators → also adds Indicator Layers + Color
  Scales under the same root, in deterministic order

Refs OP#988.
---
 spp_gis/__manifest__.py                       |  3 +-
 spp_gis/views/menu.xml                        | 43 +++++++++++++++++++
 spp_gis_indicators/__manifest__.py            |  2 +-
 .../views/color_scale_views.xml               |  6 +--
 .../views/indicator_layer_views.xml           |  6 +--
 spp_gis_indicators/views/menu.xml             | 16 +++----
 6 files changed, 60 insertions(+), 16 deletions(-)
 create mode 100644 spp_gis/views/menu.xml

diff --git a/spp_gis/__manifest__.py b/spp_gis/__manifest__.py
index f22d35a8..94ae012d 100644
--- a/spp_gis/__manifest__.py
+++ b/spp_gis/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "OpenSPP GIS",
     "category": "OpenSPP/Core",
-    "version": "19.0.2.0.0",
+    "version": "19.0.2.0.1",
     "sequence": 1,
     "author": "OpenSPP.org",
     "website": "https://github.com/OpenSPP/OpenSPP2",
@@ -25,6 +25,7 @@
         "views/data_layer_view.xml",
         "views/color_scheme_views.xml",
         "views/area.xml",
+        "views/menu.xml",
     ],
     "assets": {
         "web.assets_backend": [
diff --git a/spp_gis/views/menu.xml b/spp_gis/views/menu.xml
new file mode 100644
index 00000000..f66da11d
--- /dev/null
+++ b/spp_gis/views/menu.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    GIS Configuration menu — owned by spp_gis because the underlying
+    Raster Layer / Data Layer / Color Scheme actions and models live
+    here. Previously this root menu was declared in spp_gis_indicators,
+    which meant installing spp_gis alone left every Raster/Data Layer
+    action orphaned (no menu pointed at them) and the configuration
+    section under Settings was empty. spp_gis_indicators now reuses
+    the root via `spp_gis.menu_gis_config_root`. See OP#988.
+-->
+<odoo>
+    <menuitem
+        id="menu_gis_config_root"
+        name="GIS Configuration"
+        parent="base.menu_administration"
+        sequence="780"
+        groups="base.group_system"
+    />
+
+    <menuitem
+        id="menu_gis_raster_layer"
+        name="Raster Layers"
+        parent="menu_gis_config_root"
+        action="action_spp_gis_raster_layer"
+        sequence="10"
+    />
+
+    <menuitem
+        id="menu_gis_data_layer"
+        name="Data Layers"
+        parent="menu_gis_config_root"
+        action="action_data_layer_view"
+        sequence="20"
+    />
+
+    <menuitem
+        id="menu_gis_color_scheme"
+        name="Color Schemes"
+        parent="menu_gis_config_root"
+        action="action_gis_color_scheme"
+        sequence="30"
+    />
+</odoo>
diff --git a/spp_gis_indicators/__manifest__.py b/spp_gis_indicators/__manifest__.py
index 2c200ae2..d8bc4908 100644
--- a/spp_gis_indicators/__manifest__.py
+++ b/spp_gis_indicators/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "OpenSPP GIS Indicators",
     "summary": "Choropleth visualization for area-level indicators",
-    "version": "19.0.2.0.0",
+    "version": "19.0.2.0.1",
     "category": "OpenSPP/GIS",
     "author": "OpenSPP.org",
     "website": "https://github.com/OpenSPP/OpenSPP2",
diff --git a/spp_gis_indicators/views/color_scale_views.xml b/spp_gis_indicators/views/color_scale_views.xml
index 07bc3f08..e07561ce 100644
--- a/spp_gis_indicators/views/color_scale_views.xml
+++ b/spp_gis_indicators/views/color_scale_views.xml
@@ -107,12 +107,12 @@
         </field>
     </record>
 
-    <!-- Menu Item -->
+    <!-- Menu Item — parent menu lives in spp_gis (see OP#988). -->
     <menuitem
         id="menu_gis_color_scale"
         name="Color Scales"
-        parent="menu_gis_config_root"
+        parent="spp_gis.menu_gis_config_root"
         action="action_gis_color_scale"
-        sequence="20"
+        sequence="50"
     />
 </odoo>
diff --git a/spp_gis_indicators/views/indicator_layer_views.xml b/spp_gis_indicators/views/indicator_layer_views.xml
index cbb66749..120e6e48 100644
--- a/spp_gis_indicators/views/indicator_layer_views.xml
+++ b/spp_gis_indicators/views/indicator_layer_views.xml
@@ -155,12 +155,12 @@
         </field>
     </record>
 
-    <!-- Menu Item -->
+    <!-- Menu Item — parent menu lives in spp_gis (see OP#988). -->
     <menuitem
         id="menu_gis_indicator_layer"
         name="Indicator Layers"
-        parent="menu_gis_config_root"
+        parent="spp_gis.menu_gis_config_root"
         action="action_gis_indicator_layer"
-        sequence="10"
+        sequence="40"
     />
 </odoo>
diff --git a/spp_gis_indicators/views/menu.xml b/spp_gis_indicators/views/menu.xml
index 1243f8c8..38ba3fd2 100644
--- a/spp_gis_indicators/views/menu.xml
+++ b/spp_gis_indicators/views/menu.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Root "GIS Configuration" menu used to live here, but installing
+    spp_gis alone left every Raster/Data Layer action orphaned because
+    the root was unreachable. The root is now declared in spp_gis
+    (which owns those actions) — see spp_gis/views/menu.xml. This
+    module's submenus reference it via `spp_gis.menu_gis_config_root`.
+    See OP#988.
+-->
 <odoo>
-    <!-- GIS Configuration parent menu under Settings -->
-    <menuitem
-        id="menu_gis_config_root"
-        name="GIS Configuration"
-        parent="base.menu_administration"
-        sequence="780"
-        groups="base.group_system"
-    />
 </odoo>

From 2f2df8bbfbff7fb15f6691233c34c92fe9a36e5b Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 6 May 2026 18:29:14 +0800
Subject: [PATCH 2/3] style(spp_gis_indicators): self-close empty odoo root for
 prettier

---
 spp_gis_indicators/views/menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spp_gis_indicators/views/menu.xml b/spp_gis_indicators/views/menu.xml
index 38ba3fd2..d82b2e30 100644
--- a/spp_gis_indicators/views/menu.xml
+++ b/spp_gis_indicators/views/menu.xml
@@ -7,5 +7,5 @@
     module's submenus reference it via `spp_gis.menu_gis_config_root`.
     See OP#988.
 -->
-<odoo>
-</odoo>
+<odoo />
+

From 3f6e86f1cdd2367734a7bd166eda3c595710a202 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 6 May 2026 18:38:18 +0800
Subject: [PATCH 3/3] style(spp_gis_indicators): drop trailing blank line in
 menu.xml

---
 spp_gis_indicators/views/menu.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spp_gis_indicators/views/menu.xml b/spp_gis_indicators/views/menu.xml
index d82b2e30..8c9973f9 100644
--- a/spp_gis_indicators/views/menu.xml
+++ b/spp_gis_indicators/views/menu.xml
@@ -8,4 +8,3 @@
     See OP#988.
 -->
 <odoo />
-