diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-19 16:07:54 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-19 16:07:59 -0400 |
commit | 6770380b6da5061857e0a15539f1b85669d24e62 (patch) | |
tree | d04d198e1fa4abf0c4642a5112dbf99c4558e832 /test | |
parent | b819475a9346bedf31fd25e67dc2640ff6431141 (diff) | |
download | fork-ledger-6770380b6da5061857e0a15539f1b85669d24e62.tar.gz fork-ledger-6770380b6da5061857e0a15539f1b85669d24e62.tar.bz2 fork-ledger-6770380b6da5061857e0a15539f1b85669d24e62.zip |
Subsantial fixes and improvements to budgeting
1. A bounded budget "from DATE to DATE" will now generate entries
throughout that entire range, if it is triggered.
2. An unbounded budget begins, as before, in the timeframe of the
reported posting which triggered it, but now continues until the
present date.
Diffstat (limited to 'test')
-rw-r--r-- | test/baseline/opt-add-budget.test | 2 | ||||
-rw-r--r-- | test/baseline/opt-budget.test | 2 | ||||
-rw-r--r-- | test/baseline/opt-budget_range.test | 111 | ||||
-rw-r--r-- | test/regress/8254755E.test | 6 |
4 files changed, 116 insertions, 5 deletions
diff --git a/test/baseline/opt-add-budget.test b/test/baseline/opt-add-budget.test index 535335d3..d2cd6945 100644 --- a/test/baseline/opt-add-budget.test +++ b/test/baseline/opt-add-budget.test @@ -1,4 +1,4 @@ -reg --add-budget books cards +reg --add-budget books cards --now=2009/12/31 <<< ~ monthly Expenses:Books $10.00 diff --git a/test/baseline/opt-budget.test b/test/baseline/opt-budget.test index eb2ade9d..67b4e85e 100644 --- a/test/baseline/opt-budget.test +++ b/test/baseline/opt-budget.test @@ -1,4 +1,4 @@ -reg --budget books +reg --budget books --now=2009/12/31 <<< ~ monthly Expenses:Books $10.00 diff --git a/test/baseline/opt-budget_range.test b/test/baseline/opt-budget_range.test new file mode 100644 index 00000000..7c8ee2d2 --- /dev/null +++ b/test/baseline/opt-budget_range.test @@ -0,0 +1,111 @@ +reg --now=2010/02 --sort=date exp --budget +<<< +~ monthly + Expenses:Food $100 + Expenses:Movies $20 + Assets:Cash + +~ monthly from 2009 + Expenses:Food $101 + Expenses:Movies $21 + Assets:Cash + +~ monthly to 2010 + Expenses:Food $102 + Expenses:Movies $22 + Assets:Cash + +~ monthly from 2009 to 2010 + Expenses:Food $103 + Expenses:Movies $23 + Assets:Cash + +2009/06/05 Grocery + Expenses:Food $5 + Assets:Cash +>>> +09-Jan-01 Budget transaction Expenses:Food $-101 $-101 +09-Jan-01 Budget transaction Expenses:Movies $-21 $-122 +09-Jan-01 Budget transaction Expenses:Food $-103 $-225 +09-Jan-01 Budget transaction Expenses:Movies $-23 $-248 +09-Feb-01 Budget transaction Expenses:Food $-101 $-349 +09-Feb-01 Budget transaction Expenses:Movies $-21 $-370 +09-Feb-01 Budget transaction Expenses:Food $-103 $-473 +09-Feb-01 Budget transaction Expenses:Movies $-23 $-496 +09-Mar-01 Budget transaction Expenses:Food $-101 $-597 +09-Mar-01 Budget transaction Expenses:Movies $-21 $-618 +09-Mar-01 Budget transaction Expenses:Food $-103 $-721 +09-Mar-01 Budget transaction Expenses:Movies $-23 $-744 +09-Apr-01 Budget transaction Expenses:Food $-101 $-845 +09-Apr-01 Budget transaction Expenses:Movies $-21 $-866 +09-Apr-01 Budget transaction Expenses:Food $-103 $-969 +09-Apr-01 Budget transaction Expenses:Movies $-23 $-992 +09-May-01 Budget transaction Expenses:Food $-101 $-1093 +09-May-01 Budget transaction Expenses:Movies $-21 $-1114 +09-May-01 Budget transaction Expenses:Food $-103 $-1217 +09-May-01 Budget transaction Expenses:Movies $-23 $-1240 +09-Jun-01 Budget transaction Expenses:Food $-100 $-1340 +09-Jun-01 Budget transaction Expenses:Movies $-20 $-1360 +09-Jun-01 Budget transaction Expenses:Food $-102 $-1462 +09-Jun-01 Budget transaction Expenses:Movies $-22 $-1484 +09-Jun-01 Budget transaction Expenses:Food $-101 $-1585 +09-Jun-01 Budget transaction Expenses:Movies $-21 $-1606 +09-Jun-01 Budget transaction Expenses:Food $-103 $-1709 +09-Jun-01 Budget transaction Expenses:Movies $-23 $-1732 +09-Jun-05 Grocery Expenses:Food $5 $-1727 +09-Jul-01 Budget transaction Expenses:Food $-100 $-1827 +09-Jul-01 Budget transaction Expenses:Movies $-20 $-1847 +09-Jul-01 Budget transaction Expenses:Food $-101 $-1948 +09-Jul-01 Budget transaction Expenses:Movies $-21 $-1969 +09-Jul-01 Budget transaction Expenses:Food $-102 $-2071 +09-Jul-01 Budget transaction Expenses:Movies $-22 $-2093 +09-Jul-01 Budget transaction Expenses:Food $-103 $-2196 +09-Jul-01 Budget transaction Expenses:Movies $-23 $-2219 +09-Aug-01 Budget transaction Expenses:Food $-100 $-2319 +09-Aug-01 Budget transaction Expenses:Movies $-20 $-2339 +09-Aug-01 Budget transaction Expenses:Food $-101 $-2440 +09-Aug-01 Budget transaction Expenses:Movies $-21 $-2461 +09-Aug-01 Budget transaction Expenses:Food $-102 $-2563 +09-Aug-01 Budget transaction Expenses:Movies $-22 $-2585 +09-Aug-01 Budget transaction Expenses:Food $-103 $-2688 +09-Aug-01 Budget transaction Expenses:Movies $-23 $-2711 +09-Sep-01 Budget transaction Expenses:Food $-100 $-2811 +09-Sep-01 Budget transaction Expenses:Movies $-20 $-2831 +09-Sep-01 Budget transaction Expenses:Food $-101 $-2932 +09-Sep-01 Budget transaction Expenses:Movies $-21 $-2953 +09-Sep-01 Budget transaction Expenses:Food $-102 $-3055 +09-Sep-01 Budget transaction Expenses:Movies $-22 $-3077 +09-Sep-01 Budget transaction Expenses:Food $-103 $-3180 +09-Sep-01 Budget transaction Expenses:Movies $-23 $-3203 +09-Oct-01 Budget transaction Expenses:Food $-100 $-3303 +09-Oct-01 Budget transaction Expenses:Movies $-20 $-3323 +09-Oct-01 Budget transaction Expenses:Food $-101 $-3424 +09-Oct-01 Budget transaction Expenses:Movies $-21 $-3445 +09-Oct-01 Budget transaction Expenses:Food $-102 $-3547 +09-Oct-01 Budget transaction Expenses:Movies $-22 $-3569 +09-Oct-01 Budget transaction Expenses:Food $-103 $-3672 +09-Oct-01 Budget transaction Expenses:Movies $-23 $-3695 +09-Nov-01 Budget transaction Expenses:Food $-100 $-3795 +09-Nov-01 Budget transaction Expenses:Movies $-20 $-3815 +09-Nov-01 Budget transaction Expenses:Food $-101 $-3916 +09-Nov-01 Budget transaction Expenses:Movies $-21 $-3937 +09-Nov-01 Budget transaction Expenses:Food $-102 $-4039 +09-Nov-01 Budget transaction Expenses:Movies $-22 $-4061 +09-Nov-01 Budget transaction Expenses:Food $-103 $-4164 +09-Nov-01 Budget transaction Expenses:Movies $-23 $-4187 +09-Dec-01 Budget transaction Expenses:Food $-100 $-4287 +09-Dec-01 Budget transaction Expenses:Movies $-20 $-4307 +09-Dec-01 Budget transaction Expenses:Food $-101 $-4408 +09-Dec-01 Budget transaction Expenses:Movies $-21 $-4429 +09-Dec-01 Budget transaction Expenses:Food $-102 $-4531 +09-Dec-01 Budget transaction Expenses:Movies $-22 $-4553 +09-Dec-01 Budget transaction Expenses:Food $-103 $-4656 +09-Dec-01 Budget transaction Expenses:Movies $-23 $-4679 +10-Jan-01 Budget transaction Expenses:Food $-100 $-4779 +10-Jan-01 Budget transaction Expenses:Movies $-20 $-4799 +10-Jan-01 Budget transaction Expenses:Food $-101 $-4900 +10-Jan-01 Budget transaction Expenses:Movies $-21 $-4921 +10-Feb-01 Budget transaction Expenses:Food $-100 $-5021 +10-Feb-01 Budget transaction Expenses:Movies $-20 $-5041 +10-Feb-01 Budget transaction Expenses:Food $-101 $-5142 +10-Feb-01 Budget transaction Expenses:Movies $-21 $-5163 diff --git a/test/regress/8254755E.test b/test/regress/8254755E.test index 26baf52d..98904d6e 100644 --- a/test/regress/8254755E.test +++ b/test/regress/8254755E.test @@ -1,4 +1,4 @@ -bal --flat food:out +bal --flat food:out --now=2009/12/31 <<< ~ Monthly Expenses:Auto:Fuel $120.00 @@ -13,8 +13,8 @@ bal --flat food:out $50.00 Expenses:Food:Out >>>2 === 0 -bal --flat --budget food:out +bal --flat --budget food:out --now=2009/12/31 >>>1 - $-50.00 Expenses:Food:Out + $-150.00 Expenses:Food:Out >>>2 === 0 |