Skip to content

Commit 4b9b027

Browse files
authored
Merge pull request #74 from apauley/hledger-1.15
Update usage of hledger to reflect updated command-line flags of hledger version 1.15
2 parents 323f819 + ec9a874 commit 4b9b027

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

ChangeLog.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog for [hledger-flow](https://github.com/apauley/hledger-flow)
22

3+
## 0.12.4.0
4+
5+
- Update usage of hledger to reflect updated command-line flags of hledger version 1.15
6+
https://github.com/apauley/hledger-flow/issues/73
7+
- Compile with stackage lts-14.9
8+
39
## 0.12.3.1
410

511
Fixed a bug where:

app/Main.hs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import Turtle hiding (switch)
66
import Prelude hiding (FilePath, putStrLn)
77

88
import Options.Applicative
9-
import Data.Semigroup ((<>))
109

1110
import Hledger.Flow.Common
1211
import qualified Hledger.Flow.RuntimeOptions as RT

package.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: hledger-flow
2-
version: 0.12.3.2
2+
version: 0.12.4.0
33
synopsis: An hledger workflow focusing on automated statement import and classification.
44
category: Finance, Console
55
license: GPL-3

src/Hledger/Flow/Reports.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ unknownTransactions opts ch journal reportsDir year = do
7373

7474
incomeStatement :: [Text] -> ReportGenerator
7575
incomeStatement sharedOptions opts ch journal reportsDir year = do
76-
let reportArgs = ["incomestatement"] ++ sharedOptions ++ ["--cost", "--value"]
76+
let reportArgs = ["incomestatement"] ++ sharedOptions ++ ["--cost"]
7777
generateReport opts ch journal reportsDir year ("income-expenses" <.> "txt") reportArgs (not . T.null)
7878

7979
balanceSheet :: [Text] -> ReportGenerator

stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
# resolver: ./custom-snapshot.yaml
2020
# resolver: https://example.com/snapshots/2018-01-01.yaml
21-
resolver: nightly-2019-08-04
21+
resolver: lts-14.9
2222

2323
# User packages to be built.
2424
# Various formats can be used as shown in the example below.

0 commit comments

Comments
 (0)