diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 04510aca821..baaa57f5aef 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -698,18 +698,25 @@ class FormMail extends Form $out .= "\n"; } - // With option one email per recipient + // With option for one email per recipient if (!empty($this->withoptiononeemailperrecipient)) { if (abs($this->withoptiononeemailperrecipient) == 1) { $out .= ''; $out .= $langs->trans("GroupEmails"); $out .= ''; $out .= ' withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> '; - $out .= ''; - $out .= ''; - $out .= ' - '; - $out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail"); - $out .= ''; + $out .= ''; + //$out .= ''; + //$out .= ' - '; + //$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail"); + //$out .= ''; + if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) { + if (!empty($this->withto) && !is_array($this->withto)) { + $out .= ' '.$langs->trans("or").' '; + } + } $out .= ''; } else { $out .= '';