lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Modif esthtiques mineures. New: Ajout du nombre de page total dans suivant/prcdent

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-09 17:50:28 +00:00
parent e3f4595920
commit ea63c23baa
9 changed files with 108 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/compta/bank/account.php
View File

@ -80,7 +80,6 @@ if ($action == 'del' && $account && $user->rights->banque->modifier)
llxHeader();
//print "<p>Page: $page - Account: " . $_GET["account"] . " - " . $HTTP_POST_VARS["account"]."</p>\n";
if ($account > 0)
{
@ -94,8 +93,6 @@ if ($account > 0)
}
$acct = new Account($db);
$acct->fetch($account);
print_titre("Journal de trésorerie du compte : " .$acct->label);
print '<br>';
// Chargement des categories dans $options
$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ;";
@ -118,21 +115,21 @@ if ($account > 0)
*
*
*/
if ($HTTP_POST_VARS["req_desc"])
if ($_POST["req_desc"])
{
$sql_rech = " AND lower(b.label) like '%".strtolower($HTTP_POST_VARS["req_desc"])."%'";
$sql_rech = " AND lower(b.label) like '%".strtolower($_POST["req_desc"])."%'";
$mode_search = 1;
}
else
{
$mode_search = 0;
}
/*
*
*
*/
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."bank as b WHERE 1=1";
// $sql .= " AND b.dateo <= now()";
$sql .= " AND b.fk_account=".$acct->id;
$sql .= $sql_rech;
@ -166,30 +163,34 @@ if ($account > 0)
$page = 0;
$limitsql = $nbline;
}
//print "$page $viewline $nbline $limitsql";
/*
* Formulaire de recherche
*
*/
$mesg='';
$nbpage=round($total_lines/$viewline)+($total_lines % $viewline > 0?1:0); // Nombre de page total
if ($limitsql > $viewline)
{
$mesg.='<a href="account.php?account='.$acct->id.'&amp;page='.($page+1).'">'.img_previous().'</a>';
}
$mesg.= ' Page '.($nbpage-$page).'/'.$nbpage.' ';
if ($total_lines > $limitsql )
{
$mesg.= '<a href="account.php?account='.$acct->id.'&amp;page='.($page-1).'">'.img_next().'</a>';
}
print_fiche_titre("Journal de trésorerie du compte : " .$acct->label,$mesg);
print '<br>';
print '<form method="post" action="'.$PHP_SELF.'">';
print '<input type="hidden" name="action" value="search">';
print '<input type="hidden" name="account" value="' . $acct->id . '">';
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
print "<tr>";
print '<td>';
if ($limitsql > $viewline)
{
print '<a href="account.php?account='.$acct->id.'&amp;page='.($page+1).'"><img alt="Page précédente" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1leftarrow.png" border="0"></a>';
}
if ($total_lines > $limitsql )
{
print '<a href="account.php?account='.$acct->id.'&amp;page='.($page-1).'"><img alt="Page suivante" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1rightarrow.png" border="0"></a>';
}
print '</td>';
print '<td colspan="3"><input type="text" name="req_desc" value="'.$HTTP_POST_VARS["req_desc"].'" size="40"></TD>';
print '<td align="right"><input type="text" name="req_debit" value="'.$HTTP_POST_VARS["req_debit"].'" size="6"></TD>';
print '<td align="right"><input type="text" name="req_credit" value="'.$HTTP_POST_VARS["req_credit"].'" size="6"></TD>';
print '<td>&nbsp;</td>';
print '<td colspan="3"><input type="text" name="req_desc" value="'.$_POST["req_desc"].'" size="40"></TD>';
print '<td align="right"><input type="text" name="req_debit" value="'.$_POST["req_debit"].'" size="6"></TD>';
print '<td align="right"><input type="text" name="req_credit" value="'.$_POST["req_credit"].'" size="6"></TD>';
print '<td align="center"><input type="submit" value="Chercher"></td>';
print '<td align="center">';
if ($user->rights->banque->modifier)

1
htdocs/compta/bank/bilan.php
View File

@ -44,6 +44,7 @@ function valeur($sql)
print_titre("Bilan");
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
print "<tr class=\"liste_titre\">";

1
htdocs/compta/bank/budget.php
View File

@ -38,6 +38,7 @@ if ($_GET["bid"] == 0)
* Liste
*/
print_titre("Budgets");
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
print "<tr class=\"liste_titre\">";

1
htdocs/compta/bank/config.php
View File

@ -30,6 +30,7 @@ if (!$user->admin && !$user->rights->compta->bank)
llxHeader();
print_titre("Configuration");
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
print "<tr class=\"liste_titre\">";

92
htdocs/compta/bank/fiche.php
View File

@ -29,29 +29,29 @@ if (!$user->admin && !$user->rights->compta->bank)
llxHeader();
if ($HTTP_POST_VARS["action"] == 'add')
if ($_POST["action"] == 'add')
{
$account = new Account($db,0);
$account->bank = $HTTP_POST_VARS["bank"];
$account->label = $HTTP_POST_VARS["label"];
$account->bank = $_POST["bank"];
$account->label = $_POST["label"];
$account->courant = $HTTP_POST_VARS["courant"];
$account->clos = $HTTP_POST_VARS["clos"];
$account->courant = $_POST["courant"];
$account->clos = $_POST["clos"];
$account->code_banque = $HTTP_POST_VARS["code_banque"];
$account->code_guichet = $HTTP_POST_VARS["code_guichet"];
$account->number = $HTTP_POST_VARS["number"];
$account->cle_rib = $HTTP_POST_VARS["cle_rib"];
$account->bic = $HTTP_POST_VARS["bic"];
$account->iban_prefix = $HTTP_POST_VARS["iban_prefix"];
$account->domiciliation = $HTTP_POST_VARS["domiciliation"];
$account->code_banque = $_POST["code_banque"];
$account->code_guichet = $_POST["code_guichet"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $HTTP_POST_VARS["proprio"];
$account->adresse_proprio = $HTTP_POST_VARS["adresse_proprio"];
$account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"];
$account->solde = $HTTP_POST_VARS["solde"];
$account->date_solde = mktime(12,0,0,$HTTP_POST_VARS["remonth"],$HTTP_POST_VARS["reday"],$HTTP_POST_VARS["reyear"]);
$account->solde = $_POST["solde"];
$account->date_solde = mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
$id = $account->create($user->id);
}
@ -61,22 +61,22 @@ if ($action == 'update')
$account = new Account($db, $id);
$account->fetch($id);
$account->bank = $HTTP_POST_VARS["bank"];
$account->label = $HTTP_POST_VARS["label"];
$account->bank = $_POST["bank"];
$account->label = $_POST["label"];
$account->courant = $HTTP_POST_VARS["courant"];
$account->clos = $HTTP_POST_VARS["clos"];
$account->courant = $_POST["courant"];
$account->clos = $_POST["clos"];
$account->code_banque = $HTTP_POST_VARS["code_banque"];
$account->code_guichet = $HTTP_POST_VARS["code_guichet"];
$account->number = $HTTP_POST_VARS["number"];
$account->cle_rib = $HTTP_POST_VARS["cle_rib"];
$account->bic = $HTTP_POST_VARS["bic"];
$account->iban_prefix = $HTTP_POST_VARS["iban_prefix"];
$account->domiciliation = $HTTP_POST_VARS["domiciliation"];
$account->code_banque = $_POST["code_banque"];
$account->code_guichet = $_POST["code_guichet"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $HTTP_POST_VARS["proprio"];
$account->adresse_proprio = $HTTP_POST_VARS["adresse_proprio"];
$account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"];
$account->update($id, $user);
}
@ -158,9 +158,18 @@ else
$account = new Account($db, $id);
$account->fetch($id);
print '<div class="titre">Compte bancaire</div><br>';
/*
* Affichage onglets
*/
$h = 0;
$head[$h][0] = DOL_URL_ROOT."$PHP_SELF";
$head[$h][1] = "Compte bancaire $account->number";
$h++;
print '<table border="1" cellpadding="3" cellspacing="0">';
dolibarr_fiche_head($head, $hselected);
print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
print '<tr><td valign="top">Banque</td>';
print '<td colspan="3">'.$account->bank.'</td></tr>';
@ -204,23 +213,22 @@ else
print "</td></tr>\n";
print '</table>';
print '<br>';
print '<br><table width="100%" border="1" cellspacing="0" cellpadding="2">';
print '</div>';
/*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
if ($user->admin)
{
print '<td width="25%" bgcolor="#e0E0E0" align="center">[<a href="fiche.php?action=edit&id='.$id.'">Editer</a>]</td>';
}
else
{
print '<td width="25%" align="center">-</td>';
print '<a class="tabAction" href="fiche.php?action=edit&id='.$id.'">Editer</a>';
}
print '<td width="25%" align="center">-</td>';
print '<td width="25%" align="center">-</td>';
print '<td width="25%" align="center">-</td>';
print '</table><br>';
print '</div>';
}

1
htdocs/compta/bank/index.php
View File

@ -31,6 +31,7 @@ if (!$user->rights->banque->lire)
llxHeader();
print_titre ("Comptes bancaires");
print '<br>';
$sql = "SELECT rowid, label,number,bank FROM ".MAIN_DB_PREFIX."bank_account";

1
htdocs/compta/bank/rappro.php
View File

@ -101,6 +101,7 @@ $acct = new Account($db);
$acct->fetch($account);
print_titre('Rapprochement bancaire compte : <a href="account.php?account='.$account.'">'.$acct->label.'</a>');
print '<br>';
$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 ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=$account";

54
htdocs/compta/bank/releve.php
View File

@ -50,11 +50,12 @@ llxHeader();
$acct = new Account($db);
$acct->fetch($_GET["account"]);
if (! isset($_GET["num"]))
{
/*
*
* Vue liste
* Vue liste tous relevés confondus
*
*
*/
@ -78,7 +79,8 @@ if (! isset($_GET["num"]))
$i = 0;
print_barre_liste("Relevés bancaires, compte : <a href=\"account.php?account=".$acct->id."\">".$acct->label."</a>", $page, $PHP_SELF,"&amp;account=$account",$sortfield,$sortorder,'',$numrows);
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
print "<tr class=\"liste_titre\">";
print "<td>Relevé</td></tr>";
@ -102,11 +104,12 @@ if (! isset($_GET["num"]))
else
{
/*
* Vue d'un releves
* Vue d'un releve
*
*/
if ($rel == 'prev')
if ($_GET["rel"] == 'prev')
{
// Recherche valeur pour num = numéro relevé précédent
$sql = "SELECT distinct(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve DESC";
$result = $db->query($sql);
if ($result)
@ -121,8 +124,9 @@ else
}
}
}
elseif ($rel == 'next')
elseif ($_GET["rel"] == 'next')
{
// Recherche valeur pour num = numéro relevé précédent
$sql = "SELECT distinct(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve > ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve ASC";
$result = $db->query($sql);
if ($result)
@ -137,26 +141,30 @@ else
}
}
}
else {
// On veut le relevé num
$num=$_GET["num"];
}
print_titre('Relevé num&eacute;ro '.$_GET["num"].', compte : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>');
$mesprevnext ="<a href=\"$PHP_SELF?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_previous()."</a>";
$mesprevnext.=" Relevé $num ";
$mesprevnext.="<a href=\"$PHP_SELF?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_next()."</a>";
print_fiche_titre('Relevé numéro '.$num.', compte : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>',$mesprevnext);
print "<table border=0 width=100%><tr><td>&nbsp;</td>";
print "<td align=right><a href=\"$PHP_SELF?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">&lt;- Relevé précédent</a>";
print "&nbsp; - &nbsp;<a href=\"$PHP_SELF?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">Relevé suivant -&gt;</a></td></tr>";
print "</table>";
print "<form method=\"post\" action=\"$PHP_SELF\">";
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
print "<TR class=\"liste_titre\">";
print '<td>Date Ope</td><td>Valeur</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 "<tr class=\"liste_titre\">";
print '<td>Date Ope</td><td>Valeur</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>&nbsp;</td>';
print "</TR>\n";
print "</tr>\n";
$sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < ".$_GET["num"]." AND fk_account = ".$acct->id;
$sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < $num AND fk_account = ".$acct->id;
if ( $db->query($sql) )
{
$total = $db->result (0, 0);
@ -166,8 +174,8 @@ else
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE";
$sql .= " num_releve='".$_GET["num"]."'";
if (! $_GET["num"]) {
$sql .= " num_releve='".$num."'";
if (! $num) {
$sql .= " or num_releve is null";
}
$sql .= " AND fk_account = ".$acct->id;
@ -178,7 +186,7 @@ else
$var=True;
$numrows = $db->num_rows();
$i = 0;
print "<tr><td colspan=\"3\"><a href=\"$PHP_SELF?num=".$_GET["num"]."&amp;ve=1&amp;rel=$rel&amp;account=".$acct->id."\">Vue etendue</a></td>";
print "<tr><td colspan=\"3\"><a href=\"$PHP_SELF?num=$num&amp;ve=1&amp;rel=$rel&amp;account=".$acct->id."\">Vue etendue</a></td>";
print "<td align=\"right\" colspan=\"2\">&nbsp;</td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
while ($i < $numrows)
@ -189,14 +197,14 @@ else
$var=!$var;
print "<tr $bc[$var]>";
print '<td>'.strftime("%d %b %Y",$objp->do).'</td><td valign="center">';
print '<td>'.dolibarr_print_date($objp->do).'</td><td valign="center">';
/* Mise à jour de la date de valeur */
print '<a href="releve.php?action=dvprev&amp;num='.$_GET["num"].'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print '<a href="releve.php?action=dvprev&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print img_previous() . "</a> ";
print strftime("%d/%m/%Y",$objp->dv) ." ";
print '<a href="releve.php?action=dvnext&amp;num='.$_GET["num"].'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print '<a href="releve.php?action=dvnext&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print img_next();
print "</td>\n";

1
htdocs/compta/bank/virement.php
View File

@ -55,6 +55,7 @@ if ($action == 'add')
}
print_titre("Virement");
print '<br>';
print "<form method=\"post\" action=\"$PHP_SELF\">";