diff options
| -rw-r--r-- | doc/NEWS | 25 | ||||
| -rw-r--r-- | src/global.cc | 2 | ||||
| -rw-r--r-- | src/report.h | 7 | ||||
| -rw-r--r-- | test/regress/205.test | 4 |
4 files changed, 26 insertions, 12 deletions
@@ -2,23 +2,34 @@ * 3.0 -- New commands: +** Incompatible changes -- New options: +*** Options changed - --anon - For anonymizing the private details of reports. This is almost solely - for the purpose of easing the creation of accurate bug reports. +- The balance reports now defaults to showing all relevant accounts, which is + the opposite of how it worked before. That is, "bal" in 3.0 does what "-s + bal" did in 2.x. To get the 2.6 behavior, use "bal -n" in 3.0. The -s + option no longer has any effect on balance reports. -- Removed commands: +*** Commands removed -- Removed options: +*** Options removed --descend --descend_if EXPR --reconcile --reconcile-date DATE +** New features + +*** Commands + +*** Options + + --anon + For anonymizing the private details of reports. This is almost solely + for the purpose of easing the creation of accurate bug reports. + * 2.6.1 - Added the concept of "balance setting transactions": diff --git a/src/global.cc b/src/global.cc index f5b9b0b4..a8d288cc 100644 --- a/src/global.cc +++ b/src/global.cc @@ -387,8 +387,6 @@ void global_scope_t::normalize_report_options(const string& verb) if (verb[0] == 'b') { if (! rep.HANDLED(empty)) rep.append_display_predicate("total"); - if (! rep.HANDLED(subtotal)) - rep.append_display_predicate("depth<=1"); } else if (verb == "equity") { // jww (2008-08-14): ??? diff --git a/src/report.h b/src/report.h index 1aff9212..8bcd6b57 100644 --- a/src/report.h +++ b/src/report.h @@ -219,7 +219,12 @@ public: OPTION(report_t, cache_); OPTION(report_t, cleared); // -C OPTION(report_t, code_as_payee); - OPTION(report_t, collapse); // -n + + OPTION_(report_t, collapse, DO() { // -n + // Make sure that balance reports are collapsed too + parent->append_display_predicate("depth<=1"); + }); + OPTION(report_t, comm_as_payee); // -x OPTION(report_t, cost); OPTION(report_t, csv_format_); diff --git a/test/regress/205.test b/test/regress/205.test index 0ad16aad..2de1f78e 100644 --- a/test/regress/205.test +++ b/test/regress/205.test @@ -4,8 +4,8 @@ bal Assets:Investments:Vanguard:VMMXX 0.350 VMMXX @ $1.00 Income:Dividends:Vanguard:VMMXX $-0.35 >>>1 - 0.350 VMMXX Assets - $-0.35 Income + 0.350 VMMXX Assets:Investments:Vanguard:VMMXX + $-0.35 Income:Dividends:Vanguard:VMMXX -------------------- $-0.35 0.350 VMMXX |