one more tweak.
This commit is contained in:
@@ -565,33 +565,34 @@
|
||||
(fn [rows category]
|
||||
(into rows
|
||||
;; TODO colspan ?
|
||||
(concat [[{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
(concat (when (seq (:journal-entries category))
|
||||
[[{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
|
||||
}
|
||||
{:value "Total"}
|
||||
{:value ""}
|
||||
{:value ""}
|
||||
{:value (:total category)
|
||||
:format :dollar}]])
|
||||
(map
|
||||
(fn [je]
|
||||
[{:value (user-friendly-date (:date je))}
|
||||
{:value (:description je "")}
|
||||
{:value (get je :debit)
|
||||
:format :dollar}
|
||||
{:value (get je :credit)
|
||||
:format :dollar}
|
||||
{:value (get je :running-balance)
|
||||
:format :dollar}])
|
||||
(:journal-entries category))
|
||||
[[{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
|
||||
}
|
||||
{:value "Total"}
|
||||
{:value ""}
|
||||
{:value ""}
|
||||
{:value (:total category)
|
||||
:format :dollar}]]
|
||||
(map
|
||||
(fn [je]
|
||||
[{:value (user-friendly-date (:date je))}
|
||||
{:value (:description je "")}
|
||||
{:value (get je :debit)
|
||||
:format :dollar}
|
||||
{:value (get je :credit)
|
||||
:format :dollar}
|
||||
{:value (get je :running-balance)
|
||||
:format :dollar}])
|
||||
(:journal-entries category))
|
||||
[[{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
|
||||
}
|
||||
{:value "Total"}
|
||||
{:value ""}
|
||||
{:value ""}
|
||||
{:value (:total category)
|
||||
:format :dollar}]]))
|
||||
:format :dollar}]]))
|
||||
|
||||
)
|
||||
[]
|
||||
|
||||
Reference in New Issue
Block a user