diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index eff0c08b2cc2d..7f070c07df505 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -738,9 +738,9 @@
{
// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
// on affiche donc juste un message
- $mesg.='
'.$langs->trans("MailingNeedCommand").'
';
- $mesg.='
';
- $mesg.='
'.$langs->trans("MailingNeedCommand2").'
';
+ $mesgembedded.=''.$langs->trans("MailingNeedCommand").'
';
+ $mesgembedded.='
';
+ $mesgembedded.='
'.$langs->trans("MailingNeedCommand2").'
';
$_GET["action"]='';
}
else
@@ -838,19 +838,17 @@
array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true)
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
- print '
';
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
}
dol_htmloutput_mesg($mesg);
-
/*
* Boutons d'action
*/
- if (GETPOST("cancel") || $confirm=='no' || $action == '' || in_array($action,array('valid','delete','sendall')))
+ if (GETPOST("cancel") || $confirm=='no' || $action == '' || in_array($action,array('valid','delete','sendall','clone')))
{
print "\n\n\n";
@@ -930,6 +928,8 @@
print '
';
}
+ if (! empty($mesgembedded)) dol_htmloutput_mesg($mesgembedded,'','warning',1);
+
// Affichage formulaire de TEST
if ($action == 'test')
{