diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index ec3faca6625..e29bea1a2e6 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -132,7 +132,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml']))
if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GETPOST('addfilehtml') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
{
$error=0;
-
+
$email_from='';
if (! empty($_POST["fromname"])) $email_from=$_POST["fromname"].' ';
if (! empty($_POST["frommail"])) $email_from.='<'.$_POST["frommail"].'>';
@@ -144,12 +144,12 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE
$subject = $_POST['subject'];
$body = $_POST['message'];
$deliveryreceipt= $_POST["deliveryreceipt"];
-
+
//Check if we have to decode HTML
if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($body, ENT_COMPAT | ENT_HTML401))) {
$body=dol_html_entity_decode($body, ENT_COMPAT | ENT_HTML401);
}
-
+
// Create form object
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
@@ -693,7 +693,7 @@ else
$formmail->clear_attached_files();
}
- $formmail->show_form(($action == 'testhtml'?'addfilehtml':'addfile'),($action == 'testhtml'?'removefilehtml':'removefile'));
+ print $formmail->get_form(($action == 'testhtml'?'addfilehtml':'addfile'),($action == 'testhtml'?'removefilehtml':'removefile'));
print ''.$mailfile->error.'
';
+ }
+ else
+ {
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ $resultmasssend.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain "
+
+ $error=0;
+
+ // Initialisation donnees
+ $object->sendtoid = 0;
+ $object->actiontypecode = $actiontypecode;
+ $object->actionmsg = $actionmsg; // Long text
+ $object->actionmsg2 = $actionmsg2; // Short text
+ $object->fk_element = $object->id;
+ $object->elementtype = $object->element;
+
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
+ if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ // Fin appel triggers
+
+ if ($error)
+ {
+ dol_print_error($db);
+ }
+ $compteEmailEnvoi ++;
+
+ }
+ else
+ {
+ $langs->load("other");
+ $resultmasssend.='';
+ if ($mailfile->error)
+ {
+ $resultmasssend.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+ $resultmasssend.='
';
+ }
+ }
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ print $resultmasssend=''.$langs->trans('ErrorCantReadFile',$file).'
';
+ dol_syslog('Failed to read file: '.$file);
+ break ;
+ }
+ }
+ }
+
+ setEventMessage($compteEmailEnvoi. '/'.$countToSend.' '.$langs->trans("RemindSent"));
+ }
+}
+
+
if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_search'))
{
if (is_array($_POST['toGenerate']))
@@ -61,9 +208,12 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
// liste les fichiers
$files = array();
$factures_bak = $factures ;
- foreach($_POST['toGenerate'] as $basename){
- foreach($factures as $facture){
- if(strstr($facture["name"],$basename)){
+ foreach($_POST['toGenerate'] as $basename)
+ {
+ foreach($factures as $facture)
+ {
+ if(strstr($facture["name"],$basename))
+ {
$files[] = $conf->facture->dir_output.'/'.$basename.'/'.$facture["name"];
}
}
@@ -121,12 +271,12 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
}
else
{
- $mesg=''.$langs->trans('NoPDFAvailableForChecked').'
';
+ setEventMessage($langs->trans('NoPDFAvailableForChecked'),'errors');
}
}
else
{
- $mesg=''.$langs->trans('InvoiceNotChecked').'
' ;
+ setEventMessage($langs->trans('InvoiceNotChecked'), 'warnings');
}
}
@@ -167,6 +317,12 @@ $(document).ready(function() {
$("#checknone").click(function() {
$(".checkformerge").attr('checked', false);
});
+ $("#checkallsend").click(function() {
+ $(".checkforsend").attr('checked', true);
+ });
+ $("#checknonesend").click(function() {
+ $(".checkforsend").attr('checked', false);
+ });
});
';
print '';
print ' ';
- print '';
- if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' ';
- print ' ';
+ if (empty($mode))
+ {
+ print '';
+ if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' ';
+ print ' ';
+ }
+ else
+ {
+ print '';
+ if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' ';
+ print ' ';
+ }
print "\n";
if ($num > 0)
@@ -384,13 +557,23 @@ if ($resql)
print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am);
print '';
- // Checkbox
- print '';
- if (! empty($formfile->numoffiles))
- print ' ';
+ if (! empty($formfile->numoffiles))
+ print ' ' ;
+ }
else
- print ' ';
- print '' ;
+ {
+ // Checkbox to send remind
+ print '';
+ print ' ' ;
+ }
print "\n";
$total_ht+=$objp->total_ht;
@@ -415,17 +598,85 @@ if ($resql)
print "";
- /*
- * Show list of available documents
- */
- $filedir=$diroutputpdf;
- $genallowed=$user->rights->facture->lire;
- $delallowed=$user->rights->facture->lire;
- print ''.$langs->trans("ResultOfMassSending").': ';
$out.= ''.$langs->trans("MailFile").' ';
+
$out.= '';
- // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
- $out.= ' \n";
}
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 0a5d3d0cfcf..c04c4966efe 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -1542,7 +1542,7 @@ else if ($id || $ref)
}
// Show form
- $formmail->show_form();
+ print $formmail->get_form();
print ''.price($line->total_ht).' ';
-
+
if (is_object($hookmanager))
{
$parameters=array('line'=>$line,'num'=>$num,'i'=>$i);
$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
}
-
+
if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
{
print 'id.'#'.$line->id.'">';
@@ -2132,7 +2132,7 @@ elseif (! empty($object->id))
}
// Show form
- $formmail->show_form();
+ print $formmail->get_form();
print ' '.price($object->lines[$i]->total_ht).' ';
print ''.price($object->lines[$i]->total_ttc).' ';
-
+
if (is_object($hookmanager))
{
$parameters=array('line'=>$object->lines[$i],'num'=>$num,'i'=>$i);
$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
}
-
+
print '';
if ($object->statut == 0) print 'lines[$i]->rowid.'">'.img_edit().' ';
else print ' ';
@@ -2370,7 +2370,7 @@ else
}
// Show form
- $formmail->show_form();
+ print $formmail->get_form();
print '