From d3c87dabab1c8fc2da0eae5f33729de61a858890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 26 Oct 2020 21:51:17 +0100
Subject: [PATCH] display members

---
 htdocs/adherents/list.php              | 7 +++----
 htdocs/adherents/subscription/list.php | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ef4639e4b5e..05100582ec2 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -656,6 +656,7 @@ while ($i < min($num, $limit)) {
 	$memberstatic->datefin = $datefin;
 	$memberstatic->socid = $obj->fk_soc;
 	$memberstatic->photo = $obj->photo;
+	$memberstatic->email = $obj->email;
 	$memberstatic->morphy = $obj->morphy;
 	$memberstatic->note_public = $obj->note_public;
 	$memberstatic->note_private = $obj->note_private;
@@ -725,12 +726,10 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print '<td class="center">';
 		$s = '';
-		if ($obj->morphy == 'phy')
-		{
+		if ($obj->morphy == 'phy') {
 			$s .= '<span class="customer-back" title="'.$langs->trans("Physical").'">'.dol_substr($langs->trans("Physical"), 0, 1).'</span>';
 		}
-		if ($obj->morphy == 'mor')
-		{
+		if ($obj->morphy == 'mor') {
 			$s .= '<span class="vendor-back" title="'.$langs->trans("Moral").'">'.dol_substr($langs->trans("Moral"), 0, 1).'</span>';
 		}
 		print $s;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 364a7854fb7..9b5efa214b9 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -142,6 +142,7 @@ $now = dol_now();
 
 // List of subscriptions
 $sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo, d.statut,";
+$sql .= " d.gender, d.email, d.morphy,";
 $sql .= " c.rowid as crowid, c.fk_type, c.subscription,";
 $sql .= " c.dateadh, c.datef, c.datec as date_creation, c.tms as date_update,";
 $sql .= " c.fk_bank as bank, c.note,";
@@ -151,8 +152,7 @@ $sql .= " JOIN ".MAIN_DB_PREFIX."subscription as c on d.rowid = c.fk_adherent";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
-{
+if (isset($date_select) && $date_select != '') {
     $sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
     $sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
 }
@@ -403,6 +403,9 @@ while ($i < min($num, $limit)) {
 	$adherent->statut = $obj->statut;
 	$adherent->login = $obj->login;
 	$adherent->photo = $obj->photo;
+	$adherent->gender = $obj->gender;
+	$adherent->morphy = $obj->morphy;
+	$adherent->email = $obj->email;
 	$adherent->typeid = $obj->type;
 
 	$typeid = ($obj->fk_type > 0 ? $obj->fk_type : $adherent->typeid);