From 5db62b37e18002e52f74c5517bc67c4d7aac1b7b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 27 Dec 2024 12:09:45 -1000 Subject: [PATCH] fix:close: --infer-costs no longer implies -x/--explicit [#1826] --- hledger/Hledger/Cli/Commands/Close.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hledger/Hledger/Cli/Commands/Close.hs b/hledger/Hledger/Cli/Commands/Close.hs index 676c4c4ff..a6479ea99 100644 --- a/hledger/Hledger/Cli/Commands/Close.hs +++ b/hledger/Hledger/Cli/Commands/Close.hs @@ -14,7 +14,6 @@ import Data.Maybe (fromMaybe) import qualified Data.Text as T import qualified Data.Text.IO as T import Data.Time.Calendar (addDays) -import Lens.Micro ((^.)) import System.Console.CmdArgs.Explicit as C import Hledger @@ -74,7 +73,7 @@ closeModeFromRawOpts rawopts = lastDef Close $ collectopts (\(name,_) -> readMay -- Debugger, beware: close is incredibly devious; simple rules combine to make a horrid maze. -- Tests are in hledger/test/close.test. -close copts@CliOpts{rawopts_=rawopts, reportspec_=rspec0} j = do +close CliOpts{rawopts_=rawopts, reportspec_=rspec0} j = do let mode_ = closeModeFromRawOpts rawopts defacctsq_ = if mode_ == Retain then Type [Revenue, Expense] else Type [Asset, Liability] @@ -119,7 +118,7 @@ close copts@CliOpts{rawopts_=rawopts, reportspec_=rspec0} j = do opendate = addDays 1 closedate -- should we show the amount(s) on the equity posting(s) ? - explicit = boolopt "explicit" rawopts || copts ^. infer_costs + explicit = boolopt "explicit" rawopts -- the accounts to close argsacctq = filterQuery (\q -> queryIsAcct q || queryIsType q) argsq