diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index eb9a4da5530..a6b51bb504e 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -159,7 +159,7 @@ if ($mil->fetch($_GET["id"]) == 0)
print '
';
$obj = new $classname($db);
- print $obj->getDesc();
+ print img_object('',$obj->picto).' '.$obj->getDesc();
print ' | ';
/*
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 5a68db3e78f..147fbf0e94c 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -63,7 +63,8 @@ while (($file = readdir($handle))!==false)
{
if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
{
- if (eregi("(.*)\.(.*)\.(.*)",$file,$reg)) {
+ if (eregi("(.*)\.(.*)\.(.*)",$file,$reg))
+ {
$var = !$var;
$modulename=$reg[1];
@@ -72,35 +73,49 @@ while (($file = readdir($handle))!==false)
$file = $dir."/".$modulename.".modules.php";
$classname = "mailing_".$modulename;
require_once($file);
- $obj = new $classname($db);
+ $mailmodule = new $classname($db);
- foreach ($obj->statssql as $sql)
+ foreach ($mailmodule->statssql as $sql)
{
- print '';
-
- $result=$db->query($sql);
- if ($result)
+ $qualified=1;
+ foreach ($mailmodule->require_module as $key)
{
- $num = $db->num_rows($result);
-
- $i = 0;
-
- while ($i < $num )
+ if (! $conf->$key->enabled)
{
- $obj = $db->fetch_object($result);
- print '| '.$obj->label.' | '.$obj->nb.' | ';
- $i++;
+ $qualified=0;
+ //print "Le module mailing a besoin du module $key. Il ne sera pas actif";
+ break;
}
-
- $db->free();
- }
- else
- {
- dolibarr_print_error($db);
}
- }
-
- print ' |
';
+
+ // Si le module mailing est qualifié
+ if ($qualified)
+ {
+ print '';
+
+ $result=$db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+
+ $i = 0;
+
+ while ($i < $num )
+ {
+ $obj = $db->fetch_object($result);
+ print '| '.img_object('',$mailmodule->picto).' '.$obj->label.' | '.$obj->nb.' | ';
+ $i++;
+ }
+
+ $db->free($result);
+ }
+ else
+ {
+ dolibarr_print_error($db);
+ }
+ print ' |
';
+ }
+ }
}
}
}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 9db43b88a2a..30d18e8caef 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -41,6 +41,7 @@ AddRecipients=Add recipients
MailingModuleDescContactProspects=All contacts for all prospect companies
MailingModuleDescContactCustomers=All contacts for all customer companies
MailingModuleDescDolibarrUsers=All Dolibarr users
+MailingModuleDescMembersValidated=All validated members
RecipientSelectionModules=Active modules for recipients selection
MailSelectedRecipients=Selected recipients
MailingArea=Mailings area
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 78ca7b067ef..bba7df70db7 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1,6 +1,7 @@
# Dolibarr language file - en_US - main
charset=iso-8859-1
Error=Error
+ErrorFieldRequired=Field '%s' is required
ErrorFileDoesNotExists=File %s does not exists
ErrorCanNotCreateDir=Can not create dir %s
ErrorConstantNotDefined=Parameter %s not defined
@@ -181,4 +182,5 @@ Rejects=Rejects
Preview=Preview
NextStep=Next step
PreviousStep=Previous step
-None=None
\ No newline at end of file
+None=None
+Late=Late
\ No newline at end of file
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 0a529ce7e69..b1f61719db5 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -10,4 +10,15 @@ DateAbonment=Abonment date
NewMember=New member
MembersTypes=Members types
MembersAttribute=Members attributes
-SearchAMember=Search a member
\ No newline at end of file
+SearchAMember=Search a member
+MemberStatusDraft=Draft (need to be validated)
+MemberStatusActive=Validated
+MemberStatusResiliated=Resiliated
+MembersStatusToValid=Members to valid
+MembersStatusValidated=Members validated
+MembersStatusPayed=Subscription done
+MembersStatusResiliated=Members resiliated
+NewCotisation=New cotisation
+EditMember=Edit member
+SubscriptionEndDate=subscription end date
+MembersArea=Members area
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 8f959665e4e..e1692b74440 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -41,6 +41,7 @@ AddRecipients=Ajout de destinataires
MailingModuleDescContactProspects=Tous les contacts de toutes les sociétés propsects
MailingModuleDescContactCustomers=Tous les contacts de toutes les sociétés clientes
MailingModuleDescDolibarrUsers=Tous les utilisateurs Dolibarr
+MailingModuleDescMembersValidated=Tous les adhérents validés
RecipientSelectionModules=Modules actifs de sélection de destinataires
MailSelectedRecipients=Destinataires sélectionnés
MailingArea=Espace Mailings
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index f50dafc23e6..48f31ecec04 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -1,6 +1,7 @@
# Dolibarr language file - fr_FR - main
charset=iso-8859-1
Error=Erreur
+ErrorFieldRequired=Le champ '%s' est obligatoire
ErrorFileDoesNotExists=Le fichier %s n'existe pas
ErrorCanNotCreateDir=Impossible de créer le répertoire %s
ErrorConstantNotDefined=Paramètre %s non défini
@@ -182,4 +183,5 @@ Rejects=Rejets
Preview=Aperçu
NextStep=Etape suivante
PreviousStep=Etape précédente
-None=Aucun
\ No newline at end of file
+None=Aucun
+Late=Retard
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 17f641ec105..428cb5450a5 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -10,4 +10,15 @@ DateAbonment=Date cotisation
NewMember=Nouvel adhérent
MembersTypes=Types d'adhérents
MembersAttributes=Attributs adhérents
-SearchAMember=Rechercher un membre
\ No newline at end of file
+SearchAMember=Rechercher un membre
+MemberStatusDraft=Brouillon (à valider)
+MemberStatusActive=Validé
+MemberStatusResiliated=Résilié
+MembersStatusToValid=Adhérent à valider
+MembersStatusValidated=Adhérents validés
+MembersStatusPayed=Cotisation à jour
+MembersStatusResiliated=Adhérents résiliés
+NewCotisation=Nouvelle adhésion
+EditMember=Edition adhérent
+SubscriptionEndDate=Date de fin adhésion
+MembersArea=Espace adhérents