Fix: Mauvais alignement tableau.
This commit is contained in:
parent
b903f37a58
commit
e65d09f09c
@ -20,22 +20,28 @@
|
|||||||
* $Source$
|
* $Source$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $num
|
/*!
|
||||||
* $rel
|
\file htdocs/compta/bank/releve.php
|
||||||
* $ve
|
\ingroup banque
|
||||||
*/
|
\brief Page d'affichage d'un relevé
|
||||||
|
\version $Revision$
|
||||||
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
|
$langs->load("companies");
|
||||||
|
|
||||||
|
|
||||||
if (!$user->rights->banque->lire)
|
if (!$user->rights->banque->lire)
|
||||||
accessforbidden();
|
accessforbidden();
|
||||||
|
|
||||||
|
|
||||||
if ($_GET["action"] == 'dvnext')
|
if ($_GET["action"] == 'dvnext')
|
||||||
{
|
{
|
||||||
$ac = new Account($db);
|
$ac = new Account($db);
|
||||||
$ac->datev_next($_GET["dvid"]);
|
$ac->datev_next($_GET["dvid"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($_GET["action"] == 'dvprev')
|
if ($_GET["action"] == 'dvprev')
|
||||||
{
|
{
|
||||||
$ac = new Account($db);
|
$ac = new Account($db);
|
||||||
@ -50,14 +56,11 @@ llxHeader();
|
|||||||
$acct = new Account($db);
|
$acct = new Account($db);
|
||||||
$acct->fetch($_GET["account"]);
|
$acct->fetch($_GET["account"]);
|
||||||
|
|
||||||
|
|
||||||
if (! isset($_GET["num"]))
|
if (! isset($_GET["num"]))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Vue liste tous relevés confondus
|
* Vue liste tous relevés confondus
|
||||||
*
|
*
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
if ($page == -1) { $page = 0 ; }
|
if ($page == -1) { $page = 0 ; }
|
||||||
|
|
||||||
@ -81,7 +84,7 @@ if (! isset($_GET["num"]))
|
|||||||
print_barre_liste("Relevés bancaires, compte : <a href=\"account.php?account=".$acct->id."\">".$acct->label."</a>", $page, "releve.php","&account=$account",$sortfield,$sortorder,'',$numrows);
|
print_barre_liste("Relevés bancaires, compte : <a href=\"account.php?account=".$acct->id."\">".$acct->label."</a>", $page, "releve.php","&account=$account",$sortfield,$sortorder,'',$numrows);
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
|
print '<table class="noborder" width="100%">';
|
||||||
print "<tr class=\"liste_titre\">";
|
print "<tr class=\"liste_titre\">";
|
||||||
print "<td>Relevé</td></tr>";
|
print "<td>Relevé</td></tr>";
|
||||||
|
|
||||||
@ -157,12 +160,12 @@ else
|
|||||||
|
|
||||||
print "<form method=\"post\" action=\"releve.php\">";
|
print "<form method=\"post\" action=\"releve.php\">";
|
||||||
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
|
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
|
||||||
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
|
print '<table class="border" width="100%">';
|
||||||
print "<tr class=\"liste_titre\">";
|
print "<tr class=\"liste_titre\">";
|
||||||
print '<td>Date Ope</td><td>Valeur</td><td>'.$langs->trans("Type").'</td><td width="30%">'.$langs->trans("Description").'</td>';
|
print '<td>Date Ope</td><td>Date Valeur</td><td>'.$langs->trans("Type").'</td><td width="30%">'.$langs->trans("Description").'</td>';
|
||||||
print '<td align="right">Debit</td>';
|
print '<td align="right">'.$langs->trans("Debit").'</td>';
|
||||||
print '<td align="right">Credit</td>';
|
print '<td align="right">'.$langs->trans("Credit").'</td>';
|
||||||
print '<td align="right">Solde</td>';
|
print '<td align="right">'.$langs->trans("Solde").'</td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -189,8 +192,10 @@ else
|
|||||||
$var=True;
|
$var=True;
|
||||||
$numrows = $db->num_rows();
|
$numrows = $db->num_rows();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
print "<tr><td colspan=\"3\"><a href=\"releve.php?num=$num&ve=1&rel=$rel&account=".$acct->id."\">Vue etendue</a></td>";
|
|
||||||
print "<td align=\"right\" colspan=\"2\"> </td><td align=\"right\"><b>".price($total)."</b></td><td> </td></tr>\n";
|
// Ligne Solde début releve
|
||||||
|
print "<tr><td colspan=\"4\"><a href=\"releve.php?num=$num&ve=1&rel=$rel&account=".$acct->id."\">Vue etendue</a></td>";
|
||||||
|
print "<td align=\"right\" colspan=\"2\"><b>".$langs->trans("Solde initial")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td> </td></tr>\n";
|
||||||
|
|
||||||
while ($i < $numrows)
|
while ($i < $numrows)
|
||||||
{
|
{
|
||||||
@ -266,8 +271,10 @@ else
|
|||||||
}
|
}
|
||||||
$db->free();
|
$db->free();
|
||||||
}
|
}
|
||||||
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>";
|
// Ligne Total
|
||||||
print "<tr><td align=\"right\" colspan=\"5\"><b>Solde :</b></td><td align=\"right\"><b>".price($total)."</b></td><td> </td></tr>\n";
|
print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total")." :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td> </td><td> </td></tr>";
|
||||||
|
// Ligne Solde
|
||||||
|
print "<tr><td align=\"right\" colspan=\"4\"> </td><td align=\"right\" colspan=\"2\"><b>".$langs->trans("Solde final")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td> </td></tr>\n";
|
||||||
print "</table></form>\n";
|
print "</table></form>\n";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user