From a2a7df509529f25a411130fc35c9056b7dd1a18f Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Fri, 21 Nov 2003 18:13:10 +0000 Subject: [PATCH] Modif gestion des variables --- htdocs/compta/bank/account.php | 51 +++++++++++++++++----------------- htdocs/compta/bank/budget.php | 6 ++-- htdocs/compta/bank/releve.php | 37 +++++++++++------------- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index f2f82389d66..c7ff23749dd 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -23,12 +23,10 @@ require("./pre.inc.php"); -$user->getrights('compta'); - if (!$user->rights->banque->lire) accessforbidden(); -if ($HTTP_POST_VARS["action"] == 'add' && $account) +if ($HTTP_POST_VARS["action"] == 'add' && $_GET["account"]) { if ($credit > 0) { @@ -40,14 +38,18 @@ if ($HTTP_POST_VARS["action"] == 'add' && $account) } $dateop = "$dateoy" . "$dateo"; - $acct=new Account($db,$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); - if ($insertid == ''){ - print "

Probleme d'insertion : ".$db->error(); - }else{ - Header("Location: $PHP_SELF?account=$account"); - } + $acct=new Account($db,$_GET["account"]); + + $insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq,$cat1); + + if ($insertid == '') + { + print "

Probleme d'insertion : ".$db->error(); + } + else + { + Header("Location: $PHP_SELF?account=$acct->id"); + } /* if ($num_chq) { @@ -85,7 +87,7 @@ if ($action == 'del' && $account && $user->rights->banque->modifier) //bank_delete_line($db, $rowid); } -/* +/*********************************************************************************** * * * @@ -103,8 +105,8 @@ if ($_GET["account"] > 0) { $viewline = 20; } - $acct=new Account($db); - $acct->fetch($account); + $acct = new Account($db); + $acct->fetch($_GET["account"]); $sql = "SELECT rowid, label FROM llx_bank_categ;"; $result = $db->query($sql); @@ -157,7 +159,8 @@ if ($_GET["account"] > 0) */ $sql = "SELECT count(*) FROM llx_bank as b WHERE 1=1"; $sql .= " AND b.dateo <= now()"; - if ($account) { $sql .= " AND b.fk_account=$account"; } + $sql .= " AND b.fk_account=".$acct->id; + $sql .= $sql_rech; if ( $db->query($sql) ) { @@ -194,18 +197,18 @@ if ($_GET["account"] > 0) * Formulaire de recherche * */ - print '

'; + print ''; print ''; print ''; print ""; print ''; print ''; @@ -215,7 +218,7 @@ if ($_GET["account"] > 0) print ''; @@ -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 .= " FROM llx_bank as b "; - - if ($account) - { - $sql .= " WHERE fk_account=$account"; - } + $sql .= " WHERE fk_account=".$acct->id; if ($req_debit) { @@ -381,7 +380,7 @@ Function _print_lines($db,$sql, $acct) else { //Xavier DUTOIT : Ajout d'un lien pour modifier la ligne - print ""; print ""; - while ($i < min($numrows,$limit)) { $objp = $db->fetch_object( $i); $var=!$var; - print "\n"; + print "\n"; $i++; } print "
'; if ($limitsql > $viewline) { - print 'Page précédente'; + print 'Page précédente'; } if ($total_lines > $limitsql ) { - print 'Page suivante'; + print 'Page suivante'; } print ' '; if ($user->rights->banque->modifier) { - print 'Rappro'; + print 'Rappro'; } else { @@ -230,7 +233,7 @@ if ($_GET["account"] > 0) */ if ($user->rights->banque->modifier) { - print ""; + print ''; print ''; } print '
rowid&account=$account\">$objp->label "; + print "rowid&account=$acct->id\">$objp->label "; /* * Ajout les liens */ diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 6a1811930cb..994429c80c7 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -31,7 +31,7 @@ llxHeader(); * */ -if ($bid == 0) +if ($_GET["bid"] == 0) { /* * Liste @@ -84,7 +84,7 @@ else /* * 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->num_rows() ) @@ -103,7 +103,7 @@ else $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 .= " 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); if ($result) diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 95885075000..124d5430b0d 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -30,8 +30,7 @@ if (!$user->rights->banque->lire) llxHeader(); - -if (! strlen($num)) +if (! strlen($_GET["num"])) { /* * @@ -39,7 +38,6 @@ if (! strlen($num)) * * */ - if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; @@ -47,9 +45,8 @@ if (! strlen($num)) $pageprev = $page - 1; $pagenext = $page + 1; - $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); $result = $db->query($sql); @@ -66,12 +63,11 @@ if (! strlen($num)) print "
Date
numr&account=$account\">$objp->numr
numr&account=".$_GET["account"]."\">$objp->numr
"; @@ -87,7 +83,7 @@ else */ 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); if ($result) { @@ -103,7 +99,7 @@ else } 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); if ($result) { @@ -119,14 +115,13 @@ else } $acct = new Account($db); - $acct->fetch($account); + $acct->fetch($_GET["account"]); - print_titre('Releve numéro '.$num.' compte : '.$acct->label.''); + print_titre('Releve numéro '.$_GET["num"].' compte : '.$acct->label.''); - print ""; - print "
 <- prev"; - print " - next ->
"; + print "id\"><- prev"; + print " - id\">next ->"; print ""; print ""; print ''; @@ -139,7 +134,7 @@ else print "\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) ) { $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 .= " 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"; $result = $db->query($sql); if ($result) @@ -156,7 +151,7 @@ else $var=True; $numrows = $db->num_rows(); $i = 0; - print ""; + print ""; print "\n"; while ($i < $numrows) @@ -198,19 +193,19 @@ else if ($objp->amount < 0) { $totald = $totald + abs($objp->amount); - print "\n"; + print '\n"; } else { $totalc = $totalc + abs($objp->amount); - print "\n"; + print "\n"; } - print "\n"; + print "\n"; if ($user->rights->banque->modifier) { - print ""; + print ""; } else {
vue etendue
id."\">vue etendueTotal :".price($total)." 
".price($objp->amount * -1)." '.price($objp->amount * -1)."  ".price($objp->amount)." ".price($objp->amount)."".price($total)."".price($total)."[rowid&account=$account\">edit][rowid&account=".$acct->id."\">edit]