diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 4d0420aea84..e0a5c6680d4 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -474,7 +474,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer) } else { - $s1='global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>'; + $s1='global->ADHERENT_DEFAULT_SENDINFOBYMAIL?' checked="true"':'').'>'; $s2=$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
'; $s2.=$langs->trans("MailRecipient").': '.$adh->email.''; //$s2.='
'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS); diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index f4e7575cef1..2393de6ab00 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -846,9 +846,14 @@ if ($rowid && $action != 'edit') // Confirmation de la Resiliation if ($action == 'resign') { - // Cree un tableau formulaire + $langs->load("mails"); + + // Cree un tableau formulaire $formquestion=array(); - if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $langs->trans("SendAnEMailToMember",$adh->email), 'value' => 'false'); + $label=$langs->trans("SendAnEMailToMember").' ('.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.', '; + $label.=$langs->trans("MailRecipient").': '.$adh->email.''; + $label.=')'; + if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?'true':'false')); $html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion); print '
'; diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index 6dd5592dcaa..bce46ac5ed9 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -94,7 +94,7 @@ print "\n"; $var=true; $form = new Form($db); -// Mail obligatoire +// Mail required for members $var=!$var; print '
'; print ''; @@ -107,6 +107,22 @@ print '\n"; print '
'; +// Send mail information is on by default +$var=!$var; +print '
'; +print ''; +print ''; +print ''; +print "".$langs->trans("MemberSendInformationByMailByDefault").''; +print $form->selectyesno('constvalue',$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL,1); +print ''; +print ''; +print "\n"; +print '
'; + + + + // Insertion cotisations dans compte financier $var=!$var; print '
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1f76489c37f..74e2ac2c2f5 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -708,6 +708,7 @@ MembersSetup=Members module setup MemberMainOptions=Main options AddSubscriptionIntoAccount=Add subscriptions into bank or cash account, of bank module AdherentMailRequired=EMail required to create a new member +MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members is on by default ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 7d3c8240932..848a5898569 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -119,7 +119,7 @@ MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe AddSubscription=Add subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr -SendAnEMailToMember=Send information email to member (EMail: %s) +SendAnEMailToMember=Send information email to member DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation DescADHERENT_MAIL_VALID=EMail for member validation DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang index 1e54190379a..ee703bd9628 100644 --- a/htdocs/langs/es_ES/members.lang +++ b/htdocs/langs/es_ES/members.lang @@ -115,7 +115,7 @@ MemberNotOrNoMoreExpectedToSubscribe=No sometida a cotizaci AddSubscription=Añadir afiliación ShowSubscription=Mostrar afiliación MemberModifiedInDolibarr=Miembro modificado en Dolibarr -SendAnEMailToMember=Enviar e-mail de inforamción al miembro (E-mail: %s) +SendAnEMailToMember=Enviar e-mail de inforamción al miembro DescADHERENT_MAIL_VALID_SUBJECT=Asunto del e-mail de validación de miembro DescADHERENT_MAIL_VALID=E-mail de validación de miembro DescADHERENT_MAIL_COTIS_SUBJECT=Asunto del e-mail de validación de cotización diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 142b378d138..c4552d5f523 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -707,6 +707,7 @@ MembersSetup=Configuration du module Adh MemberMainOptions=Options principales AddSubscriptionIntoAccount=Enregistrer cotisations dans compte bancaire ou caisse, du module banque AdherentMailRequired=EMail obligatoire pour créer un nouvel adhérent +MemberSendInformationByMailByDefault=Case à cocher pour envoyer mail de confirmation aux adhérents est à oui par défaut ##### LDAP setup ##### LDAPSetup=Configuration du module LDAP LDAPGlobalParameters=Paramètres globals diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 46c6a629099..e891481b4f1 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -119,7 +119,7 @@ MemberNotOrNoMoreExpectedToSubscribe=Non soumis ou plus soumis AddSubscription=Ajout adhésion ShowSubscription=Afficher adhésion MemberModifiedInDolibarr=Adhérent modifié dans Dolibarr -SendAnEMailToMember=Envoyer email d'information à l'adhérent (EMail: %s) +SendAnEMailToMember=Envoyer email d'information à l'adhérent DescADHERENT_MAIL_VALID_SUBJECT=Sujet du mail de validation adhérent DescADHERENT_MAIL_VALID=Mail de validation adhérent DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation cotisation diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang index f8299c5fa5a..27924149fd2 100644 --- a/htdocs/langs/it_IT/members.lang +++ b/htdocs/langs/it_IT/members.lang @@ -115,7 +115,7 @@ MemberNotOrNoMoreExpectedToSubscribe =Stati non hanno o non hanno pi AddSubscription =Aggiungi abbonamento ShowSubscription =Visualizza abbonamento MemberModifiedInDolibarr =Stati modificati in Dolibarr -SendAnEMailToMember =Invia e-mail informazioni agli Stati (e-mail: %s ) +SendAnEMailToMember =Invia e-mail informazioni agli Stati DescADHERENT_MAIL_VALID_SUBJECT =EMail oggetto di membro di convalida DescADHERENT_MAIL_VALID =E-mail per la convalida membro DescADHERENT_MAIL_COTIS_SUBJECT =EMail soggetto per la sottoscrizione