diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ User-visible changes in hledger-ui. See also the hledger changelog. +# 1.18.1 2020-06-21 + +- Fix regression in 'F' (#1255) (Dmitry Astapov) + # 1.18 2020-06-07 - builds with hledger 1.18 diff --git a/Hledger/UI/TransactionScreen.hs b/Hledger/UI/TransactionScreen.hs --- a/Hledger/UI/TransactionScreen.hs +++ b/Hledger/UI/TransactionScreen.hs @@ -73,7 +73,7 @@ where maincontent = Widget Greedy Greedy $ do let - prices = journalPriceOracle j + prices = journalPriceOracle (infer_value_ ropts) j styles = journalCommodityStyles j periodlast = fromMaybe (error' "TransactionScreen: expected a non-empty journal") $ -- XXX shouldn't happen diff --git a/Hledger/UI/UIState.hs b/Hledger/UI/UIState.hs --- a/Hledger/UI/UIState.hs +++ b/Hledger/UI/UIState.hs @@ -14,6 +14,7 @@ import Data.List import Data.Text.Zipper (gotoEOL) import Data.Time.Calendar (Day) +import Data.Maybe (fromMaybe) import Hledger import Hledger.Cli.CliOptions @@ -172,7 +173,7 @@ forecast' = case forecast_ ropts of Just _ -> Nothing - Nothing -> forecastPeriodFromRawOpts d $ rawopts_ copts + Nothing -> Just $ fromMaybe nulldatespan $ forecastPeriodFromRawOpts d $ rawopts_ copts -- | Toggle between showing all and showing only real (non-virtual) items. toggleReal :: UIState -> UIState diff --git a/hledger-ui.1 b/hledger-ui.1 --- a/hledger-ui.1 +++ b/hledger-ui.1 @@ -1,5 +1,5 @@ -.TH "hledger-ui" "1" "June 2020" "hledger-ui 1.18" "hledger User Manuals" +.TH "hledger-ui" "1" "June 2020" "hledger-ui 1.18.1" "hledger User Manuals" @@ -139,12 +139,19 @@ hledger-ui/hledger-web) .TP \f[B]\f[CB]-B --cost\f[B]\f[R] -convert amounts to their cost at transaction time (using the transaction -price, if any) +convert amounts to their cost/selling amount at transaction time .TP -\f[B]\f[CB]-V --value\f[B]\f[R] -convert amounts to their market value on the report end date (using the -most recent applicable market price, if any) +\f[B]\f[CB]-V --market\f[B]\f[R] +convert amounts to their market value in default valuation commodities +.TP +\f[B]\f[CB]-X --exchange=COMM\f[B]\f[R] +convert amounts to their market value in commodity COMM +.TP +\f[B]\f[CB]--value\f[B]\f[R] +convert amounts to cost or market value, more flexibly than -B/-V/-X +.TP +\f[B]\f[CB]--infer-value\f[B]\f[R] +with -V/-X/--value, also infer market prices from transactions .TP \f[B]\f[CB]--auto\f[B]\f[R] apply automated posting rules to modify transactions. diff --git a/hledger-ui.cabal b/hledger-ui.cabal --- a/hledger-ui.cabal +++ b/hledger-ui.cabal @@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 315b95d3ecfb2c8ff5debfcbcd2d1ef92989941f0cdfec48b8c39a4535a8228a +-- hash: 75705f545e9d160a3a9b275ecd4b9c17835b8e2d103fdd12f6329f8158f80adc name: hledger-ui -version: 1.18 +version: 1.18.1 synopsis: Curses-style terminal interface for the hledger accounting system description: A simple curses-style terminal user interface for the hledger accounting system. It can be a more convenient way to browse your accounts than the CLI. @@ -64,7 +64,7 @@ hs-source-dirs: ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.18" + cpp-options: -DVERSION="1.18.1" build-depends: ansi-terminal >=0.6.2.3 , async @@ -77,8 +77,8 @@ , extra >=1.6.3 , filepath , fsnotify >=0.2.1.2 && <0.4 - , hledger >=1.18 && <1.19 - , hledger-lib >=1.18 && <1.19 + , hledger >=1.18.1 && <1.19 + , hledger-lib >=1.18.1 && <1.19 , megaparsec >=7.0.0 && <8.1 , microlens >=0.4 , microlens-platform >=0.2.3.1 diff --git a/hledger-ui.info b/hledger-ui.info --- a/hledger-ui.info +++ b/hledger-ui.info @@ -3,8 +3,8 @@  File: hledger-ui.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.18 -***************************** +hledger-ui(1) hledger-ui 1.18.1 +******************************* hledger-ui - terminal interface for the hledger accounting tool @@ -152,12 +152,21 @@ hledger-ui/hledger-web) '-B --cost' - convert amounts to their cost at transaction time (using the - transaction price, if any) -'-V --value' + convert amounts to their cost/selling amount at transaction time +'-V --market' - convert amounts to their market value on the report end date (using - the most recent applicable market price, if any) + convert amounts to their market value in default valuation + commodities +'-X --exchange=COMM' + + convert amounts to their market value in commodity COMM +'--value' + + convert amounts to cost or market value, more flexibly than + -B/-V/-X +'--infer-value' + + with -V/-X/-value, also infer market prices from transactions '--auto' apply automated posting rules to modify transactions. @@ -499,26 +508,26 @@  Tag Table: Node: Top71 -Node: OPTIONS1470 -Ref: #options1567 -Node: KEYS4998 -Ref: #keys5093 -Node: SCREENS9369 -Ref: #screens9474 -Node: Accounts screen9564 -Ref: #accounts-screen9692 -Node: Register screen11908 -Ref: #register-screen12063 -Node: Transaction screen14060 -Ref: #transaction-screen14218 -Node: Error screen15088 -Ref: #error-screen15210 -Node: ENVIRONMENT15454 -Ref: #environment15568 -Node: FILES16375 -Ref: #files16474 -Node: BUGS16687 -Ref: #bugs16764 +Node: OPTIONS1474 +Ref: #options1571 +Node: KEYS5186 +Ref: #keys5281 +Node: SCREENS9557 +Ref: #screens9662 +Node: Accounts screen9752 +Ref: #accounts-screen9880 +Node: Register screen12096 +Ref: #register-screen12251 +Node: Transaction screen14248 +Ref: #transaction-screen14406 +Node: Error screen15276 +Ref: #error-screen15398 +Node: ENVIRONMENT15642 +Ref: #environment15756 +Node: FILES16563 +Ref: #files16662 +Node: BUGS16875 +Ref: #bugs16952  End Tag Table diff --git a/hledger-ui.txt b/hledger-ui.txt --- a/hledger-ui.txt +++ b/hledger-ui.txt @@ -135,13 +135,22 @@ hledger-ui/hledger-web) -B --cost - convert amounts to their cost at transaction time (using the - transaction price, if any) + convert amounts to their cost/selling amount at transaction time - -V --value - convert amounts to their market value on the report end date - (using the most recent applicable market price, if any) + -V --market + convert amounts to their market value in default valuation com- + modities + -X --exchange=COMM + convert amounts to their market value in commodity COMM + + --value + convert amounts to cost or market value, more flexibly than + -B/-V/-X + + --infer-value + with -V/-X/--value, also infer market prices from transactions + --auto apply automated posting rules to modify transactions. --forecast @@ -441,4 +450,4 @@ -hledger-ui 1.18 June 2020 hledger-ui(1) +hledger-ui 1.18.1 June 2020 hledger-ui(1)