Common Demo Module Restructure

.github/workflows/test.yml

@@ -153,7 +153,7 @@ jobs:
       - name: Install addons and dependencies
         env:
           SKIP_EXT_DEB_DEPENDENCIES: "true"
-          EXCLUDE_REGEX: "odoo-addon-g2p.*|odoo-addon-muk.*"
+          EXCLUDE_REGEX: "odoo-addon-g2p.*|odoo-addon-muk.*|odoo-addon-spp.*"
         run: oca_install_addons
       - name: Check licenses
         run: manifestoo -d . check-licenses
@@ -167,10 +167,15 @@ jobs:
         run: |
           rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_programs/tests
           rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_registry_individual/tests
+      - name: Initialize sp_mis db
+        env:
+          PGDATABASE: sp_mis
+        run: oca_init_test_database
       - name: Run SP-MIS tests
         env:
+          PGDATABASE: sp_mis
           COVERAGE_FILE: ".coverage-mis"
-          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_social_registry,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm"
+          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_social_registry,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_base_farmer_registry_demo"
         run: oca_run_tests
       - name: Initialize farmer_registry db
         env:
@@ -198,7 +203,7 @@ jobs:
         env:
           PGDATABASE: social_registry
           COVERAGE_FILE: ".coverage-social"
-          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_spmis,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group"
+          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_spmis,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group,spp_base_farmer_registry_demo"
         run: oca_run_tests
       - name: Combine coverage data
         run: coverage combine .coverage-mis .coverage-farmer .coverage-social

spp_base_common/models/__init__.py

@@ -1,3 +1,4 @@
 from . import ir_module_module
 from . import phone_validation
 from . import phone_number
+from . import res_partner

spp_base_common/models/res_partner.py

@@ -0,0 +1,16 @@
+import logging
+
+from odoo import fields, models
+
+_logger = logging.getLogger(__name__)
+
+
+class SPPResPartner(models.Model):
+    _inherit = "res.partner"
+
+    company_id = fields.Many2one(
+        "res.company",
+        string="Company",
+        default=lambda self: self.env.company,
+        required=False,
+    )

spp_base_common/views/main_view.xml

@@ -18,4 +18,11 @@
         name="Settings"
         web_icon="spp_base_common,static/description/OpenSPP-Icons-Setting.png"
     />
+    <menuitem
+        id="spp_bank_types_config_menu"
+        action="base.action_res_bank_form"
+        name="Banks"
+        parent="g2p_registry_base.g2p_configuration_menu_root"
+        sequence="50"
+    />
 </odoo>

spp_base_common/views/phone_validation_view.xml

@@ -35,7 +35,7 @@
                     class="btn-danger"
                     invisible="state == 'inactive'"
                 />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>

spp_farmer_registry_demo/README.rst → spp_base_farmer_registry_demo/README.rst

@@ -17,7 +17,7 @@ OpenSPP Farmer Registry Demo
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OpenSPP%2Fopenspp--modules-lightgray.png?logo=github
-    :target: https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_farmer_registry_demo
+    :target: https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_base_farmer_registry_demo
     :alt: OpenSPP/openspp-modules
 
 |badge1| |badge2| |badge3|
@@ -28,7 +28,7 @@ OpenSPP Farmer Registry Demo
 Overview
 --------
 
-The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module is a
+The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module is a
 demonstration module for OpenSPP that provides pre-populated data for
 the farmer registry. It builds upon the
 `spp_base_farmer_registry <spp_base_farmer_registry>`__ module and its
@@ -80,7 +80,7 @@ Module Dependencies and Integration
 Additional Functionality
 ------------------------
 
-The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module
+The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module
 introduces the following key functionalities:
 
 -  **Sample Data Generation:** The module includes a dedicated model,
@@ -123,7 +123,7 @@ introduces the following key functionalities:
 Conclusion
 ----------
 
-The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module
+The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module
 provides a valuable tool for understanding and demonstrating the
 functionalities of the OpenSPP farmer registry system. By populating the
 database with realistic sample data, it allows users to explore the
@@ -143,7 +143,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenSPP/openspp-modules/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_farmer_registry_demo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_base_farmer_registry_demo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -172,6 +172,6 @@ Current maintainers:
 
 |maintainer-jeremi| |maintainer-gonzalesedwin1123| |maintainer-reichie020212| 
 
-This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_farmer_registry_demo>`_ project on GitHub.
+This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_base_farmer_registry_demo>`_ project on GitHub.
 
 You are welcome to contribute.

spp_farmer_registry_demo/__manifest__.py → spp_base_farmer_registry_demo/__manifest__.py

@@ -17,12 +17,13 @@
         "base",
         "g2p_registry_base",
         "spp_base_farmer_registry",
-        "spp_base_demo",
+        "spp_demo_common",
         "queue_job",
         "spp_custom_filter_farmer_registry",
     ],
     "excludes": [
         "spp_base_spmis",
+        "spp_base_social_registry",
     ],
     "data": [
         "security/ir.model.access.csv",
@@ -36,7 +37,6 @@
         "data/feed_items_data.xml",
         "views/group_view.xml",
         "views/individual_view.xml",
-        "views/generate_farmer_data_view.xml",
     ],
     "assets": {},
     "demo": [],