From 0ca13d8ebd45f544617fa6d17bf19040045fc1d6 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 25 Oct 2022 07:45:29 -0700 Subject: [PATCH] Revert "one more test." This reverts commit 0c20fc4e5544acc6708b78445bab273c455dd1b0. --- src/clj/auto_ap/pdf/ledger.clj | 2 +- src/cljc/auto_ap/ledger/reports.cljc | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/clj/auto_ap/pdf/ledger.clj b/src/clj/auto_ap/pdf/ledger.clj index f0f02919..e92a40d1 100644 --- a/src/clj/auto_ap/pdf/ledger.clj +++ b/src/clj/auto_ap/pdf/ledger.clj @@ -127,7 +127,7 @@ (fn [[so-far a] next] (let [new-a (+ a (or (:colspan next) 1))] - (if (<= new-a n) + (if (> new-a n) [(conj so-far next) new-a] [so-far new-a]))) diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc index 7f70b69b..68c52698 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -584,14 +584,13 @@ {:value (get je :running-balance) :format :dollar}]) (:journal-entries category)) - [[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) ) - :colspan 2 - :bold true} - {:value ""} - {:value ""} - {:value ""} - {:value (:total category) - :format :dollar}]])) + [[[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) ) + :colspan 2 + :bold true} + {:value ""} + {:value ""} + {:value (:total category) + :format :dollar}]]])) ) []