diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index c431b7b40e9..c1ba3602cf0 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -54,12 +54,13 @@ if ($action == 'del') { } $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ ORDER BY label;"; $result = $db->query($sql); +$options=""; if ($result) { $var=True; $num = $db->num_rows(); $i = 0; - $options = ""; while ($i < $num) { + if ($options == "") { $options = ""; } $obj = $db->fetch_object($i); $options .= "\n"; $i++; } @@ -86,7 +87,7 @@ $acct->fetch($account); print_titre('Rapprochement bancaire compte : '.$acct->label.''); $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 rappro=0 AND fk_account=$account AND dateo <= now()"; +$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=$account"; $sql .= " ORDER BY dateo ASC LIMIT 10"; @@ -100,15 +101,15 @@ if ($result) print "
Pas de transactions saisies en attente de rapprochement, pour ce compte bancaire.
"; } else { - print ''; - print ""; + print '
'; + print ""; print ""; print ""; print ""; print ""; print ''; print ''; - print "\n"; + print "\n"; } $i = 0; @@ -134,11 +135,18 @@ if ($result) print "\n"; } - print ""; - print ""; - print ""; - + if ($objp->do <= mktime() ) { + print ""; + print ""; + print ""; + } + else { + print ""; + } + if ($objp->rappro) { print ""; @@ -147,9 +155,16 @@ if ($result) { if ($user->rights->banque->modifier) { - print ""; + print ""; } else { @@ -159,10 +174,14 @@ if ($result) print ""; print ""; + if ($options) { + print ""; + } + else { + print " "; + } + print ""; print ""; $i++; }
DateDescriptionDebitCreditReleveRappro 
 ".price($objp->amount).""; - print ""; + print ""; + print "Ecriture future. Ne peut pas encore être rapprochée."; + print "num_releve&account=$acct->id\">$objp->num_releverowid&account=$acct->id\">"; - print img_delete(); - print ""; + if ($objp->do <= mktime() ) { + print "rowid&account=$acct->id\">"; + print img_delete(); + print ""; + } + else { + print " "; // On n'empeche la suppression car le raprochement ne pourra se faire qu'après la date passée et que l'écriture apparaissent bien sur le compte. + } + print "
 ".$objp->fk_type.($objp->num_chq?" ".$objp->num_chq:"").""; - print ""; - print "