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

;csv: refactor transactionFromCsvRecord

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2020-02-27 01:23:28 -08:00
parent a87baf4b29
commit 5a2f28f3ac
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -900,29 +900,25 @@ transactionFromCsvRecord sourcepos rules record = t
-- be balanced, generate the second posting to balance it. -- be balanced, generate the second posting to balance it.
[(p1,final)] -> [(p1,final)] ->
if ptype p1 == VirtualPosting if ptype p1 == VirtualPosting
then [p1'] then [improveUnless final p1]
else [p1', p2] else [improveUnless final p1, improveUnknownAccountName p2]
where where
p1' = (if final then id else improveUnknownAccountName) p1 p2 = nullposting{paccount=unknownExpenseAccount
p2 = improveUnknownAccountName
nullposting{paccount=unknownExpenseAccount
,pamount=costOfMixedAmount (-pamount p1) ,pamount=costOfMixedAmount (-pamount p1)
,ptransaction=Just t} ,ptransaction=Just t}
-- when rules generate exactly two postings, and only the second has -- when rules generate exactly two postings, and only the second has
-- no amount, give it the balancing amount. -- no amount, give it the balancing amount.
[(p1,final1), (p2,final2)] -> [(p1,final1), (p2,final2)] ->
case (pamount p1 == missingmixedamt, pamount p2 == missingmixedamt) of if hasAmount p1 && not (hasAmount p2)
(False, True) -> [p1',p2'] then [improveUnless final1 p1, improveUnless final2 p2{pamount=costOfMixedAmount(-(pamount p1))}]
where p2' = (if final2 then id else improveUnknownAccountName) else [improveUnless final1 p1, improveUnless final2 p2]
p2{pamount=costOfMixedAmount(-(pamount p1))}
_ -> [p1', p2']
where p2' = (if final2 then id else improveUnknownAccountName) p2
where
p1' = (if final1 then id else improveUnknownAccountName) p1
-- otherwise, just refine any unknown account names. -- otherwise, just refine any unknown account names.
ps -> [(if final then id else improveUnknownAccountName) p | (p,final) <- ps] ps -> [improveUnless final p | (p,final) <- ps]
where
improveUnless final = if final then id else improveUnknownAccountName
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- 4. Build the transaction (and name it, so postings can reference it). -- 4. Build the transaction (and name it, so postings can reference it).