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

Modif gestion des variables

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-11-21 18:13:10 +00:00
parent a5f27bb4e9
commit a2a7df5095
3 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,10 @@
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights('compta');
if (!$user->rights->banque->lire) if (!$user->rights->banque->lire)
accessforbidden(); accessforbidden();
if ($HTTP_POST_VARS["action"] == 'add' && $account) if ($HTTP_POST_VARS["action"] == 'add' && $_GET["account"])
{ {
if ($credit > 0) if ($credit > 0)
{ {
@ -40,14 +38,18 @@ if ($HTTP_POST_VARS["action"] == 'add' && $account)
} }
$dateop = "$dateoy" . "$dateo"; $dateop = "$dateoy" . "$dateo";
$acct=new Account($db,$account); $acct=new Account($db,$_GET["account"]);
$insertid=$acct->addline($dateop, $operation, $label, $amount, $num_chq,$cat1);
// $insertid=bank_add_line($db,$dateop, $label, $amount,$author,$num_chq,$account,$operation,$cat1); $insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq,$cat1);
if ($insertid == ''){
print "<p> Probleme d'insertion : ".$db->error(); if ($insertid == '')
}else{ {
Header("Location: $PHP_SELF?account=$account"); print "<p> Probleme d'insertion : ".$db->error();
} }
else
{
Header("Location: $PHP_SELF?account=$acct->id");
}
/* /*
if ($num_chq) if ($num_chq)
{ {
@ -85,7 +87,7 @@ if ($action == 'del' && $account && $user->rights->banque->modifier)
//bank_delete_line($db, $rowid); //bank_delete_line($db, $rowid);
} }
/* /***********************************************************************************
* *
* *
* *
@ -103,8 +105,8 @@ if ($_GET["account"] > 0)
{ {
$viewline = 20; $viewline = 20;
} }
$acct=new Account($db); $acct = new Account($db);
$acct->fetch($account); $acct->fetch($_GET["account"]);
$sql = "SELECT rowid, label FROM llx_bank_categ;"; $sql = "SELECT rowid, label FROM llx_bank_categ;";
$result = $db->query($sql); $result = $db->query($sql);
@ -157,7 +159,8 @@ if ($_GET["account"] > 0)
*/ */
$sql = "SELECT count(*) FROM llx_bank as b WHERE 1=1"; $sql = "SELECT count(*) FROM llx_bank as b WHERE 1=1";
$sql .= " AND b.dateo <= now()"; $sql .= " AND b.dateo <= now()";
if ($account) { $sql .= " AND b.fk_account=$account"; } $sql .= " AND b.fk_account=".$acct->id;
$sql .= $sql_rech; $sql .= $sql_rech;
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
@ -194,18 +197,18 @@ if ($_GET["account"] > 0)
* Formulaire de recherche * Formulaire de recherche
* *
*/ */
print '<form method="post" action="'."$PHP_SELF?account=$account".'">'; print '<form method="post" action="'.$PHP_SELF.'?account='.$acct->id.'">';
print '<input type="hidden" name="action" value="search">'; print '<input type="hidden" name="action" value="search">';
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">'; print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
print "<TR>"; print "<TR>";
print '<td>'; print '<td>';
if ($limitsql > $viewline) if ($limitsql > $viewline)
{ {
print '<a href="account.php?account='.$account.'&amp;page='.($page+1).'"><img alt="Page précédente" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1leftarrow.png" border="0"></a>'; 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 ) if ($total_lines > $limitsql )
{ {
print '<a href="account.php?account='.$account.'&amp;page='.($page-1).'"><img alt="Page suivante" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1rightarrow.png" border="0"></a>'; 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>';
print '<td>&nbsp;</td><td><input type="text" name="req_desc" value="'.$HTTP_POST_VARS["req_desc"].'" size="24"></TD>'; print '<td>&nbsp;</td><td><input type="text" name="req_desc" value="'.$HTTP_POST_VARS["req_desc"].'" size="24"></TD>';
@ -215,7 +218,7 @@ if ($_GET["account"] > 0)
print '<td align="center">'; print '<td align="center">';
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print '<a href="rappro.php?account='.$account.'">Rappro</a>'; print '<a href="rappro.php?account='.$acct->id.'">Rappro</a>';
} }
else else
{ {
@ -230,7 +233,7 @@ if ($_GET["account"] > 0)
*/ */
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print "<form method=\"post\" action=\"$PHP_SELF?vline=$vline&amp;account=$account\">"; print '<form method="post" action="'.$PHP_SELF.'?vline='.$vline.'&amp;account='.$acct->id.'">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
} }
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -247,11 +250,7 @@ if ($_GET["account"] > 0)
$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 = "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 "; $sql .= " FROM llx_bank as b ";
$sql .= " WHERE fk_account=".$acct->id;
if ($account)
{
$sql .= " WHERE fk_account=$account";
}
if ($req_debit) if ($req_debit)
{ {
@ -381,7 +380,7 @@ Function _print_lines($db,$sql, $acct)
else else
{ {
//Xavier DUTOIT : Ajout d'un lien pour modifier la ligne //Xavier DUTOIT : Ajout d'un lien pour modifier la ligne
print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$account\">$objp->label</a>&nbsp;"; print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$acct->id\">$objp->label</a>&nbsp;";
/* /*
* Ajout les liens * Ajout les liens
*/ */

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

@ -31,7 +31,7 @@ llxHeader();
* *
*/ */
if ($bid == 0) if ($_GET["bid"] == 0)
{ {
/* /*
* Liste * Liste
@ -84,7 +84,7 @@ else
/* /*
* Vue * Vue
*/ */
$sql = "SELECT label FROM llx_bank_categ WHERE rowid=$bid"; $sql = "SELECT label FROM llx_bank_categ WHERE rowid=".$_GET["bid"];
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
if ( $db->num_rows() ) if ( $db->num_rows() )
@ -103,7 +103,7 @@ else
$sql = "SELECT d.amount, d.label, ".$db->pdate("d.dateo")." as do, d.rowid"; $sql = "SELECT d.amount, d.label, ".$db->pdate("d.dateo")." as do, d.rowid";
$sql .= " FROM llx_bank_class as l, llx_bank as d"; $sql .= " FROM llx_bank_class as l, llx_bank as d";
$sql .= " WHERE d.rowid=l.lineid AND l.fk_categ=$bid ORDER by d.dateo DESC"; $sql .= " WHERE d.rowid=l.lineid AND l.fk_categ=".$_GET["bid"]." ORDER by d.dateo DESC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)

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

@ -30,8 +30,7 @@ if (!$user->rights->banque->lire)
llxHeader(); llxHeader();
if (! strlen($_GET["num"]))
if (! strlen($num))
{ {
/* /*
* *
@ -39,7 +38,6 @@ if (! strlen($num))
* *
* *
*/ */
if ($page == -1) { $page = 0 ; } if ($page == -1) { $page = 0 ; }
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
@ -47,9 +45,8 @@ if (! strlen($num))
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$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 = '.$_GET["account"].' ORDER BY numr DESC';
$sql .= $db->plimit($limit + 1,$offset); $sql .= $db->plimit($limit + 1,$offset);
$result = $db->query($sql); $result = $db->query($sql);
@ -66,12 +63,11 @@ if (! strlen($num))
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";
print "<td>Date</td></tr>"; print "<td>Date</td></tr>";
while ($i < min($numrows,$limit)) while ($i < min($numrows,$limit))
{ {
$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&amp;account=$account\">$objp->numr</a></td></tr>\n"; print "<tr $bc[$var]><td><a href=\"$PHP_SELF?num=$objp->numr&amp;account=".$_GET["account"]."\">$objp->numr</a></td></tr>\n";
$i++; $i++;
} }
print "</table>"; print "</table>";
@ -87,7 +83,7 @@ else
*/ */
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 < ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve DESC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
@ -103,7 +99,7 @@ else
} }
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 > ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve ASC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
@ -119,14 +115,13 @@ else
} }
$acct = new Account($db); $acct = new Account($db);
$acct->fetch($account); $acct->fetch($_GET["account"]);
print_titre('Releve num&eacute;ro '.$num.' compte : <a href="account.php?account='.$account.'">'.$acct->label.'</a>');
print_titre('Releve num&eacute;ro '.$_GET["num"].' compte : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>');
print "<table border=0 width=100%><tr><td>&nbsp;</td>"; 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=$account\">&lt;- prev</a>"; print "<td align=right><a href=\"$PHP_SELF?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">&lt;- prev</a>";
print "&nbsp;-&nbsp;<a href=\"$PHP_SELF?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$account\">next -&gt;</a></td></tr></table>"; print "&nbsp;-&nbsp;<a href=\"$PHP_SELF?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">next -&gt;</a></td></tr></table>";
print "<form method=\"post\" action=\"$PHP_SELF\">"; print "<form method=\"post\" action=\"$PHP_SELF\">";
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%" cellspacing="0" cellpadding="2">';
@ -139,7 +134,7 @@ else
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 < ".$_GET["num"]." AND fk_account = ".$acct->id;
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
$total = $db->result (0, 0); $total = $db->result (0, 0);
@ -148,7 +143,7 @@ else
$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 = "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 .= " FROM llx_bank as b WHERE num_releve=".$_GET["num"]." AND fk_account = ".$acct->id;
$sql .= " ORDER BY dateo ASC"; $sql .= " ORDER BY dateo ASC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
@ -156,7 +151,7 @@ else
$var=True; $var=True;
$numrows = $db->num_rows(); $numrows = $db->num_rows();
$i = 0; $i = 0;
print "<tr><td colspan=\"3\"><a href=\"$PHP_SELF?num=$num&amp;ve=1&amp;rel=$rel&amp;account=$account\">vue etendue</a></td>"; 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 "<td align=\"right\" colspan=\"2\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n"; print "<td align=\"right\" colspan=\"2\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
while ($i < $numrows) while ($i < $numrows)
@ -198,19 +193,19 @@ else
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";
} }
print "<td align=\"right\">".price($total)."</TD>\n"; print "<td align=\"right\">".price($total)."</td>\n";
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print "<td align=\"center\">[<a href=\"ligne.php?rowid=$objp->rowid&amp;account=$account\">edit</a>]</td>"; print "<td align=\"center\">[<a href=\"ligne.php?rowid=$objp->rowid&amp;account=".$acct->id."\">edit</a>]</td>";
} }
else else
{ {