simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-12-28 04:46:31 +03:00
Code Issues Projects Releases Wiki Activity
6,529 Commits 51 Branches 501 Tags 138 MiB
510b4c1b55
Commit Graph

1433 Commits

Author SHA1 Message Date
Simon Michael
571ea1540b document scientific notation (#704, #706) 2018-03-31 02:41:31 +01:00
Mykola Orliuk
b377bff90a lib: support scientific number notation (#704, #706) 
closes simonmichael/hledger#704
 2018-03-31 01:49:46 +01:00
Simon Michael
2b34ff1184 lib: reportSpan debug output 2018-03-30 02:41:03 +01:00
Simon Michael
ebaac2866b lib: fix reportStartEndDates, rename to reportSpan 2018-03-30 00:16:35 +01:00
Simon Michael
dc4def835c lib: refactor runPeriodicTransaction, add a test 2018-03-29 18:11:34 +01:00
Simon Michael
d060398484 lib: splitSpan: return no spans for an empty datespan 
Fixes an issue where a bounded budget could wrongly appear in a
disjoint report period.
 2018-03-29 18:10:51 +01:00
Simon Michael
4d562ef068 lib: don't count periodic/modifier txns in Journal debug output 2018-03-29 16:45:34 +01:00
Simon Michael
083d9190fd budget: only periodic txns with the selected interval are used 2018-03-29 15:51:52 +01:00
Simon Michael
64e06750eb doc: draft changelogs & release notes 2018-03-28 18:25:01 +01:00
Simon Michael
d403b003c1 lib: disable doctests when building with ghc 8.4 on mac 
[ci skip]
 2018-03-26 18:23:46 +01:00
Moritz Kiefer
d7b68fbd7d Use skipMany/skipSome for parsing spacenonewline 
This avoids allocating the list of space characters only to then
discard it.
 2018-03-25 22:59:05 +01:00
Simon Michael
84579bb1b4 silence redundant import warnings with ghc 8.4 2018-03-24 22:51:56 +00:00
Simon Michael
21db75f1a6 update cabal files 2018-03-24 16:06:20 +00:00
Simon Michael
d1a55e5f76 tighten base upper bound, avoid breakage with next major GHC 2018-03-22 16:43:40 +00:00
Simon Michael
1e738e6ee5 lib: regenerate cabal file with older hpack to silence warning 2018-03-22 16:42:02 +00:00
Peter Simons
b3e4abe46d hledger-lib: re-generate the hledger-lib.cabal file 2018-03-22 16:08:17 +00:00
Peter Simons
a1ddecd8f5 hledger-lib: remove redundant dependency declaration on semigroups 
This dependency is already expressed conditionally for GHC versions older than
8.0.x, which is the proper way to do it since newer versions have that code in
base already.
 2018-03-22 16:08:17 +00:00
Simon Michael
7635f56a5c lib: add conditional dep to package.yaml and rest of cabal file 2018-03-12 23:27:23 +00:00
Peter Simons
4c5a58ec1e hledger-lib: add missing Semigroup instance for Journal 
GHC 8.4.1 makes Semigroup a superclass of Monoid. See
https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid
for details.
 2018-03-12 23:17:14 +00:00
Simon Michael
6aa35b5cb8 lib: move easytest tests to lib, depend on released version 2018-03-05 17:27:13 -08:00
Simon Michael
3390972cab update generated manuals 2018-02-16 11:09:37 -08:00
Simon Michael
968ae13035 lib: redo buggy Amount refactoring 2018-02-16 02:26:39 -08:00
Simon Michael
b6a089b8a3 lib: Amount: hlint 2018-02-15 17:28:23 -08:00
Simon Michael
b231d99e38 lib: Account, AccountName: hlint 2018-02-15 11:38:34 -08:00
Simon Michael
6d94eed6fd lib: Types: fix/silence hlint warnings 2018-02-15 07:35:51 -08:00
Simon Michael
298651fa02 doc: periodic txns, automated postings edits 
[ci skip]
 2018-02-11 20:09:19 -08:00
Simon Michael
13855d6b53 csv: no csv records is no longer an error 2018-02-01 09:41:03 -08:00
Simon Michael
d3fde29b36 bal: --invert flag to flip all signs 2018-01-29 14:53:23 -08:00
Simon Michael
92d48ed0a2 lib/ui/web/api: move manuals to extra-source-files in these pkgs too 
[ci skip]
 2018-01-26 11:49:26 -08:00
Simon Michael
37555617b7 journal, bal: document account codes 2018-01-23 16:51:12 -08:00
Simon Michael
9b88fc2ed0 bal/bs/cf/is: sort accounts by account code, if any, then account name 
If any accounts have numeric codes assigned via account directives,
those accounts will be listed first, lowest account codes first.
 2018-01-23 11:33:24 -08:00
Simon Michael
d420a8b534 journal: account directive: parse and store a numeric account code also 2018-01-23 11:33:23 -08:00
Simon Michael
88ef586480 lib: rename, clarify purpose of balanceReportFromMultiBalanceReport 2018-01-23 11:32:24 -08:00
Simon Michael
5b1883fcdf bs/bse/cf/is: fix display of abbreviated name for December 2018-01-19 12:45:51 -08:00
Simon Michael
e9624486b6 bs/bse/cf/is: show local abbreviated month names on monthly columns 2018-01-18 11:46:12 -08:00
Simon Michael
46d7893446 updated generated manuals 2018-01-18 11:01:15 -08:00
Simon Michael
6b349e3123 bs/bse/cf/is: show all balances as normally-positive (experimental) 
Income, liability and equity balances, which until now we have
always displayed as negative numbers, are now shown as normally positive
by these reports.
Negative numbers now indicate a contra-balance (eg an overdrawn
checking account), a net loss, a negative net worth, etc.
This makes these reports more like conventional financial statements,
and easier to read and share with normal people.
 2018-01-18 11:01:07 -08:00
Simon Michael
3b2a9eaba4 lib: refactor 2018-01-15 14:15:52 -08:00
Simon Michael
79812f974a rename NormalBalance -> NormalSign 2018-01-15 14:12:38 -08:00
Christoph Nicolai
c409afc90b Update Editor Table 
Reformat markdown table and update Sublime Text URL.
 2018-01-10 07:58:14 -08:00
Simon Michael
fedf36e823 lib: when the text encoding is UTF-8, ignore any UTF-8 BOM prefix 
Paypal's new CSV has this BOM prefix (at the time of writing),
which was causing a confusing parse error.
 2018-01-04 16:29:23 -08:00
Simon Michael
81e964502b lib: refactor low-level text file reading 2018-01-04 16:17:25 -08:00
Simon Michael
a0d765edb5 update embedded manuals 2018-01-04 10:19:27 -08:00
Simon Michael
bc3f5c476c bump version to 1.5.99 2018-01-04 10:15:03 -08:00
Simon Michael
82283d75d7 doc: changelog updates 2017-12-31 10:30:28 -08:00
Simon Michael
956dee9682 update cabal files 2017-12-31 10:24:15 -08:00
Simon Michael
6ccabe3b48 update embedded manuals 2017-12-31 10:22:09 -08:00
Simon Michael
52c3884ab7 bump version strings & bounds to 1.5 2017-12-31 10:20:48 -08:00
Simon Michael
7921f0cf44 update embedded manuals 2017-12-31 10:08:44 -08:00
Simon Michael
0d8ac2cd6f update cabal files 2017-12-31 10:03:50 -08:00
Simon Michael
e927e587e6 lib,cli: auto/forecast/budget option/docs cleanup, consistency 2017-12-31 10:01:18 -08:00
Simon Michael
667a1d7e59 remove upper bounds on all but hledger* and base 
It's rare that my deps break their api or that newer versions must be avoided,
and very common that they release new versions which I must tediously
and promptly test and release hackage revisions for or risk falling out
of stackage. Trying it this way for a bit.
 2017-12-31 09:13:50 -08:00
Simon Michael
26d1f10ef1 consistent spacing in bounds 2017-12-31 09:05:39 -08:00
Simon Michael
d3363d09d8 allow megaparsec 6.4.0 2017-12-31 08:47:59 -08:00
Simon Michael
99cde10e98 doc: draft changelogs 2017-12-30 18:20:41 -08:00
Simon Michael
ecdbc05703 Merge branch 'feature/space-as-digits-sep' of https://github.com/ony/hledger into ony-feature/space-as-digits-sep 2017-12-30 09:29:22 -08:00
Simon Michael
2a0e12122c tools: regen cabal files with latest stack's hpack to avoid warnings 2017-12-30 08:47:47 -08:00
Simon Michael
8f55b6137d uses today's prices, not those of last txn date, for -V (fix #683,#648) 2017-12-29 21:42:59 -08:00
Simon Michael
69e255cead lib: deduplicate, refactor valuation code 2017-12-29 16:52:08 -08:00
Simon Michael
aa06d0f9bd lib, cli, ui: allow ansi-terminal 0.8 2017-12-29 12:41:22 -08:00
Simon Michael
d15a2dc4c0 lib: fix journalAccountNames doc 
[ci skip]
 2017-12-29 12:34:51 -08:00
Simon Michael
ddef7d722d lib: update journal account names api 
Now we have:

-- | Sorted unique account names posted to by this journal's transactions.
journalAccountNamesUsed :: Journal -> [AccountName]

-- | Sorted unique account names implied by this journal's transactions -
-- accounts posted to and all their implied parent accounts.
journalAccountNamesImplied :: Journal -> [AccountName]

-- | Sorted unique account names declared by account directives in this journal.
journalAccountNamesDeclared :: Journal -> [AccountName]

-- | Sorted unique account names declared by account directives or posted to
-- by transactions in this journal.
journalAccountNamesDeclaredOrUsed :: Journal -> [AccountName]

-- | Sorted unique account names declared by account directives, or posted to
-- or implied as parents by transactions in this journal.
journalAccountNamesDeclaredOrImplied :: Journal -> [AccountName]

-- | Convenience/compatibility alias for journalAccountNamesImpliedOrUsed.
journalAccountNames :: Journal -> [AccountName]
 2017-12-29 12:18:04 -08:00
Simon Michael
d7d75c50fe lib: expandAccountNames, accountNamesFromPostings should sort here 2017-12-29 12:16:46 -08:00
Simon Michael
07596b1c54 update embedded manuals 2017-12-22 10:13:38 -08:00
Simon Michael
0621a27833 update cabal files 2017-12-22 10:13:37 -08:00
Simon Michael
efdee17aae bump version strings & lower bounds to 1.4.99 2017-12-22 10:13:37 -08:00
Simon Michael
761fc31eb8 lib,cli,ui,web: allow megaparsec 6.3.0 2017-12-15 12:32:11 -08:00
Nadrieril
9e6e06033f lib: Allow balance-only entries in csv reader 2017-12-14 18:26:29 -08:00
Simon Michael
cd5c74625e update embedded manuals 2017-12-14 18:20:07 -08:00
Dmitry Astapov
040b9aef91 doc: add Periodic transactions, Automated posting rules 2017-12-14 17:20:07 -08:00
Simon Michael
302ee50bfe update embedded manuals 2017-12-07 12:04:11 -08:00
Simon Michael
9013694d89 cabal: regenerate with stack 1.6/hpack 0.20 2017-12-07 11:46:33 -08:00
Simon Michael
c18a75ecfe fix data-files paths in yaml/cabal files 2017-12-06 18:45:01 -08:00
Simon Michael
968cff7a4a remove numbers from all but nroff filenames 2017-12-06 18:35:18 -08:00
Simon Michael
61a2fa4d53 move package manual files out of doc/ 2017-12-06 18:26:20 -08:00
Simon Michael
1d26845525 remove */doc/README 2017-12-06 18:18:03 -08:00
Mykola Orliuk
95db5062d6 journal: inherit commodities in included files 
Followup on some comments for simonmichael/hledger#487
 2017-12-04 12:26:26 -08:00
Mykola Orliuk
9cdd02e0b0 journal: pretty errors for included files 
Fixes simonmichael/hledger#660
 2017-12-04 12:26:26 -08:00
Mykola Orliuk
fa2e680b2e lib: fix styles after cost application 
Fixes simonmichael/hledger#509
 2017-12-04 12:26:26 -08:00
Mykola Orliuk
47766ea9d4 journal: support space as digits sep 
Resolves simonmichael/hledger#330
 2017-11-29 17:20:18 +01:00
Dmitry Astapov
6f92e70575 lib: remove needless numeric comparisons in bal/bs 
accountsFromPostings is currently doing excessive work when adding up
postings in each account. It sorts (accountName, amount) tuples which
cause amounts in them to be compared. There is no need to look at amount
here at all since subsequent summing up and counting does not depend on
order. It is enough to sort by accountname only.

Went through similar pieces of code, made them all look uniform.
 2017-11-29 07:08:18 -08:00
Dmitry Astapov
cf0dfa9f58 lib: add dependecy on 'extra' package 
It has a collection of useful list processing functions.
 2017-11-29 07:08:18 -08:00
Simon Michael
4228203740 doc: regenerate embedded manuals 
[ci skip]
 2017-11-28 17:37:27 -08:00
Mykola Orliuk
9df985f8c6 doc: resolving of amount decimal/group ambiguity 2017-11-27 15:47:56 -08:00
Mykola Orliuk
e58272f28f journal: use groups sep and prec for decimal hint 
Use whole AmountStyle in process of resolving decimal/groups separator
ambiguity.

Resolve simonmichael/hledger#399
 2017-11-27 15:47:56 -08:00
Mykola Orliuk
7cbdeb40a4 journal: get decimal hint from default commodity 
If appropriate commodity directive is missing fallback to default
commodity directive to get number representation style.
 2017-11-27 15:47:56 -08:00
Mykola Orliuk
b7dbe044b0 journal: use decimal sep hint for amount parser 
Make use of commodity format directive as a hint for parsing amount.

Kinda resolves simonmichael/hledger#487
 2017-11-27 15:47:56 -08:00
Mykola Orliuk
dafdaec1ca journal: factor out rawnumberp 2017-11-27 15:47:56 -08:00
Mykola Orliuk
bcf7a1add5 journal: make numbers parsing more strict 
- Hunt down adjacent punctuations with altering char.
- Add some tests dedicated to parsing amounts.
 2017-11-27 15:47:56 -08:00
Mykola Orliuk
53ad035b24 journal: limit scope of directives backtracking 
Effectively improves error reporting for directives.

Resolves simonmichael/hledger#402
 2017-11-27 14:32:48 -08:00
Mykola Orliuk
48623b4ceb lib: fix backtracking in periodexpr parser 
- Simplify doctests for periodexpr.
- Besides consuming leading space consume ending space for periodexpr also.
- Drop implicit option (def, def) behaviour of periodexpr. I.e. disallow
  hledger reg -p '' and auto-transaction with heading just '~'.
- Slightly re-factor periodexpr.
- Ensure that reportinginterval doesn't consume trailing space.
  Useful if  we'll start disallowing periods like "every1stjan2009-".
 2017-11-27 06:38:47 -08:00
Dmitry Astapov
23f3da4e92 cli: --auto adds automated postings to reports 
Ledger-style automated postings, previously supported only by
hledger-budget, have landed as a first-class feature.  The --auto
flag activates them, so that any postings they generate are
included in reports.
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
f101d5b515 cli: --forecast adds periodic transactions to reports 
Ledger-style periodic transactions, previously supported only by
hledger-budget, have landed as a first-class feature.  The --forecast
flag activates them, so that any transactions they generate are
included in reports.
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
50b4d76ce9 lib: runPeriodicTransaction's start date must line up with interval 
This is very helpful for periodic transactions, because in budget mode
you need to ensure that no periodic transactions extend past the end
of the journal, and in forecast mode you need to make sure that all
periodic transactions are strictly after the end of the journal.
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
597e9c47c9 lib: more periodic transaction tests 
Some of these demonstrate that runPeriodicTransaction could generate
transactions ouside of requested DateSpan. This happens because
runPeriodicTransaction uses splitSpan internally, and splitSpan always
generates dateSpans that fully cover original DateSpan, extending
beyound left/right boundary if necessary. This is ok if transactions
are generated for budgeting purpose, but during forecasting care should
be taken to check that all generated transactions are happening past
the end of the real journal.
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
950891b55b lib: support "every <weekday>" 
A shorter spelling for "every <n>th day of week".
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
993e3f2b67 lib: support "every 2nd Thursday of month" in period expressions 
Useful for periodic transactions.
 2017-11-26 14:57:41 +00:00
Dmitry Astapov
f1b4618f2d lib: support "every 11th Nov" in period expressions 
Useful for periodic transactions
Without it, once-per-year periodic transactions always occur on 1st Jan.
 2017-11-26 14:57:37 +00:00
Dmitry Astapov
7acb5d45aa lib: make month names in period expressions case-insensitive 
Currently only lower-case account names are supported, both on the
command line, and in the journal (in periodic transactions):

This works:
$ hledger balance -p nov

This does not:
$ hledger balance -p Nov

First transaction will parse, second will not:
```
cat every-month.journal                                                                                                                                ~/devel/haskell/darcs-get/hledger/examples
~ aug to sep
    assets
    expenses    $1

~ Aug to Sep
    assets
    expenses    $2
```

$../bin/hledger-budget bal -f every-month.journal
hledger-budget: Failed to parse "Aug to Sep": date parse error ()

This commit fixes both cases.
 2017-11-26 00:25:08 +00:00
Dmitry Astapov
4049455f26 lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered 
Demonstration:

Consider year-test.journal:
```
2015/02/01 first half
    expenses  $1
    assets

2015/07/01 second half
    expenses  $2
    assets

2016/02/01 first half
    expenses  $4
    assets

2016/07/01 second half
    expenses  $8
    assets

2017/02/01 first half
    expenses  $16
    assets

2017/07/01 second half
    expenses  $32
    assets
```

Year balances are good:
```
$ hledger balance -f year-test.journal -p yearly
Balance changes in 2015/01/01-2017/12/31:

          || 2015  2016  2017
==========++==================
 assets   ||  $-3  $-12  $-48
 expenses ||   $3   $12   $48
----------++------------------
          ||    0     0     0
```

Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master:
```$ hledger balance -f year-test.journal -p 'every 2nd day of month'
Balance changes in 2015/07/02-2017/07/01:

          || 2015/07/02-2015/08/01  2015/08/02-2015/09/01  2015/09/02-2015/10/01  2015/10/02-2015/11/01  2015/11/02-2015/12/01  2015/12/02-2016/01/01  2016/01/02-2016/02/01  2016/02/02-2016/03/01  2016/03/02-2016/04/01  2016/04/02-2016/05/01  2016/05/02-2016/06/01  2016/06/02-2016/07/01  2016/07/02-2016/08/01  2016/08/02-2016/09/01  2016/09/02-2016/10/01  2016/10/02-2016/11/01  2016/11/02-2016/12/01  2016/12/02-2017/01/01  2017/01/02-2017/02/01  2017/02/02-2017/03/01  2017/03/02-2017/04/01  2017/04/02-2017/05/01  2017/05/02-2017/06/01  2017/06/02-2017/07/01
==========++========================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
 assets   ||                     0                      0                      0                      0                      0                      0                    $-4                      0                      0                      0                      0                    $-8                      0                      0                      0                      0                      0                      0                   $-16                      0                      0                      0                      0                   $-32
 expenses ||                     0                      0                      0                      0                      0                      0                     $4                      0                      0                      0                      0                     $8                      0                      0                      0                      0                      0                      0                    $16                      0                      0                      0                      0                    $32
----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
          ||                     0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0                      0
```

Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same...
```
$ hledger balance -f year-test.journal -p 'every 4th Apr'
Balance changes in 2016/04/04-2018/04/03:

          || 2016/04/04-2017/04/03  2017/04/04-2018/04/03
==========++==============================================
 assets   ||                  $-24                   $-32
 expenses ||                   $24                    $32
----------++----------------------------------------------
          ||                     0                      0
```
 2017-11-25 21:43:13 +00:00
Simon Michael
f5a39f7bc4 doc: csv: expand description part, include examples 
[ci skip]
 2017-11-05 17:30:31 -08:00
Simon Michael
4ab71f0d0a journal: clarify that txn/posting comments must start with semicolon 2017-11-01 08:04:25 -07:00
Simon Michael
0e4d791371 doc: journal: use consistent semicolon comments in examples 
About to add support for # posting comments, but using the semicolon
in examples makes them easier to test with Ledger.

[ci skip]
 2017-11-01 06:12:55 -07:00
Simon Michael
676eb6e1a2 update embedded manuals 2017-10-31 12:38:37 -07:00
jeevcat
3a9ea65b99 Rewrite of BalanceAssertion type to track its source position. 
Fixes #481.
 2017-10-16 13:25:03 -07:00
Sam Jeeves
11684843a0 Balance assertion errors now show line of failed assertion posting. Fixes #481. 2017-10-14 15:11:19 -07:00
Simon Michael
302723b1be lib,cli,ui,web: allow megaparsec 6.2 
Forgot to commit this last time.

[ci skip]
 2017-10-01 09:49:51 -10:00
Simon Michael
5de51c9bad fix warnings/errors found by make stacktest 2017-09-30 13:00:22 -10:00
Simon Michael
7520da5e0c update embedded manuals 2017-09-30 11:46:03 -10:00
Simon Michael
bfb4a38afb update cabal files 2017-09-30 11:45:33 -10:00
Simon Michael
4a49b86175 bump version strings & lower bounds to 1.4 2017-09-30 11:44:53 -10:00
Simon Michael
8c86d9b578 doc: update manuals re --sort-amount 2017-09-29 19:31:44 -10:00
Simon Michael
62c822c1e6 lib: more compact debug output for Accounts 2017-09-29 18:50:18 -10:00
Simon Michael
b5602fd771 bal: --sort-amount sorts tree-mode multi-column balance reports 2017-09-29 18:49:47 -10:00
Simon Michael
d527384261 bal: --sort-amount sorts tree-mode single-column balance reports too 2017-09-28 09:49:03 -10:00
Simon Michael
32d5428197 doc: draft 1.4 changelogs 
[ci skip]
 2017-09-26 16:22:30 -10:00
Simon Michael
580ad88dca timedot: fix parsing of month quantities (Nmo) 
[ci skip]
 2017-09-26 15:11:37 -10:00
Simon Michael
cd998e7f2f slight fix for --sort-amount, don't flip when normal balance unspecified 2017-09-25 19:10:21 -10:00
Simon Michael
d9d92b3bf1 bs/bse/is: --sort-amount puts large liabilities/equities/incomes at top 
Compound balance commands like these can now be aware of normal account
balance sign, and sort negative balances accordingly.

This also adds utility-ht as a dependency, only for the uncurry function
right now but it looks potentially useful to have.
 2017-09-25 19:06:38 -10:00
Simon Michael
35e2e94228 bal/bs/cf/is: --sort-amount sorts by amount instead of account name 2017-09-25 06:17:46 -10:00
Simon Michael
5c85a1dd1c lib: allow trailing whitespace in regex account aliases 
Trailing whitespace in the replacement part of a regular expression
account alias is now significant. Eg, slightly flattening some bank
accounts: --alias '/:somebank:/=somebank '
 2017-09-22 16:43:03 -10:00
Simon Michael
7edacdf443 cli: import command! hledger import *.csv adds new txns to main file 2017-09-17 18:57:51 -07:00
Simon Michael
0720cf9341 csv: doc: note how --rules-file affects all files in command 2017-09-17 13:37:06 -07:00
Simon Michael
1edb828a75 lib, print: rename --new's save files to .latest.*, easier to manage 2017-09-17 13:26:42 -07:00
Simon Michael
669fa706c0 print: --new shows only transactions added since last time 
First cut, error messages could be refined etc.
 2017-09-15 09:55:17 -07:00
Simon Michael
e3c4a76119 add & use simpler readJournalFilesWithOpts/InputOpts api 2017-09-14 17:43:32 -07:00
Simon Michael
55cebad0d5 cli: refactor: move commands to a subdirectory, reinstate test command 2017-09-12 10:04:36 -07:00
Simon Michael
3b1637341c lib: doctests: fix unused import warning 2017-09-08 10:58:13 -07:00
Simon Michael
0175a0231d lib: make doctests build with ghc 7.10 again 2017-09-08 10:25:42 -07:00
Simon Michael
5ae011b249 lib: add missing parsec lower bound, possibly related to #596, fpco/stackage#2835 
[ci skip]
 2017-09-06 07:32:13 -07:00
Simon Michael
efbbcda7e6 doc: tweak description/payee/note docs (#598, #608) 2017-09-05 14:06:43 -07:00
Simon Michael
079e76a370 doc: update description/payee/note docs (#598, #608) 2017-09-05 11:44:02 -07:00
Simon Michael
9501b43471 lib: pivot -> journalPivot, drop implicit tags notion (#598, #608) 2017-09-05 10:48:35 -07:00
Jakub Zárybnický
72cf6a8219 lib: Fix filtering by payee and note (#598) 2017-09-05 08:37:19 -07:00
Simon Michael
b246d0e990 cf: more restrictive regexp (#584) 2017-08-27 08:26:47 -07:00
Christian G. Warden
deaf9cfbef Exclude Fixed Assets from Cashflow Report 
Add "fixed" to the regex used to exclude asset accounts from cashflow
reports.  Assumes accounts are set up something like:
assets:fixed assets:equipment
assets:fixed assets:vehicles
assets:fixed assets:buildings
 2017-08-27 04:41:05 -07:00
Simon Michael
6b6e185827 lib: doc: note #583 issue number 2017-08-26 08:29:53 -07:00
Simon Michael
831ab78a74 lib, cli, ui: allow ansi-terminal 0.7 2017-08-26 07:47:34 -07:00
Simon Michael
f02d35ff39 lib, web: remove obsolete conditionals for old GHC 2017-08-25 17:15:26 -07:00
Simon Michael
b324d3de95 lib, cli, ui, web: drop oldtime flag, require time 1.5+ 
Should be safe to do now, I hope.
 2017-08-25 16:56:41 -07:00
Simon Michael
3778db9ec7 lib: similar package.yaml whitespace 2017-08-25 16:53:41 -07:00
Simon Michael
230dfea207 update tested-with GHC versions 2017-08-25 16:40:29 -07:00
Simon Michael
6448053448 lib, cli, web: remove ghc < 7.6 support 2017-08-25 16:36:17 -07:00
Simon Michael
d9e72d389e lib: fix a deps problem in package.yaml breaking test suite with ghc 8.2 2017-08-25 14:39:35 -07:00
Simon Michael
12673b1738 update changelogs 2017-08-25 09:18:26 -07:00
Hans-Peter Deifel
37d7c248e2 Allow megaparsec-6.1 2017-08-24 15:56:49 -07:00
Simon Michael
32cc9dc62b timedot: doc: fix links to journal manual 
[ci skip]
 2017-08-21 17:46:05 -07:00
Simon Michael
1ebf1fec28 timedot: also provide syntax for seconds, days, weeks, months & years 2017-08-21 17:28:57 -07:00
Simon Michael
5cdb60b69b timedot: allow minutes to be logged as Nm 2017-08-20 13:00:29 -07:00
Simon Michael
16c07c537b csv: also switch which posting is converted to cost 
After switching the postings, make sure it's the second which is converted
to cost.
 2017-08-15 08:40:52 -07:00
Simon Michael
501634d2e9 doc: journal: makeinfo-version-related encoding change, hopefully correct 2017-08-15 08:18:06 -07:00
Simon Michael
cd589a5e4e doc: csv: improve CSV conversion tips 
[ci skip]
 2017-08-15 08:17:15 -07:00
Simon Michael
ce5724fee1 csv: switch the order of generated postings, so account1 is first 
This is subjective, but simplifies things as we'll be adding more than
two postings. Free-form entry templates will allow custom orderings
in future.
 2017-08-15 08:16:49 -07:00
Mark Hansen
e98d213ca2 Add link to Visual Studio Code hledger plugin 2017-08-02 05:37:26 -07:00
Simon Michael
cb0cb1e1e1 regenerate embedded manuals 2017-07-31 15:52:41 -07:00
Simon Michael
1efbbbc7ac regenerate cabal files 2017-07-31 15:01:23 -07:00
Simon Michael
5706353881 bump version strings & lower bounds to 1.3.99 2017-07-31 14:02:35 -07:00
Simon Michael
f4acef58b1 lib: doctests: refactor, include Text.* 2017-07-31 07:09:57 -07:00
Simon Michael
20442196fb lib: refactor 2017-07-31 07:09:06 -07:00
Simon Michael
f1c5cce575 lib: another doctests fix, replace wrong haddock char 2017-07-31 07:09:06 -07:00
Simon Michael
dbef13b13f lib: more consistent deps, fixing doctests with Cabal 2 (fixes #596) 2017-07-31 07:09:06 -07:00
Simon Michael
ecfc8224dd lib: cleanup up megaparsec 6 compat module, simplify error type (#594) 2017-07-28 07:53:02 -07:00
Simon Michael
d7d5f8a064 add support for megaparsec 6 (fixes #594) 
Older megaparsec is still supported.
Also cleans up our custom parser types,
and some text (un)packing is done in different places
(possible performance impact).
 2017-07-27 19:20:46 -07:00
Simon Michael
8851ebc29f bs/cf/is: support --output-file and --output-format=txt|csv 
The CSV output should be reasonably ok for dragging into
a spreadsheet and reformatting.
 2017-07-25 19:43:45 -07:00
Simon Michael
8313695306 doc: journal: update sample in generated manuals 2017-07-24 22:19:25 +01:00
Nicholas Niro
93fbc0e989 lib: Fix of a bug with the -H option. 
This patch fixes a bug that happened when using the -H option on
a period without any transaction. Previously, the behavior was no
output at all even though it should have shown the previous ending balances
of past transactions. (This is similar to previously using -H with -E,
but with the extra advantage of not showing empty accounts)
 2017-07-15 08:02:03 +01:00
Nicholas Niro
f0914ff08e lib: Added a new much more thorough test to MultiBalanceReports. 
This test makes sure that -H works correctly and it does not show
empty accounts.
 2017-07-15 08:02:03 +01:00
Nicholas Niro
9873bcfcba lib: Added a new transaction to samplejournal. 
The new entry effectively adds a loan which is placed in the checking account.
This loan is then closed by the "pay off" transaction (which was already
present).

This is mainly to be used as a test point for the -H option; to make
sure -H does not show empty accounts.

All previous tests were changed to reflect the new change.
The documentation of the journal module was updated too.
 2017-07-15 08:02:03 +01:00
Nicholas Niro
a7f6b551c5 lib: Implemented a testing context for the module MultiBalanceReports. 
Of the 2 tests, the first is a simple test on a specific period.
The second is expected to fail at this point until the new upcoming
code to fix the issue with the history option is implemented.

For the record : this issue happens when we use the -H flag for a period
that does not contain any transactions. Currently, the ending balance
values are only taken into account if the current period contains
a Transaction containing one of the previous populated accounts.

For example, if we have a statement on the 2008/01/01 for $1
and we do a command (with -H) to check the value on the
(without transactions) 2008/01/02, we will not get the $1 from
2008/01/01. In that same example, if we had a transaction for the same
account as 2008/01/01 in say 2008/01/03 then the -H command would
successfully show the statement from 2008/01/03 with the initial amount
that we set in 2008/01/01.
 2017-07-15 08:02:03 +01:00
Nicholas Niro
fe2a1b35da lib: Added 2 new tests to BalanceReport. 
These tests verify the behavior when we input a very specific period.
The second test is meant to make sure that the new upcoming code in
MultiBalanceReports will not change anything in the behavior of
the module BalanceReport.
 2017-07-15 08:02:03 +01:00
Nicholas Niro
a204908be6 lib: Added a comment to explain the type MultiBalanceReportTotals 2017-07-15 08:02:03 +01:00
Simon Michael
ee735514fe doc: update builtin manuals 2017-07-07 02:08:38 +01:00
Simon Michael
b3b33336b4 csv: show the "creating/using rules file" message only with --debug 2017-07-06 14:07:46 +01:00
Simon Michael
e94f04311d csv: fix multiple includes in one rules file 2017-07-05 16:08:13 +01:00
Simon Michael
6614aab5d7 csv: add newest-first directive for more robust same-day ordering 2017-07-05 15:24:17 +01:00
Simon Michael
5ce66fb0de doc, site: final 1.3 changelogs, release notes, announcement 
[ci skip]
 2017-07-01 18:56:57 +01:00
Simon Michael
28c420109d doc: changelogs for 1.3 2017-06-30 22:26:36 +01:00
Simon Michael
af952532c9 bump package versions to 1.3 2017-06-30 20:57:47 +01:00
Simon Michael
c4248072db doc: bump version to 1.3, update builtin manuals 2017-06-30 20:45:50 +01:00
Simon Michael
1d5f3a44d5 lib: debug: add a log0 that writes to debug.log in the current directory 
Seems to work somewhat, might have some laziness issues.
 2017-06-30 19:14:57 +01:00
Simon Michael
41d62d669b doc: journal: note that transaction code must be parenthesised 2017-06-30 14:49:19 +01:00
David Reaver
a9959b30c2 Fix date of 1.2 release in CHANGES 2017-06-20 08:45:35 -07:00
Simon Michael
59af88b796 ui: add temporary --status-toggles for testing toggle styles (#564) 2017-06-18 16:20:30 -07:00
Simon Michael
22e751983b ui: allow multiple status filters to be active at once (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
dcc58d4a2b lib: rename ClearedStatus type to Status 
(and fix hard-coded enum count)
 2017-06-15 19:16:39 -07:00
Simon Michael
430c49154a lib: rename Query's Status constructor to StatusQ 2017-06-15 19:16:39 -07:00
Simon Michael
cca95d2974 doc: update builtin manuals 2017-06-15 19:16:39 -07:00
Simon Michael
e119941648 rename "uncleared" status to "unmarked" and --uncleared to --unmarked (#564) 
See the issue and linked mail list discussion. Ambiguity between the
uncleared state, and the "not cleared" --uncleared flag causes confusion
and friction. At this point it seems best to break with Ledger and
past hledger, pick a new name and drop --uncleared to put an end to it.
 2017-06-15 19:16:39 -07:00
Simon Michael
794647780d doc: fixes for builtin manuals 2017-06-15 19:16:39 -07:00
Simon Michael
d0771a8526 doc: regenerate builtin manuals 2017-06-15 19:16:39 -07:00
Simon Michael
f168d74010 doc: update status docs 2017-06-15 19:16:39 -07:00
Simon Michael
5d28120f6d lib: multiple status: query terms are OR'd (#564) 
Like desc: and acct:. I think this is more intuitive and useful,
so now eg "status: status:!" works (equivalent to -UP or "not:status:*").
 2017-06-15 19:16:39 -07:00
Simon Michael
7fc921db86 lib, cli: -U/-P/-C flags can be combined (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
8b073014e4 lib, cli: -U/--uncleared no longer matches pending things (#564) 
Also begin using "marked"/"unmarked" terminology where it's helpful.
 2017-06-15 19:16:39 -07:00
Simon Michael
c5d63f03ce lib: clean up status functional tests, document ClearedStatus (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
dae17093c3 lib: hide successful hunit tests, to avoid obscuring failed doctests (#568) 2017-06-07 06:42:58 -07:00
Carel Fellinger
da9aa81ec7 Update AutoTransaction.hs 
lib: fix unit test some more after 5c095534
 2017-06-07 12:56:43 +02:00
Simon Michael
7cc2d86ac0 lib: fix unit tests after 5c095534 2017-06-06 09:43:05 -07:00
Simon Michael
1755f71202 bump version/month in all generated docs 2017-06-06 09:22:39 -07:00
Simon Michael
af11cd6243 bump package versions to 1.2.98 (1.3 alpha) 2017-06-06 09:21:51 -07:00
Simon Michael
5c09553481 lib: keep amounts aligned when rendering a transaction with posting flags 
Related to #563, when rendering a transaction, we reserve two more chars
of width so that amounts remain aligned when there are posting flags.
Affects hledger-ui's transaction screen, print, hledger-rewrite etc.
 2017-06-04 21:26:18 -07:00
Simon Michael
1adc636554 lib: show pending posting flags when rendering a transaction (fix #563) 
This affects hledger-ui's transaction screen, print, hledger-rewrite etc.
A pending flag on postings is now displayed, just like a cleared flag.
Also there will now be a space between flag and account name.
And it's slightly better at aligning amounts, due to now considering
virtual posting parentheses/brackets or something.
 2017-06-04 17:54:57 -07:00
Simon Michael
c9e7bbdc7c clarify recent print changes a bit (#551) 2017-05-30 13:57:52 -07:00
Simon Michael
aca7c0d93b lib: clarify journalBalanceTransactions 2017-05-30 13:57:52 -07:00
Christian G. Warden
d39040c634 Add Support for Rewriting Multipler Postings Into Different Commodities (#557) 
When generating a new posting as a multiple of an existing posting,
support conversion to a different commodity.  For example, postings in
hours can be used to generate postings in USD.

Automatic transactions generated from rewrite rules use the commodity,
amount style, and transaction price if the rewrite defines a commodity.
 2017-05-30 07:30:15 -07:00
Joe Horsnell
35f77ee5e4 Fix trivial typo (#balance-assertions anchor) in CSV docs. (#559) 2017-05-30 07:27:14 -07:00
Simon Michael
dca7ffc10b doc: journal: meaning of --uncleared, matching tips (#553) 
[ci skip]
 2017-05-24 19:17:29 -07:00
Simon Michael
34af40024a doc: journal: expand transactions/postings/status sections (#553) 2017-05-24 17:44:32 -07:00
Simon Michael
a5b545c4eb doc: clarify some transaction price details 
- remove inaccurate print examples
- note #551
- note Ledger's fixed price syntax
- note how posting order can affect -B
- edits for clarity
 2017-05-22 17:52:14 -07:00
Jan Zerebecki
f403b1e709 Fix link to queries (#550) 2017-05-22 07:29:55 -07:00
Simon Michael
5e00d2f31c csv: refactor (#548) 2017-05-14 18:17:56 +09:00
Nicolas Wavrant
309d1ccd59 CsvReader: simplify '-' signs if there exist more than one (#548) 
It prevents hledger to crash later, as it fails to read
amount strings containing more than one '-'

Fix #524
 2017-05-14 09:34:33 +09:00
Simon Michael
2de0109953 allow megaparsec 5.3 2017-04-29 17:16:27 -07:00
Simon Michael
10d85bedec bal: show negative amounts in red 
The balance command now shows negative amounts in red, when it thinks
ANSI codes are supported, ie when TERM is not "dumb" and stdout is not
being redirected or piped somewhere.
 2017-04-25 18:34:09 -07:00
Simon Michael
9a86c9ee52 lib: begin supporting colour 
Add some basic helpers for working with ANSI colour codes,
and make strWidth and the various string layout functions aware of them.
 2017-04-25 18:27:25 -07:00
Simon Michael
48a84cdd58 lib: note an issue with journalfieldnames ordering 2017-04-19 09:05:21 -07:00
Simon Michael
2ac77338f8 doc: csv tweaks 2017-04-19 09:04:44 -07:00
Dmitry Astapov
c4c4be5fad Fix parsing of blank/empty balances + testcases (#539) 2017-04-18 09:07:30 -07:00
Dmitry Astapov
451f9d7307 "balance" parser for csv reader (#537) 
* "balance" parser for csv reader

* Some docs for
 2017-04-14 14:52:03 -07:00
Simon Michael
f9ad13b1c1 doc: journal: drop obsolete info 2017-04-13 08:42:52 -07:00
Simon Michael
d9488ea01b doc: move cost/market value into general options section 
[ci skip]
 2017-03-31 19:18:17 -07:00
Simon Michael
ff598f2635 doc: make changelogs from release notes 2017-03-31 18:11:44 -07:00
Simon Michael
6ee66979ff doc: regenerate files 2017-03-31 18:01:32 -07:00
Simon Michael
1850fb732f bump version to 1.2 2017-03-31 17:58:11 -07:00
Simon Michael
646cdf34e2 lib: mark todo for multicolumn balance/bs (#518) 2017-03-31 16:55:04 -07:00
Simon Michael
61a5b5274b doc: journal: fix link to aliases howto 
[ci skip]
 2017-03-31 10:42:53 -07:00
Simon Michael
55fb5424e9 tools: travis: don't doctest ledger-parse 2017-03-30 13:15:50 -07:00
Simon Michael
e8dcef5b5f lib: disable WIP ledger4 parser, lighten dependencies 2017-03-29 21:06:26 -07:00
Moritz Kiefer
f4b3f1c094 Add an option to use unicode in balance tables (#528) 
* Add an option to use unicode in balance tables

fixes #522

* Add a test for unicode tables

* Document --pretty-tables

* Support --pretty-tables in BalanceView
 2017-03-29 11:12:01 -07:00
Simon Michael
b402fc7e7d lib: optserror -> usageError, consolidate with other error functions (#529) 2017-03-29 08:00:51 -07:00
Simon Michael
59704dcb6b doc: regenerate doc files 2017-03-27 05:12:03 -07:00
Peter Simons
e2c8a6ae42 Use more accurate license tag in Cabal file. 2017-03-15 23:07:57 +00:00
Simon Michael
3c13da3ca2 update cabal files to hpack 0.17.0/stack 1.4 format #512 2017-03-15 23:04:35 +00:00
Simon Michael
ea1f19c71e lib: csv: refactor, allow writing different rules text 2017-02-06 02:34:18 -08:00
Simon Michael
9cfb7bf6af lib: update readJournalFromCsv doc 2017-02-06 01:45:32 -08:00
Simon Michael
7dd34d71b5 ui: transaction: fix pattern match failure when pressing E (fixes #508) 2017-02-05 12:00:45 -08:00
Justin Le
600132445c documentation changed to reflect new bs/is/cf and -V behavior 2017-02-04 16:38:18 -08:00
Justin Le
f47df67167 mapping function over journal amounts 2017-02-04 16:38:18 -08:00
Simon Michael
fa388257d9 add MarketPrice module to other cabal sections #505 2017-02-04 16:32:03 -08:00
Justin Le
6bccb847d5 Added a simple 'showMarketPrice' function to show market price directives in a journal-compatible way (#505) 
* added showMarketPrice and Hledger.Data.MarketPrice module

* showMarketPrice implemented using showDate

* attempted to add tests to Hledger.Data.MarketPrice

* moved MarketPrice test to Hledger.Read.JournalReader; fixed documentation on MarketPrice; added MarketPrice module to package.yaml
 2017-02-03 18:20:00 -08:00
Simon Michael
a30583f6a1 allow megaparsec 5.2 #503 2017-02-01 16:24:37 -08:00
Bryan Richter
4890d2bf90 Escape account names (#499) 
Fixes #498.
 2017-01-30 09:17:18 -08:00
Simon Michael
0395543719 doc: journal: market price doc tweak 2017-01-26 14:19:23 -08:00
Mykola Orliuk
3a632acea0 budget: periodic transactions support 2017-01-20 13:42:17 -08:00
Mykola Orliuk
7437c96ff6 Make hledger-rewrite tool suitable for re-factoring original journals (#490) 
* cli: fix bug in pivot for postings without tag

Without this fix for postings without tag query checked effective
account which is always empty text ("").

* rewrite: inherit dates, change application order

For budgeting it is important to inherit actual date of posting if it
differs from date of transaction. These dates will be added
as a separate line of comment.

More natural order of rewrites is when result of first defined one is
available for all next rewrites.

* rewrite: factor out Hledger.Data.AutoTransaction

* rewrite: add diff output

With this option you can modify your original files without loosing
inter-transaction comments etc. I.e. you can run:

hledger-rewrite --diff Agency \
  --add-posting 'Expenses:Taxes  *0.17' \
  | patch

As result multiple files should be updated.
Also it is nice to review your changes using colordiff instead of
patch.

* lib: track source lines range for journal

* doc: auto entries and diff output for rewrite
 2017-01-20 07:33:24 -08:00
Simon Michael
9759b5c867 doc: clarify tags 
[ci skip]
 2017-01-16 16:26:51 -08:00
Simon Michael
91dbeedee4 doc: document new --pivot 
[ci skip]
 2017-01-16 15:53:51 -08:00
Simon Michael
5345e2641a regenerate cabal files with hpack 
A few packages which included the Paths_* module no longer do,
and this seems ok with stack and cabal as far as I can tell.
That should be the only change, aside from a bunch of reorderings.
 2017-01-16 14:23:47 -08:00
Simon Michael
ce69f17db6 lib: fix a potential build failure: add Ledger.Parse.Text to package.yaml 2017-01-16 13:52:30 -08:00
Mykola Orliuk
3af81a73ca txnTieKnot fix (~10% memory reduce) (#483) 
* bin: ignore chart and dupes addons

* lib: fix txnTieKnot

Ensure that postings refers to their transaction rather than original
one.
This should allow compiler perform destructive update and/or allow
garbage collecting old transaction.
 2017-01-16 07:42:41 -08:00