Merge pull request #230 from purcell/fix-csv-commodity-column

Commodity column in default CSV format should match the displayed amount
This commit is contained in:
John Wiegley 2014-01-06 12:51:49 -08:00
commit f5d5149d76
2 changed files with 3 additions and 3 deletions

View file

@ -5833,7 +5833,7 @@ Strings}). The default is:
"%(quoted(code))," "%(quoted(code)),"
"%(quoted(payee))," "%(quoted(payee)),"
"%(quoted(display_account))," "%(quoted(display_account)),"
"%(quoted(commodity))," "%(quoted(commodity(scrub(display_amount)))),"
"%(quoted(quantity(scrub(display_amount))))," "%(quoted(quantity(scrub(display_amount)))),"
"%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\")))," "%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),"
"%(quoted(join(note | xact.note)))\n" "%(quoted(join(note | xact.note)))\n"
@ -6780,7 +6780,7 @@ Set the format for @command{csv} reports. The default is:
%(quoted(code)), %(quoted(code)),
%(quoted(payee)), %(quoted(payee)),
%(quoted(display_account)), %(quoted(display_account)),
%(quoted(commodity)), %(quoted(commodity(scrub(display_amount)))),
%(quoted(quantity(scrub(display_amount)))), %(quoted(quantity(scrub(display_amount)))),
%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))), %(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),
%(quoted(join(note | xact.note)))\n" %(quoted(join(note | xact.note)))\n"

View file

@ -521,7 +521,7 @@ public:
"%(quoted(code))," "%(quoted(code)),"
"%(quoted(payee))," "%(quoted(payee)),"
"%(quoted(display_account))," "%(quoted(display_account)),"
"%(quoted(commodity))," "%(quoted(commodity(scrub(display_amount)))),"
"%(quoted(quantity(scrub(display_amount))))," "%(quoted(quantity(scrub(display_amount)))),"
"%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\")))," "%(quoted(cleared ? \"*\" : (pending ? \"!\" : \"\"))),"
"%(quoted(join(note | xact.note)))\n"); "%(quoted(join(note | xact.note)))\n");