Skip to content

Commit

Permalink
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jul 17, 2018
2 parents c68b949 + 7662f8f commit 47cb1f9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions htdocs/compta/bank/bankentries_list.php
Expand Up @@ -990,15 +990,15 @@
$objforbalance = $db->fetch_object($resqlforbalance);
if ($objforbalance)
{
// If sort is desc,desc,desc then total of previous date is balance of the line to show
// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
{
$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
}
// If sort is asc,asc,asc then total of previous date is balancebefore of the line to show
// If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
else
{
$balancebefore = $objforbalance->previoustotal;
$balance = $objforbalance->previoustotal;
}
}
}
Expand Down

0 comments on commit 47cb1f9

Please sign in to comment.