fix(change_request): replace head-replacement toggle with an info notice (#871)

Drop the 'Replace current Head of Household' boolean. When the new member
is given the Head role and the group already has a head, the form now
shows a warning that applying will make this member the head and remove
the role from the current head; the replacement then happens
automatically on apply (the CR still passes through approval first).

Author: emjay0921

spp_change_request_v2/details/add_member.py

@@ -138,8 +138,9 @@ class SPPCRDetailAddMember(models.Model):
 
     # ──────────────────────────────────────────────────────────────────────
     # Head-of-household replacement (OP#871 QA round 1)
-    # When the target group already has a head, making this new member the head
-    # is an explicit, confirmed action rather than a silent auto-demotion.
+    # When the target group already has a head and this new member is given the
+    # Head role, an info banner warns that applying will replace the current
+    # head. The replacement then happens automatically on apply.
     # ──────────────────────────────────────────────────────────────────────
     group_has_head = fields.Boolean(
         compute="_compute_current_head",
@@ -149,11 +150,6 @@ class SPPCRDetailAddMember(models.Model):
         compute="_compute_current_head",
         string="Current Head of Household",
     )
-    replace_existing_head = fields.Boolean(
-        string="Replace current Head of Household",
-        help="When set, applying this change request removes the Head role from "
-        "the group's current head and assigns it to this new member.",
-    )
     selected_role_is_head = fields.Boolean(
         compute="_compute_selected_role_is_head",
         string="Selected Role Is Head",

spp_change_request_v2/strategies/add_member.py

@@ -92,17 +92,6 @@ def _validate(self, detail):
                 )
             )
 
-        # Replacing an existing head must be explicitly confirmed.
-        if self._is_head_role(detail.membership_type_id) and detail.group_has_head and not detail.replace_existing_head:
-            head_suffix = f" ({detail.current_head_name})" if detail.current_head_name else ""
-            raise UserError(
-                _(
-                    "This group already has a Head of Household%s. Enable "
-                    "'Replace current Head of Household' to make this new member the head."
-                )
-                % head_suffix
-            )
-
     # ──────────────────────────────────────────────────────────────────────
     # Individual creation
     # ──────────────────────────────────────────────────────────────────────
@@ -208,8 +197,9 @@ def _demote_existing_head_if_needed(self, detail, group):
         picking the Head role. "Demote" unlinks the ``head`` code from the
         existing membership's ``membership_type_ids``; other roles are kept.
         """
-        # Only when the new member is being made head AND the user confirmed.
-        if not (self._is_head_role(detail.membership_type_id) and detail.replace_existing_head):
+        # Only when the new member is being made head. Demotion is automatic on
+        # apply; the form warns the user beforehand via the info banner.
+        if not self._is_head_role(detail.membership_type_id):
             return
 
         head_code = self._head_code()

spp_change_request_v2/tests/test_add_member_strategy.py

@@ -161,12 +161,11 @@ def test_adding_head_demotes_existing_head(self):
         )
         self.assertIn(self.head_kind, old_membership.membership_type_ids)
 
-        # Add new member as head, confirming the replacement.
+        # Add new member as head — replacement happens automatically on apply.
         cr = self._make_cr(
             given_name="New",
             family_name="Head",
             membership_type_id=self.head_kind.id,
-            replace_existing_head=True,
         )
         cr.approval_state = "approved"
         cr.action_apply()
@@ -179,31 +178,8 @@ def test_adding_head_demotes_existing_head(self):
         # Old head's membership had `head` removed.
         self.assertNotIn(self.head_kind, old_membership.membership_type_ids)
 
-    def test_head_replacement_requires_confirmation(self):
-        """Making the new member head while the group already has one is blocked
-        until 'Replace current Head of Household' is enabled (OP#871 QA round 1)."""
-        if not self.head_kind:
-            self.skipTest("head membership-type code not present in the vocabulary")
-        old_head = self.partner_model.create({"name": "Seated Head", "is_registrant": True, "is_group": False})
-        self.membership_model.create(
-            {
-                "group": self.group.id,
-                "individual": old_head.id,
-                "start_date": "2020-01-01",
-                "membership_type_ids": [Command.link(self.head_kind.id)],
-            }
-        )
-        # Head role picked but replacement NOT confirmed → blocked on apply.
-        cr = self._make_cr(given_name="No", family_name="Confirm", membership_type_id=self.head_kind.id)
-        self.assertTrue(cr.get_detail().group_has_head)
-        cr.approval_state = "approved"
-        with self.assertRaises(UserError) as cm:
-            cr.action_apply()
-        self.assertIn("already has a head of household", str(cm.exception).lower())
-
-    def test_replace_toggle_ignored_when_role_not_head(self):
-        """A stale replace toggle must not make a non-head member the head, nor
-        demote the existing head, when the picked role isn't Head (OP#871)."""
+    def test_non_head_role_leaves_existing_head(self):
+        """Adding a non-head member must not touch the group's existing head."""
         if not self.head_kind or not self.member_kind:
             self.skipTest("head/member membership-type codes not present")
         old_head = self.partner_model.create({"name": "Keep Head", "is_registrant": True, "is_group": False})
@@ -215,16 +191,13 @@ def test_replace_toggle_ignored_when_role_not_head(self):
                 "membership_type_ids": [Command.link(self.head_kind.id)],
             }
         )
-        cr = self._make_cr(
-            given_name="Plain",
-            family_name="Member",
-            membership_type_id=self.member_kind.id,
-            replace_existing_head=True,  # stale toggle, role is not head
-        )
-        self.assertFalse(cr.get_detail().selected_role_is_head)
+        cr = self._make_cr(given_name="Plain", family_name="Member", membership_type_id=self.member_kind.id)
+        detail = cr.get_detail()
+        self.assertTrue(detail.group_has_head)
+        self.assertFalse(detail.selected_role_is_head)  # drives the info banner visibility
         cr.approval_state = "approved"
         cr.action_apply()
-        new_member = cr.get_detail().created_individual_id
+        new_member = detail.created_individual_id
         new_membership = self.membership_model.search(
             [("group", "=", self.group.id), ("individual", "=", new_member.id)]
         )

spp_change_request_v2/views/detail_add_member_views.xml

@@ -175,33 +175,26 @@
                             >Head</em> before applying.
                             </div>
 
-                            <!-- Head-of-household replacement (OP#871 QA round 1):
-                                 only surfaced when the group already has a head. -->
+                            <!-- Head-of-household replacement notice (OP#871 QA round 1):
+                                 shown only when Role is Head and the group already has one. -->
                             <field name="group_has_head" invisible="1" />
                             <field name="selected_role_is_head" invisible="1" />
                             <div
-                                class="alert alert-info"
+                                class="alert alert-warning"
                                 role="alert"
                                 invisible="not group_has_head or not selected_role_is_head"
                             >
-                                <i class="fa fa-info-circle me-2" />
+                                <i class="fa fa-exclamation-triangle me-2" />
                                 This group already has a Head of Household
                                 (<field
                                 name="current_head_name"
                                 readonly="1"
                                 nolabel="1"
                                 class="d-inline"
                             />).
-                                Enable <strong
-                            >Replace current Head of Household</strong> to make
-                                this new member the head instead — the current head loses the Head
-                                role when this change request is applied.
+                                Applying this change request will make this new member the Head and
+                                remove the Head role from the current head.
                             </div>
-                            <group
-                                invisible="not group_has_head or not selected_role_is_head"
-                            >
-                                <field name="replace_existing_head" />
-                            </group>
 
                             <separator string="Existing members (read-only)" />
                             <field