IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug 797659 - Liabilities in budget report no longer calculate correctly"

Browse Source 
This reverts commit 2329c1c508.

Reverted for snap release. Not tested thoroughly yet. Bug 797659 need
further betatesters.
This commit is contained in:
Christopher Lam 2020-04-10 08:51:23 +08:00
parent 9733b4c960
commit 642885a186
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnucash/gnome/gnc-budget-view.c
View File

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