From 9ede5cef1e48033d78cc773ee768e56b93a5315e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 2 Dec 2014 11:49:34 -0800 Subject: [PATCH 1/8] doc: start release notes --- hledger/CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hledger/CHANGES b/hledger/CHANGES index 0506719a3..412e85dce 100644 --- a/hledger/CHANGES +++ b/hledger/CHANGES @@ -1,3 +1,8 @@ +0.24 (unreleased) + +- register: faster with large output +- register: postings with multi-commodity amounts are now top-aligned, like Ledger + 0.23.3 (2014/9/12) - allow text 1.2+ (fixes #207) From 55993543be56f62ef59617f5230d49fe982ea980 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 2 Dec 2014 11:51:03 -0800 Subject: [PATCH 2/8] doc: funding links: gratipay, bountysource, flattr --- doc/site/download.md | 8 +++++--- doc/site/index.md | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/site/download.md b/doc/site/download.md index dd24b38bf..e7efba6be 100644 --- a/doc/site/download.md +++ b/doc/site/download.md @@ -54,9 +54,11 @@ Use cabal -
- **[Gittip](https://www.gittip.com/simonmichael/)**, - paypal +
+Flattr this
+paypal
+**[Gittip](https://www.gittip.com/simonmichael/)**
+
Building and supporting Windows and Mac binaries is costly, so it's demand-driven - you can indicate demand by making a project diff --git a/doc/site/index.md b/doc/site/index.md index cb10f3bb8..7b82d9760 100644 --- a/doc/site/index.md +++ b/doc/site/index.md @@ -119,7 +119,10 @@ or the **[mail list](http://hledger.org/list)**.
-**[Gittip](https://www.gittip.com/simonmichael/)**, -paypal +   +bountysource   +Flattr this   +**[Gittip](https://www.gittip.com/simonmichael/)**   +paypal  
From 29bca9691a18a9457f8aba90eec1f2229ee608f2 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 2 Dec 2014 11:52:25 -0800 Subject: [PATCH 3/8] doc: link fedora haskell SIG --- doc/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer-guide.md b/doc/developer-guide.md index a2234050f..d27f7135f 100644 --- a/doc/developer-guide.md +++ b/doc/developer-guide.md @@ -25,7 +25,7 @@ tr { | Debian | source packages
[haskell-hledger-lib](http://packages.qa.debian.org/h/haskell-hledger-lib.html), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=haskell-hledger-lib), [haskell-hledger](http://packages.qa.debian.org/h/haskell-hledger.html), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=haskell-hledger), [haskell-hledger-web](http://packages.qa.debian.org/h/haskell-hledger-web.html), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=haskell-hledger-web)
binary packages
testing: [hledger](https://packages.debian.org/testing/hledger), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=hledger;dist=testing), [hledger-web](https://packages.debian.org/testing/hledger-web), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=hledger-web;dist=testing)
unstable: [hledger](https://packages.debian.org/unstable/hledger), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=hledger;dist=unstable), [hledger-web](https://packages.debian.org/unstable/hledger-web), [bugs](https://bugs.debian.org/cgi-bin/pkgreport.cgi?package=hledger-web;dist=unstable)
all: [\*hledger\*](https://packages.debian.org/search?searchon=names&keywords=hledger)
popularity stats: [hledger](https://qa.debian.org/popcon.php?package=haskell-hledger), [hledger-web](https://qa.debian.org/popcon.php?package=haskell-hledger-web)
[PTS help](https://www.debian.org/doc/manuals/developers-reference/resources.html#pkg-tracking-system) | | Ubuntu | source packages
[haskell-hledger-lib](https://launchpad.net/ubuntu/+source/haskell-hledger-lib), [bugs](https://bugs.launchpad.net/ubuntu/+source/haskell-hledger-lib), [haskell-hledger](https://launchpad.net/ubuntu/+source/haskell-hledger), [bugs](https://bugs.launchpad.net/ubuntu/+source/haskell-hledger), [haskell-hledger-web](https://launchpad.net/ubuntu/+source/haskell-hledger-web), [bugs](https://bugs.launchpad.net/ubuntu/+source/haskell-hledger-web)
binary packages
[\*hledger\*](http://packages.ubuntu.com/search?suite=all&searchon=names&keywords=hledger) | | Gentoo | [hledger](http://gpo.zugaina.org/dev-haskell/hledger), [hledger-web](http://gpo.zugaina.org/dev-haskell/hledger-web), [\*hledger\*](http://gpo.zugaina.org/Search?search=hledger) | -| Fedora | [hledger](https://apps.fedoraproject.org/packages/hledger), [\*hledger\*](https://apps.fedoraproject.org/packages/s/hledger) | +| Fedora | [hledger](https://apps.fedoraproject.org/packages/hledger), [\*hledger\*](https://apps.fedoraproject.org/packages/s/hledger), [Haskell SIG](http://fedoraproject.org/wiki/Haskell_SIG) | @@ -349,26 +349,29 @@ examples we get: assets:foreign currency $135.00 assets:cash $-135.00 -##### Fixed Lot Prices +###### Prices are fixed -ledger has another syntax for -[fixed lot prices](http://ledger-cli.org/3.0/doc/ledger3.html#Fixing-Lot-Prices). -(`{=PRICE}`). In ledger, this is equivalent to `@ PRICE`, except you -can provide both and then ledger generates an automatic Capital Losses -posting covering the difference. +In hledger, the price used in a given posting is fixed. +This is what you want for eg recording purchases made while travelling abroad, +but you can't (yet) track the value of stocks whose price fluctuates. -hledger will parse this syntax, but ignore it. +This is different from Ledger, where prices fluctuate by default. +Ledger has a different syntax for specifying +[fixed prices](http://ledger-cli.org/3.0/doc/ledger3.html#Fixing-Lot-Prices): `{=PRICE}`. +hledger parses that syntax, and (currently) ignores it. + -##### Historical prices +###### Historical prices -hledger will parse and ignore ledger-style historical price directives: +hledger also parses, and currently ignores, ledger-style historical price directives: - - ; Historical price directives look like: P DATE COMMODITYSYMBOL UNITPRICE - ; These say the euro's exchange rate is $1.35 during 2009 and - ; $1.40 from 2010/1/1 on. - P 2009/1/1 € $1.35 - P 2010/1/1 € $1.40 +``` +; Historical price directives look like: P DATE COMMODITYSYMBOL UNITPRICE +; These say the euro's exchange rate is $1.35 during 2009 and +; $1.40 from 2010/1/1 on. +P 2009/1/1 € $1.35 +P 2010/1/1 € $1.40 +``` #### Comments From 7124b1c4d466e6eaf583d91b578d40159b6b190a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 2 Dec 2014 11:54:19 -0800 Subject: [PATCH 7/8] doc: remove commented doc --- doc/manual.md | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/doc/manual.md b/doc/manual.md index db600b539..0c9537ae7 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -940,37 +940,7 @@ Additional convenience features: - Input prompts are displayed in a different colour when the terminal supports it. -Here's [an example](step-by-step#record-a-transaction-with-hledger-add). - +Here's [an example](step-by-step.html#record-a-transaction-with-hledger-add). ### Reports From d5b329a8ad180be985e0b59f0af9672dc010ae5e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 2 Dec 2014 11:54:41 -0800 Subject: [PATCH 8/8] doc: note csv improvements --- doc/manual.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/manual.md b/doc/manual.md index 0c9537ae7..ecf8ab2fc 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -559,7 +559,7 @@ skip 1 **`date-format` *DATEFMT***\ When your CSV date fields are not formatted like `YYYY/MM/DD` (or `YYYY-MM-DD` or `YYYY.MM.DD`), you'll need to specify the format. -DATEFMT is a [strptime-style date parsing pattern](http://hackage.haskell.org/packages/archive/time/latest/doc/html/Data-Time-Format.html#v:formatTime), +DATEFMT is a [strptime-like date parsing pattern](http://hackage.haskell.org/packages/archive/time/latest/doc/html/Data-Time-Format.html#v:formatTime), which must parse the date field values completely. Examples: ``` # parses "6/11/2013": @@ -639,7 +639,8 @@ banking thru software ``` **`include` *RULESFILE***\ -Include another rules file at this point. Eg: +Include another rules file at this point. `RULESFILE` is either an absolute file path or +a path relative to the current file's directory. Eg: ``` # rules reused with several CSV files include common.rules @@ -657,6 +658,10 @@ If the CSV has the currency in a separate field, assign that to the `currency` p If an amount value is parenthesised, it will be de-parenthesised and sign-flipped automatically. +The generated journal entries will be sorted by date (after reversing +them if the first's date is later than the last's, to preserve the +order of same-day entries). + ### Timelog hledger can also read time log files. These are (a subset of) timeclock.el's