slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

csv: switch the order of generated postings, so account1 is first

Browse Source 
This is subjective, but simplifies things as we'll be adding more than
two postings. Free-form entry templates will allow custom orderings
in future.
This commit is contained in:
Simon Michael 2017-08-15 08:16:49 -07:00
parent 3d6486c60d
commit ce5724fee1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -697,8 +697,8 @@ transactionFromCsvRecord sourcepos rules record = t
tcomment = T.pack comment, tcomment = T.pack comment,
tpreceding_comment_lines = T.pack precomment, tpreceding_comment_lines = T.pack precomment,
tpostings = tpostings =
[posting {paccount=account2, pamount=amount2, ptransaction=Just t} [posting {paccount=account1, pamount=amount1, ptransaction=Just t, pbalanceassertion=balance}
,posting {paccount=account1, pamount=amount1, ptransaction=Just t, pbalanceassertion=balance} ,posting {paccount=account2, pamount=amount2, ptransaction=Just t}
] ]
} }

22
tests/csv/csv-read.test
View File

@ -8,8 +8,8 @@
printf 'fields date, description, amount\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'fields date, description, amount\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/09/10 Flubber Co 2009/09/10 Flubber Co
income:unknown $-50
assets:myacct $50 assets:myacct $50
income:unknown $-50
>>>2 >>>2
>>>=0 >>>=0
@ -21,12 +21,12 @@
11/2009/09,Flubber Co,,50 11/2009/09,Flubber Co,,50
>>> >>>
2009/09/10 Flubber Co 2009/09/10 Flubber Co
income:unknown $-50
Assets:MyAccount $50 Assets:MyAccount $50
income:unknown $-50
2009/09/11 Flubber Co 2009/09/11 Flubber Co
expenses:unknown $50
Assets:MyAccount $-50 Assets:MyAccount $-50
expenses:unknown $50
>>>2 >>>2
>>>=0 >>>=0
@ -35,8 +35,8 @@
printf 'fields date, description, amount\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\nif Flubber\n account2 acct\n comment cmt' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'fields date, description, amount\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\nif Flubber\n account2 acct\n comment cmt' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/09/10 Flubber Co ; cmt 2009/09/10 Flubber Co ; cmt
acct $-50
assets:myacct $50 assets:myacct $50
acct $-50
>>>2 >>>2
>>>=0 >>>=0
@ -45,8 +45,8 @@
printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/09/10 Flubber Co 2009/09/10 Flubber Co
income:unknown $-50
assets:myacct $50 = $123 assets:myacct $50 = $123
income:unknown $-50
>>>2 >>>2
>>>=0 >>>=0
@ -55,12 +55,12 @@
printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n11/2009/09,Blubber Co,60,\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n11/2009/09,Blubber Co,60,\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/09/10 Flubber Co 2009/09/10 Flubber Co
income:unknown $-50
assets:myacct $50 = $123 assets:myacct $50 = $123
income:unknown $-50
2009/09/11 Blubber Co 2009/09/11 Blubber Co
income:unknown $-60
assets:myacct $60 assets:myacct $60
income:unknown $-60
>>>2 >>>2
>>>=0 >>>=0
@ -69,12 +69,12 @@
printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n11/2009/09,Blubber Co,60, \n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'fields date, description, amount, balance\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\n' >t.$$.csv.rules; printf '10/2009/09,Flubber Co,50,123\n11/2009/09,Blubber Co,60, \n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/09/10 Flubber Co 2009/09/10 Flubber Co
income:unknown $-50
assets:myacct $50 = $123 assets:myacct $50 = $123
income:unknown $-50
2009/09/11 Blubber Co 2009/09/11 Blubber Co
income:unknown $-60
assets:myacct $60 assets:myacct $60
income:unknown $-60
>>>2 >>>2
>>>=0 >>>=0
@ -83,12 +83,12 @@
printf 'skip 1\n\ncurrency $\n\nfields date, payee, payment\n\namount -%%payment\naccount1 liabilities:bank\naccount2 expense:other' >t.$$.csv.rules; printf 'date,payee,amount\n2009/10/9,Flubber Co,50\n2009/11/09,Merchant Credit,-60\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules printf 'skip 1\n\ncurrency $\n\nfields date, payee, payment\n\namount -%%payment\naccount1 liabilities:bank\naccount2 expense:other' >t.$$.csv.rules; printf 'date,payee,amount\n2009/10/9,Flubber Co,50\n2009/11/09,Merchant Credit,-60\n' | hledger -f csv:- --rules-file t.$$.csv.rules print && rm -rf t.$$.csv.rules
>>> >>>
2009/10/09 2009/10/09
expense:other $50
liabilities:bank $-50 liabilities:bank $-50
expense:other $50
2009/11/09 2009/11/09
expense:other $-60
liabilities:bank $60 liabilities:bank $60
expense:other $-60
>>>2 >>>2
>>>=0 >>>=0