diff options
author | Daraul <thurst306@gmail.com> | 2020-03-10 13:38:43 -0400 |
---|---|---|
committer | Martin Michlmayr <tbm@cyrius.com> | 2020-04-05 11:33:09 +0800 |
commit | 0018c884dbf228c54e30f0bc8b7586cc35c56b0f (patch) | |
tree | 66f637fb69dd59e5e902cdb2ecd1aa041e26f933 /src/account.h | |
parent | a413a072a5a8199d0acee6d6b7a9586a4ddd86ac (diff) | |
download | fork-ledger-0018c884dbf228c54e30f0bc8b7586cc35c56b0f.tar.gz fork-ledger-0018c884dbf228c54e30f0bc8b7586cc35c56b0f.tar.bz2 fork-ledger-0018c884dbf228c54e30f0bc8b7586cc35c56b0f.zip |
fix: Fix #543 by tracking an account's real balance
Without these changes, whether an account's balance is virtual
or real is not considered when asserting it's balance. This lead
to situations where the user must consider their virtual postings
when attemping to assert the real balance of the account. See
test/regress/543_a.test for that testcase, taken from the original
issue. This commit also includes other, fringe, situations that I
noticed while working on the fix. It essentially just adds a separate
attribute to the account class(?) that hold's the account's "real"
balance, which is only updated when the user attempts an assertion on a
real account. The virtual account's balance is updated the way it always
was.
Diffstat (limited to 'src/account.h')
-rw-r--r-- | src/account.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/account.h b/src/account.h index 0abbd87a..2db36cea 100644 --- a/src/account.h +++ b/src/account.h @@ -170,6 +170,7 @@ public: struct details_t { value_t total; + value_t real_total; bool calculated; bool gathered; @@ -277,7 +278,7 @@ public: return *xdata_; } - value_t amount(const optional<expr_t&>& expr = none) const; + value_t amount(const optional<bool> real_only = false, const optional<expr_t&>& expr = none) const; value_t total(const optional<expr_t&>& expr = none) const; const xdata_t::details_t& self_details(bool gather_all = true) const; |