diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ User-visible changes in the hledger command line tool. +# 1.11.1 (2018/10/06) + +* fix wrong transaction rendering in balance assertion errors and when + using the add command + + # 1.11 (2018/9/30) * The default display order of accounts is now influenced by diff --git a/Hledger/Cli/Commands/Add.hs b/Hledger/Cli/Commands/Add.hs --- a/Hledger/Cli/Commands/Add.hs +++ b/Hledger/Cli/Commands/Add.hs @@ -141,7 +141,7 @@ 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 @@ 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 @@ -- 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 diff --git a/embeddedfiles/hledger-api.1 b/embeddedfiles/hledger-api.1 --- a/embeddedfiles/hledger-api.1 +++ b/embeddedfiles/hledger-api.1 @@ -1,5 +1,5 @@ -.TH "hledger\-api" "1" "September 2018" "hledger\-api 1.10.99" "hledger User Manuals" +.TH "hledger\-api" "1" "September 2018" "hledger\-api 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger-api.info b/embeddedfiles/hledger-api.info --- a/embeddedfiles/hledger-api.info +++ b/embeddedfiles/hledger-api.info @@ -3,8 +3,8 @@  File: hledger-api.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-api(1) hledger-api 1.10.99 -********************************** +hledger-api(1) hledger-api 1.11.1 +********************************* hledger-api is a simple web API server, intended to support client-side web apps operating on hledger data. It comes with a series of simple @@ -80,7 +80,7 @@  Tag Table: Node: Top72 -Node: OPTIONS1666 -Ref: #options1751 +Node: OPTIONS1664 +Ref: #options1749  End Tag Table diff --git a/embeddedfiles/hledger-api.txt b/embeddedfiles/hledger-api.txt --- a/embeddedfiles/hledger-api.txt +++ b/embeddedfiles/hledger-api.txt @@ -117,4 +117,4 @@ -hledger-api 1.10.99 September 2018 hledger-api(1) +hledger-api 1.11.1 September 2018 hledger-api(1) diff --git a/embeddedfiles/hledger-ui.1 b/embeddedfiles/hledger-ui.1 --- a/embeddedfiles/hledger-ui.1 +++ b/embeddedfiles/hledger-ui.1 @@ -1,5 +1,5 @@ -.TH "hledger\-ui" "1" "September 2018" "hledger\-ui 1.10.99" "hledger User Manuals" +.TH "hledger\-ui" "1" "September 2018" "hledger\-ui 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger-ui.info b/embeddedfiles/hledger-ui.info --- a/embeddedfiles/hledger-ui.info +++ b/embeddedfiles/hledger-ui.info @@ -3,8 +3,8 @@  File: hledger-ui.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.10.99 -******************************** +hledger-ui(1) hledger-ui 1.11.1 +******************************* hledger-ui is hledger's curses-style interface, providing an efficient full-window text UI for viewing accounts and transactions, and some @@ -380,19 +380,19 @@  Tag Table: Node: Top71 -Node: OPTIONS829 -Ref: #options926 -Node: KEYS4226 -Ref: #keys4321 -Node: SCREENS7280 -Ref: #screens7365 -Node: Accounts screen7455 -Ref: #accounts-screen7583 -Node: Register screen9813 -Ref: #register-screen9968 -Node: Transaction screen12042 -Ref: #transaction-screen12200 -Node: Error screen13070 -Ref: #error-screen13192 +Node: OPTIONS827 +Ref: #options924 +Node: KEYS4224 +Ref: #keys4319 +Node: SCREENS7278 +Ref: #screens7363 +Node: Accounts screen7453 +Ref: #accounts-screen7581 +Node: Register screen9811 +Ref: #register-screen9966 +Node: Transaction screen12040 +Ref: #transaction-screen12198 +Node: Error screen13068 +Ref: #error-screen13190  End Tag Table diff --git a/embeddedfiles/hledger-ui.txt b/embeddedfiles/hledger-ui.txt --- a/embeddedfiles/hledger-ui.txt +++ b/embeddedfiles/hledger-ui.txt @@ -387,4 +387,4 @@ -hledger-ui 1.10.99 September 2018 hledger-ui(1) +hledger-ui 1.11.1 September 2018 hledger-ui(1) diff --git a/embeddedfiles/hledger-web.1 b/embeddedfiles/hledger-web.1 --- a/embeddedfiles/hledger-web.1 +++ b/embeddedfiles/hledger-web.1 @@ -1,5 +1,5 @@ -.TH "hledger\-web" "1" "September 2018" "hledger\-web 1.10.99" "hledger User Manuals" +.TH "hledger\-web" "1" "September 2018" "hledger\-web 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger-web.info b/embeddedfiles/hledger-web.info --- a/embeddedfiles/hledger-web.info +++ b/embeddedfiles/hledger-web.info @@ -3,8 +3,8 @@  File: hledger-web.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-web(1) hledger-web 1.10.99 -********************************** +hledger-web(1) hledger-web 1.11.1 +********************************* hledger-web is hledger's web interface. It starts a simple web application for browsing and adding transactions, and optionally opens @@ -212,7 +212,7 @@  Tag Table: Node: Top72 -Node: OPTIONS3160 -Ref: #options3245 +Node: OPTIONS3158 +Ref: #options3243  End Tag Table diff --git a/embeddedfiles/hledger-web.txt b/embeddedfiles/hledger-web.txt --- a/embeddedfiles/hledger-web.txt +++ b/embeddedfiles/hledger-web.txt @@ -251,4 +251,4 @@ -hledger-web 1.10.99 September 2018 hledger-web(1) +hledger-web 1.11.1 September 2018 hledger-web(1) diff --git a/embeddedfiles/hledger.1 b/embeddedfiles/hledger.1 --- a/embeddedfiles/hledger.1 +++ b/embeddedfiles/hledger.1 @@ -1,6 +1,6 @@ .\"t -.TH "hledger" "1" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger" "1" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger.info b/embeddedfiles/hledger.info --- a/embeddedfiles/hledger.info +++ b/embeddedfiles/hledger.info @@ -3,8 +3,8 @@  File: hledger.info, Node: Top, Next: EXAMPLES, Up: (dir) -hledger(1) hledger 1.10.99 -************************** +hledger(1) hledger 1.11.1 +************************* This is hledger's command-line interface (there are also curses and web interfaces). Its basic function is to read a plain text file describing @@ -2467,142 +2467,142 @@  Tag Table: Node: Top68 -Node: EXAMPLES1890 -Ref: #examples1990 -Node: OPTIONS3636 -Ref: #options3738 -Node: General options4103 -Ref: #general-options4228 -Node: Command options6910 -Ref: #command-options7061 -Node: Command arguments7459 -Ref: #command-arguments7613 -Node: Argument files7734 -Ref: #argument-files7885 -Node: Special characters8151 -Ref: #special-characters8304 -Node: Input files9723 -Ref: #input-files9859 -Node: Smart dates11829 -Ref: #smart-dates11970 -Node: Report start & end date13376 -Ref: #report-start-end-date13546 -Node: Report intervals14611 -Ref: #report-intervals14774 -Node: Period expressions15175 -Ref: #period-expressions15335 -Node: Depth limiting19292 -Ref: #depth-limiting19436 -Node: Pivoting19778 -Ref: #pivoting19896 -Node: Cost21572 -Ref: #cost21680 -Node: Market value21798 -Ref: #market-value21933 -Node: Combining -B and -V23299 -Ref: #combining--b-and--v23462 -Node: Output destination23609 -Ref: #output-destination23771 -Node: Output format24054 -Ref: #output-format24206 -Node: Regular expressions24591 -Ref: #regular-expressions24728 -Node: QUERIES26089 -Ref: #queries26191 -Node: COMMANDS30153 -Ref: #commands30265 -Node: accounts31265 -Ref: #accounts31363 -Node: activity32609 -Ref: #activity32719 -Node: add33079 -Ref: #add33178 -Node: balance35839 -Ref: #balance35950 -Node: Classic balance report39033 -Ref: #classic-balance-report39206 -Node: Customising the classic balance report40575 -Ref: #customising-the-classic-balance-report40803 -Node: Colour support42877 -Ref: #colour-support43044 -Node: Flat mode43217 -Ref: #flat-mode43365 -Node: Depth limited balance reports43778 -Ref: #depth-limited-balance-reports43978 -Node: Multicolumn balance report44434 -Ref: #multicolumn-balance-report44632 -Node: Budget report49812 -Ref: #budget-report49955 -Ref: #output-format-152989 -Node: balancesheet53067 -Ref: #balancesheet53203 -Node: balancesheetequity55514 -Ref: #balancesheetequity55663 -Node: cashflow56200 -Ref: #cashflow56328 -Node: check-dates58451 -Ref: #check-dates58578 -Node: check-dupes58695 -Ref: #check-dupes58819 -Node: close58956 -Ref: #close59064 -Node: files59394 -Ref: #files59495 -Node: help59636 -Ref: #help59736 -Node: import60810 -Ref: #import60924 -Node: incomestatement61654 -Ref: #incomestatement61788 -Node: prices64192 -Ref: #prices64307 -Node: print64579 -Ref: #print64689 -Node: print-unique69583 -Ref: #print-unique69709 -Node: register69777 -Ref: #register69904 -Node: Custom register output74405 -Ref: #custom-register-output74534 -Node: register-match75764 -Ref: #register-match75898 -Node: rewrite76081 -Ref: #rewrite76196 -Node: roi76265 -Ref: #roi76363 -Node: stats76479 -Ref: #stats76578 -Node: tags77448 -Ref: #tags77546 -Node: test77782 -Ref: #test77866 -Node: ADD-ON COMMANDS78574 -Ref: #add-on-commands78684 -Node: Official add-ons79971 -Ref: #official-add-ons80111 -Node: api80198 -Ref: #api80287 -Node: ui80339 -Ref: #ui80438 -Node: web80496 -Ref: #web80585 -Node: Third party add-ons80631 -Ref: #third-party-add-ons80806 -Node: diff80941 -Ref: #diff81038 -Node: iadd81137 -Ref: #iadd81251 -Node: interest81334 -Ref: #interest81455 -Node: irr81550 -Ref: #irr81648 -Node: Experimental add-ons81726 -Ref: #experimental-add-ons81878 -Node: autosync82158 -Ref: #autosync82269 -Node: chart82508 -Ref: #chart82627 -Node: check82698 -Ref: #check82800 +Node: EXAMPLES1888 +Ref: #examples1988 +Node: OPTIONS3634 +Ref: #options3736 +Node: General options4101 +Ref: #general-options4226 +Node: Command options6908 +Ref: #command-options7059 +Node: Command arguments7457 +Ref: #command-arguments7611 +Node: Argument files7732 +Ref: #argument-files7883 +Node: Special characters8149 +Ref: #special-characters8302 +Node: Input files9721 +Ref: #input-files9857 +Node: Smart dates11827 +Ref: #smart-dates11968 +Node: Report start & end date13374 +Ref: #report-start-end-date13544 +Node: Report intervals14609 +Ref: #report-intervals14772 +Node: Period expressions15173 +Ref: #period-expressions15333 +Node: Depth limiting19290 +Ref: #depth-limiting19434 +Node: Pivoting19776 +Ref: #pivoting19894 +Node: Cost21570 +Ref: #cost21678 +Node: Market value21796 +Ref: #market-value21931 +Node: Combining -B and -V23297 +Ref: #combining--b-and--v23460 +Node: Output destination23607 +Ref: #output-destination23769 +Node: Output format24052 +Ref: #output-format24204 +Node: Regular expressions24589 +Ref: #regular-expressions24726 +Node: QUERIES26087 +Ref: #queries26189 +Node: COMMANDS30151 +Ref: #commands30263 +Node: accounts31263 +Ref: #accounts31361 +Node: activity32607 +Ref: #activity32717 +Node: add33077 +Ref: #add33176 +Node: balance35837 +Ref: #balance35948 +Node: Classic balance report39031 +Ref: #classic-balance-report39204 +Node: Customising the classic balance report40573 +Ref: #customising-the-classic-balance-report40801 +Node: Colour support42875 +Ref: #colour-support43042 +Node: Flat mode43215 +Ref: #flat-mode43363 +Node: Depth limited balance reports43776 +Ref: #depth-limited-balance-reports43976 +Node: Multicolumn balance report44432 +Ref: #multicolumn-balance-report44630 +Node: Budget report49810 +Ref: #budget-report49953 +Ref: #output-format-152987 +Node: balancesheet53065 +Ref: #balancesheet53201 +Node: balancesheetequity55512 +Ref: #balancesheetequity55661 +Node: cashflow56198 +Ref: #cashflow56326 +Node: check-dates58449 +Ref: #check-dates58576 +Node: check-dupes58693 +Ref: #check-dupes58817 +Node: close58954 +Ref: #close59062 +Node: files59392 +Ref: #files59493 +Node: help59634 +Ref: #help59734 +Node: import60808 +Ref: #import60922 +Node: incomestatement61652 +Ref: #incomestatement61786 +Node: prices64190 +Ref: #prices64305 +Node: print64577 +Ref: #print64687 +Node: print-unique69581 +Ref: #print-unique69707 +Node: register69775 +Ref: #register69902 +Node: Custom register output74403 +Ref: #custom-register-output74532 +Node: register-match75762 +Ref: #register-match75896 +Node: rewrite76079 +Ref: #rewrite76194 +Node: roi76263 +Ref: #roi76361 +Node: stats76477 +Ref: #stats76576 +Node: tags77446 +Ref: #tags77544 +Node: test77780 +Ref: #test77864 +Node: ADD-ON COMMANDS78572 +Ref: #add-on-commands78682 +Node: Official add-ons79969 +Ref: #official-add-ons80109 +Node: api80196 +Ref: #api80285 +Node: ui80337 +Ref: #ui80436 +Node: web80494 +Ref: #web80583 +Node: Third party add-ons80629 +Ref: #third-party-add-ons80804 +Node: diff80939 +Ref: #diff81036 +Node: iadd81135 +Ref: #iadd81249 +Node: interest81332 +Ref: #interest81453 +Node: irr81548 +Ref: #irr81646 +Node: Experimental add-ons81724 +Ref: #experimental-add-ons81876 +Node: autosync82156 +Ref: #autosync82267 +Node: chart82506 +Ref: #chart82625 +Node: check82696 +Ref: #check82798  End Tag Table diff --git a/embeddedfiles/hledger.txt b/embeddedfiles/hledger.txt --- a/embeddedfiles/hledger.txt +++ b/embeddedfiles/hledger.txt @@ -2230,4 +2230,4 @@ -hledger 1.10.99 September 2018 hledger(1) +hledger 1.11.1 September 2018 hledger(1) diff --git a/embeddedfiles/hledger_csv.5 b/embeddedfiles/hledger_csv.5 --- a/embeddedfiles/hledger_csv.5 +++ b/embeddedfiles/hledger_csv.5 @@ -1,5 +1,5 @@ -.TH "hledger_csv" "5" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger_csv" "5" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger_csv.info b/embeddedfiles/hledger_csv.info --- a/embeddedfiles/hledger_csv.info +++ b/embeddedfiles/hledger_csv.info @@ -3,8 +3,8 @@  File: hledger_csv.info, Node: Top, Next: CSV RULES, Up: (dir) -hledger_csv(5) hledger 1.10.99 -****************************** +hledger_csv(5) hledger 1.11.1 +***************************** hledger can read CSV (comma-separated value) files as if they were journal files, automatically converting each CSV record into a @@ -317,33 +317,33 @@  Tag Table: Node: Top72 -Node: CSV RULES2169 -Ref: #csv-rules2277 -Node: skip2539 -Ref: #skip2633 -Node: date-format2805 -Ref: #date-format2932 -Node: field list3438 -Ref: #field-list3575 -Node: field assignment4280 -Ref: #field-assignment4435 -Node: conditional block4939 -Ref: #conditional-block5093 -Node: include5989 -Ref: #include6119 -Node: newest-first6350 -Ref: #newest-first6464 -Node: CSV TIPS6875 -Ref: #csv-tips6969 -Node: CSV ordering7087 -Ref: #csv-ordering7205 -Node: CSV accounts7386 -Ref: #csv-accounts7524 -Node: CSV amounts7778 -Ref: #csv-amounts7924 -Node: CSV balance assertions8699 -Ref: #csv-balance-assertions8881 -Node: Reading multiple CSV files9086 -Ref: #reading-multiple-csv-files9256 +Node: CSV RULES2167 +Ref: #csv-rules2275 +Node: skip2537 +Ref: #skip2631 +Node: date-format2803 +Ref: #date-format2930 +Node: field list3436 +Ref: #field-list3573 +Node: field assignment4278 +Ref: #field-assignment4433 +Node: conditional block4937 +Ref: #conditional-block5091 +Node: include5987 +Ref: #include6117 +Node: newest-first6348 +Ref: #newest-first6462 +Node: CSV TIPS6873 +Ref: #csv-tips6967 +Node: CSV ordering7085 +Ref: #csv-ordering7203 +Node: CSV accounts7384 +Ref: #csv-accounts7522 +Node: CSV amounts7776 +Ref: #csv-amounts7922 +Node: CSV balance assertions8697 +Ref: #csv-balance-assertions8879 +Node: Reading multiple CSV files9084 +Ref: #reading-multiple-csv-files9254  End Tag Table diff --git a/embeddedfiles/hledger_csv.txt b/embeddedfiles/hledger_csv.txt --- a/embeddedfiles/hledger_csv.txt +++ b/embeddedfiles/hledger_csv.txt @@ -249,4 +249,4 @@ -hledger 1.10.99 September 2018 hledger_csv(5) +hledger 1.11.1 September 2018 hledger_csv(5) diff --git a/embeddedfiles/hledger_journal.5 b/embeddedfiles/hledger_journal.5 --- a/embeddedfiles/hledger_journal.5 +++ b/embeddedfiles/hledger_journal.5 @@ -1,6 +1,6 @@ .\"t -.TH "hledger_journal" "5" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger_journal" "5" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger_journal.info b/embeddedfiles/hledger_journal.info --- a/embeddedfiles/hledger_journal.info +++ b/embeddedfiles/hledger_journal.info @@ -4,8 +4,8 @@  File: hledger_journal.info, Node: Top, Next: FILE FORMAT, Up: (dir) -hledger_journal(5) hledger 1.10.99 -********************************** +hledger_journal(5) hledger 1.11.1 +********************************* hledger's usual data source is a plain text file containing journal entries in hledger journal format. This file represents a standard @@ -1393,93 +1393,93 @@  Tag Table: Node: Top76 -Node: FILE FORMAT2378 -Ref: #file-format2502 -Node: Transactions2789 -Ref: #transactions2910 -Node: Postings3594 -Ref: #postings3721 -Node: Dates4716 -Ref: #dates4831 -Node: Simple dates4896 -Ref: #simple-dates5022 -Node: Secondary dates5388 -Ref: #secondary-dates5542 -Node: Posting dates7105 -Ref: #posting-dates7234 -Node: Status8608 -Ref: #status8728 -Node: Description10436 -Ref: #description10574 -Node: Payee and note10893 -Ref: #payee-and-note11007 -Node: Account names11249 -Ref: #account-names11392 -Node: Amounts11879 -Ref: #amounts12015 -Node: Virtual Postings15032 -Ref: #virtual-postings15191 -Node: Balance Assertions16411 -Ref: #balance-assertions16586 -Node: Assertions and ordering17482 -Ref: #assertions-and-ordering17668 -Node: Assertions and included files18368 -Ref: #assertions-and-included-files18609 -Node: Assertions and multiple -f options18942 -Ref: #assertions-and-multiple--f-options19196 -Node: Assertions and commodities19328 -Ref: #assertions-and-commodities19563 -Node: Assertions and subaccounts20259 -Ref: #assertions-and-subaccounts20491 -Node: Assertions and virtual postings21012 -Ref: #assertions-and-virtual-postings21219 -Node: Balance Assignments21361 -Ref: #balance-assignments21542 -Node: Transaction prices22662 -Ref: #transaction-prices22831 -Node: Comments25099 -Ref: #comments25233 -Node: Tags26403 -Ref: #tags26521 -Node: Directives27923 -Ref: #directives28066 -Node: Comment blocks33948 -Ref: #comment-blocks34093 -Node: Including other files34269 -Ref: #including-other-files34449 -Node: Default year34857 -Ref: #default-year35026 -Node: Declaring commodities35449 -Ref: #declaring-commodities35632 -Node: Default commodity36859 -Ref: #default-commodity37035 -Node: Market prices37671 -Ref: #market-prices37836 -Node: Declaring accounts38677 -Ref: #declaring-accounts38856 -Node: Account display order39406 -Ref: #account-display-order39596 -Node: Rewriting accounts40617 -Ref: #rewriting-accounts40805 -Node: Basic aliases41539 -Ref: #basic-aliases41685 -Node: Regex aliases42389 -Ref: #regex-aliases42560 -Node: Multiple aliases43278 -Ref: #multiple-aliases43453 -Node: end aliases43951 -Ref: #end-aliases44098 -Node: Default parent account44199 -Ref: #default-parent-account44367 -Node: Periodic transactions45251 -Ref: #periodic-transactions45433 -Node: Forecasting with periodic transactions46644 -Ref: #forecasting-with-periodic-transactions46887 -Node: Budgeting with periodic transactions48574 -Ref: #budgeting-with-periodic-transactions48813 -Node: Transaction Modifiers49272 -Ref: #transaction-modifiers49435 -Node: EDITOR SUPPORT50691 -Ref: #editor-support50809 +Node: FILE FORMAT2376 +Ref: #file-format2500 +Node: Transactions2787 +Ref: #transactions2908 +Node: Postings3592 +Ref: #postings3719 +Node: Dates4714 +Ref: #dates4829 +Node: Simple dates4894 +Ref: #simple-dates5020 +Node: Secondary dates5386 +Ref: #secondary-dates5540 +Node: Posting dates7103 +Ref: #posting-dates7232 +Node: Status8606 +Ref: #status8726 +Node: Description10434 +Ref: #description10572 +Node: Payee and note10891 +Ref: #payee-and-note11005 +Node: Account names11247 +Ref: #account-names11390 +Node: Amounts11877 +Ref: #amounts12013 +Node: Virtual Postings15030 +Ref: #virtual-postings15189 +Node: Balance Assertions16409 +Ref: #balance-assertions16584 +Node: Assertions and ordering17480 +Ref: #assertions-and-ordering17666 +Node: Assertions and included files18366 +Ref: #assertions-and-included-files18607 +Node: Assertions and multiple -f options18940 +Ref: #assertions-and-multiple--f-options19194 +Node: Assertions and commodities19326 +Ref: #assertions-and-commodities19561 +Node: Assertions and subaccounts20257 +Ref: #assertions-and-subaccounts20489 +Node: Assertions and virtual postings21010 +Ref: #assertions-and-virtual-postings21217 +Node: Balance Assignments21359 +Ref: #balance-assignments21540 +Node: Transaction prices22660 +Ref: #transaction-prices22829 +Node: Comments25097 +Ref: #comments25231 +Node: Tags26401 +Ref: #tags26519 +Node: Directives27921 +Ref: #directives28064 +Node: Comment blocks33946 +Ref: #comment-blocks34091 +Node: Including other files34267 +Ref: #including-other-files34447 +Node: Default year34855 +Ref: #default-year35024 +Node: Declaring commodities35447 +Ref: #declaring-commodities35630 +Node: Default commodity36857 +Ref: #default-commodity37033 +Node: Market prices37669 +Ref: #market-prices37834 +Node: Declaring accounts38675 +Ref: #declaring-accounts38854 +Node: Account display order39404 +Ref: #account-display-order39594 +Node: Rewriting accounts40615 +Ref: #rewriting-accounts40803 +Node: Basic aliases41537 +Ref: #basic-aliases41683 +Node: Regex aliases42387 +Ref: #regex-aliases42558 +Node: Multiple aliases43276 +Ref: #multiple-aliases43451 +Node: end aliases43949 +Ref: #end-aliases44096 +Node: Default parent account44197 +Ref: #default-parent-account44365 +Node: Periodic transactions45249 +Ref: #periodic-transactions45431 +Node: Forecasting with periodic transactions46642 +Ref: #forecasting-with-periodic-transactions46885 +Node: Budgeting with periodic transactions48572 +Ref: #budgeting-with-periodic-transactions48811 +Node: Transaction Modifiers49270 +Ref: #transaction-modifiers49433 +Node: EDITOR SUPPORT50689 +Ref: #editor-support50807  End Tag Table diff --git a/embeddedfiles/hledger_journal.txt b/embeddedfiles/hledger_journal.txt --- a/embeddedfiles/hledger_journal.txt +++ b/embeddedfiles/hledger_journal.txt @@ -1151,4 +1151,4 @@ -hledger 1.10.99 September 2018 hledger_journal(5) +hledger 1.11.1 September 2018 hledger_journal(5) diff --git a/embeddedfiles/hledger_timeclock.5 b/embeddedfiles/hledger_timeclock.5 --- a/embeddedfiles/hledger_timeclock.5 +++ b/embeddedfiles/hledger_timeclock.5 @@ -1,5 +1,5 @@ -.TH "hledger_timeclock" "5" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger_timeclock" "5" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger_timeclock.info b/embeddedfiles/hledger_timeclock.info --- a/embeddedfiles/hledger_timeclock.info +++ b/embeddedfiles/hledger_timeclock.info @@ -4,8 +4,8 @@  File: hledger_timeclock.info, Node: Top, Up: (dir) -hledger_timeclock(5) hledger 1.10.99 -************************************ +hledger_timeclock(5) hledger 1.11.1 +*********************************** hledger can read timeclock files. As with Ledger, these are (a subset of) timeclock.el's format, containing clock-in and clock-out entries as diff --git a/embeddedfiles/hledger_timeclock.txt b/embeddedfiles/hledger_timeclock.txt --- a/embeddedfiles/hledger_timeclock.txt +++ b/embeddedfiles/hledger_timeclock.txt @@ -77,4 +77,4 @@ -hledger 1.10.99 September 2018 hledger_timeclock(5) +hledger 1.11.1 September 2018 hledger_timeclock(5) diff --git a/embeddedfiles/hledger_timedot.5 b/embeddedfiles/hledger_timedot.5 --- a/embeddedfiles/hledger_timedot.5 +++ b/embeddedfiles/hledger_timedot.5 @@ -1,5 +1,5 @@ -.TH "hledger_timedot" "5" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger_timedot" "5" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/embeddedfiles/hledger_timedot.info b/embeddedfiles/hledger_timedot.info --- a/embeddedfiles/hledger_timedot.info +++ b/embeddedfiles/hledger_timedot.info @@ -4,8 +4,8 @@  File: hledger_timedot.info, Node: Top, Next: FILE FORMAT, Up: (dir) -hledger_timedot(5) hledger 1.10.99 -********************************** +hledger_timedot(5) hledger 1.11.1 +********************************* Timedot is a plain text format for logging dated, categorised quantities (of time, usually), supported by hledger. It is convenient for @@ -110,7 +110,7 @@  Tag Table: Node: Top76 -Node: FILE FORMAT813 -Ref: #file-format914 +Node: FILE FORMAT811 +Ref: #file-format912  End Tag Table diff --git a/embeddedfiles/hledger_timedot.txt b/embeddedfiles/hledger_timedot.txt --- a/embeddedfiles/hledger_timedot.txt +++ b/embeddedfiles/hledger_timedot.txt @@ -124,4 +124,4 @@ -hledger 1.10.99 September 2018 hledger_timedot(5) +hledger 1.11.1 September 2018 hledger_timedot(5) diff --git a/hledger.1 b/hledger.1 --- a/hledger.1 +++ b/hledger.1 @@ -1,6 +1,6 @@ .\"t -.TH "hledger" "1" "September 2018" "hledger 1.10.99" "hledger User Manuals" +.TH "hledger" "1" "September 2018" "hledger 1.11.1" "hledger User Manuals" diff --git a/hledger.cabal b/hledger.cabal --- a/hledger.cabal +++ b/hledger.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: a53ed723ef2c43c6425e4bf2d40ae7a37b9816dcdbd49795a7a7972b4b4ca203 +-- hash: 1da5c664b1043cb4783947a5c5ae448812f4098aec23fb3123031982aa353ba4 name: hledger -version: 1.11 +version: 1.11.1 synopsis: Command-line interface for the hledger accounting tool description: This is hledger's command-line interface. Its basic function is to read a plain text file describing @@ -111,7 +111,7 @@ other-modules: Paths_hledger ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.11" + cpp-options: -DVERSION="1.11.1" build-depends: Decimal , Diff @@ -129,7 +129,7 @@ , hashable >=1.2.4 , haskeline >=0.6 , here - , hledger-lib >=1.11 && <1.12 + , hledger-lib >=1.11.1 && <1.12 , lucid , megaparsec >=6.4.1 && <7 , mtl @@ -164,7 +164,7 @@ hs-source-dirs: app ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.11" + cpp-options: -DVERSION="1.11.1" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -181,7 +181,7 @@ , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11 && <1.12 + , hledger-lib >=1.11.1 && <1.12 , megaparsec >=6.4.1 && <7 , mtl , mtl-compat @@ -218,7 +218,7 @@ hs-source-dirs: test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.11" + cpp-options: -DVERSION="1.11.1" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -235,7 +235,7 @@ , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11 && <1.12 + , hledger-lib >=1.11.1 && <1.12 , megaparsec >=6.4.1 && <7 , mtl , mtl-compat @@ -289,7 +289,7 @@ , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11 && <1.12 + , hledger-lib >=1.11.1 && <1.12 , html , megaparsec >=6.4.1 && <7 , mtl diff --git a/hledger.info b/hledger.info --- a/hledger.info +++ b/hledger.info @@ -3,8 +3,8 @@  File: hledger.info, Node: Top, Next: EXAMPLES, Up: (dir) -hledger(1) hledger 1.10.99 -************************** +hledger(1) hledger 1.11.1 +************************* This is hledger's command-line interface (there are also curses and web interfaces). Its basic function is to read a plain text file describing @@ -2467,142 +2467,142 @@  Tag Table: Node: Top68 -Node: EXAMPLES1890 -Ref: #examples1990 -Node: OPTIONS3636 -Ref: #options3738 -Node: General options4103 -Ref: #general-options4228 -Node: Command options6910 -Ref: #command-options7061 -Node: Command arguments7459 -Ref: #command-arguments7613 -Node: Argument files7734 -Ref: #argument-files7885 -Node: Special characters8151 -Ref: #special-characters8304 -Node: Input files9723 -Ref: #input-files9859 -Node: Smart dates11829 -Ref: #smart-dates11970 -Node: Report start & end date13376 -Ref: #report-start-end-date13546 -Node: Report intervals14611 -Ref: #report-intervals14774 -Node: Period expressions15175 -Ref: #period-expressions15335 -Node: Depth limiting19292 -Ref: #depth-limiting19436 -Node: Pivoting19778 -Ref: #pivoting19896 -Node: Cost21572 -Ref: #cost21680 -Node: Market value21798 -Ref: #market-value21933 -Node: Combining -B and -V23299 -Ref: #combining--b-and--v23462 -Node: Output destination23609 -Ref: #output-destination23771 -Node: Output format24054 -Ref: #output-format24206 -Node: Regular expressions24591 -Ref: #regular-expressions24728 -Node: QUERIES26089 -Ref: #queries26191 -Node: COMMANDS30153 -Ref: #commands30265 -Node: accounts31265 -Ref: #accounts31363 -Node: activity32609 -Ref: #activity32719 -Node: add33079 -Ref: #add33178 -Node: balance35839 -Ref: #balance35950 -Node: Classic balance report39033 -Ref: #classic-balance-report39206 -Node: Customising the classic balance report40575 -Ref: #customising-the-classic-balance-report40803 -Node: Colour support42877 -Ref: #colour-support43044 -Node: Flat mode43217 -Ref: #flat-mode43365 -Node: Depth limited balance reports43778 -Ref: #depth-limited-balance-reports43978 -Node: Multicolumn balance report44434 -Ref: #multicolumn-balance-report44632 -Node: Budget report49812 -Ref: #budget-report49955 -Ref: #output-format-152989 -Node: balancesheet53067 -Ref: #balancesheet53203 -Node: balancesheetequity55514 -Ref: #balancesheetequity55663 -Node: cashflow56200 -Ref: #cashflow56328 -Node: check-dates58451 -Ref: #check-dates58578 -Node: check-dupes58695 -Ref: #check-dupes58819 -Node: close58956 -Ref: #close59064 -Node: files59394 -Ref: #files59495 -Node: help59636 -Ref: #help59736 -Node: import60810 -Ref: #import60924 -Node: incomestatement61654 -Ref: #incomestatement61788 -Node: prices64192 -Ref: #prices64307 -Node: print64579 -Ref: #print64689 -Node: print-unique69583 -Ref: #print-unique69709 -Node: register69777 -Ref: #register69904 -Node: Custom register output74405 -Ref: #custom-register-output74534 -Node: register-match75764 -Ref: #register-match75898 -Node: rewrite76081 -Ref: #rewrite76196 -Node: roi76265 -Ref: #roi76363 -Node: stats76479 -Ref: #stats76578 -Node: tags77448 -Ref: #tags77546 -Node: test77782 -Ref: #test77866 -Node: ADD-ON COMMANDS78574 -Ref: #add-on-commands78684 -Node: Official add-ons79971 -Ref: #official-add-ons80111 -Node: api80198 -Ref: #api80287 -Node: ui80339 -Ref: #ui80438 -Node: web80496 -Ref: #web80585 -Node: Third party add-ons80631 -Ref: #third-party-add-ons80806 -Node: diff80941 -Ref: #diff81038 -Node: iadd81137 -Ref: #iadd81251 -Node: interest81334 -Ref: #interest81455 -Node: irr81550 -Ref: #irr81648 -Node: Experimental add-ons81726 -Ref: #experimental-add-ons81878 -Node: autosync82158 -Ref: #autosync82269 -Node: chart82508 -Ref: #chart82627 -Node: check82698 -Ref: #check82800 +Node: EXAMPLES1888 +Ref: #examples1988 +Node: OPTIONS3634 +Ref: #options3736 +Node: General options4101 +Ref: #general-options4226 +Node: Command options6908 +Ref: #command-options7059 +Node: Command arguments7457 +Ref: #command-arguments7611 +Node: Argument files7732 +Ref: #argument-files7883 +Node: Special characters8149 +Ref: #special-characters8302 +Node: Input files9721 +Ref: #input-files9857 +Node: Smart dates11827 +Ref: #smart-dates11968 +Node: Report start & end date13374 +Ref: #report-start-end-date13544 +Node: Report intervals14609 +Ref: #report-intervals14772 +Node: Period expressions15173 +Ref: #period-expressions15333 +Node: Depth limiting19290 +Ref: #depth-limiting19434 +Node: Pivoting19776 +Ref: #pivoting19894 +Node: Cost21570 +Ref: #cost21678 +Node: Market value21796 +Ref: #market-value21931 +Node: Combining -B and -V23297 +Ref: #combining--b-and--v23460 +Node: Output destination23607 +Ref: #output-destination23769 +Node: Output format24052 +Ref: #output-format24204 +Node: Regular expressions24589 +Ref: #regular-expressions24726 +Node: QUERIES26087 +Ref: #queries26189 +Node: COMMANDS30151 +Ref: #commands30263 +Node: accounts31263 +Ref: #accounts31361 +Node: activity32607 +Ref: #activity32717 +Node: add33077 +Ref: #add33176 +Node: balance35837 +Ref: #balance35948 +Node: Classic balance report39031 +Ref: #classic-balance-report39204 +Node: Customising the classic balance report40573 +Ref: #customising-the-classic-balance-report40801 +Node: Colour support42875 +Ref: #colour-support43042 +Node: Flat mode43215 +Ref: #flat-mode43363 +Node: Depth limited balance reports43776 +Ref: #depth-limited-balance-reports43976 +Node: Multicolumn balance report44432 +Ref: #multicolumn-balance-report44630 +Node: Budget report49810 +Ref: #budget-report49953 +Ref: #output-format-152987 +Node: balancesheet53065 +Ref: #balancesheet53201 +Node: balancesheetequity55512 +Ref: #balancesheetequity55661 +Node: cashflow56198 +Ref: #cashflow56326 +Node: check-dates58449 +Ref: #check-dates58576 +Node: check-dupes58693 +Ref: #check-dupes58817 +Node: close58954 +Ref: #close59062 +Node: files59392 +Ref: #files59493 +Node: help59634 +Ref: #help59734 +Node: import60808 +Ref: #import60922 +Node: incomestatement61652 +Ref: #incomestatement61786 +Node: prices64190 +Ref: #prices64305 +Node: print64577 +Ref: #print64687 +Node: print-unique69581 +Ref: #print-unique69707 +Node: register69775 +Ref: #register69902 +Node: Custom register output74403 +Ref: #custom-register-output74532 +Node: register-match75762 +Ref: #register-match75896 +Node: rewrite76079 +Ref: #rewrite76194 +Node: roi76263 +Ref: #roi76361 +Node: stats76477 +Ref: #stats76576 +Node: tags77446 +Ref: #tags77544 +Node: test77780 +Ref: #test77864 +Node: ADD-ON COMMANDS78572 +Ref: #add-on-commands78682 +Node: Official add-ons79969 +Ref: #official-add-ons80109 +Node: api80196 +Ref: #api80285 +Node: ui80337 +Ref: #ui80436 +Node: web80494 +Ref: #web80583 +Node: Third party add-ons80629 +Ref: #third-party-add-ons80804 +Node: diff80939 +Ref: #diff81036 +Node: iadd81135 +Ref: #iadd81249 +Node: interest81332 +Ref: #interest81453 +Node: irr81548 +Ref: #irr81646 +Node: Experimental add-ons81724 +Ref: #experimental-add-ons81876 +Node: autosync82156 +Ref: #autosync82267 +Node: chart82506 +Ref: #chart82625 +Node: check82696 +Ref: #check82798  End Tag Table diff --git a/hledger.txt b/hledger.txt --- a/hledger.txt +++ b/hledger.txt @@ -2230,4 +2230,4 @@ -hledger 1.10.99 September 2018 hledger(1) +hledger 1.11.1 September 2018 hledger(1)