From dcbedadcc4eb2bb029293105563d9e65d6f9b73f Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 6 Oct 2018 09:16:25 -1000 Subject: [PATCH] add: fix wrong txn rendering during data entry & in journal file --- hledger/Hledger/Cli/Commands/Add.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hledger/Hledger/Cli/Commands/Add.hs b/hledger/Hledger/Cli/Commands/Add.hs index 1182f2aae..40c3875ce 100644 --- a/hledger/Hledger/Cli/Commands/Add.hs +++ b/hledger/Hledger/Cli/Commands/Add.hs @@ -141,7 +141,7 @@ getAndAddTransactions es@EntryState{..} = (do confirmedTransactionWizard es@EntryState{..} = do t <- transactionWizard es -- liftIO $ hPrintf stderr {- "Transaction entered:\n%s" -} (show t) - output $ show t + output $ showTransaction t y <- let def = "y" in retryMsg "Please enter y or n." $ parser ((fmap ('y' ==)) . headMay . map toLower . strip) $ @@ -155,7 +155,7 @@ transactionWizard es@EntryState{..} = do let es1@EntryState{esArgs=args1} = es{esArgs=drop 1 esArgs, esDefDate=date} (desc,comment) <- descriptionAndCommentWizard es1 let mbaset = similarTransaction es1 desc - when (isJust mbaset) $ liftIO $ hPrintf stderr "Using this similar transaction for defaults:\n%s" (show $ fromJust mbaset) + when (isJust mbaset) $ liftIO $ hPrintf stderr "Using this similar transaction for defaults:\n%s" (showTransaction $ fromJust mbaset) let es2 = es1{esArgs=drop 1 args1, esSimilarTransaction=mbaset} balancedPostingsWizard = do ps <- postingsWizard es2{esPostings=[]} @@ -379,7 +379,7 @@ journalAddTransaction j@Journal{jtxns=ts} opts t = do -- unelided shows all amounts explicitly, in case there's a price, cf #283 when (debug_ opts > 0) $ do putStrLn $ printf "\nAdded transaction to %s:" f - putStrLn =<< registerFromString (show t) + putStrLn =<< registerFromString (showTransaction t) return j{jtxns=ts++[t]} -- | Append a string, typically one or more transactions, to a journal