diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
commit | f3bedb88b24ae8b2047ad86e57b161265c2812f5 (patch) | |
tree | e6e5954f40a09e7fd002f242523c1eb0f318b397 /src/journal.cc | |
parent | 0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (diff) | |
parent | 63b4bdaecff5a865bff22e8e7914bef6ab46fa6b (diff) | |
download | fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.gz fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.bz2 fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.zip |
Merge branch 'next'
Diffstat (limited to 'src/journal.cc')
-rw-r--r-- | src/journal.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/journal.cc b/src/journal.cc index ed1e26be..fd6d3eac 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -105,8 +105,7 @@ account_t * journal_t::find_account_re(const string& regexp) return master->find_account_re(regexp); } -bool journal_t::add_xact(xact_t * xact, - optional<date_t::year_type> current_year) +bool journal_t::add_xact(xact_t * xact) { xact->journal = this; @@ -115,17 +114,16 @@ bool journal_t::add_xact(xact_t * xact, return false; } - extend_xact(xact, current_year); + extend_xact(xact); xacts.push_back(xact); return true; } -void journal_t::extend_xact(xact_base_t * xact, - optional<date_t::year_type> current_year) +void journal_t::extend_xact(xact_base_t * xact) { foreach (auto_xact_t * auto_xact, auto_xacts) - auto_xact->extend_xact(*xact, current_year); + auto_xact->extend_xact(*xact); } bool journal_t::remove_xact(xact_t * xact) |