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

FIX #8079

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-08 16:13:12 +01:00
parent 8240b6b5f3
commit 91bed7c014
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,6 +924,7 @@ if ($resql)
$balance = 0; // For balance
$balancecalculated = false;
$posconciliatecol = 0;
// Loop on each record
$sign = 1;
@ -1347,7 +1348,11 @@ if ($resql)
}
}
print '</td>';
if (! $i) $totalarray['nbfield']++;
if (! $i)
{
$totalarray['nbfield']++;
$posconciliatecol = $totalarray['nbfield'];
}
}
if (! empty($arrayfields['b.conciliated']['checked']))
@ -1430,6 +1435,12 @@ if ($resql)
}
elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';
elseif ($i == $posconciliatecol)
{
print '<td>';
if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="' . $langs->trans("Conciliate") . '">';
print '</td>';
}
else print '<td></td>';
}
print '</tr>';