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

New: Some enhancements on member management when bank synchro is enbled

Browse Source
This commit is contained in:
Laurent Destailleur 2008-11-15 00:44:19 +00:00
parent 1f3b344a27
commit f6dc853d70
9 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/card_subscriptions.php
View File

@ -474,7 +474,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
} }
else 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("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b><br>';
$s2.=$langs->trans("MailRecipient").': <b>'.$adh->email.'</b>'; $s2.=$langs->trans("MailRecipient").': <b>'.$adh->email.'</b>';
//$s2.='<br>'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS); //$s2.='<br>'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS);

9
htdocs/adherents/fiche.php
View File

@ -846,9 +846,14 @@ if ($rowid && $action != 'edit')
// Confirmation de la Resiliation // Confirmation de la Resiliation
if ($action == 'resign') if ($action == 'resign')
{ {
// Cree un tableau formulaire $langs->load("mails");
// Cree un tableau formulaire
$formquestion=array(); $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); $html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
print '<br>'; print '<br>';

18
htdocs/admin/adherent.php
View File

@ -94,7 +94,7 @@ print "</tr>\n";
$var=true; $var=true;
$form = new Form($db); $form = new Form($db);
// Mail obligatoire // Mail required for members
$var=!$var; $var=!$var;
print '<form action="adherent.php" method="POST">'; print '<form action="adherent.php" method="POST">';
print '<input type="hidden" name="action" value="update">'; 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 "</td></tr>\n";
print '</form>'; 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 // Insertion cotisations dans compte financier
$var=!$var; $var=!$var;
print '<form action="adherent.php" method="POST">'; print '<form action="adherent.php" method="POST">';

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

@ -708,6 +708,7 @@ MembersSetup=Members module setup
MemberMainOptions=Main options MemberMainOptions=Main options
AddSubscriptionIntoAccount=Add subscriptions into bank or cash account, of bank module AddSubscriptionIntoAccount=Add subscriptions into bank or cash account, of bank module
AdherentMailRequired=EMail required to create a new member AdherentMailRequired=EMail required to create a new member
MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members is on by default
##### LDAP setup ##### ##### LDAP setup #####
LDAPSetup=LDAP Setup LDAPSetup=LDAP Setup
LDAPGlobalParameters=Global parameters LDAPGlobalParameters=Global parameters

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

@ -119,7 +119,7 @@ MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
AddSubscription=Add subscription AddSubscription=Add subscription
ShowSubscription=Show subscription ShowSubscription=Show subscription
MemberModifiedInDolibarr=Member modified in Dolibarr 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_SUBJECT=EMail subject for member validation
DescADHERENT_MAIL_VALID=EMail for member validation DescADHERENT_MAIL_VALID=EMail for member validation
DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription

2
htdocs/langs/es_ES/members.lang
View File

@ -115,7 +115,7 @@ MemberNotOrNoMoreExpectedToSubscribe=No sometida a cotizaci
AddSubscription=Añadir afiliación AddSubscription=Añadir afiliación
ShowSubscription=Mostrar afiliación ShowSubscription=Mostrar afiliación
MemberModifiedInDolibarr=Miembro modificado en Dolibarr 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_SUBJECT=Asunto del e-mail de validación de miembro
DescADHERENT_MAIL_VALID=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 DescADHERENT_MAIL_COTIS_SUBJECT=Asunto del e-mail de validación de cotización

1
htdocs/langs/fr_FR/admin.lang
View File

@ -707,6 +707,7 @@ MembersSetup=Configuration du module Adh
MemberMainOptions=Options principales MemberMainOptions=Options principales
AddSubscriptionIntoAccount=Enregistrer cotisations dans compte bancaire ou caisse, du module banque AddSubscriptionIntoAccount=Enregistrer cotisations dans compte bancaire ou caisse, du module banque
AdherentMailRequired=EMail obligatoire pour créer un nouvel adhérent 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 ##### ##### LDAP setup #####
LDAPSetup=Configuration du module LDAP LDAPSetup=Configuration du module LDAP
LDAPGlobalParameters=Paramètres globals LDAPGlobalParameters=Paramètres globals

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

@ -119,7 +119,7 @@ MemberNotOrNoMoreExpectedToSubscribe=Non soumis ou plus soumis
AddSubscription=Ajout adhésion AddSubscription=Ajout adhésion
ShowSubscription=Afficher adhésion ShowSubscription=Afficher adhésion
MemberModifiedInDolibarr=Adhérent modifié dans Dolibarr 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_SUBJECT=Sujet du mail de validation adhérent
DescADHERENT_MAIL_VALID=Mail de validation adhérent DescADHERENT_MAIL_VALID=Mail de validation adhérent
DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation cotisation DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation cotisation

2
htdocs/langs/it_IT/members.lang
View File

@ -115,7 +115,7 @@ MemberNotOrNoMoreExpectedToSubscribe =Stati non hanno o non hanno pi
AddSubscription =Aggiungi abbonamento AddSubscription =Aggiungi abbonamento
ShowSubscription =Visualizza abbonamento ShowSubscription =Visualizza abbonamento
MemberModifiedInDolibarr =Stati modificati in Dolibarr 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_SUBJECT =EMail oggetto di membro di convalida
DescADHERENT_MAIL_VALID =E-mail per la convalida membro DescADHERENT_MAIL_VALID =E-mail per la convalida membro
DescADHERENT_MAIL_COTIS_SUBJECT =EMail soggetto per la sottoscrizione DescADHERENT_MAIL_COTIS_SUBJECT =EMail soggetto per la sottoscrizione