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

Fix: Balance total line if there is transactions in future

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-17 14:07:28 +00:00
parent 91cc98d7e8
commit 69028883e7
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/compta/bank/account.php
View File

@ -23,7 +23,7 @@
/** /**
* \file htdocs/compta/bank/account.php * \file htdocs/compta/bank/account.php
* \ingroup banque * \ingroup banque
* \brief Page de détail des transactions bancaires * \brief Page de d<EFBFBD>tail des transactions bancaires
* \version $Id$ * \version $Id$
*/ */
@ -475,10 +475,13 @@ if ($account || $_GET["ref"])
{ {
$var=!$var; $var=!$var;
if ($objp->do > $time && !$sep) // Is it a transaction in future ?
if ($objp->do > $time && !$sep) // Yes, we show a subtotal
{ {
$sep = 1 ; $sep = 1 ;
print "<tr><td align=\"right\" colspan=\"6\">&nbsp;</td>"; print '<tr class="liste_total"><td colspan="7">';
print $langs->trans("CurrentBalance");
print '</td>';
print "<td align=\"right\" nowrap><b>".price($total - $objp->amount)."</b></td>"; print "<td align=\"right\" nowrap><b>".price($total - $objp->amount)."</b></td>";
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print '</tr>'; print '</tr>';
@ -564,7 +567,7 @@ if ($account || $_GET["ref"])
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">'; print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg)) if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
{ {
// Label générique car entre parenthèses. On l'affiche en le traduisant // Label g<EFBFBD>n<EFBFBD>rique car entre parenth<74>ses. On l'affiche en le traduisant
if ($reg[1]=='paiement') $reg[1]='Payment'; if ($reg[1]=='paiement') $reg[1]='Payment';
print $langs->trans($reg[1]); print $langs->trans($reg[1]);
} }
@ -608,6 +611,7 @@ if ($account || $_GET["ref"])
} }
print '</td>'; print '</td>';
// Amount
if ($objp->amount < 0) if ($objp->amount < 0)
{ {
print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td>&nbsp;</td>\n"; print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
@ -617,6 +621,7 @@ if ($account || $_GET["ref"])
print "<td>&nbsp;</td><td align=\"right\" nowrap>&nbsp;".price($objp->amount)."</td>\n"; print "<td>&nbsp;</td><td align=\"right\" nowrap>&nbsp;".price($objp->amount)."</td>\n";
} }
// Balance
if ($action != 'search') if ($action != 'search')
{ {
if ($total >= 0) if ($total >= 0)
@ -633,7 +638,7 @@ if ($account || $_GET["ref"])
print '<td align="right">-</td>'; print '<td align="right">-</td>';
} }
// Relevé rappro ou lien edition // Receipt conciliate or edit link
if ($objp->rappro && $acct->type != 2) // Si non compte cash if ($objp->rappro && $acct->type != 2) // Si non compte cash
{ {
print "<td align=\"center\" nowrap>"; print "<td align=\"center\" nowrap>";
@ -676,10 +681,13 @@ if ($account || $_GET["ref"])
$i++; $i++;
} }
// Affichage total // Show total
if ($page == 0 && ! $mode_search) if ($page == 0 && ! $mode_search)
{ {
print '<tr class="liste_total"><td align="left" colspan="7">'.$langs->trans("CurrentBalance").'</td>'; print '<tr class="liste_total"><td align="left" colspan="7">';
if ($sep) print '&nbsp;';
else print $langs->trans("CurrentBalance");
print '</td>';
print '<td align="right" nowrap>'.price($total).'</td>'; print '<td align="right" nowrap>'.price($total).'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';