diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 1a81831610a..6eb192aef86 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -151,6 +151,7 @@ if ($account > 0) * */ $sql = "SELECT count(*) FROM llx_bank as b WHERE 1=1"; + $sql .= " AND b.dateo <= now()"; if ($account) { $sql .= " AND b.fk_account=$account"; } $sql .= $sql_rech; if ( $db->query($sql) ) @@ -215,12 +216,10 @@ if ($account > 0) */ print "
"; print ''; - print ""; - print "DateTypeDescription"; - print "Débit"; - print "Crédit"; - print "Solde"; - print "Relevé"; + print ''; + print 'DateTypeDescription'; + print 'DébitCréditSolde'; + print 'Relevé'; // DEBUG // print "$nbline$viewlinetotal_lines $total_lineslimitsql $limitsql"; @@ -255,16 +254,62 @@ if ($account > 0) $sql .= " AND b.amount < 0 "; } } + + $sql .= " AND b.dateo <= now()"; + $sql .= " ORDER BY b.dateo ASC"; $sql .= $db->plimit($limitsql, 0); $result = $db->query($sql); if ($result) { - $var=True; - $num = $db->num_rows(); - $i = 0; $total = 0; - $sep = 0; + _print_lines($db, $sql, $acct); + } + /* + * Opérations futures + * + */ + + + print " "; + print "".price($total)." \n"; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ""; + print 'YYYYMMDD0000.00'; + print ''; + print "
"; +} +else +{ + print "Erreur : numéro ce compte inexistant"; +} + +$db->close(); + +llxFooter("Dernière modification $Date$ révision $Revision$"); +/* + * + */ +Function _print_lines($db,$sql, $acct) +{ + global $bc, $nbline, $viewline; + $var=True; + $num = $db->num_rows(); + $i = 0; $total = 0; + $sep = 0; while ($i < $num) { @@ -308,7 +353,7 @@ if ($account > 0) if ($objp->num_chq) { - print "rowid&account=$account\">CHQ $objp->num_chq - $objp->label"; + print "rowid&account=$acct->id\">CHQ $objp->num_chq - $objp->label"; } else { @@ -355,11 +400,11 @@ if ($account > 0) if ($objp->rappro) { - print "num_releve&account=$account\">$objp->num_releve"; + print "num_releve&account=$acct->id\">$objp->num_releve"; } else { - print "rowid&account=$account&page=$page\">[Del]"; + print "rowid&account=$acct->id&page=$page\">[Del]"; } print ""; @@ -369,52 +414,5 @@ if ($account > 0) $i++; } $db->free(); - } - /* - * Opérations futures - * - */ - if ($sep) - { - print " "; - print "".price($total)." \n"; - } - else - { - - print " "; - print "".price($total)." \n"; - print ""; - print ''; - print ''; - print ""; - - print ''; - print ""; - print ''; - print ''; - print ''; - print ""; - print 'YYYYMMDD0000.00'; - - print ''; - - } - print ""; } -else -{ - print "Erreur : numéro ce compte inexistant"; -} - -$db->close(); - -llxFooter("Dernière modification $Date$ révision $Revision$"); ?>