diff options
| -rw-r--r-- | src/draft.cc | 3 | ||||
| -rw-r--r-- | src/pool.cc | 4 | ||||
| -rw-r--r-- | src/textual.cc | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/draft.cc b/src/draft.cc index 8478a31d..fc53e956 100644 --- a/src/draft.cc +++ b/src/draft.cc @@ -458,6 +458,9 @@ xact_t * draft_t::insert(journal_t& journal) *post.cost *= new_post->amount; post.cost->set_commodity(cost_commodity); } + else if (new_post->amount.sign() < 0) { + new_post->cost->in_place_negate(); + } new_post->cost = *post.cost; DEBUG("derive.xact", "Copied over posting cost"); diff --git a/src/pool.cc b/src/pool.cc index 70f4eed6..f895a8bc 100644 --- a/src/pool.cc +++ b/src/pool.cc @@ -247,7 +247,7 @@ commodity_pool_t::exchange(const amount_t& amount, current_annotation = &as_annotated_commodity(commodity).details; amount_t per_unit_cost = - (is_per_unit || amount.is_realzero() ? cost : cost / amount).abs(); + (is_per_unit || amount.is_realzero()) ? cost.abs() : (cost / amount).abs(); DEBUG("commodity.prices.add", "exchange: per-unit-cost = " << per_unit_cost); @@ -255,7 +255,7 @@ commodity_pool_t::exchange(const amount_t& amount, exchange(commodity, per_unit_cost, moment ? *moment : CURRENT_TIME()); cost_breakdown_t breakdown; - breakdown.final_cost = ! is_per_unit ? cost : cost * amount; + breakdown.final_cost = ! is_per_unit ? cost : cost * amount.abs(); DEBUG("commodity.prices.add", "exchange: final-cost = " << breakdown.final_cost); diff --git a/src/textual.cc b/src/textual.cc index c5a6d896..cbeb6358 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -1050,6 +1050,9 @@ post_t * instance_t::parse_post(char * line, *post->cost *= post->amount; post->cost->set_commodity(cost_commodity); } + else if (post->amount.sign() < 0) { + post->cost->in_place_negate(); + } DEBUG("textual.parse", "line " << linenum << ": " << "Total cost is " << *post->cost); |