gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/642885a1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9733b4c9 (commit)
	from  https://github.com/Gnucash/gnucash/commit/882fd22c (commit)



commit 642885a18663b8c569dd56ed64dbe98d530e5b76
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Apr 10 08:51:23 2020 +0800

    Revert "Bug 797659 - Liabilities in budget report no longer calculate correctly"
    
    This reverts commit 2329c1c508dc4e8849089e17328e8c7c3c05f270.
    
    Reverted for snap release. Not tested thoroughly yet. Bug 797659 need
    further betatesters.

diff --git a/gnucash/gnome/gnc-budget-view.c b/gnucash/gnome/gnc-budget-view.c
index 05559a524..7b44c294a 100644
--- a/gnucash/gnome/gnc-budget-view.c
+++ b/gnucash/gnome/gnc-budget-view.c
@@ -1202,9 +1202,10 @@ totals_col_source (GtkTreeViewColumn *col, GtkCellRenderer *cell,
             switch (row_type)
             {
                 case TOTALS_TYPE_ASSET_LIAB_EQ:
-                    if ((acctype != ACCT_TYPE_ASSET) &&
-                        (acctype != ACCT_TYPE_EQUITY) &&
-                        (acctype != ACCT_TYPE_LIABILITY))
+                    if ((acctype == ACCT_TYPE_LIABILITY) ||
+                        (acctype == ACCT_TYPE_EQUITY))
+                        neg = !neg;
+                    else if (acctype != ACCT_TYPE_ASSET)
                         continue;
                     break;
                 case TOTALS_TYPE_EXPENSES:
@@ -1217,7 +1218,10 @@ totals_col_source (GtkTreeViewColumn *col, GtkCellRenderer *cell,
                     neg = !neg;
                     break;
                 case TOTALS_TYPE_REMAINDER:
-                    neg = !neg;
+                    if ((acctype == ACCT_TYPE_ASSET) ||
+                        (acctype == ACCT_TYPE_INCOME) ||
+                        (acctype == ACCT_TYPE_EXPENSE))
+                        neg = !neg;
                     break;
                 default:
                     continue;       /* don't count if unexpected total row type is passed in... */
@@ -1231,7 +1235,6 @@ totals_col_source (GtkTreeViewColumn *col, GtkCellRenderer *cell,
             switch (row_type)
             {
                 case TOTALS_TYPE_ASSET_LIAB_EQ:
-                    neg = (acctype == ACCT_TYPE_ASSET);
                     if ((acctype != ACCT_TYPE_ASSET) &&
                         (acctype != ACCT_TYPE_LIABILITY) &&
                         (acctype != ACCT_TYPE_EQUITY))
@@ -1246,8 +1249,7 @@ totals_col_source (GtkTreeViewColumn *col, GtkCellRenderer *cell,
                         continue;
                     break;
                 case TOTALS_TYPE_REMAINDER:
-                    neg = ((acctype == ACCT_TYPE_ASSET) ||
-                           (acctype == ACCT_TYPE_EXPENSE));
+                    neg = (acctype != ACCT_TYPE_INCOME);
                     break;
                 default:
                     continue;       /* don't count if unexpected total row type is passed in... */

commit 9733b4c9604cb68b787441856b23891f799f5eff
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Apr 10 08:50:56 2020 +0800

    Revert "Bug 797640 - The Reconciliation Window starting balance calculator needs to ignore splits after statement date"
    
    This reverts commit f182d9f9121130b49320e82810a924b73d69a6b9.
    
    Reverted for snap release. Breaks reconciliation when data has future
    reconciled_dates.

diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index 76a1ac0bd..22e2cbb53 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -281,8 +281,7 @@ recnRecalculateBalance (RecnWindow *recnData)
 
     /* update the starting balance */
     include_children = xaccAccountGetReconcileChildrenStatus(account);
-    starting = gnc_ui_account_get_reconciled_balance_as_of_date
-        (account, recnData->statement_date, include_children);
+    starting = gnc_ui_account_get_reconciled_balance(account, include_children);
     print_info = gnc_account_print_info (account, TRUE);
 
     /*



Summary of changes:
 gnucash/gnome/gnc-budget-view.c  | 16 +++++++++-------
 gnucash/gnome/window-reconcile.c |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)