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

Short-circuit annotated commodity valuation

Browse source
This commit is contained in:
John Wiegley 2010-06-03 17:59:43 -04:00
parent e6c5837b2c
commit e8bf3da053
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amount.cc
View file

@ -737,7 +737,9 @@ amount_t::value(const bool primary_only,
#endif #endif
if (has_commodity() && if (has_commodity() &&
(! primary_only || ! commodity().has_flags(COMMODITY_PRIMARY))) { (! primary_only || ! commodity().has_flags(COMMODITY_PRIMARY))) {
if (in_terms_of && commodity() == *in_terms_of) { if (in_terms_of &&
(commodity() == *in_terms_of ||
commodity().referent() == in_terms_of->referent())) {
return *this; return *this;
} }
else if (has_annotation() && annotation().price && else if (has_annotation() && annotation().price &&