diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index ac71718f3ca..eb54ff62b2e 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -112,7 +112,7 @@ llxHeader(); // Liste des cotisations -$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, b.fk_account,"; +$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,"; $sql.= " c.cotisation, ".$db->pdate("c.dateadh")." as dateadh, c.fk_bank as bank, c.rowid as crowid,"; $sql.= " b.fk_account"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; @@ -142,11 +142,11 @@ if ($result) print_liste_field_titre($langs->trans("Ref"),"cotisations.php","c.rowid",$param,"","",$sortfield); 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 ($conf->global->ADHERENT_BANK_USE) { print_liste_field_titre($langs->trans("Bank"),"cotisations.php","b.fk_account",$pram,"","",$sortfield); } + print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation",$param,"","align=\"right\"",$sortfield); print "\n"; $var=true; @@ -169,14 +169,15 @@ if ($result) print ''.$cotisation->getNomUrl(1).''; print ''.dolibarr_print_date($objp->dateadh)."\n"; print ''.$adherent->getNomUrl(1).''; - print ''.price($objp->cotisation).''; if ($conf->global->ADHERENT_BANK_USE) { if ($objp->fk_account) { - $acc=new Account($db); - $acc->fetch($objp->fk_account); - print ''.$acc->label.''; + $accountstatic=new Account($db); + $accountstatic->id=$objp->fk_account; + $accountstatic->fetch($objp->fk_account); + //$accountstatic->label=$objp->label; + print ''.$accountstatic->getNomUrl(1).''; } else { @@ -195,6 +196,7 @@ if ($result) print "\n"; } } + print ''.price($objp->cotisation).''; print ""; $i++; } @@ -204,12 +206,13 @@ if ($result) print "".$langs->trans("Total")."\n"; print " \n"; print " \n"; - print "".price($total)."\n"; if ($conf->global->ADHERENT_BANK_USE) { print ' '; } + print "".price($total)."\n"; print "\n"; + print ""; print "
\n";