slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,160 Commits 1 Branch 0 Tags 88 MiB
3aba40c5b6
Commit Graph

332 Commits

Author SHA1 Message Date
Sergey Astanin
86fab58e6a Allow UTF8 in ledgers (account names, descriptions). 
This patch fixes broken layout of some commands when there is Unicode
text in the ledger file.

I substituted System.IO functions with System.IO.UTF8. Now all strings
are Unicode internally, and take's and length's work correctly.
In particular, add, balance, hist, print and register commands seem
to work correctly; ui is still broken for me, I didn't try web.

I decode command line arguments from UTF8 forcefully, to permit
searches for accounts and descriptions with Unicode (otherwise, it
does not work).

The patch adds an additional dependency: utf8-string.

This patch does not include new test cases.
 2009-05-14 20:44:06 +00:00
Simon Michael
b103f6a0d8 be more accurate about checking balanced amounts, don't rely on display precision 2009-05-16 22:54:12 +00:00
Simon Michael
c5e7b12a59 add command, reads transactions interactively and adds them to the ledger 2009-04-08 05:30:26 +00:00
Simon Michael
32a3af8334 transactionamount -> postingamount 2009-04-07 21:18:51 +00:00
Simon Michael
d8fe2aabb2 drop TimeLog, it's no longer needed 2009-04-03 11:05:16 +00:00
Simon Michael
1548e84aa9 add file path field to RawLedger 2009-04-08 03:40:05 +00:00
Simon Michael
b60f9187c0 refactor, moving generic io functions into Ledger.IO 2009-04-04 08:50:36 +00:00
Simon Michael
ab94a6e9a2 --uncleared option 2009-04-03 11:45:56 +00:00
Simon Michael
0f1cbef9a8 namegeddon! conform to new terminology in ledger 3, more or less 
This renames RawTransaction -> Posting and Entry -> LedgerTransaction,
plus a bunch more cleanups for consistency.  So while ledger 3 has
transactions containing postings, and so do we when speaking to users,
internally we call ledger 3's transactions LedgerTransaction, and we keep
our old Transaction type as well, because it's useful and used all over
the place. To review:

- ledger 2 had Entrys containing Transactions.

- hledger 0.4 had Entrys containing RawTransactions, and Transactions
  which are a RawTransaction with its parent Entry's info added.
  Transactions are what we most work with when reporting and are
  ubiquitous in the code and docs.

- ledger 3 has Transactions containing Postings.

- hledger 0.5 now has LedgerTransactions containing Postings, with
  Transactions kept as before (a Posting plus it's parent's info).  These
  could be named PartialTransactions or TransactionPostings, but it gets
  too verbose and obscure for devs and users.
 2009-04-03 10:58:05 +00:00
Simon Michael
1fc9db3af5 individual transactions now have a cleared status 2009-01-23 00:14:12 +00:00
Simon Michael
55c0a688c0 that parser is not right, breaks hours period selection 2009-01-23 18:10:17 +00:00
Simon Michael
fdc13f6f43 smart dates: make "this" optional 2009-01-23 02:27:56 +00:00
Simon Michael
415c48d855 getCurrentLocalTime 2009-01-25 06:47:05 +00:00
Simon Michael
26594287cc strip cleanup 2009-03-15 03:57:19 +00:00
Simon Michael
f7b2e62bcb cacheLedger cleanup 2009-03-17 19:50:43 +00:00
Simon Michael
38fd44917c test and fix for auto-clockout of a future clockin 2009-04-01 05:00:08 +00:00
Simon Michael
c2352c3c64 localise the single use of regexpr 2009-04-02 01:28:36 +00:00
Simon Michael
8256a4fcbd test util cleanups 2009-04-01 04:57:05 +00:00
Simon Michael
0693723aee ltrace, labelled trace 2009-03-15 03:58:43 +00:00
Simon Michael
931144a12d remove conflictory p 2009-01-25 13:55:08 +00:00
Simon Michael
bd8dcefd9d apply --depth to print command 2009-04-02 06:02:00 +00:00
Simon Michael
89abdfa456 refactor/fix balanced entry checking and test it properly 2009-04-01 08:55:46 +00:00
Simon Michael
0cacc2a7e4 test and bugfix for multi-day timelog session splitting 2009-03-15 12:42:03 +00:00
Simon Michael
564aba4976 split midnight-spanning timelog sessions. Accurate time reports at last! 2009-01-26 20:22:42 +00:00
Simon Michael
ae5a9439d0 count time elapsed in open timelog entries, ignore time zone 
Any open sessions in a timelog will be considered clocked out as of the
current time, and included in calculations. Also, contrary to the earlier
patch we now ignore timezone everywhere and deal only with local times.
This might need revisiting eg to track time while crossing timezones.
 2009-01-25 07:06:59 +00:00
tim
ec10ab8a16 Added variants to parse dates into maybe values 2009-01-11 06:58:35 +00:00
Simon Michael
80f20bdad8 tests and bugfix for accountNameTreeFrom 2009-03-15 04:02:04 +00:00
Simon Michael
2dac5754c7 subAccounts test and bugfix 2009-03-15 04:06:10 +00:00
Simon Michael
d8989a357d account/description matching is supposed to be case-insensitive, fix 2009-01-27 22:16:57 +00:00
tim
fd8587fbdf Handle !includes relative to the including file 2009-02-04 21:27:20 +00:00
Simon Michael
25526cf4b3 parse timelog entries according to a timezone stored in the context 2009-01-24 21:46:09 +00:00
Simon Michael
44cbed59cb use longer but standard and clearer getCurrentTime/Day 2009-01-24 19:48:37 +00:00
Simon Michael
b218647631 a little cleanup, haddock parsing context 2009-01-24 21:15:38 +00:00
Simon Michael
f8905464ac implement default year, allowing m/d dates in ledger 2009-01-27 21:55:26 +00:00
Simon Michael
16e33b50e6 parse Y default year lines in a ledger, so they don't break it (ignoring them) 2009-01-22 23:42:34 +00:00
Simon Michael
46c09c6fac patterns now use not: and desc: prefixes instead of ^ and ^^ 
This is more like but not the same as ledger 3.
 2009-04-02 06:25:22 +00:00
Simon Michael
564c218d61 dead code 2008-11-25 04:15:03 +00:00
tim
6fdaf2a248 Added showAmount' that shows only the number part of an amount 2008-11-23 21:26:38 +00:00
Simon Michael
770c2956a5 oops, maybe another piece of the Date/DateTime removal 2008-11-27 04:29:32 +00:00
Simon Michael
4d5478b334 haddock fix 2008-11-27 07:50:02 +00:00
Simon Michael
b4fed8f2fd docs 2008-12-04 19:32:30 +00:00
Simon Michael
e333c76d6f leaves utility 2008-12-04 19:32:42 +00:00
Simon Michael
6f6ce11ca8 more balance-calculating extraction 2008-12-05 08:26:13 +00:00
Simon Michael
eca112f7d4 extract common balance-calculating code 2008-12-05 05:09:54 +00:00
Simon Michael
76df6ec88f optimise cacheLedger by using the tree to help calculate account balances 
from:

	total time  =        0.14 secs   (7 ticks @ 20 ms)
	total alloc = 275,520,536 bytes  (excludes profiling overheads)

     cacheLedger                                     1   0.0    0.1      42.9       48.6
      sumTransactions                                0   0.0    0.6      28.6       42.5
       isZeroAmount                              13529   0.0    2.0      14.3       39.2
        showAmount                               13529   0.0    7.2      14.3       37.2
         showAmount'                             13529  14.3   29.9      14.3       29.9
         con2tag_Side#                           27232   0.0    0.0       0.0        0.0
       normaliseMixedAmount                       6733   0.0    1.8      14.3        2.7
        con2tag_Side#                              120   0.0    0.0       0.0        0.0
        sumAmountsPreservingPrice                 6803   0.0    0.2      14.3        1.0
         amountop                                13351   0.0    0.4      14.3        0.8
          convertAmountTo                        13351  14.3    0.4      14.3        0.4
           conversionRate                        13351   0.0    0.0       0.0        0.0
      isAccountNamePrefixOf                      25122   0.0    2.0       0.0        2.0

to:

	total time  =        0.08 secs   (4 ticks @ 20 ms)
	total alloc = 168,637,964 bytes  (excludes profiling overheads)

     cacheLedger                                     1   0.0    0.1       0.0       27.1
      sumTransactions                                0   0.0    0.3       0.0       18.8
       isZeroAmount                               3931   0.0    0.9       0.0       17.3
        showAmount                                3931   0.0    3.4       0.0       16.3
         showAmount'                              3931   0.0   12.9       0.0       12.9
         con2tag_Side#                            7884   0.0    0.0       0.0        0.0
       normaliseMixedAmount                       1964   0.0    0.8       0.0        1.3
        con2tag_Side#                               12   0.0    0.0       0.0        0.0
        sumAmountsPreservingPrice                 1970   0.0    0.1       0.0        0.5
         amountop                                 3793   0.0    0.2       0.0        0.4
          convertAmountTo                         3793   0.0    0.2       0.0        0.2
           conversionRate                         3793   0.0    0.0       0.0        0.0
 2008-12-05 03:31:45 +00:00
Simon Michael
8bc078ff7b fix haddock error preventing docs update 2008-12-10 05:52:26 +00:00
Simon Michael
fdb45b8d9c make mixed amount adding and showing more robust 2008-12-05 04:36:32 +00:00
Simon Michael
063dce2642 more string utils 2008-12-06 07:15:19 +00:00
nick
4ea30b7411 Fixed ;-only bug 2008-12-08 07:20:29 +00:00
Simon Michael
130e3bcd30 utils tweaks 2008-12-10 07:08:50 +00:00
Simon Michael
da70e00e3b make fromparse utility show the parse error 2008-12-08 17:15:02 +00:00
nick
68682fa0ee Tilde expansion in !include 2008-12-10 17:40:05 +00:00
nick
600582184c Support for !account directives, and tests 2008-12-08 07:21:33 +00:00
nick
9b7a3689f5 !account affects timelog entries 2008-12-10 17:40:36 +00:00
tim
250c92f646 Support parsing of dates in yyyy-dd-mm format 2008-12-09 07:15:18 +00:00
Simon Michael
470cae55ca show clockin/out times in timelog entries, detect clockout < clockin 2008-12-11 01:35:07 +00:00
Simon Michael
614e6e6932 count timelog sessions on the day they end, like ledger, for now 2008-12-05 01:16:42 +00:00
tim
4bc97d237a Added support for reading historical prices from files 2008-12-16 10:54:20 +00:00
nick
5e0313e447 Added timelog entries to ledger and added useful utilities 2008-12-08 01:48:03 +00:00
Simon Michael
b51740e9bb optimise canonicaliseAmounts 
First optimisation in a while. hledger -s bal on my ledger took 2s, and profiling showed:

	total time  =        0.66 secs   (33 ticks @ 20 ms)
	total alloc = 3,631,667,848 bytes  (excludes profiling overheads)

     canonicaliseAmounts                             1   0.0    0.8      69.7       92.4
      rawLedgerCommoditiesWithSymbol              3928  27.3   23.1      69.7       91.6
       rawLedgerCommodities                          0  18.2   18.7      42.4       68.5
        amounts                                7712628   3.0    0.0       3.0        0.0
        rawLedgerAmounts                             0   0.0    9.3      21.2       49.9
         rawLedgerTransactions                       0   9.1   19.5      21.2       40.5
          flattenEntry                         3408636  12.1   21.0      12.1       21.0

Now it takes 1/2s and the profile is healthier:

	total time  =        0.14 secs   (7 ticks @ 20 ms)
	total alloc = 275,520,536 bytes  (excludes profiling overheads)

     canonicaliseAmounts                             1   0.0    0.4       0.0        0.5
      amounts                                     1964   0.0    0.0       0.0        0.0
      rawLedgerTransactions                          0   0.0    0.1       0.0        0.1
       flattenEntry                                868   0.0    0.1       0.0        0.1
 2008-12-05 02:09:19 +00:00
nick
0be862f760 Fixed TimeLog handling and certain blank lines 2008-12-08 03:45:35 +00:00
Simon Michael
3343e21ab1 work towards a fix for zero-balance root account eliding 2009-01-17 18:07:20 +00:00
Simon Michael
a51596899f a cached ledger now includes the full ledger text, also. 
This reads the file twice, since I couldn't figure out how to do it just
once with the new error monad.. fixes welcome.
 2008-12-10 07:29:08 +00:00
nick
ee4a2a1c1e New ledger parser with file inclusion 2008-12-08 01:49:31 +00:00
Simon Michael
ebdf67a5ab smart dates: also accept yyyymmdd with no separators 2009-01-17 20:07:24 +00:00
nick
91f3b7faac Abstract over all GenParser state types 2008-12-08 01:11:07 +00:00
Simon Michael
5a0156d5ee smart dates: work towards next/last monthname/weekdayname 2009-01-17 20:21:44 +00:00
Simon Michael
77098fec7e lowercase/uppercase 2008-11-27 06:32:31 +00:00
Simon Michael
0c4cf88578 perl-like strip 2008-11-26 21:11:44 +00:00
Simon Michael
f69716ddf9 fix reporting of unbalanced entries 2008-12-05 10:04:59 +00:00
Simon Michael
5e9f9e530a better register summarising with --depth and -E support, datespan splitting bugfix 2008-12-04 19:29:29 +00:00
Simon Michael
3699343318 fix the regexpr version fix, we really do require 0.5.1 2008-12-16 18:35:46 +00:00
Simon Michael
acbb669bcc fix a collision with latest regexpr package 2008-12-11 20:07:06 +00:00
Simon Michael
41a3fb91d5 support reporting intervals in period expressions and register report, and -W/-M/-D 2008-12-03 23:20:38 +00:00
Simon Michael
dd93418784 handle "from ... to ..." period expressions 2008-11-27 19:42:03 +00:00
Simon Michael
c3bec2a3de options cleanup 2008-11-27 06:48:46 +00:00
Simon Michael
57c31f5ab0 support basic --period expressions, containing a single smart date 2008-11-27 06:29:29 +00:00
Simon Michael
d25995c1c8 refactor with DateSpan 2008-11-27 04:31:01 +00:00
Simon Michael
630e22312b remove DateTime and Date types, use Day and UTCTime directly 
This seems simplest for now, I might bring type synonyms back later.
 2008-11-27 04:01:07 +00:00
Simon Michael
b7616562d9 this/last/next month/quarter/year 2008-11-27 02:49:22 +00:00
Simon Michael
7858ed1327 this/next/last day/week 2008-11-27 01:49:13 +00:00
Simon Michael
884ebf2979 gather date stuff together, FuzzyDate -> SmartDate 2008-11-27 00:35:00 +00:00
Simon Michael
52ab3372b8 add a regexp utility plus a dependency on regexpr, the sanest regexp library 2008-11-26 03:46:23 +00:00
tim
1ea8c6c9ee Added helper functions for current time and date 2008-11-25 21:30:21 +00:00
Simon Michael
e8a0d42906 cleanup 2008-11-26 22:15:22 +00:00
Simon Michael
8c56c3c4b3 refactoring date parsing, FuzzyDate 2008-11-26 23:21:24 +00:00
Simon Michael
49a84957a9 cleanup smartdate 2008-11-26 21:34:26 +00:00
Simon Michael
3e1a615dbf misc cleanup 2008-11-26 05:21:44 +00:00
Simon Michael
4d49177117 hacking in more date parsing.. today/tomorrow/yesterday 2008-11-26 04:51:15 +00:00
Simon Michael
6c88197c6a do IO date parsing up front, and support (english) month names 2008-11-26 04:04:05 +00:00
Simon Michael
1c60514973 tighten up date parsing, make it io-friendly and parse Y, M/D, D 2008-11-25 23:52:42 +00:00
Simon Michael
b3c0bba51e haddock fix 2008-11-24 00:14:11 +00:00
Simon Michael
dc007e69a5 --options-anywhere to use ^ for negative patterns and permit options anywhere in command-line 2008-11-25 19:29:33 +00:00
Simon Michael
4d53fac9a3 clean up special char definitions in AccountName.hs 2008-11-24 00:22:47 +00:00
Simon Michael
dfe59676fb support all five date comparisons in --display 2008-11-26 21:18:24 +00:00
Simon Michael
33b2deba75 correction, dates in display expressions should be in brackets 2008-11-25 18:47:26 +00:00
Simon Michael
0582046648 preliminary --display/-d support (-d "d>DATE", sufficient for reconciling) 2008-11-24 21:51:31 +00:00
Simon Michael
0ef22d5cf6 doc fix 2008-10-16 09:50:22 +00:00
Simon Michael
febcb381f2 comment 2008-10-18 06:49:40 +00:00
Simon Michael
64c6082c23 parse comment lines beginning with a space, as from M-; in emacs ledger-mode 2008-10-18 10:54:22 +00:00
Simon Michael
7879ca63ca haddock 2008-10-18 19:16:44 +00:00
Simon Michael
497daebd44 docs 2008-10-17 00:57:00 +00:00
Simon Michael
f40696fa47 small doc edits 2008-10-17 16:54:10 +00:00
Simon Michael
93ced249b3 commodity cleanup 2008-10-18 19:30:07 +00:00
tim
d04a8dcd00 Removed quickcheck import 
It doesn't appear to be used, and isn't declared in the cabal file
 2008-11-10 21:31:25 +00:00
Simon Michael
71667f654a rectangular string utilities 2008-11-22 09:06:44 +00:00
Simon Michael
a7384a9183 show mixed amounts vertically 2008-11-22 09:07:04 +00:00
Simon Michael
a49b9715ef allow extra whitespace and comments at end of ledger 2008-11-22 07:00:52 +00:00
Simon Michael
1607661b87 fix the print command 2008-11-22 06:35:10 +00:00
Simon Michael
4c97ca5514 smarter handling of priced amounts. Normalising and some basic arithmetic now preserve prices. 
Currently, amounts with the same commodity but different prices are kept separate. Useful ?
 2008-11-22 20:30:43 +00:00
Simon Michael
54ee68976b support converting amounts to cost, using their saved price. 
And do this by default for auto-balancing transactions, as ledger seems to.
 2008-11-22 20:32:58 +00:00
Simon Michael
54b164a7ab nullamt and nullmixedamt 2008-11-22 17:21:49 +00:00
Simon Michael
52ff46a326 --basis/-B flag, to show all priced amounts on cost basis. Also a --cost alias. 2008-11-22 20:35:17 +00:00
Simon Michael
2d49bc4100 haddock 2008-11-08 22:04:59 +00:00
Simon Michael
8939c1f7b7 samesymbol cleanup 2008-11-08 22:49:14 +00:00
Simon Michael
7362fbd730 begin smart date parsing 2008-11-22 12:18:19 +00:00
tim
60b4610c2f Fix bug in parsing of TimeLogs, and enabled a test case for them 2008-11-12 07:17:31 +00:00
Simon Michael
c46189a75b filter by account patterns when caching a ledger, fix balance report totals 2008-11-22 05:51:48 +00:00
Simon Michael
ea5a87815b rename setAmountDisplayPrefs to canonicaliseAmounts 2008-11-08 22:02:38 +00:00
tim
514f015849 Implemented types for dates and datetimes 
This patch replaces the strings used in the Entry, TimeLogEntry, and Transaction
records with real types. Rather than use the inbuild system date and time types
directly, two custom types have been implemented that wrap UTCTime: Date and
DateTime. A minimal API for these has been added.
 2008-11-11 12:34:05 +00:00
Simon Michael
a7b3e0d38d define nullentry, nullrawtxn 2008-11-08 20:25:51 +00:00
tim
3a35847aa1 Fix some signatures for functions that really take dates 2008-11-10 22:05:40 +00:00
Simon Michael
33f06f334e first attempt at storing per-amount price 2008-11-22 16:26:01 +00:00
Simon Michael
8e412b1be3 autoamt -> missingamt 2008-10-18 20:29:42 +00:00
Simon Michael
f3ba1eda0c amount cleanup 2008-10-18 20:27:25 +00:00
Simon Michael
0f2c8542fc if we happen to be showing a not-yet-auto-balanced entry, hide the AUTO marker 2008-10-16 03:55:38 +00:00
Simon Michael
47cf7c3eb6 gather match functions in one place 2008-11-22 05:48:56 +00:00
Simon Michael
83d36dae63 more tests cleanup, and start to move match functions to Utils 2008-11-22 04:44:12 +00:00
Simon Michael
96e0f70a38 use the greatest precision detected for a commodity, not the first one 2008-11-08 21:44:41 +00:00
Simon Michael
5c0ff1daa5 separate confusing "normalise" uses, begin to fix broken amount display prefs 2008-10-18 21:10:08 +00:00
Simon Michael
17ab6cb0ab support --real/-R flag 2008-10-16 09:50:16 +00:00
Simon Michael
57603db7b9 support -C/--cleared flag to filter by entry status (not transaction status) 2008-10-16 09:04:44 +00:00
Simon Michael
0b23598138 remove the hard-coded rate from Commodity 2008-10-18 10:46:49 +00:00
Simon Michael
80beac7d43 try making MixedAmount a full newtype, to avoid TypeSynonymInstances error 2008-10-18 10:38:01 +00:00
Simon Michael
2d41368b8b introduce MixedAmount 2008-10-17 00:57:10 +00:00
Simon Michael
f865ab1c1c code cleanups 2008-10-18 00:52:49 +00:00
Simon Michael
db8b00d6e5 doc update 2008-10-16 03:27:43 +00:00
Simon Michael
cc81700d2a normalise amounts after adding them, why not 2008-10-18 09:02:00 +00:00
Simon Michael
ebcf695240 simplify, remove dead code 2008-10-18 09:02:19 +00:00
Simon Michael
648887b36f use MixedAmount everywhere. seems to work. 2008-10-18 08:39:08 +00:00
Simon Michael
4f83326f14 display virtual accounts with appropriate brackets in register report 2008-10-16 06:12:40 +00:00
Simon Michael
c444b02349 a first cut at mixed amounts. Accounts have a MixedAmount balance, displayed on one line 2008-10-17 03:14:23 +00:00
Simon Michael
d31ba41703 rename and unify the autofill stuff 2008-10-18 06:45:02 +00:00
Simon Michael
a304ad3ca6 and more code cleanups. 2008-10-18 04:15:43 +00:00
Simon Michael
861e2beb1c clearer error message when we can't balance an entry 2008-10-16 04:00:45 +00:00
Simon Michael
0cfbced165 and allow parsing of mixed-commodity entries, as long as we don't have to balance them 2008-10-17 03:32:00 +00:00
Simon Michael
17ceb9039b rename sumLedgerTransactions 2008-10-16 08:48:25 +00:00
Simon Michael
405f71c389 ignore virtual transactions when auto-balancing 2008-10-16 06:52:35 +00:00
Simon Michael
9acf11de4d when we fail because of more than one missing amount in an entry, show the full entry 2008-10-16 03:56:43 +00:00
Simon Michael
a1d10691a3 more code cleanups 2008-10-18 02:43:13 +00:00