From 701b83db3851d442c2411a304ef52fd7cd9f9726 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Sep 2020 02:38:12 +0200
Subject: [PATCH] FIX Bad number of subscription (forgotten when member was
 resiliated)

---
 htdocs/adherents/class/adherentstats.class.php |  2 +-
 htdocs/adherents/stats/byproperties.php        |  6 +++---
 htdocs/adherents/stats/geo.php                 | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bdb174cc0bd..eff42f92a43 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -68,7 +68,7 @@ class AdherentStats extends Stats
 
 		$this->field = 'subscription';
 
-		$this->where .= " m.statut != 0";
+		$this->where .= " m.statut != -1";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($this->memberid)
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 7927c2e3f00..3a6a7eb0342 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -108,19 +108,19 @@ dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'use
 // Print title
 if (!count($data))
 {
-	print $langs->trans("NoValidatedMemberYet").'<br>';
+	print '<span class="opacitymedium">'.$langs->trans("NoValidatedMemberYet").'</span><br>';
 	print '<br>';
 }
 else
 {
-	print $langs->trans("MembersByNature").'<br>';
+	print '<span class="opacitymedium">'.$langs->trans("MembersByNature").'</span><br>';
 	print '<br>';
 }
 
 // Print array
 print '<table class="liste centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Nature").'</td>';
+print '<td>'.$langs->trans("MemberNature").'</td>';
 print '<td class="right">'.$langs->trans("NbOfMembers").'</td>';
 print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
 print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 5b51008a9a2..db556c0eea7 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -221,13 +221,13 @@ if ($mode && !count($data))
 }
 else
 {
-    if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>';
-    elseif ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>';
-    elseif ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>';
-    elseif ($mode == 'memberbyregion') print $langs->trans("MembersByRegion").'<br>'; //+
+    if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
+    elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
+    elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
+    elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
     else
     {
-        print $langs->trans("MembersStatisticsDesc").'<br>';
+    	print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
         print '<br>';
         print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
         print '<br>';