diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fd20052eb1f..1724d7f2d64 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -117,60 +117,6 @@ if ($account) /* * */ - - /* - * Formulaire de recherche - * - */ - print '
'; - print ''; - print ''; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - print "\n"; - print ""; - /* - * - * - */ - print ""; - print ''; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - - 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 > $viewline ) - { - $limit = $nbline - $viewline ; - } - else - { - $limit = $viewline; - } - } - $sql = "SELECT rowid, label FROM llx_bank_categ;"; $result = $db->query($sql); if ($result) @@ -186,8 +132,92 @@ if ($account) } $db->free(); } - - + /* + * + * + */ + 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); + $total_lines = $nbline; + $db->free(); + + if ($nbline > $viewline ) + { + $limit = $nbline - $viewline ; + } + else + { + $limit = $viewline; + } + } + + if ($page > 0) + { + $limitsql = $nbline - ($page * $viewline); + if ($limitsql < $viewline) + { + $limitsql = $viewline; + } + $nbline = $limitsql; + } + else + { + $page = 0; + $limitsql = $nbline; + } + + /* + * Formulaire de recherche + * + */ + print ''; + print ''; + print '
  Rappro
DateTypeDescriptionDébitCréditSoldeRelevé
'; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + print "\n"; + /* + * + * + */ + print ""; + print ''; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + // DEBUG + // print ""; + /* Another solution * create temporary table solde type=heap select amount from llx_bank limit 100 ; * select sum(amount) from solde ; @@ -220,6 +250,7 @@ if ($account) } } $sql .= " ORDER BY b.dateo ASC"; + $sql .= $db->plimit($limitsql, 0); $result = $db->query($sql); if ($result) @@ -227,7 +258,6 @@ if ($account) $var=True; $num = $db->num_rows(); $i = 0; $total = 0; - $sep = 0; while ($i < $num) @@ -272,14 +302,24 @@ if ($account) if ($objp->num_chq) { - print ""; + print ""; } else { //Xavier DUTOIT : Ajout d'un lien pour modifier la ligne - print ""; - -// print ""; + print "'; } if ($objp->amount < 0) @@ -309,11 +349,11 @@ if ($account) if ($objp->rappro) { - print ""; + print ""; } else { - print ""; + print ""; } print "";
'; + if ($limitsql > $viewline) + { + print 'Page précédente'; + } + if ($total_lines > $limitsql ) + { + print 'Page suivante'; + } + print ' Rappro
DateTypeDescriptionDébitCréditSoldeRelevé
$nbline$viewlinetotal_lines $total_lineslimitsql $limitsql
rowid&account=$account\">CHQ $objp->num_chq - $objp->labelrowid&account=$account\">CHQ $objp->num_chq - $objp->labelrowid&account=$account\">$objp->label $objp->label rowid&account=$account\">$objp->label "; + /* + * Ajout les liens + */ + $urls_line = $acct->get_url($objp->rowid); + $numurl = sizeof($urls_line); + $k = 0; + while ($k < $numurl) + { + print ' '.$urls_line[$k][2].''; + $k++; + } + print 'num_releve&account=$account\">$objp->num_relevenum_releve&account=$account\">$objp->num_releverowid&account=$account\">[Del]rowid&account=$account&page=$page\">[Del]