Renamed --set-reported-account to just --account

This fits better with the --amount and --total options, which both
change the amount and total used for calculation.  Same with --account:
it happens after filtering, but before calculation so that balance
reports look as you'd expect.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/session.cc b/src/session.cc
index 0e03bbb3..378d12c7 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -156,8 +156,8 @@ void session_t::read_journal_files()
   INFO_START(journal, "Read journal file");
 
   string master_account;
-  if (HANDLED(account_))
-    master_account = HANDLER(account_).str();
+  if (HANDLED(master_account_))
+    master_account = HANDLER(master_account_).str();
 
   std::size_t count = read_data(master_account);
   if (count == 0)
@@ -187,9 +187,6 @@ option_t<session_t> * session_t::lookup_option(const char * p)
   case 'Z':
     OPT_CH(price_exp_);
     break;
-  case 'a':
-    OPT_(account_); // -a
-    break;
   case 'c':
     OPT(cache_);
     break;
@@ -208,6 +205,9 @@ option_t<session_t> * session_t::lookup_option(const char * p)
   case 'l':
     OPT_ALT(price_exp_, leeway_);
     break;
+  case 'm':
+    OPT(master_account_);
+    break;
   case 'p':
     OPT(price_db_);
     else OPT(price_exp_);