diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-20 21:33:23 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-20 21:33:23 -0500 |
| commit | 117dddabd4f883de4f464821f9567d889a6fa449 (patch) | |
| tree | 602c8c5e72b81ffc9bcf01bbaed5e2875d0e60a0 /src/annotate.cc | |
| parent | cc9110a43a1e2d006de8d24a84bbfb2c6918cf33 (diff) | |
| parent | 4e6ec09e4d2a69dcb06627e44512980b09561448 (diff) | |
| download | fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.gz fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.bz2 fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.zip | |
Merge branch 'next'
Diffstat (limited to 'src/annotate.cc')
| -rw-r--r-- | src/annotate.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/annotate.cc b/src/annotate.cc index bd5a8ef8..146a7afd 100644 --- a/src/annotate.cc +++ b/src/annotate.cc @@ -135,13 +135,13 @@ void annotation_t::print(std::ostream& out, bool keep_base) const bool keep_details_t::keep_all(const commodity_t& comm) const { - return (! comm.is_annotated() || + return (! comm.has_annotation() || (keep_price && keep_date && keep_tag && ! only_actuals)); } bool keep_details_t::keep_any(const commodity_t& comm) const { - return comm.is_annotated() && (keep_price || keep_date || keep_tag); + return comm.has_annotation() && (keep_price || keep_date || keep_tag); } bool annotated_commodity_t::operator==(const commodity_t& comm) const |