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

final fix

Browse Source
This commit is contained in:
Bryce Covert
2022-10-25 09:19:53 -07:00
parent 20e3e1f73a
commit a809c84019
2 changed files with 7 additions and 7 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]
(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])))

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

@@ -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}]]))