slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,588 Commits 1 Branch 0 Tags 88 MiB
25fa835d9a
Commit Graph

1361 Commits

Author SHA1 Message Date
Alex Chen
e45070aab5 Update dependency bounds for megaparsec 2018-10-09 11:15:33 -06:00
Simon Michael
36af23ff5a appveyor: try older ghc again, skip tests for now (#888) 
[ci skip]
 2018-10-07 10:07:31 -10:00
Simon Michael
f3afbd221d doc: merge old project changelog into hledger changelog 
[ci skip]
 2018-10-06 12:48:14 -10:00
Simon Michael
862fb873b4 update embedded manuals 2018-10-06 09:42:27 -10:00
Simon Michael
ff2a546319 bump version to 1.11.99 2018-10-06 09:42:12 -10:00
Simon Michael
e687ef1a79 doc: changelogs, relnotes 2018-10-06 09:40:06 -10:00
Simon Michael
dcbedadcc4 add: fix wrong txn rendering during data entry & in journal file 2018-10-06 09:31:22 -10:00
Simon Michael
2c9c4ebf79
Merge branch 'master' into ExceptTLayer 2018-10-04 21:04:02 -10:00
Simon Michael
7bc500ccd2 update embedded manuals 2018-09-30 20:08:15 -10:00
Simon Michael
b798c48040 bump version to 1.11 2018-09-30 20:07:45 -10:00
Simon Michael
92c8a6fffb changelogs 2018-09-30 20:05:26 -10:00
Alex Chen
3d2584d869 lib: switch to megaparsec 7 2018-09-30 20:15:12 -06:00
Dmitry Astapov
3397ccdd4c cli: command to compute return on investment 2018-09-27 13:42:31 -10:00
Simon Michael
1cb5357a7d update cabal file 2018-09-25 07:27:06 -10:00
Dmitry Astapov
bda202e4d4 cli: "close" can print only opening or closing transaction 2018-09-25 07:25:59 -10:00
Simon Michael
855bd54d19 budget: declaration and (actual) amount sorting for bal --budget 
Account declaration-aware sorting is the default throughout hledger now.
 2018-09-24 08:31:19 -10:00
Dmitry Astapov
cb979ed129 cli: command to list included files 2018-09-22 21:47:54 -10:00
Simon Michael
3de8c11de1 journal: a new account sorting mechanism, and a bunch of sorting fixes 
A bunch of account sorting changes that got intermingled.

First, account codes have been dropped. They can still be parsed and
will be ignored, for now. I don't know if anyone used them.
Instead, account display order is now controlled by the order of account
directives, if any. From the mail list:

  I'd like to drop account codes, introduced in hledger 1.9 to control
  the display order of accounts. In my experience,

  - they are tedious to maintain
  - they duplicate/compete with the natural tendency to arrange account
    directives to match your mental chart of accounts
  - they duplicate/compete with the tree structure created by account
    names

  and it gets worse if you think about using them more extensively,
  eg to classify accounts by type.

  Instead, I plan to just let the position (parse order) of account
  directives determine the display order of those declared accounts.
  Undeclared accounts will be displayed after declared accounts,
  sorted alphabetically as usual.

Second, the various account sorting modes have been implemented more
widely and more correctly. All sorting modes (alphabetically, by account
declaration, by amount) should now work correctly in almost all commands
and modes (non-tabular and tabular balance reports, tree and flat modes,
the accounts command). Sorting bugs have been fixed, eg #875.
Only the budget report (balance --budget) does not yet support sorting.

Comprehensive functional tests for sorting in the accounts and balance
commands have been added. If you are confused by some sorting behaviour,
studying these tests is recommended, as sorting gets tricky.
 2018-09-22 21:45:07 -10:00
Simon Michael
8c18bada0c lib, cli, ui, web: update cabal files 2018-09-22 21:01:23 -10:00
Simon Michael
03acd40668 lib, cli, ui, web: upper bound to avoid megaparsec 7 for now 2018-09-20 20:48:47 -10:00
Simon Michael
059ad9eb76 refactor: jaccounts -> jdeclaredaccounts 2018-09-17 05:52:13 -07:00
Simon Michael
45858abc9c cli, ui, web: drop HUnit dependency 2018-09-07 13:01:50 -07:00
Luca Molteni
ad733c1eb4 Removed hunit 2018-09-07 13:00:20 -07:00
Simon Michael
a385fa7f00 update manuals 2018-09-07 12:44:52 -07:00
Simon Michael
23bdac41d9 csv: merge lucamolteni's cassava/custom separators (squashed) (#829) 
commit 5ba464de761b298e50d57a8b7d14bc28adb30d5d
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:54:12 2018 +0200

    Fix CI 2

commit f060ae9449f4b61a915b0ed4629fc1ba9b66fb4a
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:30:08 2018 +0200

    Fix CI build

commit af0719a33b9b72ad244ae80198d881a1f7145e9d
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:19:01 2018 +0200

    Fix rebase

commit 1a24ddfa54dfb4ff1326e1a51005ffa82d3dc3c8
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Aug 10 16:25:24 2018 +0200

    Fixed some GHC warnings

commit 1ac43398a359b5925ef71f53347698f1c6c510ef
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Aug 10 16:14:49 2018 +0200

    Fix .cabal

commit 422456b925d8aa4ab3e869f51e98c2b1c3dcde0a
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 22:56:20 2018 +0200

    Removed to-do list

commit 1118b762e4fd15c4fe7ba48ba86676706ea3a5a5
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 22:53:28 2018 +0200

    Better test

commit 1146ed0941655668bf7684f18aa15c5f4b9b20c2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 15:32:28 2018 +0200

    Fix parsing

commit 4fc2374b2b81802990da30c96756aab54d77399c
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 22:11:11 2018 +0200

    Parsing of separator

commit f7a61737f1ad4460ba20ca9b2e86eb21468abb33
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 14:29:23 2018 +0200

    Almost separator in options

commit ac8841cf3b9c80914bc3271ad9b9ff4ae9ba48a7
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 14:16:59 2018 +0200

    Separator in parseCSV

commit 92a8b9f6ba77ea4237f769641e03029ac88542ea
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 13:30:41 2018 +0200

    separator option

commit ec417a81ae625647cf35e61776cdf02bdb2c6aea
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 10:45:26 2018 +0200

    Removed one qualified import

commit 8b2f386c2f780adcd34cff3de7edceacc1d325a7
Author: Luca Molteni <volothamp@gmail.com>
Date:   Wed Jun 20 14:01:12 2018 +0200

    Removed string conversions

commit a14d0e099e28a286bb81770cfc9cb8f5c7e5cf1f
Author: Luca Molteni <volothamp@gmail.com>
Date:   Wed Jun 20 10:23:20 2018 +0200

    custom delimiter in cassava

commit 694d48e2bc1ada0037b90367c017f3082f68ed45
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:51:54 2018 +0200

    Use Text.getContents - remove UTF-8 compatibility library

commit a7ada2cc60033ebdd796ca34cc2ec69a4f387843
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:49:34 2018 +0200

    todo list

commit 58ec47d3987909f6bace50e3e647e30dadd5bf03
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:45:22 2018 +0200

    CSV test now has unicode characters

commit b7851e94c3f1683b63ec7250a12bcde3b7bed691
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 16:59:39 2018 +0200

    Use decode from Text

commit 79f59fd28ccaca08fcd718fcd8d00b1c1d65d7e1
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 13:28:57 2018 +0200

    Use Text and Lazy Bytestring

commit 470c9bcb8dc00669beb4ef0303a1e7d9f7aecc89
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:30:22 2018 +0200

    Use megaparsec error

commit f978848ba249ef4f67b855bea5d4e549290c205c
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:22:07 2018 +0200

    Renamed qualify and remove Parsec

commit 152587fde204c43a55798d212e43f37cd3038c2e
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:12:36 2018 +0200

    Use cassava mega parsec

commit cf281577a3d3a071196484a6fc8485f2ea1f7d67
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 14:01:47 2018 +0200

    Removed Data.Vector

commit 1272e8e758369d8cc5778029a705b277355a5029
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 12:16:18 2018 +0200

    Removed Parsec ParseError

commit ae07f043135a19307fd65b281ade37a74c76acb2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 12:06:14 2018 +0200

    Type sinonim for ParsecError

commit 8e15b253c11bd1c0c35a7641aeb18aa54e0ba9b0
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 11:16:08 2018 +0200

    Replaced with typeclasses

commit 1ed46f9c175603611325f3d377004e4b85f29377
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 11:01:33 2018 +0200

    Replaced Text/CSV with Cassava

commit 362f4111b5854145703174b976fc7acbd71b8783
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 10:34:37 2018 +0200

    Use cassava parsin instead of Text/CSV

commit 83e678e371618687cf7c15a4e2cfa67f570b6b64
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 08:22:51 2018 +0200

    Text CSV error messages

commit f922df71d274beeacab9fb2530b16c97f005cc08
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 21:45:20 2018 +0200

    Better types

commit edd130781c84790a53bff2283e6041eb8232e7cf
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 21:34:59 2018 +0200

    Conversion to Text CSV type

commit 0799383214483018ad2d977a3c8022414959c2b2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 16:06:21 2018 +0200

    First function with cassava

commit e92aeb151ff527b383ff3d0ced7764e81b71af82
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 13:47:34 2018 +0200

    Added cassava as dependency

commit 5ea005c558a3939af7e5f0cd735a9b4da931228e
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 13:18:47 2018 +0200

    Better .gitignore for multi idea modules
 2018-09-07 12:34:51 -07:00
Simon Michael
91b111b60d rename easytests_* to tests_* 2018-09-06 13:13:26 -07:00
Simon Michael
f388d9311a update embedded manuals 2018-09-06 12:03:50 -07:00
Simon Michael
d93334738b test: update docs 
[ci skip]
 2018-09-06 12:02:29 -07:00
Simon Michael
4003264129 lib: drop HUnit helpers, rename expectEqPP 2018-09-04 13:52:36 -07:00
Simon Michael
ff8d582bed test: drop hunit support from the test command 2018-09-04 12:48:06 -07:00
Simon Michael
807e6dc4af tests: Cli -> easytest 2018-09-04 12:42:37 -07:00
Simon Michael
7370f2a553 tests: Hledger -> easytest 2018-09-04 12:25:52 -07:00
Simon Michael
dcc44d10a5 lib: export HasCallStack from Hledger.Utils.Test 2018-09-04 09:59:48 -07:00
Simon Michael
cd67f8ea68 tests: clear out old boilerplate 2018-08-31 18:12:17 -07:00
Jakub Zárybnický
1190e2ae5d cli: Replace embedStringFile with embedFile (compile with LC_ALL=C) 2018-08-24 09:18:26 -07:00
Simon Michael
f108b56e61 uniquify modules' easytests, simplify imports 2018-08-20 14:31:31 +01:00
Simon Michael
f30b1533a0 rewrite: disable outdated doctests 2018-08-18 16:06:34 +01:00
Simon Michael
fa6f0e8d1a cli: make cabal test suite run the test command, not just hunit tests 2018-08-18 15:20:15 +01:00
Simon Michael
d778a92561 tests: export HUnit/EasyTest from Hledger.Utils.Test; more helpers 2018-08-18 15:19:59 +01:00
Simon Michael
50d666d5a0 test: refactor, document, organise easytests, port amountp tests (#812) 2018-08-15 19:58:07 +01:00
Simon Michael
ed15ebd70e test: run some easytests as well; print test output on stdout 2018-08-15 11:24:52 +01:00
Simon Michael
b11a0eadb2 make these modules loadable in a GHCI with OverloadedStrings set 2018-08-03 14:52:11 +01:00
Simon Michael
3e0147b7e9 test: don't try to read the journal 2018-08-03 14:52:11 +01:00
Simon Michael
d685d1aa9b lib,rewrite: simplify transactionModifierToFunction 
This removes transactionModifierToFunction's extra query parameter;
the rewrite command sets it in the TransactionModifier instead, which
I think is equivalent. I had to change one functional test, but it
seems correct now, so perhaps it wasn't working right before ?
 2018-08-02 08:25:49 +01:00
Simon Michael
72acb86299 cabal: bump tested-with declarations 2018-08-02 08:25:49 +01:00
Simon Michael
1e0a7ec8f1 remove some unneeded CPP pragmas 2018-08-02 08:25:49 +01:00
Simon Michael
9bd1772ea8 bs/bse/cf/is: remove NoCPP pragma 
This was added in 2012, I guess to prevent CPP breaking on some
needed and I don't want to do this everywhere; we'll just remember
to not put CPP-like content in quasi-quoted blocks.
 2018-08-02 08:25:49 +01:00
Simon Michael
a4ed468979 don't re-export applyTransactionModifiers from Hledger.Cli.Utils, I guess 2018-08-02 08:25:49 +01:00
Simon Michael
eae9d78bb1 lib: generateAutomaticPostings -> applyTransactionModifiers 2018-08-02 08:25:49 +01:00
Simon Michael
bb36693155 lib: refactor, txnTieKnot automatically 2018-08-02 08:25:49 +01:00
Simon Michael
efc54c4c25 lib: ModifierTransaction -> TransactionModifier; try to clarify a bit 2018-07-30 19:38:21 +01:00
Simon Michael
05073e9f9d rewrite: clarify relation to print --auto (#745) 
[ci skip]
 2018-07-26 07:14:36 +01:00
Simon Michael
d5430e7ddf clean up debug helpers (api change) 2018-07-16 15:28:58 +01:00
Simon Michael
8a7db87427 doc: update manuals 2018-07-15 09:21:10 +01:00
Simon Michael
92404bb847 prices: allow filtering by query, clarify docs 
Query arguments are allowed, prices can be filtered by date, and
postings providing transaction prices can be filtered by anything.
 2018-07-15 09:21:10 +01:00
Simon Michael
2fbebc6c64 lib: clarify 2018-07-14 10:57:05 +01:00
Gaith Hallak
d0b9d76986 Keep the flags order in moveFlagsAfterCommand 2018-07-04 17:49:14 +03:00
Simon Michael
d461e96c34 doc: update manuals harder, they should say 1.10.99 
[ci skip]
 2018-07-04 15:09:57 +01:00
Simon Michael
4f40467d86 update embedded manuals 2018-07-04 13:33:27 +01:00
Simon Michael
d62f082bce bump version to 1.10.99 (dev) 2018-07-04 13:32:42 +01:00
Simon Michael
91c487d4c2 doc: manuals: update version strings 2018-07-04 12:52:29 +01:00
Simon Michael
22f2e90a4b update embedded manuals 2018-06-30 22:08:48 +01:00
Simon Michael
6242b1d784 bump version to 1.10 2018-06-30 22:08:02 +01:00
Simon Michael
6b8fcd7205 changelogs 2018-06-30 21:57:06 +01:00
Jakub Zárybnický
af98eecdf8 web: Add capabilities type, CLI options, and reading them from headers 2018-06-24 14:18:02 +02:00
Simon Michael
6a96683691 web: make --auto and multiple -f options work again 
I think we lost one or both of these at the time of ecf49b1e.
 2018-06-20 00:26:37 -07:00
Simon Michael
9c1db9ed9f lib: fix forecast start/end dates 
pushed too soon
 2018-06-18 18:08:55 -07:00
Simon Michael
26d2c79ce0 lib: make date: also set forecast end date, not just -e and -p 2018-06-18 17:55:18 -07:00
Alex Chen
ff2b042c7e lib: remove the ErroringJournalParser type 2018-06-11 13:58:56 -06:00
Simon Michael
42f47e2b6b update embedded manuals 
[ci skip]
 2018-06-08 17:27:04 -07:00
Simon Michael
061aad0431 remove some CPP that's obsolete since we require base 4.8+ 2018-06-04 17:33:21 -07:00
Simon Michael
ec39c87ca8 disambiguate the base-compat imports in hledger package too (#794) 2018-06-04 17:32:45 -07:00
Simon Michael
0ce9c5728a switch to base-compat-batteries to fix ghc 7.10 support (#794) 
base-compat-batteries provides the same API across more ghc versions
than base-compat does, at the cost of more dependencies. Eg it exports
Prelude.Compat ((<>)) with ghc 7.10/base 4.8, which we expect.
My belief is that several of our deps already require it so the added
cost is not too great. We should probably go back to base-compat when
possible though, eg when we stop supporting ghc 7.10.
 2018-06-04 17:32:42 -07:00
Simon Michael
328b2dabfe require latest base-compat, might as well (#794) 2018-06-04 17:32:32 -07:00
Peter Simons
8c0c168cd6 Fix the build of hledger-lib with ghc 8.0.x and base-compat 0.10.x. 
We don't need to import Data.Monoid because Prelude.Compat exports "<>"
already. In fact, importing that module causes build failures:

    Hledger/Read/Common.hs:725:62: error:
        Ambiguous occurrence ‘<>’
        It could refer to either ‘Sem.<>’,
                                 imported from ‘Prelude.Compat’ at Hledger/Read/Common.hs:97:1-39
                                 (and originally defined in ‘Data.Semigroup’)
                              or ‘Data.Monoid.<>’,
                                 imported from ‘Data.Monoid’ at Hledger/Read/Common.hs:110:1-18

Fixes https://github.com/simonmichael/hledger/issues/794.
 2018-06-04 20:58:58 +02:00
Alex Chen
12e8d0e282 lib: change some parsers to use takeWhileP 2018-05-22 12:16:46 -07:00
Alex Chen
b245ec7b3d lib: remove the megaparsec compatability module 2018-05-22 12:16:46 -07:00
Alex Chen
c4ba7542d7 lib: use megaparsec 6 for all supported ghc versions 2018-05-22 12:16:46 -07:00
Simon Michael
581d02162c resolve all current build warnings with the supported GHC versions 
If I'm lucky.
 2018-05-17 20:43:55 -07:00
Mykola Orliuk
64c7eb78f4 GHC 8.0 compatibility 2018-05-13 14:41:08 -07:00
Simon Michael
2c0abac928 cli, ui, web: fix build on ghc < 8.4, hopefully 2018-05-05 16:20:27 -07:00
Simon Michael
c71f29d6fb doc: options: fix wiki link 2018-05-05 16:14:44 -07:00
Simon Michael
ad99ffe935 ui: preserve the effect of --value, --forecast, --anon on reload (#753) 2018-05-05 15:55:14 -07:00
Simon Michael
18e5c9d5c9 doc: move market price docs under directives 2018-05-03 13:11:17 -07:00
Simon Michael
000cd2780c cli: fix benchmark compilation, clean up cabal 2018-04-30 18:37:43 -07:00
Simon Michael
87fce4db68 cli: add missing change note 
[ci skip]
 2018-04-30 13:34:03 -07:00
Simon Michael
290ea1891a regen manuals 2018-04-29 18:04:59 -07:00
Simon Michael
59c804dac4 doc: journal: directives & periodic/automated cleanups 2018-04-29 18:02:16 -07:00
Simon Michael
8799e55633 doc: bal: reference boring parent eliding example 2018-04-29 12:45:08 -07:00
Simon Michael
0aef51d725 changelogs 2018-04-29 12:45:07 -07:00
Simon Michael
34c3c5dc6c bal: show an error for unsupported --budget --sort-amount 2018-04-27 11:52:23 -07:00
Simon Michael
abb2e6bfc2 reg: include txn's code field in register CSV output (#746) 2018-04-27 10:57:40 -07:00
Simon Michael
d7f6ff0e18 doc: regenerate embedded manuals 2018-04-25 17:43:34 -07:00
Simon Michael
a4d30512bd doc: update balance docs 
[ci skip]
 2018-04-25 16:14:44 -07:00
Simon Michael
c4d18d1fe5 doc: update balance docs 
[ci skip]
 2018-04-25 16:08:41 -07:00
Simon Michael
21b3a56489 doc: budget report: update 2018-04-25 08:57:33 -07:00
Simon Michael
9151f5004e budget: show a budget report even with no interval (for whole journal period) 2018-04-24 23:12:42 -07:00
Simon Michael
41665d07b0 regenerate cabal files, fix tabular compilation error 2018-04-23 18:52:28 -07:00
Simon Michael
0c140d7238 budget: allow multi-interval budgets again 
Budgets were restricted to a single interval in 1.9, but this was
a mistake. This restores the 1.5 behaviour, where a budget can be built
up from multiple periodic transactions with different intervals.
 2018-04-23 18:52:28 -07:00
Simon Michael
43287a3e26 budget: use a new first-class BudgetReport for --budget 2018-04-23 18:52:28 -07:00
Simon Michael
3a3829ac0f doc: regen embedded manuals 2018-04-20 06:48:26 -07:00
Simon Michael
d53557b09d regen cabal files with stack 1.7's hpack (0.28.2) 2018-04-20 06:47:52 -07:00
Simon Michael
b1cd20c94c doc: typos 
[ci skip]
 2018-04-20 05:40:54 -07:00
Simon Michael
1a9a1796d1 doc: note -V limitation in multicolumn balance reports 
[ci skip]
 2018-04-20 05:38:36 -07:00
Simon Michael
be7702b187 doc: market value: update examples 
[ci skip]
 2018-04-20 05:24:09 -07:00
Simon Michael
30186e35ea cabal: update tested-with 2018-04-20 05:24:09 -07:00
Dmitry Astapov
0c835acd18 lib, app: better descriptions for forecast transactions 2018-04-18 16:05:08 -07:00
Dmitry Astapov
d82370d10b lib, app, web: remove differences between command line and journal file aliases 2018-04-17 16:09:11 -07:00
Dmitry Astapov
f6ec26e321 lib, app, web, ui: rename readJournalFile[s]WithOpts to readJournalFile, same for tryReader[s]WithOpts 2018-04-17 15:25:02 -07:00
Simon Michael
2bed041135 doc: queries: clarify 
[ci skip]
 2018-04-17 14:34:50 -07:00
Dmitry Astapov
37607beaea lib, app, web: use readJournalFileWithOpts instead of readJournalFile whenever possible 2018-04-17 14:33:32 -07:00
Dmitry Astapov
ecf49b1e4b lib: auto postings generated before amount inference and balance checks (#729) 2018-04-17 14:33:32 -07:00
Simon Michael
7129577f34 update cabal files 2018-04-04 17:56:22 +01:00
Simon Michael
4ea02bf1cb bump version to 1.9.99 2018-04-04 17:53:38 +01:00
Simon Michael
0b5ddcebee cli: clarify smart dates with more examples; add support for YYYYMM 2018-04-04 17:45:23 +01:00
Simon Michael
326ac83dcf fix haddock issues 2018-03-31 19:15:24 +01:00
Simon Michael
027abcabe6 update embedded manuals 2018-03-31 19:15:24 +01:00
Simon Michael
6ebb1fb061 update cabal files 2018-03-31 19:15:24 +01:00
Simon Michael
2db2010e40 bump version to 1.9, bump manual date 2018-03-31 19:15:24 +01:00
Simon Michael
0a1e46e018 doc: update changelogs, release notes 
[ci skip]
 2018-03-31 19:15:24 +01:00
Martin Michlmayr
633ad4455f doc: update references to the faq 
Update references to the FAQ in the documentation and on the web site.
 2018-03-31 17:58:29 +01:00
Simon Michael
0979dbc01f regenerate cabal files with stack 1.6.3 to silence hpack warnings 
[ci skip]
 2018-03-31 03:24:01 +01:00
Simon Michael
b5546fd7b6 doc: another manual update 2018-03-31 02:42:57 +01:00
Simon Michael
a8dc474a27 doc: fix budgeting wiki link 
[ci skip]
 2018-03-30 03:42:06 +01:00
Simon Michael
2a87ea56ff budget: refactor; show budget goals even with no or zero actual 
This makes budget reports more intuitive. It is a temporary hack which
can misorder columns in some cases (if actual and budget activity
occur in a different range of columns). We should redo this in a more
principled way.
 2018-03-30 03:26:32 +01:00
Simon Michael
939d6833ea budget: refactor date handling, add debug output 2018-03-30 01:01:50 +01:00
Simon Michael
c306193667 doc: also update -E/--empty command line help 
[ci skip]
 2018-03-30 00:49:28 +01:00
Simon Michael
17ce3d8329 doc: update manuals with --budget note 2018-03-29 22:37:37 +01:00
Simon Michael
178e3a234b ui/web: -E toggles zeroes at startup, with opposite default to cli 2018-03-29 22:35:06 +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
c64d598919 bal: a little more width for budget columns 2018-03-29 15:12:44 +01:00
Simon Michael
6970a4c6e8 budget: more regular layout, simple fixed-width columns 
old:
Balance changes in 2018/03/19w12:

                   ||   2018/03/19w12
===================++=================
 <unbudgeted>:aaa  ||               0
 bbb               ||        1.33 [0]
 bbb:bbbbbbbbbbbbb || 1.25 [42% of 3]
 ccc               ||     0 [0% of 0]
 ddd               ||     0 [0% of 0]
 eee               || 0.75 [75% of 1]
 fff               || 3.50 [50% of 7]
 ggg               ||        1.25 [0]
 hhh               ||     0 [0% of 6]
 iii               ||     0 [0% of 0]
-------------------++-----------------
                   ||            8.08

new:
                   ||          2018/03/19w12
===================++========================
 <unbudgeted>:aaa  ||       0
 bbb               ||    1.33 [           0]
 bbb:bbbbbbbbbbbbb ||    1.25 [ 42% of    3]
 ccc               ||       0 [  0% of    0]
 ddd               ||       0 [  0% of    0]
 eee               ||    0.75 [ 75% of    1]
 fff               ||    3.50 [ 50% of    7]
 ggg               ||    1.25 [           0]
 hhh               ||       0 [  0% of    6]
 iii               ||       0 [  0% of    0]
-------------------++------------------------
                   ||    8.08
 2018-03-29 15:03:27 +01:00
Simon Michael
550425810f budget refactoring, type synonyms 
Using "actual" and "budget" terminology. "real" is already used in the
context of real/virtual postings. "actual" should be familiar from
unit testing (expected & actual)..
 2018-03-29 15:03:27 +01:00
Simon Michael
a56c547bc2 cleanups 2018-03-29 15:03:27 +01:00
Simon Michael
d4eb3caf70 bal: comment fixes 
[ci skip]
 2018-03-29 15:03:27 +01:00
Simon Michael
64e06750eb doc: draft changelogs & release notes 2018-03-28 18:25:01 +01:00
Simon Michael
1347885cd8 bal/bs/bse/cf/is: show short monthnames in monthly reports (like html) 2018-03-28 18:17:20 +01:00
Simon Michael
265bc21b24 bal: mention --budget's newness in manual 
[ci skip]
 2018-03-26 15:18:44 +01:00
Simon Michael
28a8b55f4e move non-portable file warning to package 2018-03-26 01:04:58 +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
61f7563fa2 budget: drop obsolete hledger-budget addon (close #620) 
[ci skip]
 2018-03-12 23:14:00 +00:00
Simon Michael
8c384e3192 tweak -E help again, hledger-web also shows zeroes by default 
[ci skip]
 2018-02-18 08:05:55 -08:00
Simon Michael
a8933e8c5c ui: tweak -E help, hledger-ui shows zeroes by default 
[ci skip]
 2018-02-18 07:16:59 -08:00
Simon Michael
3390972cab update generated manuals 2018-02-16 11:09:37 -08:00
Simon Michael
d3fde29b36 bal: --invert flag to flip all signs 2018-01-29 14:53:23 -08:00
Simon Michael
77a3c7952b cli: remember to include the actual hledger manuals, as well as symlinks 
[ci skip]
 2018-01-26 11:54:38 -08:00
Simon Michael
5cea120ab7 cli: rename embedded files dir, make them extra-source-files 
Per feedback from peti. These files will no longer be installed to
cabal's data directory, where it might seem as if they are required at
runtime, which they are not. Packagers will still find them in the
tarball and can put them in the proper place.
 2018-01-26 11:12:08 -08:00
Simon Michael
7c351547ba doc: fix links to output format section 
[ci skip]
 2018-01-23 17:14:09 -08:00
Simon Michael
18a0786691 doc: fix options subheadings 
[ci skip]
 2018-01-23 17:10:16 -08:00
Simon Michael
e657e96591 bal/etc.: document html output, move to options section 2018-01-23 17:08:19 -08:00
Simon Michael
37555617b7 journal, bal: document account codes 2018-01-23 16:51:12 -08:00
Simon Michael
e491f513a1 cli: tabular reports no longer have a trailing blank line added 
Tabular reports from bal, bs etc. have until now been rendered on
the terminal with one final blank line, for readability.
This change drops the blank line.

This is consistent with the non-tabular balance and register output
(not print, which is a special case), and with most unix commands.
The real reason for it, which I admit is flimsy, is that I can now omit
the final delimiter (>=0) when using shelltestrunner 1.9's new format,
making functional tests easier to maintain and more readable.
If there's opposition, this could be reverted.
 2018-01-23 12:47:56 -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
6c60e4a97b bs/cf/is: always show a tabular report, even with no report interval 
Previously, if you specified no report interval, the text output of
these commands was a simple report like the original balance command,
with amounts on the left and account names on the right. Also,
balances used arithmetic sign like the balance command.
Now it always draws a table, with account names in the left
column, and shows balances with normal-positive sign, consistent with
the multicolumn reports. Less code, fewer bugs.
 2018-01-23 11:05:01 -08:00
Simon Michael
2e9ae3f400 bs/bse/cf/is: html output fixes and styling/styleability 2018-01-19 14:16:23 -08:00
Simon Michael
4ddb748d9c acc: rename --posted -> --used 2018-01-19 12:41:03 -08:00
Simon Michael
37a4d71f1b acc: report --declared and/or --posted accounts 2018-01-18 18:43:21 -08:00
Simon Michael
6210613f76 bs/bse/cf/is: show overall report span in title 2018-01-18 12:00:16 -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
3663c46502 bal: make --drop work with csv/html output 2018-01-18 11:26:57 -08:00
Simon Michael
3849ba7a9d bal: warn that --budget -O csv doesn't work 2018-01-18 11:24:22 -08:00
Simon Michael
46d7893446 updated generated manuals 2018-01-18 11:01:15 -08:00
Simon Michael
889ba8caac doc: make the bs/bse/cf/is web docs a bit more like their --help 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
Simon Michael
02516ef987 bal/bs/bse/cf/is: basic HTML output 2018-01-14 18:09:50 -08:00
Simon Michael
73ba78f092 bs/bse/cf/is: don't repeat the headings row for each subreport 2018-01-14 17:57:46 -08:00
Simon Michael
a26f7a9f51 include the column spans explicitly in CompoundBalanceReport 2018-01-14 17:49:45 -08:00
Simon Michael
de5d22ac21 bal/bs/is/cf: drop short name, indent fields from multicolumn CSV 2018-01-13 11:46:19 -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
1234671c69 equity: rename to close 2018-01-03 17:02:35 -08:00
Simon Michael
98dcd1406e equity: more help cleanup 2018-01-03 15:55:59 -08:00
Simon Michael
31effcd731 equity: ignore any begin date; closed balances are historical 2018-01-03 13:50:16 -08:00
Simon Michael
98dd8c5f83 equity: improve help, note limitations, ignore --date2 
Try to make this less confusing.
 2018-01-03 12:53:37 -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
79fe56f8ff doc: fix broken link 2017-12-31 07:43:02 -08:00
Simon Michael
cbb12cbb73 doc: fix accidental heading in period expressions 2017-12-30 19:21:00 -08:00
Simon Michael
f9e113c9ab print: -B shows converted amounts again, as in 1.1, even without -x. #551 (Simon Michael, Mykola Orliuk) 2017-12-30 19:08:58 -08:00
Simon Michael
99cde10e98 doc: draft changelogs 2017-12-30 18:20:41 -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
0c584759e1 doc: market value: update description 2017-12-30 07:35:23 -08:00
Simon Michael
d8195dcae9 doc: warn about combining -B and -V (#683) 2017-12-30 07:21:43 -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
0a9d724152 lib: clarify journalApplyValue comment 2017-12-29 16:06:53 -08:00
Simon Michael
aa06d0f9bd lib, cli, ui: allow ansi-terminal 0.8 2017-12-29 12:41:22 -08:00
Simon Michael
3f124cf123 add, web: suggest implied and declared account names also 2017-12-29 12:19:44 -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
Simon Michael
cd5c74625e update embedded manuals 2017-12-14 18:20:07 -08:00
Dmitry Astapov
05383277b1 doc: add --budget to balance manual 2017-12-14 17:20:07 -08:00
Dmitry Astapov
ac80c39535 lib: command-line help for --auto/--forecast matches docs 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
f3820e1e7a fix hledger/.otherdocs symlinks & README 2017-12-06 18:39:37 -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
df7f5e1659 rename hledger manual subfiles 2017-12-06 18:23:20 -08:00
Simon Michael
1d26845525 remove */doc/README 2017-12-06 18:18:03 -08:00
Simon Michael
b425e50ad1 change paths in code, scripts, readme 2017-12-06 18:16:35 -08:00
Simon Michael
d637e2fbcd doc: expand doc/README, describe doc files and workflows 2017-12-06 13:28:52 -08:00
Dmitry Astapov
58c755df86 lib: fix budget display to always show %% consumed and handle costs 
For multi-column balance report, if there are no transactions in the
given period for budgeted account, display [0% of <budget>] for
consistency.

If balance is a mix of commodities, convert to cost basis for the
purposes of computing percent of balance spent.
 2017-12-01 15:52:29 -08:00
Simon Michael
4228203740 doc: regenerate embedded manuals 
[ci skip]
 2017-11-28 17:37:27 -08:00
Dmitry Astapov
8cd58b71ab bal: show percentage of budget spent 2017-11-26 14:57:41 +00:00
Dmitry Astapov
6ea5da2d9d bal: --budget shows budget performance 
Budget goals specified with periodic transactions (as with
hledger-budget) can now be displayed in balance report (but not in bs/is/cf).

--budget shows the target amount and percentage alongside the actual
amount, per account and period.

Unbudgeted accounts will be hidden, unless --show-unbudgeted is used.

Budgeted accounts are displayed folded (depth-clipped) at a depth
matching the budget specification. Unbudgeted accounts, if shown, are
displayed at their usual depth (in full detail, or according to --depth).
 2017-11-26 14:57:41 +00: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
0dfffed52c doc: expand documentation for period expressions 
Document "first day of period" behavior. Document new period
expressions DayOfYear and WeekdayOfMonth.
 2017-11-26 14:57:41 +00:00
Simon Michael
419395e3d5 doc: argument files: fix cookbook link 
[ci skip]
 2017-10-31 12:41:05 -07:00
Simon Michael
676eb6e1a2 update embedded manuals 2017-10-31 12:38:37 -07:00
Simon Michael
a3fa09b604 doc: rename/flesh out "argument files" doc, add to cookbook 2017-10-31 12:37:13 -07:00
Simon Michael
a9c4ac24cd prices: doc: link to market prices doc 2017-10-31 12:37:13 -07:00
Simon Michael
da1cf3b72d update embedded manuals 2017-10-17 07:08:20 -07:00
Simon Michael
24d8336728 tag: first arg filters tag names, the rest filter transactions (#261) 2017-10-17 07:07:34 -07:00
jeevcat
3a9ea65b99 Rewrite of BalanceAssertion type to track its source position. 
Fixes #481.
 2017-10-16 13:25:03 -07:00
Simon Michael
e33cce52bc import: make --dry output valid journal format 
[ci skip]
 2017-10-14 08:59:09 -07:00
Simon Michael
e658c301e2 import: doc: update builtin manuals 
[ci skip]
 2017-10-02 17:56:13 -10:00
Simon Michael
732d589955 import: doc: manual edits 
[ci skip]
 2017-10-01 09:57:55 -10: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
0af0961e10 doc: options help tweaks 2017-09-30 11:29:25 -10:00
Simon Michael
6632aedd93 update embedded manuals 2017-09-30 07:00:57 -10:00
Simon Michael
3e866563d1 cli: tweak commands list 2017-09-30 06:58:25 -10:00
Simon Michael
3967e57395 doc: changelog/relnote updates 2017-09-30 06:52:15 -10:00
Simon Michael
e5f794d2cb cli,ui,web: a @FILE argument reads flags & args from FILE, one per line 2017-09-30 06:49:31 -10:00
Simon Michael
8c86d9b578 doc: update manuals re --sort-amount 2017-09-29 19:31:44 -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
32d5428197 doc: draft 1.4 changelogs 
[ci skip]
 2017-09-26 16:22:30 -10:00