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

Fix: current balance was visible when it should not

Browse Source
This commit is contained in:
Laurent Destailleur 2013-11-06 15:31:56 +01:00
parent 27b33cafe6
commit 521b3a89bf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,7 +301,7 @@ if ($id > 0 || ! empty($ref))
{ {
$text=$langs->trans('ConfirmDeleteTransaction'); $text=$langs->trans('ConfirmDeleteTransaction');
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete'); print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete');
} }
// Define transaction list navigation string // Define transaction list navigation string
@ -487,7 +487,7 @@ if ($id > 0 || ! empty($ref))
$var=true; $var=true;
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $total = 0; $sep = 0; $i = 0; $total = 0; $sep = -1;
while ($i < $num) while ($i < $num)
{ {
@ -500,13 +500,14 @@ if ($id > 0 || ! empty($ref))
// Is it a transaction in future ? // Is it a transaction in future ?
$dos=dol_print_date($db->jdate($objp->do),'%Y%m%d'); $dos=dol_print_date($db->jdate($objp->do),'%Y%m%d');
//print "dos=".$dos." nows=".$nows; //print "dos=".$dos." nows=".$nows;
if ($dos > $nows && !$sep) // Yes, we show a subtotal if ($dos < $nows) $sep=0; // 0 means there was at least one line before current date
if ($dos > $nows && ! $sep) // We have found a line in future and we already found on line before current date
{ {
$sep = 1 ; $sep = 1 ;
print '<tr class="liste_total"><td colspan="8">'; print '<tr class="liste_total"><td colspan="8">';
print $langs->trans("CurrentBalance"); print $langs->trans("CurrentBalance");
print '</td>'; print '</td>';
print '<td align="right" nowrap><b>'.price($total - $objp->amount).'</b></td>'; print '<td align="right" class="nowrap"><b>'.price($total - $objp->amount).'</b></td>';
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print '</tr>'; print '</tr>';
} }
@ -754,10 +755,10 @@ if ($id > 0 || ! empty($ref))
if ($page == 0 && ! $mode_search) if ($page == 0 && ! $mode_search)
{ {
print '<tr class="liste_total"><td align="left" colspan="8">'; print '<tr class="liste_total"><td align="left" colspan="8">';
if ($sep) print '&nbsp;'; if ($sep > 0) print '&nbsp;'; // If we had at least one line in future
else print $langs->trans("CurrentBalance"); else print $langs->trans("CurrentBalance");
print '</td>'; print '</td>';
print '<td align="right" nowrap>'.price($total).'</td>'; print '<td align="right" nowrap><b>'.price($total).'</b></td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
} }