notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Revert "Revert "one more test.""

Browse Source 
This reverts commit 0ca13d8ebd.
This commit is contained in:
Bryce Covert
2022-10-25 07:48:16 -07:00
parent 0ca13d8ebd
commit f0dc585978
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/pdf/ledger.clj
View File

@@ -127,7 +127,7 @@
(fn [[so-far a] next] (fn [[so-far a] next]
(let [new-a (+ a (or (:colspan next) (let [new-a (+ a (or (:colspan next)
1))] 1))]
(if (> new-a n) (if (<= new-a n)
[(conj so-far next) new-a] [(conj so-far next) new-a]
[so-far new-a]))) [so-far new-a])))

15
src/cljc/auto_ap/ledger/reports.cljc
View File

@@ -584,13 +584,14 @@
{:value (get je :running-balance) {:value (get je :running-balance)
:format :dollar}]) :format :dollar}])
(:journal-entries category)) (:journal-entries category))
[[[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) ) [[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) )
:colspan 2 :colspan 2
:bold true} :bold true}
{:value ""} {:value ""}
{:value ""} {:value ""}
{:value (:total category) {:value ""}
:format :dollar}]]])) {:value (:total category)
:format :dollar}]]))
) )
[] []