From 03ffb249f0841bf2b297ced48eb53473394e6606 Mon Sep 17 00:00:00 2001
From: hda <hughes.damry@acsone.eu>
Date: Tue, 20 Jun 2023 08:51:00 +0200
Subject: [PATCH] [16.0][FIX] server_environment: possible collision of string
 for field storing the default value

---
 server_environment/models/server_env_mixin.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py
index d2c6d44..2b6b708 100644
--- a/server_environment/models/server_env_mixin.py
+++ b/server_environment/models/server_env_mixin.py
@@ -401,7 +401,11 @@ class ServerEnvMixin(models.AbstractModel):
             base_field_cls = base_field.__class__
             field_args = base_field.args.copy() if base_field.args else {}
             field_args.pop("_sequence", None)
-            fieldlabel = "{} {}".format(field_args.get("string", ""), "Env Default")
+            namelabel = (
+                field_args.get("string", "")
+                or fieldname[: fieldname.rfind("_env_default")]
+            )
+            fieldlabel = "{} {}".format(namelabel, "Env Default")
             field_args.update(
                 {
                     "sparse": "server_env_defaults",