From ffdde364de8b59a417344734342241a1215104aa Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 2 Feb 2024 13:51:09 -1000 Subject: [PATCH] imp:bal:budget:csv,tsv output: show 0 not empty when there's no amount --- hledger-lib/Hledger/Reports/BudgetReport.hs | 6 +++--- hledger/test/balance/budget.test | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hledger-lib/Hledger/Reports/BudgetReport.hs b/hledger-lib/Hledger/Reports/BudgetReport.hs index 9340af899..f3799862a 100644 --- a/hledger-lib/Hledger/Reports/BudgetReport.hs +++ b/hledger-lib/Hledger/Reports/BudgetReport.hs @@ -246,9 +246,9 @@ combineBudgetAndActual ropts j | PeriodicReportRow acct budgetgoals budgettot budgetavg <- budgetrows , displayFull acct `notElem` map prrFullName actualsplusgoals , let acctBudgetByPeriod = Map.fromList $ zip budgetperiods budgetgoals :: Map DateSpan BudgetGoal - , let amtandgoals = [ (Nothing, Map.lookup p acctBudgetByPeriod) | p <- periods ] :: [BudgetCell] - , let totamtandgoal = (Nothing, Just budgettot) - , let avgamtandgoal = (Nothing, Just budgetavg) + , let amtandgoals = [ (Just 0, Map.lookup p acctBudgetByPeriod) | p <- periods ] :: [BudgetCell] + , let totamtandgoal = (Just 0, Just budgettot) + , let avgamtandgoal = (Just 0, Just budgetavg) ] -- combine and re-sort rows diff --git a/hledger/test/balance/budget.test b/hledger/test/balance/budget.test index f34246c55..992b9f20e 100644 --- a/hledger/test/balance/budget.test +++ b/hledger/test/balance/budget.test @@ -579,7 +579,7 @@ $ hledger bal -f- --budget -TA not:income -O csv "expenses:bills","$80","$370","$80","$370","$80","$370" "expenses:bills:a","$10","$20","$10","$20","$10","$20" "expenses:bills:b","$40","$200","$40","$200","$40","$200" -"expenses:bills:c","","$50","","$50","","$50" +"expenses:bills:c","0","$50","0","$50","0","$50" "expenses:bills:f","$10","0","$10","0","$10","0" "Total:","$80","$370","$80","$370","$80","$370" @@ -589,7 +589,7 @@ Account 2019-01-01..2019-01-02 budget Total budget Average budget expenses:bills $80 $370 $80 $370 $80 $370 expenses:bills:a $10 $20 $10 $20 $10 $20 expenses:bills:b $40 $200 $40 $200 $40 $200 -expenses:bills:c $50 $50 $50 +expenses:bills:c 0 $50 0 $50 0 $50 expenses:bills:f $10 0 $10 0 $10 0 Total: $80 $370 $80 $370 $80 $370