lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trad

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-16 20:06:18 +00:00
parent 1ad2649fe6
commit 9333f8be6f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/compta/bank/rappro.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/bank/rappro.php * \file htdocs/compta/bank/rappro.php
* \ingroup banque * \ingroup banque
* \brief Page de rapprochement bancaire * \brief Page to reconciliate bank transactions
* \version $Id$ * \version $Id$
*/ */
@ -128,6 +128,8 @@ $paymentvatstatic=new TVA($db);
$acct = new Account($db); $acct = new Account($db);
$acct->fetch($_GET["account"]); $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 = "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.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= " WHERE rappro=0 AND fk_account=".$_GET["account"]; $sql.= " WHERE rappro=0 AND fk_account=".$_GET["account"];
@ -145,7 +147,7 @@ if ($resql)
if ($mesg) print $mesg."<br>"; if ($mesg) print $mesg."<br>";
// Affiche nom des derniers relev<EFBFBD>s // Affiche nom des derniers releves
$nbmax=5; $nbmax=5;
$liste=""; $liste="";
@ -327,12 +329,12 @@ if ($resql)
if ($objp->rappro) if ($objp->rappro)
{ {
// Si ligne d<>j<EFBFBD> rapproch<63>e, on affiche relev<65>. // If line already reconciliated, we show receipt
print "<td align=\"center\" nowrap=\"nowrap\"><a href=\"releve.php?num=$objp->num_releve&amp;account=$acct->id\">$objp->num_releve</a></td>"; print "<td align=\"center\" nowrap=\"nowrap\"><a href=\"releve.php?num=$objp->num_releve&amp;account=$acct->id\">$objp->num_releve</a></td>";
} }
else else
{ {
// Si pas encore rapproch<63>e // If not already reconciliated
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print '<td align="center" width="30" nowrap="nowrap">'; print '<td align="center" width="30" nowrap="nowrap">';
@ -359,12 +361,12 @@ if ($resql)
// Affiche zone saisie releve + bouton "Rapprocher" // Affiche zone saisie releve + bouton "Rapprocher"
if ($db->jdate($objp->do) <= gmmktime()) if ($db->jdate($objp->do) <= $now)
{ {
print '<td align="center" nowrap="nowrap">'; print '<td align="center" nowrap="nowrap">';
print '<input class="flat" name="num_releve" type="text" value="'.$objp->num_releve.'" size="8">'; print '<input class="flat" name="num_releve" type="text" value="'.$objp->num_releve.'" size="8">';
print ' &nbsp; '; print ' &nbsp; ';
print "<input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">"; print "<input class=\"button\" type=\"submit\" value=\"".$langs->trans("Conciliate")."\">";
if ($options) if ($options)
{ {
print "<br><select class=\"flat\" name=\"cat\">$options"; print "<br><select class=\"flat\" name=\"cat\">$options";