From f6dc853d70211f563362e4e6b26b5fbf2e254bc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 15 Nov 2008 00:44:19 +0000
Subject: [PATCH] New: Some enhancements on member management when bank synchro
is enbled
---
htdocs/adherents/card_subscriptions.php | 2 +-
htdocs/adherents/fiche.php | 9 +++++++--
htdocs/admin/adherent.php | 18 +++++++++++++++++-
htdocs/langs/en_US/admin.lang | 1 +
htdocs/langs/en_US/members.lang | 2 +-
htdocs/langs/es_ES/members.lang | 2 +-
htdocs/langs/fr_FR/admin.lang | 1 +
htdocs/langs/fr_FR/members.lang | 2 +-
htdocs/langs/it_IT/members.lang | 2 +-
9 files changed, 31 insertions(+), 8 deletions(-)
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='<input name="sendmail" type="checkbox"'.($conf->global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>';
+ $s1='<input name="sendmail" type="checkbox"'.($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?' checked="true"':'').'>';
$s2=$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b><br>';
$s2.=$langs->trans("MailRecipient").': <b>'.$adh->email.'</b>';
//$s2.='<br>'.$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").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+ $label.=$langs->trans("MailRecipient").': <b>'.$adh->email.'</b>';
+ $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 '<br>';
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 "</tr>\n";
$var=true;
$form = new Form($db);
-// Mail obligatoire
+// Mail required for members
$var=!$var;
print '<form action="adherent.php" method="POST">';
print '<input type="hidden" name="action" value="update">';
@@ -107,6 +107,22 @@ print '<input type="submit" class="button" value="'.$langs->trans("Update").'" n
print "</td></tr>\n";
print '</form>';
+// Send mail information is on by default
+$var=!$var;
+print '<form action="adherent.php" method="POST">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
+print "<tr $bc[$var] class=value><td>".$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
+print $form->selectyesno('constvalue',$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL,1);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print "</td></tr>\n";
+print '</form>';
+
+
+
+
// Insertion cotisations dans compte financier
$var=!$var;
print '<form action="adherent.php" method="POST">';
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: <b>%s</b>)
+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: <b>%s</b>)
+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: <b>%s</b>)
+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: <b> %s </ b>)
+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
--
GitLab