Merge PR #100 into 12.0

Signed-off-by legalsylvain

joint_buying_base/migrations/12.0.6.3.0/post-migration.py

@@ -0,0 +1,18 @@
+import logging
+
+from openupgradelib import openupgrade
+
+_logger = logging.getLogger(__name__)
+
+
+@openupgrade.migrate(use_env=True)
+def migrate(env, version):
+    ResCompany = env["res.company"].with_context(active_test=False)
+    companies = ResCompany.search([])
+    for company in companies:
+        partner = company.joint_buying_partner_id.with_context(
+            write_joint_buying_partner=True
+        )
+        new_name = company._prepare_joint_buying_partner_vals()["name"]
+        _logger.info(f"Rename {partner.name} into {new_name} ...")
+        partner.name = new_name

joint_buying_base/models/res_company.py

@@ -73,10 +73,9 @@ def _prepare_joint_buying_partner_vals(self):
         self.ensure_one()
         icp = self.env["ir.config_parameter"].sudo()
         group_name = icp.get_param("joint_buying_base.group_name", "")
-        suffix = group_name and ("(" + group_name + ")") or ""
-        sanitized_name = self.name.replace("|", "").strip()
+        suffix = group_name and f" ({self.code} - {group_name})" or f"({self.code})"
         vals = {
-            "name": f"{sanitized_name} {suffix}",
+            "name": f"{self.name}{suffix}",
             "active": self.active,
             "is_joint_buying": True,
             "is_joint_buying_stage": True,

joint_buying_base/tests/test_company_2_partner.py

@@ -18,11 +18,14 @@ def setUp(self):
     # Test Section
     def test_001_write_company_to_partner_info(self):
         company_name = "Demo Company for Joint Buying"
-        new_company = self.ResCompany.create({"name": company_name})
+        company_code = "DJB"
+        new_company = self.ResCompany.create(
+            {"name": company_name, "code": company_code}
+        )
 
         self.assertEqual(
             new_company.joint_buying_partner_id.name,
-            f"{company_name} ({self.suffixParameter.value})",
+            f"{company_name} ({company_code} - {self.suffixParameter.value})",
             "Create a company should create a related joint buying partner",
         )
 
@@ -46,6 +49,6 @@ def test_004_change_config_parameter(self):
         for company in self.ResCompany.search([]):
             self.assertEqual(
                 company.joint_buying_partner_id.name,
-                f"{company.name} ({self.suffixParameter.value})",
+                f"{company.name} ({company.code} - {self.suffixParameter.value})",
                 "Update the config parameter should update all the joint buying partner names",
             )