diff options
author | John Wiegley <johnw@newartisans.com> | 2012-02-28 03:02:16 -0600 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2012-02-28 03:02:16 -0600 |
commit | 656e46e1823ce00285f08f72d8473a58f9bd561a (patch) | |
tree | 46b5c2b9a246ad7380bc0f570280b59d48f97be6 /src/post.cc | |
parent | 7a55c7ffc1e3565c82c746ea66dbb6af2e3d8509 (diff) | |
download | fork-ledger-656e46e1823ce00285f08f72d8473a58f9bd561a.tar.gz fork-ledger-656e46e1823ce00285f08f72d8473a58f9bd561a.tar.bz2 fork-ledger-656e46e1823ce00285f08f72d8473a58f9bd561a.zip |
Renamed actual/effective dates to primary/auxiliary
Diffstat (limited to 'src/post.cc')
-rw-r--r-- | src/post.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/post.cc b/src/post.cc index d88dd869..125947e4 100644 --- a/src/post.cc +++ b/src/post.cc @@ -91,11 +91,11 @@ date_t post_t::date() const if (xdata_ && is_valid(xdata_->date)) return xdata_->date; - if (item_t::use_effective_date) { - if (_date_eff) - return *_date_eff; - else if (xact && xact->_date_eff) - return *xact->_date_eff; + if (item_t::use_aux_date) { + if (_date_aux) + return *_date_aux; + else if (xact && xact->_date_aux) + return *xact->_date_aux; } if (! _date) { @@ -105,7 +105,7 @@ date_t post_t::date() const return *_date; } -date_t post_t::actual_date() const +date_t post_t::primary_date() const { if (xdata_ && is_valid(xdata_->date)) return xdata_->date; @@ -117,11 +117,11 @@ date_t post_t::actual_date() const return *_date; } -optional<date_t> post_t::effective_date() const +optional<date_t> post_t::aux_date() const { - optional<date_t> date = item_t::effective_date(); + optional<date_t> date = item_t::aux_date(); if (! date && xact) - return xact->effective_date(); + return xact->aux_date(); return date; } @@ -657,9 +657,9 @@ void to_xml(std::ostream& out, const post_t& post) push_xml y(out, "date"); to_xml(out, *post._date, false); } - if (post._date_eff) { - push_xml y(out, "effective-date"); - to_xml(out, *post._date_eff, false); + if (post._date_aux) { + push_xml y(out, "aux-date"); + to_xml(out, *post._date_aux, false); } if (post.account) { |