IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-30 12:44:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

[account.cpp] refactor GetBalanceAsOfDate

Browse Source 
much more compact loop.
This commit is contained in:
Christopher Lam 2020-03-13 23:05:55 +08:00
parent 8def3ba26e
commit 9865a99663
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libgnucash/engine/Account.cpp
View File

@ -3364,56 +3364,27 @@ GetBalanceAsOfDate (Account *acc, time64 date, gboolean ignclosing)
* xaccAccountForEachTransaction by using gpointer return * xaccAccountForEachTransaction by using gpointer return
* values rather than gints. * values rather than gints.
*/ */
AccountPrivate *priv; Split *latest = nullptr;
GList *lp;
gboolean found = FALSE;
gnc_numeric balance;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), gnc_numeric_zero()); g_return_val_if_fail(GNC_IS_ACCOUNT(acc), gnc_numeric_zero());
xaccAccountSortSplits (acc, TRUE); /* just in case, normally a noop */ xaccAccountSortSplits (acc, TRUE); /* just in case, normally a noop */
xaccAccountRecomputeBalance (acc); /* just in case, normally a noop */ xaccAccountRecomputeBalance (acc); /* just in case, normally a noop */
priv = GET_PRIVATE(acc); for (GList *lp = GET_PRIVATE(acc)->splits; lp; lp = lp->next)
{
if (xaccTransGetDate (xaccSplitGetParent ((Split *)lp->data)) >= date)
break;
latest = (Split *)lp->data;
}
if (!latest)
return gnc_numeric_zero();
if (ignclosing) if (ignclosing)
balance = priv->noclosing_balance; return xaccSplitGetNoclosingBalance (latest);
else else
balance = priv->balance; return xaccSplitGetBalance (latest);
lp = priv->splits;
while ( lp && !found )
{
time64 trans_time = xaccTransRetDatePosted( xaccSplitGetParent( (Split *)lp->data ));
if ( trans_time >= date )
found = TRUE;
else
lp = lp->next;
}
if ( lp )
{
if ( lp->prev )
{
/* Since lp is now pointing to a split which was past the reconcile
* date, get the running balance of the previous split.
*/
if (ignclosing)
balance = xaccSplitGetNoclosingBalance( (Split *)lp->prev->data );
else
balance = xaccSplitGetBalance( (Split *)lp->prev->data );
}
else
{
/* AsOf date must be before any entries, return zero. */
balance = gnc_numeric_zero();
}
}
/* Otherwise there were no splits posted after the given date,
* so the latest account balance should be good enough.
*/
return( balance );
} }
gnc_numeric gnc_numeric