diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs index afbe53fec..db95a71e7 100644 --- a/hledger-lib/Hledger/Read/CsvReader.hs +++ b/hledger-lib/Hledger/Read/CsvReader.hs @@ -623,9 +623,9 @@ showRecord r = "the CSV record is: "++intercalate ", " (map show r) getEffectiveAssignment :: CsvRules -> CsvRecord -> JournalFieldName -> Maybe FieldTemplate getEffectiveAssignment rules record f = lastMay $ assignmentsFor f where - assignmentsFor f = map snd $ toplevelassignments ++ conditionalassignments + assignmentsFor f = map snd $ filter ((==f).fst) $ toplevelassignments ++ conditionalassignments where - toplevelassignments = filter ((==f).fst) $ rassignments rules + toplevelassignments = rassignments rules conditionalassignments = concatMap snd $ filter blockMatches $ blocksAssigning f where blocksAssigning f = filter (any ((==f).fst) . snd) $ rconditionalblocks rules