Amlioration affichage
This commit is contained in:
parent
6e70a2fcf5
commit
871d550403
@ -1,6 +1,5 @@
|
||||
<?PHP
|
||||
/********************************************************************************
|
||||
* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
*
|
||||
* 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 "<tr $bc[$var]><td><a href=\"$PHP_SELF?num=$objp->numr&account=$account\">$objp->numr</a></td></tr>\n";
|
||||
$i++;
|
||||
if ($result)
|
||||
{
|
||||
$var=True;
|
||||
$numrows = $db->num_rows();
|
||||
$i = 0;
|
||||
|
||||
while ($i < $numrows)
|
||||
{
|
||||
$objp = $db->fetch_object( $i);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]><td><a href=\"$PHP_SELF?num=$objp->numr&account=$account\">$objp->numr</a></td></tr>\n";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
print "</table>";
|
||||
|
||||
} 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 "<table border=0 width=100%><tr><td><b>Releve numéro $num</b></td>";
|
||||
print "<td align=right><a href=\"$PHP_SELF?rel=prev&num=$num&ve=$ve\"><- prev</a>";
|
||||
@ -101,83 +112,95 @@ if (! $num) {
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
|
||||
print "<TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
|
||||
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">Credit</TD>';
|
||||
print '<td align="right">Solde</TD>';
|
||||
print '<td align="right">Francs</td>';
|
||||
print '<td align="right">Francs</td><td> </td>';
|
||||
print "</TR>\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 "<tr><td colspan=\"4\"><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";
|
||||
while ($i < $numrows) {
|
||||
$objp = $db->fetch_object( $i);
|
||||
$total = $total + $objp->amount;
|
||||
if ($result)
|
||||
{
|
||||
$var=True;
|
||||
$numrows = $db->num_rows();
|
||||
$i = 0;
|
||||
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><td> </td></tr>\n";
|
||||
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
print "<td>".strftime("%d %b %Y",$objp->do)."</TD>\n";
|
||||
print '<td>'.$objp->fk_type.'</td>';
|
||||
print "<td>$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 "<br>- <i>$objc->label</i>";
|
||||
$ii++;
|
||||
}
|
||||
} else {
|
||||
print $dc->error();
|
||||
}
|
||||
}
|
||||
|
||||
print "</td>";
|
||||
|
||||
if ($objp->amount < 0) {
|
||||
$totald = $totald + abs($objp->amount);
|
||||
print "<td align=\"right\">".price($objp->amount * -1)."</TD><td> </td>\n";
|
||||
} else {
|
||||
$totalc = $totalc + abs($objp->amount);
|
||||
print "<td> </td><td align=\"right\">".price($objp->amount)."</TD>\n";
|
||||
}
|
||||
while ($i < $numrows)
|
||||
{
|
||||
$objp = $db->fetch_object( $i);
|
||||
$total = $total + $objp->amount;
|
||||
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
print "<td>".strftime("%d %b %Y",$objp->do)."</TD>\n";
|
||||
print '<td>'.$objp->fk_type.'</td>';
|
||||
print "<td>$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 "<br>- <i>$objc->label</i>";
|
||||
$ii++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
print $dc->error();
|
||||
}
|
||||
}
|
||||
|
||||
print "</td>";
|
||||
|
||||
if ($objp->amount < 0)
|
||||
{
|
||||
$totald = $totald + abs($objp->amount);
|
||||
print "<td align=\"right\">".price($objp->amount * -1)."</TD><td> </td>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$totalc = $totalc + abs($objp->amount);
|
||||
print "<td> </td><td align=\"right\">".price($objp->amount)."</TD>\n";
|
||||
}
|
||||
|
||||
print "<td align=\"right\">".price($total)."</TD>\n";
|
||||
print "<td align=\"right\"><small>".francs($objp->amount)."</small></TD>\n";
|
||||
|
||||
print "<td align=\"center\">[<a href=\"ligne.php3?rowid=$objp->rowid&account=$account\">edit</a>]</td>";
|
||||
|
||||
print "</tr>";
|
||||
$i++;
|
||||
print "<td align=\"right\">".price($total)."</TD>\n";
|
||||
print "<td align=\"right\"><small>".francs($objp->amount)."</small></TD>\n";
|
||||
|
||||
print "<td align=\"center\">[<a href=\"ligne.php3?rowid=$objp->rowid&account=$account\">edit</a>]</td>";
|
||||
|
||||
print "</tr>";
|
||||
$i++;
|
||||
}
|
||||
$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\"> </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=\"3\">Total :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td colspan=\"3\"> </td></tr>";
|
||||
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> </td></tr>\n";
|
||||
print "</table></form>";
|
||||
|
||||
|
||||
print "<a href=\"bank/categ.php3\">Edit Categories</a>";
|
||||
print " <a href=\"bank/categories.php3\">Categories</a>";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user