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

Fix: Si adhrent n'a pas de mail, on ne propose pas envoi A.R. adhsion

Browse Source
This commit is contained in:
Laurent Destailleur 2007-02-06 09:20:11 +00:00
parent f013b5897b
commit 8591d53b34
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/card_subscriptions.php
View File

@ -41,6 +41,7 @@ $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members"); $langs->load("members");
$langs->load("users"); $langs->load("users");
$langs->load("mails");
$user->getrights('adherent'); $user->getrights('adherent');
@ -406,7 +407,11 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
} }
else else
{ {
print '<input name="sendmail" type="checkbox"'.($conf->global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>'; $s1='<input name="sendmail" type="checkbox"'.($conf->global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>';
$s2=$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b><br>';
$s2.=$langs->trans("MailTo").': <b>'.$adh->email.'</b>';
//$s2.='<br>'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS);
print $html->textwithhelp($s1,$s2,1);
} }
print '</td></tr>'; print '</td></tr>';

10
htdocs/compta/bank/account.class.php
View File

@ -248,9 +248,13 @@ class Account
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, dateo, datev, label, amount, fk_user_author, num_chq, fk_account, fk_type,emetteur,banque)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, dateo, datev, label, amount, fk_user_author, num_chq, fk_account, fk_type,emetteur,banque)";
$sql.= " VALUES (now(), '".$this->db->idate($date)."', '".$this->db->idate($datev)."', "; $sql.= " VALUES (now(), '".$this->db->idate($date)."', '".$this->db->idate($datev)."', ";
$sql.= "'".addslashes($label)."','" . price2num($amount)."','".$user->id."','$num_chq','".$this->rowid."', '$oper'"; $sql.= " '".addslashes($label)."', '" . price2num($amount)."', '".$user->id."', ";
$sql.= ",'".addslashes($emetteur)."'"; $sql.= " ".($num_chq?"'".$num_chq."'":"null").", ";
$sql.= ",'".addslashes($banque)."');"; $sql.= " '".$this->rowid."', ";
$sql.= " '".$oper."', ";
$sql.= " ".($emetteur?"'".addslashes($emetteur)."'":"null").", ";
$sql.= " ".($banque?"'".addslashes($banque)."'":"null");
$sql.= ")";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {

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

@ -352,6 +352,7 @@ Question=Question
Response=Response Response=Response
Priority=Priority Priority=Priority
SendAcknowledgementByMail=Send Ack. by mail SendAcknowledgementByMail=Send Ack. by mail
NoEMail=No EMail
# Countries # Countries
CountryFR=France CountryFR=France
CountryBE=Belgium CountryBE=Belgium

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

@ -352,6 +352,7 @@ Question=Question
Response=Réponse Response=Réponse
Priority=Priorité Priority=Priorité
SendAcknowledgementByMail=Envoi A.R. par mail SendAcknowledgementByMail=Envoi A.R. par mail
NoEMail=Pas d'email
# Countries # Countries
CountryFR=France CountryFR=France
CountryBE=Belgique CountryBE=Belgique

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

@ -36,20 +36,20 @@ MembersAttributes=Attributs adh
SearchAMember=Rechercher un membre SearchAMember=Rechercher un membre
MemberStatusDraft=Brouillon (à valider) MemberStatusDraft=Brouillon (à valider)
MemberStatusDraftShort=A valider MemberStatusDraftShort=A valider
MemberStatusActive=Validé (non cotisé) MemberStatusActive=Validé (attente adhésion)
MemberStatusActiveShort=Validé MemberStatusActiveShort=Validé
MemberStatusActiveLate=Cotisation non à jour MemberStatusActiveLate=Adhésion non à jour
MemberStatusActiveLateShort=Non à jour MemberStatusActiveLateShort=Non à jour
MemberStatusPayed=Cotisation à jour MemberStatusPayed=Adhésion à jour
MemberStatusPayedShort=A jour MemberStatusPayedShort=A jour
MemberStatusResiliated=Adhérent résilié MemberStatusResiliated=Adhérent résilié
MemberStatusResiliatedShort=Résilié MemberStatusResiliatedShort=Résilié
MembersStatusToValid=Adhérents brouillons MembersStatusToValid=Adhérents brouillons
MembersStatusToValidShort=Adhérents brouillons MembersStatusToValidShort=Adhérents brouillons
MembersStatusValidated=Adhérents validés MembersStatusValidated=Adhérents validés
MembersStatusPayed=Cotisations à jour MembersStatusPayed=Adhésions à jour
MembersStatusPayedShort=A jour MembersStatusPayedShort=A jour
MembersStatusNotPayed=Cotisations non à jour MembersStatusNotPayed=Adhésions non à jour
MembersStatusNotPayedShort=Non à jour MembersStatusNotPayedShort=Non à jour
MembersStatusResiliated=Adhérents résiliés MembersStatusResiliated=Adhérents résiliés
MembersStatusResiliatedShort=Adhérents résiliés MembersStatusResiliatedShort=Adhérents résiliés