diff options
| -rw-r--r-- | src/global.cc | 4 | ||||
| -rw-r--r-- | src/report.cc | 1 | ||||
| -rw-r--r-- | src/report.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/global.cc b/src/global.cc index 02c9e79a..e05b2bd8 100644 --- a/src/global.cc +++ b/src/global.cc @@ -419,7 +419,9 @@ void global_scope_t::normalize_report_options(const string& verb) report_t& rep(report()); // jww (2009-02-09): These globals are a hack, but hard to avoid. - item_t::use_effective_date = rep.HANDLED(effective); + item_t::use_effective_date = (rep.HANDLED(effective) && + ! rep.HANDLED(actual_dates)); + rep.session.commodity_pool->keep_base = rep.HANDLED(base); rep.session.commodity_pool->get_quotes = rep.session.HANDLED(download); diff --git a/src/report.cc b/src/report.cc index 87ebb71d..ac51203c 100644 --- a/src/report.cc +++ b/src/report.cc @@ -506,6 +506,7 @@ option_t<report_t> * report_t::lookup_option(const char * p) OPT(abbrev_len_); else OPT(account_); else OPT(actual); + else OPT(actual_dates); else OPT(add_budget); else OPT(amount_); else OPT(amount_data); diff --git a/src/report.h b/src/report.h index 40097c8d..31f65c4f 100644 --- a/src/report.h +++ b/src/report.h @@ -196,6 +196,7 @@ public: HANDLER(abbrev_len_).report(out); HANDLER(account_).report(out); HANDLER(actual).report(out); + HANDLER(actual_dates).report(out); HANDLER(add_budget).report(out); HANDLER(amount_).report(out); HANDLER(amount_data).report(out); @@ -317,6 +318,8 @@ public: parent->HANDLER(limit_).on(string("--actual"), "actual"); }); + OPTION(report_t, actual_dates); + OPTION_(report_t, add_budget, DO() { parent->budget_flags |= BUDGET_BUDGETED | BUDGET_UNBUDGETED; }); |