sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some entry balancing problems relating to the new rational code.

Browse source
This commit is contained in:
John Wiegley 2009-01-31 05:44:02 -04:00
parent 6b81bb8005
commit 6b5d006575
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/entry.cc
View file

@ -106,14 +106,12 @@ bool entry_base_t::finalize()
DEBUG("entry.finalize", "xact must balance = " << p); DEBUG("entry.finalize", "xact must balance = " << p);
if (! p.is_null()) { if (! p.is_null()) {
if (p.keep_precision()) { if (p.keep_precision()) {
amount_t temp(p);
// If the amount was a cost, it very likely has the "keep_precision" // If the amount was a cost, it very likely has the "keep_precision"
// flag set, meaning commodity display precision is ignored when // flag set, meaning commodity display precision is ignored when
// displaying the amount. We never want this set for the balance, // displaying the amount. We never want this set for the balance,
// so we must clear the flag in a temporary to avoid it propagating // so we must clear the flag in a temporary to avoid it propagating
// into the balance. // into the balance.
temp.set_keep_precision(false); add_or_set_value(balance, p.rounded());
add_or_set_value(balance, temp);
} else { } else {
add_or_set_value(balance, p); add_or_set_value(balance, p);
} }
@ -218,7 +216,8 @@ bool entry_base_t::finalize()
commodity_t::exchange(xact->amount, *xact->cost); commodity_t::exchange(xact->amount, *xact->cost);
if (xact->amount.is_annotated()) if (xact->amount.is_annotated())
add_or_set_value(balance, breakdown.basis_cost - breakdown.final_cost); add_or_set_value(balance, (breakdown.basis_cost -
breakdown.final_cost).rounded());
else else
xact->amount = breakdown.amount; xact->amount = breakdown.amount;
} }
@ -231,7 +230,7 @@ bool entry_base_t::finalize()
add_error_context(entry_context(*this)); add_error_context(entry_context(*this));
#endif #endif
add_error_context("Unbalanced remainder is: "); add_error_context("Unbalanced remainder is: ");
add_error_context(value_context(balance.unrounded())); add_error_context(value_context(balance));
throw_(balance_error, "Entry does not balance"); throw_(balance_error, "Entry does not balance");
} }