From fad24d40f7826b4c4ea840f0c068ac43ed50947d Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 11 Mar 2012 04:02:52 -0500 Subject: [PATCH] When --percent is used, disable --decimal-comma after parsing Fixes #674 --- src/report.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/report.cc b/src/report.cc index a3abcb98..3151b211 100644 --- a/src/report.cc +++ b/src/report.cc @@ -162,13 +162,16 @@ void report_t::normalize_options(const string& verb) terminus); } - if (HANDLED(percent) && HANDLED(market)) { - HANDLER(total_) - .on("?normalize", - "(__tmp = market(parent.total, value_date, exchange);" - " ((is_account & parent & __tmp) ?" - " percent(scrub(market(total, value_date, exchange)), " - " scrub(__tmp)) : 0))"); + if (HANDLED(percent)) { + commodity_t::decimal_comma_by_default = false; + if (HANDLED(market)) { + HANDLER(total_) + .on("?normalize", + "(__tmp = market(parent.total, value_date, exchange);" + " ((is_account & parent & __tmp) ?" + " percent(scrub(market(total, value_date, exchange)), " + " scrub(__tmp)) : 0))"); + } } if (HANDLED(immediate) && HANDLED(market)) {