diff --git a/ChangeLog b/ChangeLog index 65d519e4621..26d8700b182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ English Dolibarr changelog ***** Changelog for 2.6 compared to 2.5 ***** For users: +- New: Add filter on statut in emailing selector for dolibarr users. - New: Can add bookmarks on all pages. - New: Enhance bank transactions reportings. - New: When creating a contact from a third party, informations from third party card diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/includes/modules/mailings/pomme.modules.php index b4983fde463..aa2464d0231 100644 --- a/htdocs/includes/modules/mailings/pomme.modules.php +++ b/htdocs/includes/modules/mailings/pomme.modules.php @@ -82,6 +82,25 @@ class mailing_pomme extends MailingTargets /** + * \brief Affiche formulaire de filtre qui apparait dans page de selection + * des destinataires de mailings + * \return string Retourne zone select + */ + function formFilter() + { + global $langs; + $langs->load("users"); + + $s=''; + $s.=''; + return $s; + } + + + /** * \brief Renvoie url lien vers fiche de la source du destinataire du mailing * \return string Url lien */ @@ -108,6 +127,11 @@ class mailing_pomme extends MailingTargets $sql.= " u.name as name, u.firstname as firstname, u.login, u.office_phone"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test + foreach($filtersarray as $key) + { + if ($key == '1') $sql.= " AND u.statut=1"; + if ($key == '0') $sql.= " AND u.statut=0"; + } $sql.= " ORDER BY u.email"; // Stocke destinataires dans cibles