From 1006228befdd4b594c550f3180705fa167d1c2d8 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 20 Oct 2003 16:30:52 +0000 Subject: [PATCH] Modif recherche --- htdocs/compta/bank/account.php | 213 ++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 97 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index bad553af32b..fd20052eb1f 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -95,18 +95,39 @@ if ($account) } $acct=new Account($db); $acct->fetch($account); + + $sql = "SELECT rowid, label FROM llx_bank_categ;"; + $result = $db->query($sql); + if ($result) + { + $var=True; + $num = $db->num_rows(); + $i = 0; + $options = ""; + while ($i < $num) + { + $obj = $db->fetch_object($i); + $options .= "\n"; $i++; + } + $db->free(); + } + + print_titre("Compte : " .$acct->label); + /* + * + */ /* * Formulaire de recherche * */ - print '
'; + print ''; print ''; print ''; print ""; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -124,33 +145,32 @@ if ($account) print ""; print ""; print ""; - print ""; - print ""; - print "\n"; + print ""; + print ""; - $limit = 20; - - $sql = "SELECT count(*) FROM llx_bank"; - if ($account) { $sql .= " WHERE fk_account=$account"; } + if ($HTTP_POST_VARS["req_desc"]) + { + $sql_rech = " AND lower(b.label) like '%".strtolower($HTTP_POST_VARS["req_desc"])."%'"; + } + + $sql = "SELECT count(*) FROM llx_bank WHERE 1=1"; + if ($account) { $sql .= " AND fk_account=$account"; } + $sql .= $sql_rech; if ( $db->query($sql) ) { $nbline = $db->result (0, 0); $db->free(); - if ($nbline > $limit ) + if ($nbline > $viewline ) { - $offset = $nbline - $limit; + $limit = $nbline - $viewline ; } else { - $offset = 0; + $limit = $viewline; } - - } - - print ""; - print ""; - print ""; - print ''; - print ''; - print ''; - print '"; - print ""; - print ""; - print ""; - print ""; - print ''; - } - - print ""; - print "\n"; - print "\n"; - - if ($objp->num_chq) - { - print ""; - } - else - { - print ""; - } - - if ($objp->amount < 0) - { - print "\n"; - } - else - { - print "\n"; - } - - if ($action !='search') - { - if ($total > 0) + $var=!$var; + + if ($objp->do > $time && !$sep) { - print '\n"; + $sep = 1 ; + print ""; + print ""; + print ""; + print ''; + print ''; + print ''; + print '"; + print ""; + print ""; + print ""; + print ""; + print ''; + } + + print ""; + print "\n"; + print "\n"; + + if ($objp->num_chq) + { + print ""; } else { - print "\n"; + //Xavier DUTOIT : Ajout d'un lien pour modifier la ligne + print ""; + +// print ""; } - } - else - { - print ''; + + if ($objp->amount < 0) + { + print "\n"; + } + else + { + print "\n"; + } + + if ($action !='search') + { + if ($total > 0) + { + print '\n"; + } + else + { + print "\n"; + } + } + else + { + print ''; + } + + if ($objp->rappro) + { + print ""; + } + else + { + print ""; + } + + print ""; + } - if ($objp->rappro) - { - print ""; - } - else - { - print ""; - } - print ""; - - $i++; + $i++; } $db->free(); }
   DateTypeDescriptionDébitCréditSoldeRelevé
SoldeRelevé
".$nbline; - + $sql = "SELECT rowid, label FROM llx_bank_categ;"; $result = $db->query($sql); if ($result) @@ -173,12 +193,6 @@ if ($account) * select sum(amount) from solde ; */ - $pageprev = $page - 1; - $pagenext = $page + 1; - - $sql = "SELECT sum (b.amount) FROM llx_bank as b "; - - $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 "; @@ -192,10 +206,7 @@ if ($account) $sql .= " AND b.amount = -".$req_debit; } - if ($HTTP_POST_VARS["req_desc"]) - { - $sql .= " AND lower(b.label) like '%".strtolower($HTTP_POST_VARS["req_desc"])."%'"; - } + $sql .= $sql_rech; if ($vue) { @@ -209,7 +220,6 @@ if ($account) } } $sql .= " ORDER BY b.dateo ASC"; - $sql .= $db->plimit($limit, $offset); $result = $db->query($sql); if ($result) @@ -225,83 +235,92 @@ if ($account) $objp = $db->fetch_object( $i); $total = $total + $objp->amount; $time = time(); - $var = !$var; - if ($objp->do > $time && !$sep) + if ($i > ($nbline - $viewline)) { - $sep = 1 ; - print "
 ".price($total - $objp->amount)." 
'; - print ''; - print ' -'; - print "
YYYYMMDD0000.00
".strftime("%d %b %y",$objp->do)."".$objp->fk_type."rowid&account=$account\">CHQ $objp->num_chq - $objp->labelrowid&account=$account\">$objp->label ".price($objp->amount * -1)."  ".price($objp->amount)."'.price($total)."
 ".price($total - $objp->amount)." 
'; + print ''; + print ' -'; + print "
YYYYMMDD0000.00
".strftime("%d %b %y",$objp->do)."".$objp->fk_type."rowid&account=$account\">CHQ $objp->num_chq - $objp->label".price($total)."rowid&account=$account\">$objp->label $objp->label -".price($objp->amount * -1)."  ".price($objp->amount)."'.price($total)."".price($total)."-num_releve&account=$account\">$objp->num_releverowid&account=$account\">[Del]
num_releve&account=$account\">$objp->num_releverowid&account=$account\">[Del]