From 1b5c5cfafb07dcb6d5adb0603054dd3709733555 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 Jun 2018 10:42:07 +0200
Subject: [PATCH] Fix select status

---
 .../core/modules/mailings/thirdparties.modules.php   | 12 ++++++------
 .../thirdparties_services_expired.modules.php        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index c341b45cf69..57a69475000 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -131,7 +131,7 @@ class mailing_thirdparties extends MailingTargets
                     }
                     else
                     {
-                        $sql.= " AND s.status=0"; 
+                        $sql.= " AND s.status=0";
                         $addDescription.= $langs->trans("Disabled");
                     }
                 }
@@ -239,7 +239,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$langs->load("companies");
 
-		$s='';
+		$s=$langs->trans("Categories").': ';
 		$s.='<select name="filter" class="flat">';
 
 		// Show categories
@@ -284,7 +284,7 @@ class mailing_thirdparties extends MailingTargets
                 $s.= $langs->trans('ProspectCustomer');
                 $s.=': <select name="filter_client" class="flat">';
                 $s.= '<option value="-1">&nbsp;</option>';
-                if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) 
+                if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
                 {
                     $s.= '<option value="2">'.$langs->trans('Prospect').'</option>';
                 }
@@ -297,12 +297,12 @@ class mailing_thirdparties extends MailingTargets
                 $s.= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
 
                 $s.='</select> ';
-                
+
                 $s.=$langs->trans("Status");
                 $s.=': <select name="filter_status" class="flat">';
-                $s.='<option value="1">'.$langs->trans("Enabled").'</option>';
+                $s.='<option value="-1">&nbsp;</option>';
+                $s.='<option value="1" selected>'.$langs->trans("Enabled").'</option>';
                 $s.='<option value="0">'.$langs->trans("Disabled").'</option>';
-                $s.='<option value="-1">Alle</option>';
 		$s.='</select>';
 		return $s;
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 786cfa1f756..08473f3cb6d 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -213,7 +213,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
     {
         global $langs;
 
-        $s='';
+        $s=$langs->trans("ProductOrService");
         $s.='<select name="filter" class="flat">';
         if (count($this->arrayofproducts)) $s.='<option value="0">&nbsp;</option>';
         else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';