From 8b87bfb693ae29962930dae14f0693185bea7d9a Mon Sep 17 00:00:00 2001
From: Yoan Mollard <ymollard@users.noreply.github.com>
Date: Thu, 11 Aug 2022 02:41:46 +0200
Subject: [PATCH] Keep original  value of parameter, if any

---
 htdocs/societe/class/societe.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 68942d5f9ba..8de2bbe8bf0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3907,12 +3907,16 @@ class Societe extends CommonObject
 		$fullname = $member->getFullName($langs);
 
 		if ($member->morphy == 'mor') {
-			$socname = $member->company? $member->company : $member->societe;
+			if (empty($socname)) {
+				$socname = $member->company? $member->company : $member->societe;
+			}
 			if (!empty($fullname) && empty($socalias)) {
 				$socalias = $fullname;
 			}
 		} elseif (empty($socname) && $member->morphy == 'phy') {
-			$socname = $fullname;
+			if (empty($socname)) {
+				$socname = $fullname;
+			}
 			if (!empty($member->company) && empty($socalias)) {
 				$socalias = $member->company;
 			}