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

Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets

Browse Source 
FIX : Tickets mail models doesn't work
This commit is contained in:
Laurent Destailleur 2020-06-06 21:24:04 +02:00 committed by GitHub
commit 4f2af3bf67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/mails_templates.php
View File

@ -166,6 +166,7 @@ if ($conf->societe->enabled) $elementList['thirdparty']=$langs->trans(
if ($conf->adherent->enabled) $elementList['member']=$langs->trans('MailToMember'); if ($conf->adherent->enabled) $elementList['member']=$langs->trans('MailToMember');
if ($conf->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract'); if ($conf->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
if ($conf->projet->enabled) $elementList['project']=$langs->trans('MailToProject'); if ($conf->projet->enabled) $elementList['project']=$langs->trans('MailToProject');
if ($conf->ticket->enabled) $elementList['ticket_send']=$langs->trans('MailToTicket');
$elementList['user']=$langs->trans('MailToUser'); $elementList['user']=$langs->trans('MailToUser');
$parameters=array('elementList'=>$elementList); $parameters=array('elementList'=>$elementList);

2
htdocs/core/class/html.formticket.class.php
View File

@ -991,7 +991,7 @@ class FormTicket
// MESSAGE // MESSAGE
$defaultmessage=""; $defaultmessage="";
if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) { if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) {
$defaultmessage=$arraydefaultmessage->content; $defaultmessage=$arraydefaultmessage->content;
} }
$defaultmessage=str_replace('\n', "\n", $defaultmessage); $defaultmessage=str_replace('\n', "\n", $defaultmessage);

3
htdocs/langs/en_US/admin.lang
View File

@ -1792,6 +1792,7 @@ MailToThirdparty=Third parties
MailToMember=Members MailToMember=Members
MailToUser=Users MailToUser=Users
MailToProject=Projects page MailToProject=Projects page
MailToTicket=Tickets
ByDefaultInList=Show by default on list view ByDefaultInList=Show by default on list view
YouUseLastStableVersion=You use the latest stable version YouUseLastStableVersion=You use the latest stable version
TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites) TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@ -1923,4 +1924,4 @@ DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector? ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled