diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 0f61df3a150..5c81b3bffca 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/compta/bank/rappro.php * \ingroup banque - * \brief Page de rapprochement bancaire + * \brief Page to reconciliate bank transactions * \version $Id$ */ @@ -128,6 +128,8 @@ $paymentvatstatic=new TVA($db); $acct = new Account($db); $acct->fetch($_GET["account"]); +$now=dol_now(); + $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type as type"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " WHERE rappro=0 AND fk_account=".$_GET["account"]; @@ -145,7 +147,7 @@ if ($resql) if ($mesg) print $mesg."
"; - // Affiche nom des derniers relev�s + // Affiche nom des derniers releves $nbmax=5; $liste=""; @@ -327,12 +329,12 @@ if ($resql) if ($objp->rappro) { - // Si ligne d�j� rapproch�e, on affiche relev�. + // If line already reconciliated, we show receipt print "num_releve&account=$acct->id\">$objp->num_releve"; } else { - // Si pas encore rapproch�e + // If not already reconciliated if ($user->rights->banque->modifier) { print ''; @@ -359,12 +361,12 @@ if ($resql) // Affiche zone saisie releve + bouton "Rapprocher" - if ($db->jdate($objp->do) <= gmmktime()) + if ($db->jdate($objp->do) <= $now) { print ''; print ''; print '   '; - print "trans("Rapprocher")."\">"; + print "trans("Conciliate")."\">"; if ($options) { print "