Modules Fixes

spp_base_demo/tests/test_locale_providers.py

@@ -1,8 +1,6 @@
-from faker import Faker
-
 from odoo.tests.common import TransactionCase
 
-from ..locale_providers import create_faker, get_faker_provider
+from ..locale_providers import get_faker_provider
 from ..locale_providers.en_KE import Provider as EnKeProvider
 from ..locale_providers.lo_LA import Provider as LoLaProvider
 from ..locale_providers.si_LK import Provider as SiLkProvider
@@ -22,9 +20,3 @@ def test_get_faker_provider(self):
         self.assertEqual(get_faker_provider("sw_KE"), SwKeProvider)
         self.assertEqual(get_faker_provider("ta_LK"), TaLkProvider)
         self.assertEqual(get_faker_provider("en_US"), None)
-
-    def test_create_faker(self):
-        fake = create_faker("en_KE")
-        self.assertIsInstance(fake, Faker)
-        self.assertIn(fake.first_name(), EnKeProvider.first_names)
-        self.assertIn(fake.last_name(), EnKeProvider.last_names)

spp_base_farmer_registry/views/group_view.xml

@@ -304,4 +304,14 @@
             </xpath>
         </field>
     </record>
+    <record id="view_groups_list_farmer_registry_tree" model="ir.ui.view">
+        <field name="name">view_groups_list_farmer_registry_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_group.view_groups_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
 </odoo>

spp_base_farmer_registry/views/individual_view.xml

@@ -100,4 +100,14 @@
             </xpath>
         </field>
     </record>
+     <record id="view_individuals_list_farmer_registry_tree" model="ir.ui.view">
+        <field name="name">view_individuals_list_farmer_registry_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_individual.view_individuals_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
 </odoo>

spp_base_social_registry/__manifest__.py

@@ -29,7 +29,9 @@
         "spp_base_spmis",
     ],
     "external_dependencies": {},
-    "data": [],
+    "data": [
+        "views/registrant_view.xml",
+    ],
     "assets": {},
     "demo": [],
     "images": [],

spp_base_social_registry/views/registrant_view.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_individuals_list_social_registry_tree" model="ir.ui.view">
+        <field name="name">view_individuals_list_social_registry_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_individual.view_individuals_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_groups_list_social_registry_tree" model="ir.ui.view">
+        <field name="name">view_groups_list_social_registry_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_group.view_groups_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

spp_base_spmis/views/registrant_view.xml

@@ -25,4 +25,26 @@
         </field>
     </record>
 
+    <record id="view_individuals_list_spmis_tree" model="ir.ui.view">
+        <field name="name">view_individuals_list_spmis_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_individual.view_individuals_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_groups_list_spmis_tree" model="ir.ui.view">
+        <field name="name">view_groups_list_spmis_tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="g2p_registry_group.view_groups_list_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="delete">0</attribute>
+            </xpath>
+        </field>
+    </record>
+
 </odoo>

spp_change_request/__init__.py

@@ -1,3 +1,4 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 
 from . import models
+from .tests import test_models

spp_change_request/models/change_request.py

@@ -88,6 +88,38 @@ class ChangeRequestBase(models.Model):
         domain=[("is_registrant", "=", True)],
     )  #: Registrant who submitted the change request
 
+    validation_stage = fields.Selection(
+        [
+            ("local", "Local"),
+            ("hq", "HQ"),
+            ("completed", "Completed"),
+        ],
+        string="Validation Stage",
+        default="local",
+        compute="_compute_validation_stage",
+        store=True,
+    )
+
+    @api.depends("validator_ids")
+    def _compute_validation_stage(self):
+        for rec in self:
+            validation_sequences = self.env["spp.change.request.validation.sequence"].search(
+                [("request_type", "=", rec.request_type)]
+            )
+            total_sequences = len(validation_sequences)
+            total_validators = len(rec.validator_ids)
+            if not validation_sequences or total_sequences == 0:
+                rec.validation_stage = "local"
+            else:
+                if total_validators == 0:
+                    rec.validation_stage = "local"
+                elif total_validators < total_sequences - 1:
+                    rec.validation_stage = "local"
+                elif total_validators == total_sequences - 1:
+                    rec.validation_stage = "hq"
+                elif total_validators >= total_sequences:
+                    rec.validation_stage = "completed"
+
     @api.model
     def _registrant_id_not_visible_in_request_type(self):
         return []

spp_change_request/models/mixins/source_mixin.py

@@ -76,6 +76,63 @@ class ChangeRequestAddChildren(models.Model):
     #    string="DMS Files",
     #    auto_join=True,
     # )
+    validation_stage = fields.Selection(
+        string="Validation Stage",
+        related="change_request_id.validation_stage",
+    )
+    show_cr_actions = fields.Boolean(compute="_compute_show_cr_actions")
+    show_assign_button = fields.Boolean(compute="_compute_show_assign_button")
+    show_reassign_button = fields.Boolean(compute="_compute_show_reassign_button")
+
+    def _compute_show_cr_actions(self):
+        for rec in self:
+            user = self.env.user
+            rec.show_cr_actions = (
+                rec.validation_stage == "local"
+                and user.has_group("spp_change_request.group_spp_change_request_validator")
+                and user.id == rec.assign_to_id.id
+            ) or (
+                rec.validation_stage == "hq"
+                and user.has_group("spp_change_request.group_spp_change_request_hq_validator")
+                and user.id == rec.assign_to_id.id
+            )
+
+    def _compute_show_assign_button(self):
+        for rec in self:
+            user = self.env.user
+            assigned_id = rec.assign_to_id.id if rec.assign_to_id else None
+            user_not_assigned = True
+            if assigned_id:
+                user_not_assigned = True if assigned_id != user.id else False
+
+            rec.show_assign_button = (
+                rec.state in ("draft", "pending", "validated", "rejected")
+                and (
+                    rec.validation_stage == "local"
+                    and user.has_group("spp_change_request.group_spp_change_request_validator")
+                )
+                or (
+                    rec.validation_stage == "hq"
+                    and user.has_group("spp_change_request.group_spp_change_request_hq_validator")
+                )
+                or user.has_group("g2p_registry_base.group_g2p_admin")
+            ) and user_not_assigned
+
+    def _compute_show_reassign_button(self):
+        for rec in self:
+            user = self.env.user
+            rec.show_reassign_button = (
+                rec.state in ("draft", "pending", "validated", "rejected")
+                and (
+                    rec.validation_stage == "local"
+                    and user.has_group("spp_change_request.group_spp_change_request_validator")
+                )
+                or (
+                    rec.validation_stage == "hq"
+                    and user.has_group("spp_change_request.group_spp_change_request_hq_validator")
+                )
+                or user.has_group("g2p_registry_base.group_g2p_admin")
+            ) and rec.assign_to_id.id == user.id
 
     def _copy_group_member_ids(self, group_id_field, group_ref_field="registrant_id"):
         for rec in self: