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 8b224f39..a09fd5bd 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -566,10 +566,10 @@ (into rows ;; TODO colspan ? (concat (when (seq (:journal-entries category)) - [[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) ) - :colspan 2 + [[{:value (str "Total" ) + :bold true} + {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) :bold true} - {:value ""} {:value ""} {:value (:total category) :format :dollar}]]) @@ -584,10 +584,10 @@ {: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 + [[{:value (str "Total" ) + :bold true} + {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) :bold true} - {:value ""} {:value ""} {:value (:total category) :format :dollar}]]))