From 7f4efc5c1f4ed70fbbbc20dca602492da2e52d11 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 11 Mar 2026 10:50:24 +0800
Subject: [PATCH 1/3] fix(security,vocabulary): port disability registry
 changes from openspp-modules-v2

- Add disability registry category to spp_security categories
- Remove vocabulary_disability.xml from spp_vocabulary (extracted to spp_disability_registry)
---
 spp_security/security/categories.xml | 8 ++++++++
 spp_vocabulary/__manifest__.py       | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/spp_security/security/categories.xml b/spp_security/security/categories.xml
index 8bf702a6..3f9e576e 100644
--- a/spp_security/security/categories.xml
+++ b/spp_security/security/categories.xml
@@ -194,6 +194,14 @@
         <field name="sequence">150</field>
     </record>
 
+    <!-- Disability Registry Domain Category -->
+    <record id="category_spp_disability" model="ir.module.category">
+        <field name="name">Disability Registry</field>
+        <field name="description">Disability assessment and registry management</field>
+        <field name="parent_id" ref="category_spp" />
+        <field name="sequence">76</field>
+    </record>
+
     <!-- Session Tracking Domain Category -->
     <record id="category_spp_sessions" model="ir.module.category">
         <field name="name">Sessions</field>
diff --git a/spp_vocabulary/__manifest__.py b/spp_vocabulary/__manifest__.py
index 283e0dff..ce699cf2 100644
--- a/spp_vocabulary/__manifest__.py
+++ b/spp_vocabulary/__manifest__.py
@@ -32,7 +32,6 @@
         "data/vocabulary_occupation.xml",
         "data/vocabulary_education_level.xml",
         "data/vocabulary_ethnocultural.xml",
-        "data/vocabulary_disability.xml",
         "data/vocabulary_housing.xml",
         "data/vocabulary_economic_activity.xml",
         "data/vocabulary_language.xml",

From 097b348be4ca99d917e3ae595cb6956c1ddc029d Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 11 Mar 2026 11:05:01 +0800
Subject: [PATCH 2/3] fix(spp_vocabulary): add vocabulary_disability.xml to
 manifest data list

The file existed but was not referenced in the manifest, causing the
OCA file-not-used pre-commit check to fail.
---
 spp_vocabulary/__manifest__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spp_vocabulary/__manifest__.py b/spp_vocabulary/__manifest__.py
index ce699cf2..aa4310ab 100644
--- a/spp_vocabulary/__manifest__.py
+++ b/spp_vocabulary/__manifest__.py
@@ -41,6 +41,7 @@
         "data/concept_groups.xml",
         "data/vocabulary_id_type.xml",
         "data/vocabulary_cr_document_types.xml",
+        "data/vocabulary_disability.xml",
         # Temporarily disabled - references spp.relationship model from spp_registry
         # "data/relationship_types.xml",
     ],

From dd1381678166a9afd5f4e54f007ae005b283a312 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 11 Mar 2026 11:20:13 +0800
Subject: [PATCH 3/3] fix(spp_security): reorder Disability Registry category
 by sequence

Move the Disability Registry category (sequence 76) to its correct
position between Case Management (75) and Health Monitoring (77),
matching the sequence-based ordering of the file.
---
 spp_security/security/categories.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spp_security/security/categories.xml b/spp_security/security/categories.xml
index 3f9e576e..134e3ae7 100644
--- a/spp_security/security/categories.xml
+++ b/spp_security/security/categories.xml
@@ -102,6 +102,14 @@
         <field name="sequence">75</field>
     </record>
 
+    <!-- Disability Registry Domain Category -->
+    <record id="category_spp_disability" model="ir.module.category">
+        <field name="name">Disability Registry</field>
+        <field name="description">Disability assessment and registry management</field>
+        <field name="parent_id" ref="category_spp" />
+        <field name="sequence">76</field>
+    </record>
+
     <!-- Health Monitoring Domain Category -->
     <record id="category_spp_health_monitoring" model="ir.module.category">
         <field name="name">Health Monitoring</field>
@@ -194,14 +202,6 @@
         <field name="sequence">150</field>
     </record>
 
-    <!-- Disability Registry Domain Category -->
-    <record id="category_spp_disability" model="ir.module.category">
-        <field name="name">Disability Registry</field>
-        <field name="description">Disability assessment and registry management</field>
-        <field name="parent_id" ref="category_spp" />
-        <field name="sequence">76</field>
-    </record>
-
     <!-- Session Tracking Domain Category -->
     <record id="category_spp_sessions" model="ir.module.category">
         <field name="name">Sessions</field>