diff --git a/htdocs/compta/bank/releve.php3 b/htdocs/compta/bank/releve.php3 index ed177ddb6c0..776b6320137 100644 --- a/htdocs/compta/bank/releve.php3 +++ b/htdocs/compta/bank/releve.php3 @@ -41,7 +41,7 @@ if (! $num) { print ""; print ""; - print ""; + print ""; print "\n"; @@ -56,7 +56,7 @@ if (! $num) { while ($i < $numrows) { $objp = $db->fetch_object( $i); $var=!$var; - print "\n"; + print "\n"; $i++; } } @@ -68,7 +68,7 @@ if (! $num) { * */ if ($rel == 'prev') { - $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve < $num ORDER BY num_releve DESC"; + $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve < $num AND fk_account = $account ORDER BY num_releve DESC"; $result = $db->query($sql); if ($result) { $var=True; @@ -80,7 +80,7 @@ if (! $num) { } } } elseif ($rel == 'next') { - $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve > $num ORDER BY num_releve ASC"; + $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve > $num AND fk_account = $account ORDER BY num_releve ASC"; $result = $db->query($sql); if ($result) { $var=True; @@ -109,15 +109,15 @@ if (! $num) { print "\n"; - $sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num"; + $sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num AND fk_account = $account"; if ( $db->query($sql) ) { $total = $db->result (0, 0); $db->free(); } - $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve"; - $sql .= " FROM llx_bank as b WHERE num_releve=$num"; + $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq"; + $sql .= " FROM llx_bank as b WHERE num_releve=$num AND fk_account = $account"; $sql .= " ORDER BY dateo ASC"; $result = $db->query($sql); if ($result) { @@ -134,7 +134,7 @@ if (! $num) { print ""; print "\n"; - print "
DateDescriptionDate
numr\">$objp->numr
numr&account=$account\">$objp->numr
".strftime("%d %b %Y",$objp->do)."$objp->label"; + print "$objp->num_chq $objp->label"; if ($ve) { $dc = $db->clone();