When --percent is used, disable --decimal-comma after parsing

Fixes #674
This commit is contained in:
John Wiegley 2012-03-11 04:02:52 -05:00
parent d93c5a7d43
commit fad24d40f7

View file

@ -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)) {