diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 3a19bb21dd6..1eab3a05da2 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -19,7 +19,6 @@
*
* $Id$
* $Source$
- *
*/
/**
@@ -119,7 +118,8 @@ $sql.= " b.fk_account";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
$sql.= " WHERE d.rowid = c.fk_adherent";
-if(isset($date_select) && $date_select != ''){
+if(isset($date_select) && $date_select != '')
+{
$sql .= " AND dateadh LIKE '$date_select%'";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
@@ -127,71 +127,72 @@ $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $of
$result = $db->query($sql);
if ($result)
{
- $num = $db->num_rows($result);
- $i = 0;
+ $num = $db->num_rows($result);
+ $i = 0;
- print '
';
+ print '';
- print '';
- print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh","&page=$page&statut=$statut","","",$sortfield);
- print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.nom","&page=$page&statut=$statut","","",$sortfield);
- print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation","&page=$page&statut=$statut","","align=\"right\"",$sortfield);
- if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0)
- {
- print_liste_field_titre($langs->trans("Bank"),"cotisations.php","b.fk_account","&page=$page&statut=$statut","","",$sortfield);
- }
- print "
\n";
-
- $var=true;
- $total=0;
- while ($i < $num)
- {
- $objp = $db->fetch_object($result);
- $total+=price($objp->cotisation);
-
- $var=!$var;
- print "";
- print "| ".dolibarr_print_date($objp->dateadh)." | \n";
- print "rowid&action=edit\">".img_object($langs->trans("ShowMember"),"user").' '.stripslashes($objp->prenom)." ".stripslashes($objp->nom)." | \n";
- print ''.price($objp->cotisation).' | ';
+ $param="&page=$page&statut=$statut&date_select=$date_select";
+ print '
';
+ print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh",$param,"","",$sortfield);
+ print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.nom",$param,"","",$sortfield);
+ print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation",$param,"","align=\"right\"",$sortfield);
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0)
{
- if ($objp->fk_account)
- {
- $acc=new Account($db);
- $acc->fetch($objp->fk_account);
- print '| '.$acc->label.' | ';
- }
- else
- {
- print "";
- print "\n";
- print " | \n";
- }
+ print_liste_field_titre($langs->trans("Bank"),"cotisations.php","b.fk_account",$pram,"","",$sortfield);
}
- print "
";
- $i++;
- }
+ print "\n";
- $var=!$var;
- print '';
- print "| ".$langs->trans("Total")." | \n";
- print " | \n";
- print "".price($total)." | \n";
- print ' | ';
- print "
\n";
- print "
";
- print "
\n";
+ $var=true;
+ $total=0;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+ $total+=price($objp->cotisation);
+
+ $var=!$var;
+ print "";
+ print "| ".dolibarr_print_date($objp->dateadh)." | \n";
+ print "rowid&action=edit\">".img_object($langs->trans("ShowMember"),"user").' '.stripslashes($objp->prenom)." ".stripslashes($objp->nom)." | \n";
+ print ''.price($objp->cotisation).' | ';
+ if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0)
+ {
+ if ($objp->fk_account)
+ {
+ $acc=new Account($db);
+ $acc->fetch($objp->fk_account);
+ print ''.$acc->label.' | ';
+ }
+ else
+ {
+ print "";
+ print "\n";
+ print " | \n";
+ }
+ }
+ print "
";
+ $i++;
+ }
+
+ $var=!$var;
+ print '';
+ print "| ".$langs->trans("Total")." | \n";
+ print " | \n";
+ print "".price($total)." | \n";
+ print ' | ';
+ print "
\n";
+ print "
";
+ print "
\n";
}