[UPD] spp_registry_name_suffix: support multiple suffixes per individual

gonzalesedwin1123 · gonzalesedwin1123 · commit 462be1d4c515 · 2025-12-09T09:29:15.000+08:00
Change suffix field from Many2one to Many2many to allow selecting
multiple suffixes (e.g., 'Jr., PhD'). Suffixes are displayed in
sequence order. Updated views to use many2many_tags widget and
added comprehensive tests for multiple suffix scenarios.
diff --git a/spp_registry_name_suffix/data/name_suffix_data.xml b/spp_registry_name_suffix/data/name_suffix_data.xml
@@ -16,6 +16,13 @@
         <field name="description">Senior - typically used for a father when a son has the same name</field>
     </record>
 
+    <record id="suffix_jra" model="spp.name.suffix">
+        <field name="name">Jra.</field>
+        <field name="code">JRA</field>
+        <field name="sequence">25</field>
+        <field name="description">JRA </field>
+    </record>
+
     <record id="suffix_i" model="spp.name.suffix">
         <field name="name">I</field>
         <field name="code">I</field>
@@ -51,6 +58,76 @@
         <field name="description">The Fifth</field>
     </record>
 
+    <record id="suffix_vi" model="spp.name.suffix">
+        <field name="name">VI</field>
+        <field name="code">VI</field>
+        <field name="sequence">71</field>
+        <field name="description">The Sixth</field>
+    </record>
+
+    <record id="suffix_vii" model="spp.name.suffix">
+        <field name="name">VII</field>
+        <field name="code">VII</field>
+        <field name="sequence">72</field>
+        <field name="description">The Seventh</field>
+    </record>
+
+    <record id="suffix_viii" model="spp.name.suffix">
+        <field name="name">VIII</field>
+        <field name="code">VIII</field>
+        <field name="sequence">73</field>
+        <field name="description">The Eighth</field>
+    </record>
+
+    <record id="suffix_ix" model="spp.name.suffix">
+        <field name="name">IX</field>
+        <field name="code">IX</field>
+        <field name="sequence">74</field>
+        <field name="description">The Ninth</field>
+    </record>
+
+    <record id="suffix_x" model="spp.name.suffix">
+        <field name="name">X</field>
+        <field name="code">X</field>
+        <field name="sequence">75</field>
+        <field name="description">The Tenth</field>
+    </record>
+
+    <record id="suffix_xi" model="spp.name.suffix">
+        <field name="name">XI</field>
+        <field name="code">XI</field>
+        <field name="sequence">76</field>
+        <field name="description">The Eleventh</field>
+    </record>
+
+    <record id="suffix_xii" model="spp.name.suffix">
+        <field name="name">XII</field>
+        <field name="code">XII</field>
+        <field name="sequence">77</field>
+        <field name="description">The Twelfth</field>
+    </record>
+
+    <record id="suffix_xiii" model="spp.name.suffix">
+        <field name="name">XIII</field>
+        <field name="code">XIII</field>
+        <field name="sequence">78</field>
+        <field name="description">The Thirteenth</field>
+    </record>
+
+    <record id="suffix_xiv" model="spp.name.suffix">
+        <field name="name">XIV</field>
+        <field name="code">XIV</field>
+        <field name="sequence">79</field>
+        <field name="description">The Fourteenth</field>
+    </record>
+
+    <record id="suffix_xv" model="spp.name.suffix">
+        <field name="name">XV</field>
+        <field name="code">XV</field>
+        <field name="sequence">80</field>
+        <field name="description">The Fifteenth</field>
+    </record>
+
     <!-- Academic/Professional Suffixes -->
     <record id="suffix_phd" model="spp.name.suffix">
         <field name="name">PhD</field>
diff --git a/spp_registry_name_suffix/models/res_partner.py b/spp_registry_name_suffix/models/res_partner.py
@@ -4,20 +4,23 @@
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
-    suffix_id = fields.Many2one(
+    suffix_ids = fields.Many2many(
         comodel_name="spp.name.suffix",
-        string="Suffix",
-        ondelete="restrict",
-        help="Name suffix such as Jr., Sr., III, IV, PhD, MD, etc.",
+        relation="res_partner_name_suffix_rel",
+        column1="partner_id",
+        column2="suffix_id",
+        string="Suffixes",
+        help="Name suffixes such as Jr., Sr., III, IV, PhD, MD, etc.",
     )
 
-    @api.onchange("is_group", "family_name", "given_name", "addl_name", "suffix_id")
+    @api.onchange("is_group", "family_name", "given_name", "addl_name", "suffix_ids")
     def name_change(self):
-        """Extend name change to include suffix for individuals."""
+        """Extend name change to include suffixes for individuals."""
         super().name_change()
-        if not self.is_group and self.suffix_id and self.name:
-            suffix_upper = self.suffix_id.name.upper()
-            suffix_str = f", {suffix_upper}"
-            # Only append suffix if not already present (avoid double-append)
-            if not self.name.endswith(suffix_str):
-                self.name = f"{self.name}{suffix_str}"
+        if not self.is_group and self.suffix_ids and self.name:
+            # Join all suffixes in sequence order, separated by comma
+            suffixes_str = ", ".join(self.suffix_ids.sorted("sequence").mapped(lambda s: s.name.upper()))
+            suffix_part = f", {suffixes_str}"
+            # Only append suffixes if not already present (avoid double-append)
+            if not self.name.endswith(suffix_part):
+                self.name = f"{self.name}{suffix_part}"
diff --git a/spp_registry_name_suffix/tests/test_name_suffix.py b/spp_registry_name_suffix/tests/test_name_suffix.py
@@ -36,14 +36,14 @@ def test_02_suffix_data_loaded(self):
         self.assertEqual(self.suffix_phd.name, "PhD")
         self.assertEqual(self.suffix_phd.code, "PHD")
 
-    def test_03_name_with_suffix(self):
-        """Test that suffix is appended to the computed name."""
+    def test_03_name_with_single_suffix(self):
+        """Test that a single suffix is appended to the computed name."""
         individual = self.env["res.partner"].create(
             {
                 "name": "Temp",  # Required by res_partner_check_name constraint
                 "family_name": "Doe",
                 "given_name": "John",
-                "suffix_id": self.suffix_jr.id,
+                "suffix_ids": [(6, 0, [self.suffix_jr.id])],
                 "is_registrant": True,
                 "is_group": False,
             }
@@ -74,32 +74,52 @@ def test_04_name_without_suffix(self):
             "Name should not have trailing comma when no suffix",
         )
 
-    def test_05_name_with_all_fields(self):
-        """Test name with all fields including addl_name and suffix."""
+    def test_05_name_with_multiple_suffixes(self):
+        """Test name with multiple suffixes (e.g., Jr. and PhD)."""
         individual = self.env["res.partner"].create(
             {
                 "name": "Temp",  # Required by res_partner_check_name constraint
                 "family_name": "Smith",
                 "given_name": "Robert",
-                "addl_name": "James",
-                "suffix_id": self.suffix_phd.id,
+                "suffix_ids": [(6, 0, [self.suffix_jr.id, self.suffix_phd.id])],
                 "is_registrant": True,
                 "is_group": False,
             }
         )
         individual.name_change()
+        # Jr. has sequence 10, PhD has sequence 100, so Jr. comes first
         self.assertEqual(
             individual.name,
-            "SMITH, ROBERT JAMES, PHD",
-            "Name should include all parts including suffix",
+            "SMITH, ROBERT, JR., PHD",
+            "Name should include multiple suffixes in sequence order",
         )
 
-    def test_06_group_name_unaffected(self):
+    def test_06_name_with_all_fields_and_multiple_suffixes(self):
+        """Test name with all fields including addl_name and multiple suffixes."""
+        individual = self.env["res.partner"].create(
+            {
+                "name": "Temp",  # Required by res_partner_check_name constraint
+                "family_name": "Williams",
+                "given_name": "James",
+                "addl_name": "Edward",
+                "suffix_ids": [(6, 0, [self.suffix_jr.id, self.suffix_phd.id])],
+                "is_registrant": True,
+                "is_group": False,
+            }
+        )
+        individual.name_change()
+        self.assertEqual(
+            individual.name,
+            "WILLIAMS, JAMES EDWARD, JR., PHD",
+            "Name should include all parts including multiple suffixes",
+        )
+
+    def test_07_group_name_unaffected(self):
         """Test that group name is not affected by suffix logic."""
         group = self.env["res.partner"].create(
             {
                 "name": "Test Group",
-                "suffix_id": self.suffix_jr.id,
+                "suffix_ids": [(6, 0, [self.suffix_jr.id])],
                 "is_registrant": True,
                 "is_group": True,
             }
@@ -112,8 +132,8 @@ def test_06_group_name_unaffected(self):
             "Group name should not include suffix",
         )
 
-    def test_07_suffix_update_triggers_name_change(self):
-        """Test that updating suffix and calling name_change updates name."""
+    def test_08_suffix_update_triggers_name_change(self):
+        """Test that updating suffixes and calling name_change updates name."""
         individual = self.env["res.partner"].create(
             {
                 "name": "Temp",  # Required by res_partner_check_name constraint
@@ -128,38 +148,59 @@ def test_07_suffix_update_triggers_name_change(self):
         self.assertEqual(individual.name, "JOHNSON, MICHAEL")
 
         # Add suffix and call name_change again
-        individual.suffix_id = self.suffix_phd.id
+        individual.suffix_ids = [(6, 0, [self.suffix_phd.id])]
         individual.name_change()
         self.assertEqual(
             individual.name,
             "JOHNSON, MICHAEL, PHD",
             "Name should update when suffix is added",
         )
 
-    def test_08_suffix_removal(self):
-        """Test that removing suffix updates the name correctly."""
+    def test_09_suffix_removal(self):
+        """Test that removing suffixes updates the name correctly."""
         individual = self.env["res.partner"].create(
             {
                 "name": "Temp",  # Required by res_partner_check_name constraint
                 "family_name": "Williams",
                 "given_name": "Sarah",
-                "suffix_id": self.suffix_jr.id,
+                "suffix_ids": [(6, 0, [self.suffix_jr.id])],
                 "is_registrant": True,
                 "is_group": False,
             }
         )
         individual.name_change()
         self.assertEqual(individual.name, "WILLIAMS, SARAH, JR.")
 
-        individual.suffix_id = False
+        individual.suffix_ids = [(5, 0, 0)]  # Clear all suffixes
         individual.name_change()
         self.assertEqual(
             individual.name,
             "WILLIAMS, SARAH",
-            "Name should update when suffix is removed",
+            "Name should update when suffixes are removed",
+        )
+
+    def test_10_suffix_sequence_ordering(self):
+        """Test that suffixes are ordered by sequence field."""
+        # PhD has sequence 100, Jr. has sequence 10
+        # Even if we add PhD first, Jr. should appear first in the name
+        individual = self.env["res.partner"].create(
+            {
+                "name": "Temp",
+                "family_name": "Brown",
+                "given_name": "David",
+                "suffix_ids": [(6, 0, [self.suffix_phd.id, self.suffix_jr.id])],
+                "is_registrant": True,
+                "is_group": False,
+            }
+        )
+        individual.name_change()
+        self.assertEqual(
+            individual.name,
+            "BROWN, DAVID, JR., PHD",
+            "Suffixes should be ordered by sequence regardless of selection order",
         )
 
-    def test_09_name_get_with_different_code(self):
+    def test_11_name_get_with_different_code(self):
         """Test name_get when code differs from name."""
         # suffix_jr has name="Jr." and code="JR" (different)
         result = self.suffix_jr.name_get()
@@ -171,7 +212,7 @@ def test_09_name_get_with_different_code(self):
             "name_get should show name with code in parentheses",
         )
 
-    def test_10_name_get_with_same_code(self):
+    def test_12_name_get_with_same_code(self):
         """Test name_get when code equals name."""
         # Create a suffix where name and code are the same
         suffix_same = self.env["spp.name.suffix"].create(
@@ -189,7 +230,7 @@ def test_10_name_get_with_same_code(self):
             "name_get should show only name when code equals name",
         )
 
-    def test_11_name_get_multiple_records(self):
+    def test_13_name_get_multiple_records(self):
         """Test name_get with multiple records."""
         # Get multiple suffixes at once
         suffixes = self.suffix_jr | self.suffix_phd
diff --git a/spp_registry_name_suffix/views/res_partner_views.xml b/spp_registry_name_suffix/views/res_partner_views.xml
@@ -10,8 +10,9 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='addl_name']" position="after">
                 <field
-                    name="suffix_id"
-                    placeholder="Select Suffix"
+                    name="suffix_ids"
+                    widget="many2many_tags"
+                    placeholder="Select Suffixes"
                     options="{'no_create': True, 'no_open': True}"
                 />
             </xpath>
@@ -25,7 +26,7 @@
         <field name="inherit_id" ref="g2p_registry_individual.view_individuals_list_tree" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
-                <field name="suffix_id" optional="hide" />
+                <field name="suffix_ids" widget="many2many_tags" optional="hide" />
             </xpath>
         </field>
     </record>
