diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index b858693255e..f8f21d2868a 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -227,10 +227,8 @@ $sql = "SELECT c.subscription, c.dateadh as dateh"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c"; $sql.= " WHERE d.entity IN (".getEntity('adherent').")"; $sql.= " AND d.rowid = c.fk_adherent"; -if(isset($date_select) && $date_select != '') -{ - $sql .= " AND c.dateadh LIKE '".$date_select."%'"; -} + + $result = $db->query($sql); if ($result) { @@ -251,21 +249,33 @@ if ($result) print '
| '.$langs->trans("Subscriptions").' | '; -print ''.$langs->trans("Number").' | '; +print ''.$langs->trans("Year").' | '; +print ''.$langs->trans("Subscriptions").' | '; print ''.$langs->trans("AmountTotal").' | '; print ''.$langs->trans("AmountAverage").' | '; print "
|---|---|---|---|---|---|
| ... | "; + print ""; + print " | "; + print " | "; + print " | ||
| $key | "; print "".$Number[$key]." | "; print "".price($value)." | "; print "".price(price2num($value/$Number[$key], 'MT'))." | "; print "