lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Maxi debug of emailing feature

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-13 18:57:42 +00:00
parent 80dd25401f
commit 8b4a8347a2
5 changed files with 8 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
View File

@ -97,7 +97,7 @@ class mailing_dolibarr_services_expired extends MailingTargets
$now=dol_now();
// La requete doit retourner: id, email, name
$sql = " select s.rowid, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
$sql = " select s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
$sql.= " from ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c,";
$sql.= " ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
$sql.= " where s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
@ -128,9 +128,9 @@ class mailing_dolibarr_services_expired extends MailingTargets
('EndDate='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
('Contract='.$obj->fk_contrat).';'.
('ContactLine='.$obj->cdid),
'source_url' => $this->url($obj->rowid),
'source_id' => $obj->cdid,
'source_type' => 'contract_line'
'source_url' => $this->url($obj->id),
'source_id' => $obj->id,
'source_type' => 'thirdparty'
);
$old = $obj->email;
$j++;
@ -227,7 +227,7 @@ class mailing_dolibarr_services_expired extends MailingTargets
//$companystatic->id=$id;
//$companystatic->nom='';
//return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
}
}

3
htdocs/includes/modules/mailings/kiwi.modules.php
View File

@ -38,8 +38,7 @@ class mailing_kiwi extends MailingTargets
var $db;
// CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
function mailing_categories($DB)
function mailing_kiwi($DB)
{
$this->db=$DB;
}

2
htdocs/langs/en_US/mails.lang
View File

@ -74,7 +74,7 @@ SentTo=Sent to <b>%s</b>
MailingModuleDescContactCompanies=Contacts of all third parties (customer, prospect, supplier, ...)
MailingModuleDescDolibarrUsers=All Dolibarr users with emails
MailingModuleDescFundationMembers=Foundation members with emails
MailingModuleDescEmailsFromFile=EMails from a text file (email;name;surname;comments)
MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other)
MailingModuleDescContactsCategories=Third parties with emails (by category)
MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines

2
htdocs/langs/fr_FR/mails.lang
View File

@ -74,7 +74,7 @@ SentTo=Envoyés à <b>%s</b>
MailingModuleDescContactCompanies=Contacts des tiers (prospects, clients, fournisseurs...)
MailingModuleDescDolibarrUsers=Utilisateurs de Dolibarr avec e-mail
MailingModuleDescFundationMembers=Adhérents avec e-mail
MailingModuleDescEmailsFromFile=EMails issus d'un fichier texte (email;nom;prenom;divers)
MailingModuleDescEmailsFromFile=EMails issus d'un fichier texte (email;nom;prenom;autre)
MailingModuleDescContactsCategories=Tiers avec e-mail (par catégorie)
MailingModuleDescDolibarrContractsLinesExpired=Tiers avec lignes de contrats de services expirées

51
htdocs/langs/hu_HU/mails.lang
View File

@ -59,54 +59,3 @@ RemoveRecipient=Címzett eltávolítása
CommonSubstitutions=Általános helyettesítések
YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/includes/modules/mailings/README.
EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
MailingAddFile=Attach this file
NoAttachedFiles=No attached files
BadEMail=Bad value for EMail
CloneEMailing=Clone Emailing
ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
CloneContent=Clone message
CloneReceivers=Cloner recipients
DateLastSend=Date of last sending
DateSending=Date sending
SentTo=Sent to <b>%s</b>
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts of all third parties (customer, prospect, supplier, ...)
MailingModuleDescDolibarrUsers=All Dolibarr users with emails
MailingModuleDescFundationMembers=Foundation members with emails
MailingModuleDescEmailsFromFile=EMails from a text file (email;name;surname;comments)
MailingModuleDescContactsCategories=Third parties with emails (by category)
MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
LineInFile=Line %s in file
RecipientSelectionModules=Defined requests for recipient's selection
MailSelectedRecipients=Selected recipients
MailingArea=EMailings area
LastMailings=Last %s emailings
TargetsStatistics=Targets statistics
NbOfCompaniesContacts=Unique contacts of companies
MailNoChangePossible=Recipients for validated emailing can't be changed
SearchAMailing=Search mailing
SendMailing=Send emailing
SendMail=Send email
SentBy=Sent by
MailingNeedCommand=For securities reason, sending an emailing should be performed from command line. Ask your administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=Are you sure you want to send mailing ?
LimitSendingEmailing=On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
NbOfEMailingsReceived=Mass emailings received
IdRecord=ID record
DeliveryReceipt=Delivery Receipt
YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
# Module Notifications
Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
AddNewNotification=Activate a new email notification request
ListOfActiveNotifications=List all active email notification requests
ListOfNotificationsDone=List all email notifications sent