diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-03-20 03:16:13 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-03-20 03:16:13 -0500 |
| commit | 446beee376ecfd5371335ac99cd287fc26851006 (patch) | |
| tree | 6d75672049a156246e5323094235bc6d729e731c /src | |
| parent | 22505d9527edce59cd3cf90c5241e4bd809eb8a2 (diff) | |
| parent | f76d458ab7f200bd52676fe8103fbfaae4f10488 (diff) | |
| download | fork-ledger-446beee376ecfd5371335ac99cd287fc26851006.tar.gz fork-ledger-446beee376ecfd5371335ac99cd287fc26851006.tar.bz2 fork-ledger-446beee376ecfd5371335ac99cd287fc26851006.zip | |
Merge branch 't/A560FDAD' into next
Diffstat (limited to 'src')
| -rw-r--r-- | src/filters.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/filters.cc b/src/filters.cc index 5915ad3c..02dc392b 100644 --- a/src/filters.cc +++ b/src/filters.cc @@ -522,7 +522,8 @@ bool display_filter_posts::output_rounding(post_t& post) value_t new_display_total; if (show_rounding) { - new_display_total = display_total_expr.calc(bound_scope); + new_display_total = (display_total_expr.calc(bound_scope) + .strip_annotations(report.what_to_keep())); DEBUG("filters.changed_value.rounding", "rounding.new_display_total = " << new_display_total); @@ -539,7 +540,8 @@ bool display_filter_posts::output_rounding(post_t& post) return true; } - if (value_t repriced_amount = display_amount_expr.calc(bound_scope)) { + if (value_t repriced_amount = (display_amount_expr.calc(bound_scope) + .strip_annotations(report.what_to_keep()))) { if (! last_display_total.is_null()) { DEBUG("filters.changed_value.rounding", "rounding.repriced_amount = " << repriced_amount); |