diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index a4a7c736ba0..1821f84d411 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -41,6 +41,7 @@ $langs->load("companies");
$langs->load("bills");
$langs->load("members");
$langs->load("users");
+$langs->load("mails");
$user->getrights('adherent');
@@ -406,7 +407,11 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
}
else
{
- print 'global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>';
+ $s1='global->ADHERENT_MAIL_COTIS?' checked="true"':'').'>';
+ $s2=$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
';
+ $s2.=$langs->trans("MailTo").': '.$adh->email.'';
+ //$s2.='
'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS);
+ print $html->textwithhelp($s1,$s2,1);
}
print '';
diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index 183680ee608..a1d0bd4a831 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -247,10 +247,14 @@ class Account
$datev = $date;
$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.= "'".addslashes($label)."','" . price2num($amount)."','".$user->id."','$num_chq','".$this->rowid."', '$oper'";
- $sql.= ",'".addslashes($emetteur)."'";
- $sql.= ",'".addslashes($banque)."');";
+ $sql.= " VALUES (now(), '".$this->db->idate($date)."', '".$this->db->idate($datev)."', ";
+ $sql.= " '".addslashes($label)."', '" . price2num($amount)."', '".$user->id."', ";
+ $sql.= " ".($num_chq?"'".$num_chq."'":"null").", ";
+ $sql.= " '".$this->rowid."', ";
+ $sql.= " '".$oper."', ";
+ $sql.= " ".($emetteur?"'".addslashes($emetteur)."'":"null").", ";
+ $sql.= " ".($banque?"'".addslashes($banque)."'":"null");
+ $sql.= ")";
if ($this->db->query($sql))
{
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 215a275683d..e52adebedd2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -352,6 +352,7 @@ Question=Question
Response=Response
Priority=Priority
SendAcknowledgementByMail=Send Ack. by mail
+NoEMail=No EMail
# Countries
CountryFR=France
CountryBE=Belgium
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 52dd936676c..96be946874c 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -352,6 +352,7 @@ Question=Question
Response=Réponse
Priority=Priorité
SendAcknowledgementByMail=Envoi A.R. par mail
+NoEMail=Pas d'email
# Countries
CountryFR=France
CountryBE=Belgique
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 5d85e50a092..647c2e5335d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -36,20 +36,20 @@ MembersAttributes=Attributs adh
SearchAMember=Rechercher un membre
MemberStatusDraft=Brouillon (à valider)
MemberStatusDraftShort=A valider
-MemberStatusActive=Validé (non cotisé)
+MemberStatusActive=Validé (attente adhésion)
MemberStatusActiveShort=Validé
-MemberStatusActiveLate=Cotisation non à jour
+MemberStatusActiveLate=Adhésion non à jour
MemberStatusActiveLateShort=Non à jour
-MemberStatusPayed=Cotisation à jour
+MemberStatusPayed=Adhésion à jour
MemberStatusPayedShort=A jour
MemberStatusResiliated=Adhérent résilié
MemberStatusResiliatedShort=Résilié
MembersStatusToValid=Adhérents brouillons
MembersStatusToValidShort=Adhérents brouillons
MembersStatusValidated=Adhérents validés
-MembersStatusPayed=Cotisations à jour
+MembersStatusPayed=Adhésions à jour
MembersStatusPayedShort=A jour
-MembersStatusNotPayed=Cotisations non à jour
+MembersStatusNotPayed=Adhésions non à jour
MembersStatusNotPayedShort=Non à jour
MembersStatusResiliated=Adhérents résiliés
MembersStatusResiliatedShort=Adhérents résiliés