summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Purcell <steve@sanityinc.com>2014-01-06 17:22:43 +0000
committerSteve Purcell <steve@sanityinc.com>2014-01-06 17:37:04 +0000
commitd7742cd654be379aa4f203bcbb0abf09b50e93ce (patch)
treef863353f7d14a7188347655a124701279aca8ac9
parentbde5e69c9acf54e0d9f6eec7f380a15f82d3102e (diff)
downloadledger-d7742cd654be379aa4f203bcbb0abf09b50e93ce.tar.gz
ledger-d7742cd654be379aa4f203bcbb0abf09b50e93ce.tar.bz2
ledger-d7742cd654be379aa4f203bcbb0abf09b50e93ce.zip
Commodity column in default CSV format should match the displayed amount
If one uses --exchange to force CSV display amounts into a particular currency, then the commodity output column should match that currency. Without this patch, the commodity column contains the original commodity, not the commodity for the exported amount.
-rw-r--r--doc/ledger3.texi4
-rw-r--r--src/report.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ledger3.texi b/doc/ledger3.texi
index 4e544ef3..2b962180 100644
--- a/doc/ledger3.texi
+++ b/doc/ledger3.texi
@@ -5833,7 +5833,7 @@ Strings}). The default is:
"%(quoted(code)),"
"%(quoted(payee)),"
"%(quoted(display_account)),"
-"%(quoted(commodity)),"
+"%(quoted(commodity(scrub(display_amount)))),"
"%(quoted(quantity(scrub(display_amount)))),"
"%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),"
"%(quoted(join(note | xact.note)))\n"
@@ -6780,7 +6780,7 @@ Set the format for @command{csv} reports. The default is:
%(quoted(code)),
%(quoted(payee)),
%(quoted(display_account)),
- %(quoted(commodity)),
+ %(quoted(commodity(scrub(display_amount)))),
%(quoted(quantity(scrub(display_amount)))),
%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),
%(quoted(join(note | xact.note)))\n"
diff --git a/src/report.h b/src/report.h
index 5897e8f6..d7c80e11 100644
--- a/src/report.h
+++ b/src/report.h
@@ -521,7 +521,7 @@ public:
"%(quoted(code)),"
"%(quoted(payee)),"
"%(quoted(display_account)),"
- "%(quoted(commodity)),"
+ "%(quoted(commodity(scrub(display_amount)))),"
"%(quoted(quantity(scrub(display_amount)))),"
"%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),"
"%(quoted(join(note | xact.note)))\n");