slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: fix wrong txn rendering during data entry & in journal file

Browse Source
This commit is contained in:
Simon Michael 2018-10-06 09:16:25 -10:00
parent 2ba135e402
commit dcbedadcc4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger/Hledger/Cli/Commands/Add.hs
View File

@ -141,7 +141,7 @@ getAndAddTransactions es@EntryState{..} = (do
confirmedTransactionWizard es@EntryState{..} = do confirmedTransactionWizard es@EntryState{..} = do
t <- transactionWizard es t <- transactionWizard es
-- liftIO $ hPrintf stderr {- "Transaction entered:\n%s" -} (show t) -- liftIO $ hPrintf stderr {- "Transaction entered:\n%s" -} (show t)
output $ show t output $ showTransaction t
y <- let def = "y" in y <- let def = "y" in
retryMsg "Please enter y or n." $ retryMsg "Please enter y or n." $
parser ((fmap ('y' ==)) . headMay . map toLower . strip) $ 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} let es1@EntryState{esArgs=args1} = es{esArgs=drop 1 esArgs, esDefDate=date}
(desc,comment) <- descriptionAndCommentWizard es1 (desc,comment) <- descriptionAndCommentWizard es1
let mbaset = similarTransaction es1 desc 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} let es2 = es1{esArgs=drop 1 args1, esSimilarTransaction=mbaset}
balancedPostingsWizard = do balancedPostingsWizard = do
ps <- postingsWizard es2{esPostings=[]} 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 -- unelided shows all amounts explicitly, in case there's a price, cf #283
when (debug_ opts > 0) $ do when (debug_ opts > 0) $ do
putStrLn $ printf "\nAdded transaction to %s:" f putStrLn $ printf "\nAdded transaction to %s:" f
putStrLn =<< registerFromString (show t) putStrLn =<< registerFromString (showTransaction t)
return j{jtxns=ts++[t]} return j{jtxns=ts++[t]}
-- | Append a string, typically one or more transactions, to a journal -- | Append a string, typically one or more transactions, to a journal