From eb04b8be85e1af46ba94a00758a50cd1d97bf69e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 21 Jan 2009 18:54:06 -0400 Subject: Changed the order in which options are processed, to provide for the correct overrides. 1. Global defaults 2. Environment variable settings 3. Initialization file 4. Command-line arguments Whatever is later in the list overrides what is earlier. --- src/report.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/report.h') diff --git a/src/report.h b/src/report.h index 61720a0a..59380949 100644 --- a/src/report.h +++ b/src/report.h @@ -730,20 +730,23 @@ public: } value_t option_quantity(call_scope_t& args) { // O - amount_expr = "amount"; - total_expr = "total"; + show_revalued = false; + amount_expr = "amount"; + total_expr = "total"; return true; } value_t option_cost(call_scope_t& args) { // B - amount_expr = "cost"; - total_expr = "total_cost"; + show_revalued = false; + amount_expr = "cost"; + total_expr = "total_cost"; return true; } value_t option_price(call_scope_t& args) { // I - amount_expr = "price"; - total_expr = "price_total"; + show_revalued = false; + amount_expr = "price"; + total_expr = "price_total"; return true; } -- cgit v1.2.3