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.

13 files changed, 27 insertions, 49 deletions

diff --git a/test/baseline/opt-account.test b/test/baseline/opt-account.test
index d89ea52d..7cda3c4d 100644
--- a/test/baseline/opt-account.test
+++ b/test/baseline/opt-account.test
@@ -1,15 +1,11 @@
-bal --account=Master
+reg --account='payee + ":" + commodity'
 <<<
 2007/02/02 RD VMMXX
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
     Income:Dividends:Vanguard:VMMXX        $-0.35
 >>>1
-              $-0.35
-         0.350 VMMXX  Master
-         0.350 VMMXX    Assets:Investments:Vanguard:VMMXX
-              $-0.35    Income:Dividends:Vanguard:VMMXX
---------------------
-              $-0.35
-         0.350 VMMXX
+07-Feb-02 RD VMMXX              RD VMMXX:VMMXX          0.350 VMMXX  0.350 VMMXX
+07-Feb-02 RD VMMXX              RD VMMXX:$                   $-0.35       $-0.35
+                                                                     0.350 VMMXX
 >>>2
 === 0
diff --git a/test/baseline/opt-code-as-account.test b/test/baseline/opt-code-as-account.test
index c95ebd22..c669427e 100644
--- a/test/baseline/opt-code-as-account.test
+++ b/test/baseline/opt-code-as-account.test
@@ -1,4 +1,4 @@
-reg --code-as-account
+reg --account=code
 <<<
 2008/01/01 * (100) January
     Expenses:Books          $10.00
diff --git a/test/baseline/opt-code-as-payee.test b/test/baseline/opt-code-as-payee.test
index 8feafc6e..c2988626 100644
--- a/test/baseline/opt-code-as-payee.test
+++ b/test/baseline/opt-code-as-payee.test
@@ -1,4 +1,4 @@
-reg --code-as-payee
+reg --payee=code
 <<<
 2008/01/01 * (100) January
     Expenses:Books          $10.00
diff --git a/test/baseline/opt-comm-as-account.test b/test/baseline/opt-comm-as-account.test
deleted file mode 100644
index c92a47fd..00000000
--- a/test/baseline/opt-comm-as-account.test
+++ /dev/null
@@ -1,11 +0,0 @@
-reg --comm-as-account
-<<<
-2007/02/02 RD VMMXX
-    Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
-    Income:Dividends:Vanguard:VMMXX        $-0.35
->>>1
-07-Feb-02 RD VMMXX              VMMXX                   0.350 VMMXX  0.350 VMMXX
-07-Feb-02 RD VMMXX              $                            $-0.35       $-0.35
-                                                                     0.350 VMMXX
->>>2
-=== 0
diff --git a/test/baseline/opt-comm-as-payee.test b/test/baseline/opt-comm-as-payee.test
deleted file mode 100644
index 94b37b85..00000000
--- a/test/baseline/opt-comm-as-payee.test
+++ /dev/null
@@ -1,11 +0,0 @@
-reg --comm-as-payee
-<<<
-2007/02/02 RD VMMXX
-    Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
-    Income:Dividends:Vanguard:VMMXX        $-0.35
->>>1
-07-Feb-02 VMMXX                 As:In:Vanguard:VMMXX    0.350 VMMXX  0.350 VMMXX
-07-Feb-02 $                     In:Di:Vanguard:VMMXX         $-0.35       $-0.35
-                                                                     0.350 VMMXX
->>>2
-=== 0
diff --git a/test/baseline/opt-commodity-as-account.test b/test/baseline/opt-commodity-as-account.test
index 6dcf8ace..44fb0028 100644
--- a/test/baseline/opt-commodity-as-account.test
+++ b/test/baseline/opt-commodity-as-account.test
@@ -1,4 +1,4 @@
-reg --commodity-as-account
+reg --account=commodity
 <<<
 2007/02/02 RD VMMXX
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
diff --git a/test/baseline/opt-commodity-as-payee.test b/test/baseline/opt-commodity-as-payee.test
index 9872a15c..2f829b4a 100644
--- a/test/baseline/opt-commodity-as-payee.test
+++ b/test/baseline/opt-commodity-as-payee.test
@@ -1,4 +1,4 @@
-reg --commodity-as-payee
+reg --payee=commodity
 <<<
 2007/02/02 RD VMMXX
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
diff --git a/test/baseline/opt-master-account.test b/test/baseline/opt-master-account.test
new file mode 100644
index 00000000..1b571e6b
--- /dev/null
+++ b/test/baseline/opt-master-account.test
@@ -0,0 +1,15 @@
+bal --master-account=Master
+<<<
+2007/02/02 RD VMMXX
+    Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
+    Income:Dividends:Vanguard:VMMXX        $-0.35
+>>>1
+              $-0.35
+         0.350 VMMXX  Master
+         0.350 VMMXX    Assets:Investments:Vanguard:VMMXX
+              $-0.35    Income:Dividends:Vanguard:VMMXX
+--------------------
+              $-0.35
+         0.350 VMMXX
+>>>2
+=== 0
diff --git a/test/baseline/opt-payee-as-account.test b/test/baseline/opt-payee-as-account.test
index e85f5f0c..a9c95b2c 100644
--- a/test/baseline/opt-payee-as-account.test
+++ b/test/baseline/opt-payee-as-account.test
@@ -1,4 +1,4 @@
-reg --payee-as-account
+reg --account=payee
 <<<
 2008/01/01 * (100) January
     Expenses:Books          $10.00
diff --git a/test/baseline/opt-set-payee.test b/test/baseline/opt-payee.test
index 7f05da53..56ee0cde 100644
--- a/test/baseline/opt-set-payee.test
+++ b/test/baseline/opt-payee.test
@@ -1,4 +1,4 @@
-reg --set-payee='account_base + ":" + commodity'
+reg --payee='account_base + ":" + commodity'
 <<<
 2007/02/02 RD VMMXX
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
diff --git a/test/baseline/opt-set-account.test b/test/baseline/opt-set-account.test
deleted file mode 100644
index 4da48f08..00000000
--- a/test/baseline/opt-set-account.test
+++ /dev/null
@@ -1,11 +0,0 @@
-reg --set-account='payee + ":" + commodity'
-<<<
-2007/02/02 RD VMMXX
-    Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
-    Income:Dividends:Vanguard:VMMXX        $-0.35
->>>1
-07-Feb-02 RD VMMXX              RD VMMXX:VMMXX          0.350 VMMXX  0.350 VMMXX
-07-Feb-02 RD VMMXX              RD VMMXX:$                   $-0.35       $-0.35
-                                                                     0.350 VMMXX
->>>2
-=== 0
diff --git a/test/manual/transaction-codes-2.test b/test/manual/transaction-codes-2.test
index 4e4c76cf..140044d3 100644
--- a/test/manual/transaction-codes-2.test
+++ b/test/manual/transaction-codes-2.test
@@ -1,4 +1,4 @@
-bal checking --set-reported-account=code
+bal checking --account=code
 <<<
 2009/10/29 (XFER) Panera Bread
     Expenses:Food               $4.50
diff --git a/test/manual/transaction-notes-4.test b/test/manual/transaction-notes-4.test
index 516094c7..3dd82677 100644
--- a/test/manual/transaction-notes-4.test
+++ b/test/manual/transaction-notes-4.test
@@ -1,4 +1,4 @@
-bal food and tag type --set-reported-account='"Tags:" + tag("Type")'
+bal food and tag type --account='"Tags:" + tag("Type")'
 <<<
 2009/11/01 Panera Bread  ; Got something to eat
     Expenses:Food               $4.50