From 38e1264588382063e6d0cdfb9b0cc2b7a3e5927a Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 22 Feb 2021 09:56:48 +0100 Subject: [PATCH 1/3] For more flexible salutation in some languages the folloing Variables are availible __CONTACT_LASTNAME_XXX__ __CONTACT_FIRSTNAME_XXX__ __CONTACT_SALUTATION_XXX__ --- htdocs/core/tpl/card_presend.tpl.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 5d3381b2719..07de3624eb3 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -275,6 +275,9 @@ if ($action == 'presend') foreach ($contactarr as $contact) { $contactstatic->fetch($contact['id']); $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); + $substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname; + $substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname; + $substitutionarray['__CONTACT_SALUTATION_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel(); } } From 7bbf1b48413ead3c4c5b11d6db7cd8773b15c124 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 22 Feb 2021 10:04:29 +0100 Subject: [PATCH 2/3] Fix Formatting --- htdocs/core/tpl/card_presend.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 07de3624eb3..358fab60ab7 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -277,7 +277,7 @@ if ($action == 'presend') $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); $substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname; $substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname; - $substitutionarray['__CONTACT_SALUTATION_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel(); + $substitutionarray['__CONTACT_SALUTATION_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel(); } } From 2673e93dfc58e35fe1c200ee42f9d44da61f4f8b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Feb 2021 11:19:47 +0100 Subject: [PATCH 3/3] Update card_presend.tpl.php --- htdocs/core/tpl/card_presend.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 358fab60ab7..0a7ed20981e 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -277,7 +277,7 @@ if ($action == 'presend') $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); $substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname; $substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname; - $substitutionarray['__CONTACT_SALUTATION_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel(); + $substitutionarray['__CONTACT_TITLE_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel(); } }