diff --git a/htdocs/compta/bank/pre.inc.php3 b/htdocs/compta/bank/pre.inc.php3
index eaedbf68bc0..ab7e970e0c4 100644
--- a/htdocs/compta/bank/pre.inc.php3
+++ b/htdocs/compta/bank/pre.inc.php3
@@ -45,7 +45,8 @@ function llxHeader($head = "") {
while ($i < $num) {
$objp = $db->fetch_object($i);
- $menu->add_submenu("account.php3?account=" . $objp->rowid, $objp->label);
+ $menu->add("account.php3?account=" . $objp->rowid, $objp->label);
+ $menu->add_submenu("releve.php3","Relevés");
$i++;
}
@@ -59,7 +60,7 @@ function llxHeader($head = "") {
$menu->add_submenu("bilan.php3","Bilan");
$menu->add_submenu("virement.php3","Virement");
- $menu->add_submenu("releve.php3","Relevés");
+
$menu->add_submenu("config.php3","Config");
$menu->add("/compta/facture.php3","Factures");
diff --git a/htdocs/compta/bank/releve.php3 b/htdocs/compta/bank/releve.php3
index ade2cb885b1..f13e680f8a2 100644
--- a/htdocs/compta/bank/releve.php3
+++ b/htdocs/compta/bank/releve.php3
@@ -31,7 +31,12 @@ llxHeader();
$db = new Db();
if (! $num) {
-
+ /*
+ *
+ * Vue liste
+ *
+ *
+ */
print "Releves bancaires";
print "
";
@@ -41,7 +46,7 @@ if (! $num) {
print "\n";
$sql = "SELECT distinct(b.num_releve) as numr";
- $sql .= " FROM llx_bank as b ORDER BY numr DESC";
+ $sql .= " FROM llx_bank as b WHERE fk_account = $account ORDER BY numr DESC";
$result = $db->query($sql);
if ($result) {
$var=True;
@@ -58,8 +63,12 @@ if (! $num) {
print "
";
} else {
+ /*
+ * Vue d'un releves
+ *
+ */
if ($rel == 'prev') {
- $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve < $num ORDER BY num_releve DESC";
+ $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve < $num AND fk_account = $account ORDER BY num_releve DESC";
$result = $db->query($sql);
if ($result) {
$var=True;
@@ -71,7 +80,7 @@ if (! $num) {
}
}
} elseif ($rel == 'next') {
- $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve > $num ORDER BY num_releve ASC";
+ $sql = "SELECT distinct(num_releve) FROM llx_bank WHERE num_releve > $num AND fk_account = $account ORDER BY num_releve ASC";
$result = $db->query($sql);
if ($result) {
$var=True;
@@ -100,7 +109,7 @@ if (! $num) {
print "\n";
- $sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num";
+ $sql = "SELECT sum(amount) FROM llx_bank WHERE num_releve < $num AND fk_account = $account";
if ( $db->query($sql) ) {
$total = $db->result (0, 0);
$db->free();
@@ -108,7 +117,7 @@ if (! $num) {
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve";
- $sql .= " FROM llx_bank as b WHERE num_releve=$num";
+ $sql .= " FROM llx_bank as b WHERE num_releve=$num AND fk_account = $account";
$sql .= " ORDER BY dateo ASC";
$result = $db->query($sql);
if ($result) {