Amélioration affichage

This commit is contained in:
Rodolphe Quiedeville 2003-03-18 15:22:05 +00:00
parent 6e70a2fcf5
commit 871d550403

View File

@ -1,6 +1,5 @@
<?PHP <?PHP
/******************************************************************************** /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -18,8 +17,7 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
* */
*******************************************************************************/
/* $num /* $num
* $rel * $rel
@ -30,7 +28,8 @@ require("./pre.inc.php3");
llxHeader(); llxHeader();
$db = new Db(); $db = new Db();
if (! $num) { if (! strlen($num))
{
/* /*
* *
* Vue liste * Vue liste
@ -48,12 +47,15 @@ if (! $num) {
$sql = "SELECT distinct(b.num_releve) as numr"; $sql = "SELECT distinct(b.num_releve) as numr";
$sql .= " FROM llx_bank as b WHERE fk_account = $account ORDER BY numr DESC"; $sql .= " FROM llx_bank as b WHERE fk_account = $account ORDER BY numr DESC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) {
if ($result)
{
$var=True; $var=True;
$numrows = $db->num_rows(); $numrows = $db->num_rows();
$i = 0; $i = 0;
while ($i < $numrows) { while ($i < $numrows)
{
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td><a href=\"$PHP_SELF?num=$objp->numr&account=$account\">$objp->numr</a></td></tr>\n"; print "<tr $bc[$var]><td><a href=\"$PHP_SELF?num=$objp->numr&account=$account\">$objp->numr</a></td></tr>\n";
@ -62,31 +64,40 @@ if (! $num) {
} }
print "</table>"; print "</table>";
} else { }
else
{
/* /*
* Vue d'un releves * Vue d'un releves
* *
*/ */
if ($rel == 'prev') { if ($rel == 'prev')
{
$sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve < $num AND fk_account = $account 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); $result = $db->query($sql);
if ($result) { if ($result)
{
$var=True; $var=True;
$numrows = $db->num_rows(); $numrows = $db->num_rows();
$i = 0; $i = 0;
if ($numrows > 0) { if ($numrows > 0)
{
$row = $db->fetch_row(0); $row = $db->fetch_row(0);
$num = $row[0]; $num = $row[0];
} }
} }
} elseif ($rel == 'next') { }
elseif ($rel == 'next')
{
$sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve > $num AND fk_account = $account 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); $result = $db->query($sql);
if ($result) { if ($result)
{
$var=True; $var=True;
$numrows = $db->num_rows(); $numrows = $db->num_rows();
$i = 0; $i = 0;
if ($numrows > 0) { if ($numrows > 0)
{
$row = $db->fetch_row(0); $row = $db->fetch_row(0);
$num = $row[0]; $num = $row[0];
} }
@ -101,16 +112,17 @@ if (! $num) {
print "<input type=\"hidden\" name=\"action\" value=\"add\">"; print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">"; print "<TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";
print "<td>Date</td><td>Type</td><td>Description</TD>"; print '<td>Date</td><td>Type</td><td width="30%">Description</TD>';
print '<td align="right">Debit</TD>'; print '<td align="right">Debit</TD>';
print '<td align="right">Credit</TD>'; print '<td align="right">Credit</TD>';
print '<td align="right">Solde</TD>'; print '<td align="right">Solde</TD>';
print '<td align="right">Francs</td>'; print '<td align="right">Francs</td><td>&nbsp;</td>';
print "</TR>\n"; print "</TR>\n";
$sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num AND fk_account = $account"; $sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num AND fk_account = $account";
if ( $db->query($sql) ) { if ( $db->query($sql) )
{
$total = $db->result (0, 0); $total = $db->result (0, 0);
$db->free(); $db->free();
} }
@ -120,13 +132,16 @@ if (! $num) {
$sql .= " FROM llx_bank as b WHERE num_releve=$num AND fk_account = $account"; $sql .= " FROM llx_bank as b WHERE num_releve=$num AND fk_account = $account";
$sql .= " ORDER BY dateo ASC"; $sql .= " ORDER BY dateo ASC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result)
{
$var=True; $var=True;
$numrows = $db->num_rows(); $numrows = $db->num_rows();
$i = 0; $i = 0;
print "<tr><td colspan=\"4\"><a href=\"$PHP_SELF?num=$num&ve=1&rel=$rel&account=$account\">vue etendue</a></td>"; print "<tr><td colspan=\"3\"><a href=\"$PHP_SELF?num=$num&ve=1&rel=$rel&account=$account\">vue etendue</a></td>";
print "<td align=\"right\" colspan=\"2\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td align=\"right\"><small>".francs($total)."</small></td></tr>\n"; print "<td align=\"right\" colspan=\"2\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td align=\"right\"><small>".francs($total)."</small></td><td>&nbsp;</td></tr>\n";
while ($i < $numrows) {
while ($i < $numrows)
{
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$total = $total + $objp->amount; $total = $total + $objp->amount;
@ -137,29 +152,37 @@ if (! $num) {
print '<td>'.$objp->fk_type.'</td>'; print '<td>'.$objp->fk_type.'</td>';
print "<td>$objp->num_chq $objp->label"; print "<td>$objp->num_chq $objp->label";
if ($ve) { if ($ve)
{
$dc = $db->clone(); $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"; $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); $resc = $dc->query($sql);
if ($resc) { if ($resc)
{
$numc = $dc->num_rows(); $numc = $dc->num_rows();
$ii = 0; $ii = 0;
while ($ii < $numc) { while ($ii < $numc)
{
$objc = $dc->fetch_object($ii); $objc = $dc->fetch_object($ii);
print "<br>-&nbsp;<i>$objc->label</i>"; print "<br>-&nbsp;<i>$objc->label</i>";
$ii++; $ii++;
} }
} else { }
else
{
print $dc->error(); print $dc->error();
} }
} }
print "</td>"; print "</td>";
if ($objp->amount < 0) { if ($objp->amount < 0)
{
$totald = $totald + abs($objp->amount); $totald = $totald + abs($objp->amount);
print "<td align=\"right\">".price($objp->amount * -1)."</TD><td>&nbsp;</td>\n"; print "<td align=\"right\">".price($objp->amount * -1)."</TD><td>&nbsp;</td>\n";
} else { }
else
{
$totalc = $totalc + abs($objp->amount); $totalc = $totalc + abs($objp->amount);
print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</TD>\n"; print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</TD>\n";
} }
@ -174,8 +197,8 @@ if (! $num) {
} }
$db->free(); $db->free();
} }
print "<tr><td align=\"right\" colspan=\"2\">Total :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td colspan=\"3\">&nbsp;</td></tr>"; print "<tr><td align=\"right\" colspan=\"3\">Total :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td colspan=\"3\">&nbsp;</td></tr>";
print "<tr><td align=\"right\" colspan=\"4\"><b>Solde :</b></td><td align=\"right\"><b>".price($total)."</b></td><td align=\"right\"><small>".francs($total)."</small></td></tr>\n"; print "<tr><td align=\"right\" colspan=\"5\"><b>Solde :</b></td><td align=\"right\"><b>".price($total)."</b></td><td align=\"right\"><small>".francs($total)."</small></td><td>&nbsp;</td></tr>\n";
print "</table></form>"; print "</table></form>";
print "<a href=\"bank/categ.php3\">Edit Categories</a>"; print "<a href=\"bank/categ.php3\">Edit Categories</a>";