diff --git a/htdocs/compta/bank/releve.php3 b/htdocs/compta/bank/releve.php3 index 3fbede63ddf..f0a9cb546ca 100644 --- a/htdocs/compta/bank/releve.php3 +++ b/htdocs/compta/bank/releve.php3 @@ -1,6 +1,5 @@ +/* Copyright (C) 2001-2003 Rodolphe Quiedeville * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +17,7 @@ * * $Id$ * $Source$ - * - *******************************************************************************/ + */ /* $num * $rel @@ -30,7 +28,8 @@ require("./pre.inc.php3"); llxHeader(); $db = new Db(); -if (! $num) { +if (! strlen($num)) +{ /* * * Vue liste @@ -48,51 +47,63 @@ if (! $num) { $sql = "SELECT distinct(b.num_releve) as numr"; $sql .= " FROM llx_bank as b WHERE fk_account = $account ORDER BY numr DESC"; $result = $db->query($sql); - if ($result) { - $var=True; - $numrows = $db->num_rows(); - $i = 0; - while ($i < $numrows) { - $objp = $db->fetch_object( $i); - $var=!$var; - print "numr&account=$account\">$objp->numr\n"; - $i++; + if ($result) + { + $var=True; + $numrows = $db->num_rows(); + $i = 0; + + while ($i < $numrows) + { + $objp = $db->fetch_object( $i); + $var=!$var; + print "numr&account=$account\">$objp->numr\n"; + $i++; + } } - } print ""; -} else { +} +else +{ /* * Vue d'un releves * */ - if ($rel == 'prev') { - $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; - $numrows = $db->num_rows(); - $i = 0; - if ($numrows > 0) { - $row = $db->fetch_row(0); - $num = $row[0]; - } + if ($rel == 'prev') + { + $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; + $numrows = $db->num_rows(); + $i = 0; + if ($numrows > 0) + { + $row = $db->fetch_row(0); + $num = $row[0]; + } + } } - } elseif ($rel == 'next') { - $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; - $numrows = $db->num_rows(); - $i = 0; - if ($numrows > 0) { - $row = $db->fetch_row(0); - $num = $row[0]; - } + elseif ($rel == 'next') + { + $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; + $numrows = $db->num_rows(); + $i = 0; + if ($numrows > 0) + { + $row = $db->fetch_row(0); + $num = $row[0]; + } + } } - } - + print ""; print "
Releve numéro $num<- prev"; @@ -101,83 +112,95 @@ if (! $num) { print ""; print ""; print ""; - print ""; + print ''; print ''; print ''; print ''; - print ''; + print ''; print "\n"; $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(); - } + 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, b.num_chq, b.fk_type"; $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) { - $var=True; - $numrows = $db->num_rows(); - $i = 0; - print ""; - print "\n"; - while ($i < $numrows) { - $objp = $db->fetch_object( $i); - $total = $total + $objp->amount; + if ($result) + { + $var=True; + $numrows = $db->num_rows(); + $i = 0; + print ""; + print "\n"; - $var=!$var; - print ""; - - print "\n"; - print ''; - print ""; - - if ($objp->amount < 0) { - $totald = $totald + abs($objp->amount); - print "\n"; - } else { - $totalc = $totalc + abs($objp->amount); - print "\n"; - } + while ($i < $numrows) + { + $objp = $db->fetch_object( $i); + $total = $total + $objp->amount; + + $var=!$var; + print ""; + + print "\n"; + print ''; + print ""; + + if ($objp->amount < 0) + { + $totald = $totald + abs($objp->amount); + print "\n"; + } + else + { + $totalc = $totalc + abs($objp->amount); + print "\n"; + } - print "\n"; - print "\n"; - - print ""; - - print ""; - $i++; + print "\n"; + print "\n"; + + print ""; + + print ""; + $i++; + } + $db->free(); } - $db->free(); - } - print ""; - print "\n"; + print ""; + print "\n"; print "
DateTypeDescriptionDateTypeDescriptionDebitCreditSoldeFrancsFrancs 
vue etendueTotal :".price($total)."".francs($total)."
vue etendueTotal :".price($total)."".francs($total)." 
".strftime("%d %b %Y",$objp->do)."'.$objp->fk_type.'$objp->num_chq $objp->label"; - - if ($ve) { - $dc = $db->clone(); - $sql = "SELECT label FROM llx_bank_categ as ct, llx_bank_class as cl WHERE ct.rowid=cl.fk_categ AND cl.lineid=$objp->rowid"; - $resc = $dc->query($sql); - if ($resc) { - $numc = $dc->num_rows(); - $ii = 0; - while ($ii < $numc) { - $objc = $dc->fetch_object($ii); - print "
- $objc->label"; - $ii++; - } - } else { - print $dc->error(); - } - } - - print "		".price($objp->amount * -1)."  ".price($objp->amount)."
".strftime("%d %b %Y",$objp->do)."'.$objp->fk_type.'$objp->num_chq $objp->label"; + + if ($ve) + { + $dc = $db->clone(); + $sql = "SELECT label FROM llx_bank_categ as ct, llx_bank_class as cl WHERE ct.rowid=cl.fk_categ AND cl.lineid=$objp->rowid"; + $resc = $dc->query($sql); + if ($resc) + { + $numc = $dc->num_rows(); + $ii = 0; + while ($ii < $numc) + { + $objc = $dc->fetch_object($ii); + print "
- $objc->label"; + $ii++; + } + } + else + { + print $dc->error(); + } + } + + print "		".price($objp->amount * -1)."  ".price($objp->amount)."".price($total)."".francs($objp->amount)."[rowid&account=$account\">edit]
".price($total)."".francs($objp->amount)."[rowid&account=$account\">edit]
Total :".price($totald)."".price($totalc)." 
Solde :".price($total)."".francs($total)."
Total :".price($totald)."".price($totalc)." 
Solde :".price($total)."".francs($total)." 
"; - + print "Edit Categories"; print " Categories"; }