another small improvement.
This commit is contained in:
@@ -566,10 +566,9 @@
|
||||
(into rows
|
||||
;; TODO colspan ?
|
||||
(concat (when (seq (:journal-entries category))
|
||||
[[{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
|
||||
}
|
||||
{:value "Total"}
|
||||
[[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) )
|
||||
:colspan 2
|
||||
:bold true}
|
||||
{:value ""}
|
||||
{:value ""}
|
||||
{:value (:total category)
|
||||
@@ -585,14 +584,13 @@
|
||||
{: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}]]))
|
||||
[[[{:value (str "Total " (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)) )
|
||||
:colspan 2
|
||||
:bold true}
|
||||
{:value ""}
|
||||
{:value ""}
|
||||
{:value (:total category)
|
||||
:format :dollar}]]]))
|
||||
|
||||
)
|
||||
[]
|
||||
|
||||
Reference in New Issue
Block a user