Commit Graph

289 Commits

Author SHA1 Message Date
Stephen Morgan
826faa18c2 lib: Tweaks to work with stack-8.2. 2020-06-22 23:08:22 +10:00
Stephen Morgan
5168d136ed lib: multiBalanceReport: Enable --drop for tree mode. 2020-06-22 22:28:08 +10:00
Stephen Morgan
fcaec1540a lib: multiBalanceReport: Remove unnecessary addition of parent accounts. 2020-06-22 22:27:11 +10:00
Stephen Morgan
e079c8b808 lib: multiBalanceReport: Remove old balanceReport code, update some tests. 2020-06-22 22:27:09 +10:00
Stephen Morgan
edb28d51c5 lib: multiBalanceReport: Get boring parent ellision working for multiBalanceReport. 2020-06-22 22:25:23 +10:00
Stephen Morgan
cd41404fd4 lib: multiBalanceReport: Get --drop working with multiBalanceReports. 2020-06-22 22:21:31 +10:00
Stephen Morgan
6467c252c7 lib: multiBalanceReport: Move responsibility for display name into displayedAccounts 2020-06-22 22:21:30 +10:00
Stephen Morgan
5f0918217a multibalanceReport: Move responsibility for determining displayed name in multiBalanceReportWith, not at point of consumption. 2020-06-22 22:20:09 +10:00
Stephen Morgan
0dedcfbe15 lib: multiBalanceReport: Miscellaneous simplifications. 2020-06-22 22:11:54 +10:00
Stephen Morgan
1e7e80504f lib: multiBalanceReport: Keep Account around longer so we can use both aibalance and aebalance. 2020-06-22 22:10:24 +10:00
Stephen Morgan
0e89a389d6 lib: multiBalanceReport: Split displayedAccounts, calculateReportQuery into separate functions. 2020-06-22 22:07:55 +10:00
Stephen Morgan
b106850391 lib: multiBalanceReport: Split postprocessReport and calculateTotalsRow into separate functions. 2020-06-22 21:59:15 +10:00
Stephen Morgan
baa5844d4e lib: multiBalanceReport: Change indentation. 2020-06-22 21:54:38 +10:00
Stephen Morgan
0b30b2f9fb lib: multiBalanceReport: Split sortRows into a separate function. 2020-06-22 21:51:38 +10:00
Stephen Morgan
7a9bf998e5 lib: multiBalanceReport: Split buildReportRows into a separate function, remove unnecessary query and valuation. 2020-06-22 21:50:27 +10:00
Stephen Morgan
a81c6d0397 lib: multiBalanceReport: Split accumValueAmounts into a separate function. 2020-06-22 21:48:20 +10:00
Stephen Morgan
b2bed03b4c lib: multiBalanceReport: Don't import BalanceReport in MultiBalanceReport. 2020-06-22 21:45:42 +10:00
Stephen Morgan
0dcfddd201 lib: multiBalanceReport: Break calculateAccountChanges and acctChangesFromPostings separate functions. 2020-06-22 21:43:30 +10:00
Stephen Morgan
a72c4f285b lib: multiBalanceReport: Break calculateColumns into a separate function. 2020-06-22 21:39:41 +10:00
Stephen Morgan
fc6a30b234 lib: multiBalanceReport: Break calculateColSpans into a separate function. 2020-06-22 21:38:16 +10:00
Stephen Morgan
44dcd613e8 lib: multiBalanceReport: Break getPostings and makeReportQuery into separate functions. 2020-06-22 21:36:30 +10:00
Stephen Morgan
f21bf53610 lib: multiBalanceReport: Break startingBalances into separate function. 2020-06-22 21:33:16 +10:00
Simon Michael
e3cae4aadc valuation: implement new --infer-value flag & semantics (#1239, #1253) 2020-06-19 14:40:20 -07:00
Simon Michael
06d5014f5f ;lib: multibalancereport: apply debug output policy 2020-06-16 21:00:08 -07:00
Simon Michael
684cb45e1a tweak debug levels, document some guidelines
Beginnings of a project-wide policy for what output to show at
each debug level, for now. Later we'll want more flexibility,
eg filtering by topic.
2020-06-14 17:17:09 -07:00
Dmitry Astapov
b7413edf22 lib: --forecast=PERIODICEXPR. Fixes #835, #1236 2020-06-03 15:53:00 -07:00
Simon Michael
97f2235bca ;lib: refactor amount cost functions
Rename costOfAmount -> amountCost, costOfMixedAmount -> mixedAmountCost,
drop amountToCost, mixedAmountToCost.
2020-05-31 15:48:08 -07:00
Simon Michael
660ba7e1d9 lib: clarify zero-checking function names
isZeroAmount                -> amountLooksZero
isReallyZeroAmount          -> amountIsZero
isZeroMixedAmount           -> mixedAmountLooksZero
isReallyZeroMixedAmount     -> mixedAmountIsZero
isReallyZeroMixedAmountCost dropped
2020-05-29 18:57:22 -07:00
Dmitry Astapov
cbacef21eb lib: multiBalanceReport derives query from ReportOpts 2020-05-25 15:50:14 -07:00
Simon Michael
2a5f7819af bs,cf,is,bal,print,reg: support json output format 2020-02-24 17:49:53 -08:00
Simon Michael
7f16d23898 ;refactor: extract --value=then error message 2020-02-24 17:49:53 -08:00
Simon Michael
ae9d8d6e56 ;add then and t to --value's error message
[ci skip]
2020-02-10 12:40:02 -08:00
Simon Michael
aa96b41efe print, register: add --value=then, valuing at each posting's date
Currently this will give an error with other kinds of report.
2020-02-10 08:20:39 -08:00
Stephen Morgan
228edf6ba6 Don't store leaf name in PeriodReport.
Calculate at the point of consumption instead.
2020-01-04 21:15:42 -08:00
Stephen Morgan
2e20d0717f lib: Generalise PeriodicReport to be polymorphic in the account labels. 2020-01-04 17:23:17 -08:00
Stephen Morgan
88dc619257 lib: Use records instead of tuples in PeriodicReport. 2020-01-04 17:23:17 -08:00
Stephen Morgan
beb8b6d7c8 lib: Use PeriodicReport in place of MultiBalanceReport. 2020-01-04 17:23:17 -08:00
Stephen Morgan
74778efcf5 Use nubSort instead of nub . sort. 2020-01-04 08:31:10 -08:00
Stephen Morgan
38904372b2 Calculate MultiReportBalance columns more efficiently.
Only calculate posting date once for each posting, and calculate their
columns instead of checking each DateSpan separately.
2020-01-03 16:11:46 -08:00
Simon Michael
47567cd770 ;fix some warnings with GHC 8.10 alpha
hledger is GHC 8.10 ready!
2019-12-14 17:30:19 -08:00
Simon Michael
2b2a0b3cf8 ;tests: use "test" alias for testCase everywhere
Easier to type and read, and a little clearer to my eyes;
"testCase" implies a single case, but it can contain many assertions.
2019-11-28 15:33:33 -08:00
Simon Michael
b36f6df110 tests: port all unit tests to tasty, second pass (#1090)
Hledger.Util.Tests helpers have been cleaned up, and test names are
now shown.

Tests have been cleaned up a bit. Some groups of unnamed tests have
been collapsed into a single named test containing a sequence of
assertions. The test command counts named tests, not assertions, so
the reported unit test count has dropped from 199 to 188.
2019-11-27 13:17:34 -08:00
Simon Michael
13a3542464 tests: port all unit tests to tasty, first cut (#1090)
easytest is not actively maintained and requires an old version of
hedgehog which does not support base-compat 0.11 & ghc 8.8.

This is still using the old easytest helpers, and not displaying test
names properly.
2019-11-27 12:43:43 -08:00
Simon Michael
332624f9fa ui: B and V keys toggle display of cost, value 2019-11-21 17:33:04 -08:00
Mykola Orliuk
5287fe671b ;all: hide RawOpts internals
This way we can ensure we always use only functions from RawOptions.
2019-11-18 17:38:39 -08:00
Simon Michael
4cb2a03f7f ;lib: more docs for unifyMixedAmount
[ci skip]
2019-11-18 17:22:42 -08:00
Michael Kainer
79ca4a767e cli: Add -% to compound balance commands
This commit introduces the commandline argument -%/--percent to show
percentages of the column's total instead of the absolute amounts for
each account in reports. The signs of the values are preserved.

This option is especially useful for the balance and incomestatement
commands.

If there are multiple commodities involved in a report hledger bails
with an error message. This can be avoided by using --cost. Also note
that if one uses -% with the balance command the chances are high that
all numbers are 0. This is due to the fact that by default balance sums
up to zero. If one wants to use -% in a meaningful way with balance one
has to add a query.

In order to keep the implementation as simple as possible --tree has no
influence over how the percentages are calculated, i.e., the percentages
always represent the fraction of the columns total. If one wants to know
the percentages relative to a parent account, one has to use a query to
narrow down the accounts.
2019-11-18 17:10:59 -08:00
Simon Michael
2e3b51c03f ;lib: journalConvertAmountsToCost -> journalToCost 2019-10-19 19:58:27 -07:00
Simon Michael
905149df86 ;lib: transaction valuation helpers 2019-10-19 19:41:21 -07:00
Mykola Orliuk
78146978f4 ;lib: store raw opts unquoted
It looks like we only need quote when we build query and in some
messages.

Fixes simonmichael/hledger#1079
2019-10-19 14:44:08 -07:00