Merge pull request #10993 from altatof/presend

NEW : use outputlangs in fullname construction for emails
Dolibarr · Apr 11, 2019 · 7db0c0c · 7db0c0c
2 parents f2fd07d + 79beb59
commit 7db0c0c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
@@ -145,7 +145,7 @@
 	{
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
-		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
+		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
 	}
 	elseif ($object->element == 'societe')
 	{
@@ -155,11 +155,11 @@
 	}
 	elseif ($object->element == 'contact')
 	{
-		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
+		$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";
 	}
 	elseif ($object->element == 'user' || $object->element == 'member')
 	{
-		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
+		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
 	}
 	else
 	{
@@ -221,7 +221,7 @@
 
 		foreach ($contactarr as $contact) {
             $contactstatic->fetch($contact['id']);
-            $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($langs, 1);
+            $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1);
 		}
 	}