diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-05-22 21:05:30 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-05-22 21:35:03 -0400 |
| commit | b5c9be4d29fab1388e195600d659602ae19b8f4e (patch) | |
| tree | 51dcdd9e9f15e1df96e34690638e24755608cc90 /src/report.h | |
| parent | 9557a9d955f4272ac4ad7b727af18ab388b1f92e (diff) | |
| download | fork-ledger-b5c9be4d29fab1388e195600d659602ae19b8f4e.tar.gz fork-ledger-b5c9be4d29fab1388e195600d659602ae19b8f4e.tar.bz2 fork-ledger-b5c9be4d29fab1388e195600d659602ae19b8f4e.zip | |
Created new valexpr variable display_account
Where display_account might be '(Expenses:Food)', account will always be
'Expenses:Food'. account is now used by all matching and query
operations, while display_account is used in the various report outputs
(besides balance, which never distinguished virtual accounts).
Fixes F2832452-4521-49A3-B854-F4E12CC4D82E
Diffstat (limited to 'src/report.h')
| -rw-r--r-- | src/report.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/report.h b/src/report.h index 64c14858..aff4af91 100644 --- a/src/report.h +++ b/src/report.h @@ -463,7 +463,7 @@ public: "%(quoted(date))," "%(quoted(code))," "%(quoted(payee))," - "%(quoted(account))," + "%(quoted(display_account))," "%(quoted(commodity))," "%(quoted(quantity(scrub(display_amount))))," "%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\")))," @@ -752,13 +752,13 @@ public: OPTION__(report_t, prices_format_, CTOR(report_t, prices_format_) { on(none, - "%(date) %-8(account) %(justify(scrub(display_amount), 12, " + "%(date) %-8(display_account) %(justify(scrub(display_amount), 12, " " 2 + 9 + 8 + 12, true, color))\n"); }); OPTION__(report_t, pricedb_format_, CTOR(report_t, pricedb_format_) { on(none, - "P %(datetime) %(account) %(scrub(display_amount))\n"); + "P %(datetime) %(display_account) %(scrub(display_amount))\n"); }); OPTION(report_t, print_virtual); @@ -785,8 +785,8 @@ public: " if color & date > today))" " %(ansify_if(justify(truncated(payee, payee_width), payee_width), " " bold if color & !cleared & actual))" - " %(ansify_if(justify(truncated(account, account_width, abbrev_len), " - " account_width), blue if color))" + " %(ansify_if(justify(truncated(display_account, account_width, " + " abbrev_len), account_width), blue if color))" " %(justify(scrub(display_amount), amount_width, " " 3 + meta_width + date_width + payee_width + account_width" " + amount_width + prepend_width, true, color))" |