diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 7a3a3933cbc..b94a9aabf96 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -32,7 +32,12 @@ if (!$user->rights->banque->lire) llxHeader(); -if (! strlen($_GET["num"])) + +// Récupère info du compte +$acct = new Account($db); +$acct->fetch($_GET["account"]); + +if (! isset($_GET["num"])) { /* * @@ -49,7 +54,7 @@ if (! strlen($_GET["num"])) $sql = "SELECT distinct(b.num_releve) as numr"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE fk_account = ".$_GET["account"]." ORDER BY numr DESC"; - $sql .= $db->plimit($limit + 1,$offset); + $sql .= $db->plimit($limit,$offset); $result = $db->query($sql); @@ -59,20 +64,24 @@ if (! strlen($_GET["num"])) $numrows = $db->num_rows(); $i = 0; - print_barre_liste("Relevés bancaires", $page, $PHP_SELF,"&account=$account",$sortfield,$sortorder,'',$numrows); + print_barre_liste("Relevés bancaires, compte : id."\">".$acct->label."", $page, $PHP_SELF,"&account=$account",$sortfield,$sortorder,'',$numrows); print ''; - print ""; - print ""; + print ""; + print ""; while ($i < min($numrows,$limit)) { $objp = $db->fetch_object( $i); $var=!$var; - print "\n"; + if (! $objp->numr) { +// print "\n"; + } else { + print "\n"; + } $i++; } - print "
Date
Relevé
numr&account=".$_GET["account"]."\">$objp->numr
Ecritures rapprochées à aucun relevé
numr&account=".$_GET["account"]."\">$objp->numr
"; + print "\n"; } @@ -116,14 +125,12 @@ else } } - $acct = new Account($db); - $acct->fetch($_GET["account"]); - - print_titre('Releve numéro '.$_GET["num"].' compte : '.$acct->label.''); + print_titre('Relevé numéro '.$_GET["num"].', compte : '.$acct->label.''); print ""; print "
 id\"><- Relevé précédent"; - print "  -  id\">Relevé suivant ->
"; + print "  -  id\">Relevé suivant ->"; + print ""; print "
"; print ""; print ''; @@ -145,7 +152,12 @@ 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 ".MAIN_DB_PREFIX."bank as b WHERE num_releve=".$_GET["num"]." AND fk_account = ".$acct->id; + $sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE"; + $sql .= " num_releve='".$_GET["num"]."'"; + if (! $_GET["num"]) { + $sql .= " or num_releve is null"; + } + $sql .= " AND fk_account = ".$acct->id; $sql .= " ORDER BY dateo ASC"; $result = $db->query($sql); if ($result) @@ -222,7 +234,7 @@ else } print ""; print "\n"; - print "
Total :".price($totald)."".price($totalc)." 
Solde :".price($total)." 
"; + print "\n"; } $db->close();