diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index ec1c1b13725..5eb5d389de9 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -43,7 +43,7 @@ llxHeader('','Mailing');
*
*/
-print_titre("Espace mailing");
+print_titre($langs->trans("MailingArea"));
print '
';
@@ -100,7 +100,7 @@ print '';
*
*/
-$sql = "SELECT m.rowid, m.titre, m.nbemail";
+$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
$sql .= " LIMIT 10";
if ( $db->query($sql) )
@@ -109,7 +109,7 @@ if ( $db->query($sql) )
if ($num > 0)
{
print '';
- print '| Les 10 derniers mailings | ';
+ print '| '.$langs->trans("LastMailings",10).' | '.$langs->trans("Status").' | ';
$var = true;
$i = 0;
@@ -119,8 +119,10 @@ if ( $db->query($sql) )
$var=!$var;
print "";
- print '| '.$obj->titre.' | ';
+ print ''.img_object($langs->trans("ShowEMail"),"email").' '.$obj->titre.' | ';
print ''.($obj->nbemail?$obj->nbemail:"0")." ".$langs->trans("EMails").' | ';
+ $mail=new Mailing($db);
+ print ''.$mail->statuts[$obj->statut].' | ';
print ' ';
$i++;
}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 8f633a2f09c..6411f6414da 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -41,4 +41,6 @@ MailingModuleDescContactProspects=All contacts for all prospect companies
MailingModuleDescContactCustomers=All contacts for all customer companies
RecipientSelectionModules=Active modules for recipients selection
MailSelectedRecipients=Selected recipients
+MailingArea=Mailings area
+LastMailings=Last %s mailings
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index ce40ab60fdf..6283b4b5d40 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -41,3 +41,5 @@ MailingModuleDescContactProspects=Tous les contacts de toutes les soci
MailingModuleDescContactCustomers=Tous les contacts de toutes les sociétés clientes
RecipientSelectionModules=Modules actifs de sélection de destinataires
MailSelectedRecipients=Destinataires sélectionnés
+MailingArea=Espace Mailings
+LastMailings=Les %s derniers mailings
diff --git a/htdocs/theme/dev/img/object_email.png b/htdocs/theme/dev/img/object_email.png
new file mode 100644
index 00000000000..2a7d3ff43de
Binary files /dev/null and b/htdocs/theme/dev/img/object_email.png differ
diff --git a/htdocs/theme/dev/img/object_task.png b/htdocs/theme/dev/img/object_task.png
new file mode 100644
index 00000000000..82f4dff41b9
Binary files /dev/null and b/htdocs/theme/dev/img/object_task.png differ
diff --git a/htdocs/theme/eldy/img/object_email.png b/htdocs/theme/eldy/img/object_email.png
new file mode 100644
index 00000000000..2a7d3ff43de
Binary files /dev/null and b/htdocs/theme/eldy/img/object_email.png differ
diff --git a/htdocs/theme/freelug/img/object_email.png b/htdocs/theme/freelug/img/object_email.png
new file mode 100644
index 00000000000..2a7d3ff43de
Binary files /dev/null and b/htdocs/theme/freelug/img/object_email.png differ
diff --git a/htdocs/theme/freelug/img/object_task.png b/htdocs/theme/freelug/img/object_task.png
new file mode 100644
index 00000000000..82f4dff41b9
Binary files /dev/null and b/htdocs/theme/freelug/img/object_task.png differ
diff --git a/htdocs/theme/yellow/img/object_email.png b/htdocs/theme/yellow/img/object_email.png
new file mode 100644
index 00000000000..2a7d3ff43de
Binary files /dev/null and b/htdocs/theme/yellow/img/object_email.png differ
diff --git a/htdocs/theme/yellow/img/object_task.png b/htdocs/theme/yellow/img/object_task.png
new file mode 100644
index 00000000000..82f4dff41b9
Binary files /dev/null and b/htdocs/theme/yellow/img/object_task.png differ
|