summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-01-06 12:51:49 -0800
committerJohn Wiegley <johnw@newartisans.com>2014-01-06 12:51:49 -0800
commitf5d5149d76af947eab90e12c61d99ed6fa7cce2f (patch)
treef863353f7d14a7188347655a124701279aca8ac9
parentbde5e69c9acf54e0d9f6eec7f380a15f82d3102e (diff)
parentd7742cd654be379aa4f203bcbb0abf09b50e93ce (diff)
downloadfork-ledger-f5d5149d76af947eab90e12c61d99ed6fa7cce2f.tar.gz
fork-ledger-f5d5149d76af947eab90e12c61d99ed6fa7cce2f.tar.bz2
fork-ledger-f5d5149d76af947eab90e12c61d99ed6fa7cce2f.zip
Merge pull request #230 from purcell/fix-csv-commodity-column
Commodity column in default CSV format should match the displayed 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");