diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 03cce1dff096645b5c8f0076e638d36bcd7e2d66..6b8126bd97708e6f3089121a507b0357b1a088c6 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -229,11 +229,11 @@ if ($action == 'edit') print '<input type="hidden" name="action" value="update">'; dol_fiche_head($head, 'common', '', -1); - + print $langs->trans("EMailsDesc")."<br>\n"; print "<br>\n"; - - + + clearstatcache(); $var=true; @@ -241,17 +241,17 @@ if ($action == 'edit') print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>'; // Disable - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'; print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1); print '</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; // Method - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>'; // SuperAdministrator access only @@ -270,7 +270,7 @@ if ($action == 'edit') print '</td></tr>'; // Host server - + print '<tr class="oddeven"><td>'; if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { @@ -303,7 +303,7 @@ if ($action == 'edit') print '</td></tr>'; // Port - + print '<tr class="oddeven"><td>'; if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { @@ -338,7 +338,7 @@ if ($action == 'edit') // ID if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { - + $mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:''); print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'; // SuperAdministrator access only @@ -358,7 +358,7 @@ if ($action == 'edit') // PW if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { - + $mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:''); print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'; // SuperAdministrator access only @@ -376,7 +376,7 @@ if ($action == 'edit') } // TLS - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>'; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { @@ -390,7 +390,7 @@ if ($action == 'edit') print '</td></tr>'; // STARTTLS - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>'; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { @@ -404,17 +404,17 @@ if ($action == 'edit') print '</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; - + // From - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>'; print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:''); print '"></td></tr>'; // Default from type - + $liste = array(); $liste['user'] = $langs->trans('UserEmail'); $liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?$langs->trans("NotDefined"):$conf->global->MAIN_INFO_SOCIETE_MAIL).')'; @@ -424,17 +424,17 @@ if ($action == 'edit') print '</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; - + // From - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>'; print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:''); print '"></td></tr>'; // Autocopy to - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>'; print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:''); print '"></td></tr>'; @@ -442,7 +442,7 @@ if ($action == 'edit') print '</table>'; dol_fiche_end(); - + print '<br><div class="center">'; print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">'; print ' '; @@ -454,26 +454,26 @@ if ($action == 'edit') else { dol_fiche_head($head, 'common', '', -1); - + print $langs->trans("EMailsDesc")."<br>\n"; print "<br>\n"; - - + + $var=true; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>'; // Disable - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; // Method - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>'; $text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE]; if (empty($text)) $text=$langs->trans("Undefined").img_warning(); @@ -481,7 +481,7 @@ else print '</td></tr>'; // Host server - + if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; @@ -492,7 +492,7 @@ else } // Port - + if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; @@ -503,21 +503,21 @@ else } // SMTPS ID - + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>'; } // SMTPS PW - + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>'; } // TLS - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>'; if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { @@ -531,7 +531,7 @@ else print '</td></tr>'; // STARTTLS - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>'; if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { @@ -545,18 +545,18 @@ else print '</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; // From - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>'; print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM; if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail")); print '</td></tr>'; // Default from type - + print '<tr '.$bc[$var?1:0].'><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>'; print '<td>'; if($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user'){ @@ -567,18 +567,18 @@ else print '</td></tr>'; // Separator - + print '<tr class="oddeven"><td colspan="2"> </td></tr>'; // Errors To - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>'; print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO; if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail")); print '</td></tr>'; // Autocopy to - + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>'; print '<td>'; if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) @@ -591,12 +591,12 @@ else print ' '; } print '</td></tr>'; - + print '</table>'; dol_fiche_end(); - - + + if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) { print '<br>'; @@ -614,7 +614,7 @@ else print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA")); } - + // Boutons actions print '<div class="tabsAction">'; @@ -647,7 +647,7 @@ else $text = $langs->trans("WarningPHPMail"); print info_admin($text); } - + // Run the test to connect if ($action == 'testconnect') { @@ -673,6 +673,7 @@ else // Show email send test form if ($action == 'test' || $action == 'testhtml') { + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend")); // Cree l'objet formulaire mail diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 17d4d066569d8a74a3cd9103089fc547bb8408d1..8f4deb53edf45a8e4aa9c323abb1d41fff5cb921 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -1010,7 +1010,8 @@ else // Affichage formulaire de TEST if ($action == 'test') { - print load_fiche_titre($langs->trans("TestMailing")); + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; + print load_fiche_titre($langs->trans("TestMailing")); // Create l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 3e8580d5350d456bba9ac86aa4d8647b65617457..67dbca101f8820f21ad5088e64e5f07b4d19c372 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2281,7 +2281,7 @@ if ($action == 'create') // Send if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) { - print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init">' . $langs->trans('SendByMail') . '</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'; } else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>'; } @@ -2412,6 +2412,7 @@ if ($action == 'create') $file = $fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendPropalByMail')); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index e2db47a6c9d5aee6087a46fd2e10e7e0793aa6bf..83135a8c0f58b2c06e68fdddc63c6760d10ea0e3 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2443,7 +2443,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Send if ($object->statut > Commande::STATUS_DRAFT) { if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) { - print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init">' . $langs->trans('SendByMail') . '</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'; } else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>'; } diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index fa9bdf60dc5834d3fdec58bd34c081f0a9cf563b..c4bf83293de1e6ab8acfbe6f5c0b648740a317b4 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4071,7 +4071,7 @@ else if ($id > 0 || ! empty($ref)) print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('SendByMail') . '</span></div>'; } else { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) { - print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=presend&mode=init">' . $langs->trans('SendByMail') . '</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'; } else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>'; } @@ -4328,6 +4328,7 @@ else if ($id > 0 || ! empty($ref)) $file = $fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans($titreform)); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 58b1608f44b99e45870ee0bbfe987c2170ac5eaa..b2ab3bf3cb8cb4d7196281e38ceb1494510575a3 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2162,6 +2162,7 @@ else $file = $fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendContractByMail')); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 72044d68fcf308bc226c546f32d70a17f51c86af..efc64d843966c4bc84a622a693dc7c24d16f8723 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2037,7 +2037,7 @@ else if ($id || $ref) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send) { - print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a>'; + print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>'; } else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>'; } @@ -2162,6 +2162,7 @@ else if ($id || $ref) $file=$fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendShippingByEMail')); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index c084806c4a6e7f6f80e7e66f2f0247df4c8db7ad..108aaf7a23a6ead507d9e0d91de637f07eafbc54 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1598,7 +1598,7 @@ else if ($id > 0 || ! empty($ref)) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send) { - print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>'; } else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>'; } @@ -1753,6 +1753,7 @@ else if ($id > 0 || ! empty($ref)) $file=$fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendInterventionByMail')); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index dda4a0d7254132c70eb08b69436302b56f5aca86..4deca7ea83684378148e7b9566c0757bbdfb5e5d 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2174,6 +2174,7 @@ elseif (! empty($object->id)) $file=$fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendOrderByMail')); @@ -2572,7 +2573,7 @@ elseif (! empty($object->id)) { if ($user->rights->fournisseur->commande->commander) { - print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a>'; + print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>'; } } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 1078999b89e9d92d1c97ce2c6510965998890f77..db017cc004a5ed30a8244d86b68f73c1a24463b4 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2660,7 +2660,7 @@ else { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send) { - print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>'; } else print '<div class="inline-block divButAction"><span class="butActionRefused">'.$langs->trans('SendByMail').'</a></div>'; } @@ -2836,7 +2836,8 @@ else $file=$fileparams['fullname']; } - print '<div class="clearboth"></div>'; + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; + print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendBillByMail')); diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 56e0ea1d3ede6d5776d6d30cb3b51fbdae618dd7..03dfd62f5d3779d5a8bdd3331012eeb238fef1ac 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -426,6 +426,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if (empty($reshook)) { + // Send + print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n"; + if ($user->rights->mymodule->write) { print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a></div>'."\n"; diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index e26b4733c84e6eba147ac62a8c6d43d417e2076c..b5afba996b8f8df6051db02bf8763f610da631d5 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2462,7 +2462,9 @@ else $action='send'; $modelmail='thirdparty'; - //print '<br>'; + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; + print '<div class="clearboth"></div>'; + print '<br>'; print load_fiche_titre($langs->trans($titreform)); dol_fiche_head(); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 72c9793b40bed49fd45feccd73684a8520989056..d7d967d24b83a6fa0ec574a52b04b26528c04477 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1740,7 +1740,7 @@ if ($action == 'create') // Send if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) { - print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init">' . $langs->trans('SendByMail') . '</a></div>'; + print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'; } else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>'; } @@ -1854,6 +1854,7 @@ if ($action == 'create') $file = $fileparams['fullname']; } + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div class="clearboth"></div>'; print '<br>'; print load_fiche_titre($langs->trans('SendAskByMail')); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8400a95d370edbf7cd885e2020b7382fc869d294..9d9684371a98fc57ba859dd9a722852303a39dd8 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1669,6 +1669,7 @@ else $action='send'; $modelmail='user'; + print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>'; print '<div id="presend"></div>'; print load_fiche_titre($langs->trans($titreform));