Merge branch 'refactor-structure' into cleanup-build-errors

Author: anthonymarkQA

.github/workflows/build_deploy.yml

@@ -3,7 +3,7 @@ name: Build and deploy OpenSPP documentation
 on:
   push:
     branches:
-      - "main"
+      - "**"
 
 jobs:
   build_deploy:
@@ -71,9 +71,11 @@ jobs:
       #     src: '_build/html/'
       #     dest: '${{secrets.DEPLOY_USER_DOCS}}@${{secrets.DEPLOY_SERVER_DOCS}}:${{secrets.DEPLOY_PATH_DOCS}}'
       - name: Commit documentation changes
+        if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: _build/html
       - name: Display status from deploy
+        if: github.ref == 'refs/heads/main'
         run: echo "${{ steps.deploy.outputs.status }}"

Makefile

@@ -3,7 +3,7 @@
 SHELL           = bash
 
 # Include module documentation targets
-include Makefile.modules
+# include Makefile.modules
 
 # You can set these variables from the command line.
 SPHINXOPTS      ?=

docs/developer_guide/api_usage/dci_api.md

@@ -15,15 +15,17 @@ OpenSPP provides a RESTful API that adheres to the Digital Convergence Initiativ
 - Client credentials (Client ID and Client Secret) obtained from the OpenSPP instance.
 - Python 3.x and the `requests` library installed (`pip install requests`).
 
-## 1. Authentication: Obtaining an Access Token
+## Process
+
+### Authentication: Obtaining an Access Token
 
 The DCI API is secured using OAuth 2.0 with the Client Credentials grant type. Before making any data requests, your application must obtain a bearer token.
 
 - **Endpoint**: `/oauth2/client/token`
 - **Method**: `POST`
 - **Body**: `x-www-form-urlencoded` with `grant_type`, `client_id`, `client_secret`, `db_name`.
 
-### Example: Get Access Token
+**Example: Get Access Token**
 
 ```python
 import requests
@@ -50,7 +52,7 @@ access_token = token_data.get("access_token")
 print("Access Token obtained successfully.")
 ```
 
-## 2. Searching the Registry
+### Searching the Registry
 
 Once authenticated, you can use the access token to perform a synchronous search on the registry.
 
@@ -61,7 +63,7 @@ Once authenticated, you can use the access token to perform a synchronous search
     - `Content-Type`: `application/json`
 - **Body**: A JSON object conforming to the DCI `sync/search` request specification.
 
-### Example: Search for an Individual
+**Example: Search for an Individual**
 
 ```python
 search_url = f"{url}/registry/sync/search"
@@ -72,7 +74,7 @@ headers = {
 }
 
 # Example search payload based on DCI specification
-# This searches for an individual with a specific phone number.
+# This searches for an individual with a specific birthdate.
 search_payload = {
     "header": {
         "message_id": "123456789020211216223812",
@@ -103,7 +105,7 @@ search_payload = {
                             "expression1": {
                                 "attribute_name": "birthdate",
                                 "operator": "eq",
-                                "attribute_value": "06/15/2020"
+                                "attribute_value": "2020-11-02"
                             }
                         }
                     ]
@@ -125,7 +127,7 @@ else:
 ```
 
 
-## 3. Setup and Configuration
+### Setup and Configuration
 
 To use the DCI API, you must first configure a client in OpenSPP.
 
@@ -135,15 +137,14 @@ To use the DCI API, you must first configure a client in OpenSPP.
 4.  **Reveal Credentials**: A **Show** button will appear. Click it to reveal the `Client ID` and `Client Secret`.
 5.  **Important**: Copy these credentials immediately. For security, the **Show** button will disappear after you close the dialog, and you will not be able to retrieve the secret again.
 
-## 4. Best Practices
+## Best Practices
 
 1.  **Secure Credential Storage**: Never hard-code your `Client ID` or `Client Secret` in your application. Use environment variables or a secure secret management system.
 2.  **Token Management**: Access tokens are short-lived. Your application should handle token expiration and automatically request a new one when needed.
 3.  **Error Handling**: Implement robust error handling to manage different HTTP status codes and error responses from the API.
 4.  **Secure Connections**: Always use HTTPS for all API traffic to protect data in transit.
 5.  **Logging**: Log request `transaction_id`s and correlation IDs to help with troubleshooting and auditing.
 
-## 5. References
+## References
 
-- [DCI Interface Standards v1.0](https://standards.spdci.org/standards/standards-for-interoperability-interfaces/structure-and-versioning-of-the-standards)
-- [Odoo 17 Developer Documentation](https://www.odoo.com/documentation/17.0/developer/)
+- [DCI Interface Standards v1.0](https://standards.spdci.org/standards/standards-for-interoperability-interfaces/structure-and-versioning-of-the-standards)

docs/developer_guide/api_usage/external_api_jsonrpc.md

@@ -15,14 +15,15 @@ This guide explains how to connect to and interact with OpenSPP Registry using t
 - User credentials or API key with appropriate permissions.
 - Python 3.x and the `requests` library installed (`pip install requests`).
 
-## 1. Understanding JSON-RPC in OpenSPP
+## Process
+### Understanding JSON-RPC in OpenSPP
 
 OpenSPP exposes much of its data and functionality via JSON-RPC endpoints. You can use these endpoints to authenticate, read, create, update, and delete records from external applications.
 
 **Endpoint:**  
 - `/jsonrpc` — All JSON-RPC calls (authentication and model methods)
 
-## 1.1 JSON-RPC Payload Structure and Methods
+### JSON-RPC Payload Structure and Methods
 
 All interactions with the OpenSPP JSON-RPC API use a standard payload structure. Each request is a JSON object with the following keys:
 
@@ -59,11 +60,11 @@ payload = {
 
 ---
 
-## 1.2 Common Model Methods and Args
+### Common Model Methods and Args
 
 When using the `"object"` service with the `"execute_kw"` method, you can call various model methods. Here are the most common:
 
-### `create`
+**`create`**
 Creates a new record.
 
 **Args:**
@@ -79,7 +80,7 @@ Creates a new record.
 **Result:**
 Returns the ID of the newly created record.
 
-### `write`
+**`write`**
 Updates existing records.
 
 **Args:**
@@ -96,7 +97,7 @@ Updates existing records.
 **Result:**
 Returns a dictionary indicating the result of the update.
 
-### `unlink`
+**`unlink`**
 Deletes records.
 
 **Args:**
@@ -113,7 +114,7 @@ Deletes records.
 Returns a dictionary indicating the result of the deletion.
 
 
-### `search_read`
+**`search_read`**
 Searches for records and reads their fields.
 
 **Args:**
@@ -141,7 +142,7 @@ Returns a dictionary of the search results.
 
 ---
 
-## 2. Authentication
+### Authentication
 
 You must authenticate before accessing most data. Use your password or an API key (recommended).
 
@@ -170,9 +171,9 @@ if not uid:
 print("Authenticated UID:", uid)
 ```
 
-## 3. Working with Individuals
+### Working with Individuals
 
-### Gather the Fields
+**Gather The Fields**
 
 For this example we are going to use these fields:
 
@@ -184,7 +185,7 @@ For this example we are going to use these fields:
 - `is_registrant` (boolean, default=True)
 - `is_group` (boolean, default=False)
 
-### Example: Create an Individual
+**Example: Create an Individual**
 
 ```python
 # First, get a gender_id (e.g., for "Male")
@@ -254,9 +255,9 @@ updated = response["result"]
 print("Result:", updated)
 ```
 
-## 4. Working with Groups
+### Working with Groups
 
-### Required Fields
+**Gather The Fields**
 
 For this example we are going to use these fields:
 
@@ -266,7 +267,7 @@ For this example we are going to use these fields:
 - `is_group` (boolean, default=True)
 
 
-### Example: Create a Group
+**Example: Create a Group**
 
 ```python
 # Get a group kind (e.g., "Household")
@@ -333,9 +334,9 @@ updated = response["result"]
 print("Result:", updated)
 ```
 
-## 5. Working with Memberships
+### Working with Memberships
 
-### Required Fields
+**Gather The Fields**
 
 From your `g2p_registry_membership` module, the main model is likely `g2p_registry_membership.group_membership`. Required fields typically include:
 - `individuak` (many2one, required)
@@ -344,7 +345,7 @@ From your `g2p_registry_membership` module, the main model is likely `g2p_regist
 - `start_date` (date, required)
 - Any other required fields as defined in your model
 
-### Example: Add an Individual to a Group
+**Example: Add an Individual to a Group**
 
 ```python
 # Get a membership kind (e.g., "Head")
@@ -391,13 +392,13 @@ membership_id = response["result"]
 print("Created Membership ID:", membership_id)
 ```
 
-## 6. Security: Using API Keys
+### Security: Using API Keys
 
 - **API keys** are recommended over passwords for scripts and integrations.
 - Generate API keys in your OpenSPP user preferences under **Account Security**.
 - Use the API key in place of your password in all JSON-RPC calls.
 
-## 7. Best Practices
+## Best Practices
 
 1. **Use API Keys**: Safer than passwords; revoke if compromised.
 2. **Limit Permissions**: Create dedicated users for API access with only necessary rights.
@@ -408,5 +409,4 @@ print("Created Membership ID:", membership_id)
 ## References
 
 - [Odoo 17 Developer Documentation](https://www.odoo.com/documentation/17.0/developer/)
-- [OpenSPP Developer Guide](https://docs.openspp.org/)
 - [JSON-RPC Specification](https://www.jsonrpc.org/specification)

docs/developer_guide/module_development/areas.md

@@ -210,8 +210,13 @@ Create `data/area_kind_data.xml` to add custom area types:
 
 On your `models/area.py` you can add computed fields, constrains, and validations:
 
+First, add the necessary imports:
+```python
+from odoo import api, fields, models
+from odoo.exceptions import ValidationError
+```
+
 ```python
-    # Add api on the import of odoo
 
     area_population_density = fields.Float(
         string="Population Density",
@@ -242,6 +247,7 @@ On your `models/area.py` you can add computed fields, constrains, and validation
                 if record.area_population_year > current_year:
                     raise ValidationError("Population year cannot be in the future.")
 ```
+Then add the custom computed field to the `area_views.xml` file
 
 ### Step 8: Install and Test
 

docs/developer_guide/module_development/indicators.md

@@ -101,7 +101,6 @@ class G2PRegistrant(models.Model):
         compute="_compute_ind_grp_num_children",
         help="Number of children in the group",
         store=True,
-        allow_filter=True,
     )
 
     # Boolean indicator example
@@ -110,7 +109,6 @@ class G2PRegistrant(models.Model):
         compute="_compute_ind_grp_is_single_head_hh",
         help="Single-headed HH - extracted from demographic data of HH adult members",
         store=True,
-        allow_filter=True,
     )
 
     # Individual indicator example
@@ -222,7 +220,6 @@ from odoo import api, ValidationError
 ## Best Practices
 
 - Use `store=True` for indicators that need to be queried.
-- Use `allow_filter=True` for indicators that should be filterable in views.
 - Provide clear help text explaining the indicator's purpose.
 
 ## References

docs/developer_guide/module_development/registry.md

@@ -5,7 +5,7 @@ reviewer: migration-script
 migration-notes: "Added during 2025 documentation reorganization"
 ---
 
-# Customize the Registry
+# Registry
 
 This article explains how to customize OpenSPP's registry system by introducing a new **top-level group** type. As a practical example, we’ll add a new top-level group type (such as "Village") that can contain regular groups (households), along with custom UI, data, and actions.
 
@@ -422,6 +422,4 @@ Village A (Top Level Group)
 For more information on extending OpenSPP modules, refer to:
 - [Odoo 17 Developer Documentation](https://www.odoo.com/documentation/17.0/developer/)
 - [OpenSPP Documentation](https://docs.openspp.org/)
-- Registry modules: `g2p_registry_group`, `g2p_registry_individual`, `g2p_registry_membership`
-- Hierarchy module: `spp_registry_group_hierarchy`
 - Related guides: {doc}`Customizing Fields <fields>`, {doc}`Customizing Indicators <indicators>`