From 8b8c957ed2c6e37380416215468f48e11d8c0803 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Wed, 4 Sep 2019 21:40:23 +0800 Subject: [PATCH] Bug 797326 - Enhancement: budget's Estimate tool should ignore Closing Entries addition to estimate-budget tool to optionally ignore closing entries using brand new API --- gnucash/gnome/gnc-plugin-page-budget.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c index 3dba5d39b0..ca77b48937 100644 --- a/gnucash/gnome/gnc-plugin-page-budget.c +++ b/gnucash/gnome/gnc-plugin-page-budget.c @@ -892,9 +892,10 @@ estimate_budget_helper(GtkTreeModel *model, GtkTreePath *path, if (priv->useAvg && num_periods) { - num = xaccAccountGetBalanceChangeForPeriod(acct, - recurrenceGetPeriodTime(&priv->r, 0, FALSE), - recurrenceGetPeriodTime(&priv->r, num_periods - 1, TRUE), TRUE); + num = xaccAccountGetNoclosingBalanceChangeForPeriod + (acct, recurrenceGetPeriodTime(&priv->r, 0, FALSE), + recurrenceGetPeriodTime(&priv->r, num_periods - 1, TRUE), TRUE); + num = gnc_numeric_div(num, gnc_numeric_create(num_periods, 1), GNC_DENOM_AUTO, @@ -913,7 +914,10 @@ estimate_budget_helper(GtkTreeModel *model, GtkTreePath *path, { for (i = 0; i < num_periods; i++) { - num = recurrenceGetAccountPeriodValue(&priv->r, acct, i); + num = xaccAccountGetNoclosingBalanceChangeForPeriod + (acct, recurrenceGetPeriodTime(&priv->r, i, FALSE), + recurrenceGetPeriodTime(&priv->r, i, TRUE), TRUE); + if (!gnc_numeric_check(num)) { if (gnc_reverse_balance(acct))