made report changes.

This commit is contained in:
2022-11-02 22:06:15 -07:00
parent 85e2381214
commit dbedfec0da
2 changed files with 19 additions and 17 deletions

View File

@@ -566,15 +566,11 @@
(into rows
;; TODO colspan ?
(concat (when (seq (:journal-entries category))
[[{:value (str "Total" )
:bold true}
{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)))
:bold true}
[[{:value (str "" )}
{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)))}
{:value ""}
{:value ""}
{:value (:total category)
:format :dollar
:bold true}]])
{:value ""}]])
(map
(fn [je]
[{:value (user-friendly-date (:date je))}
@@ -588,18 +584,18 @@
(:journal-entries category))
[[{:value (str "Total" )
:bold true
:border [:bottom]}
:border [:top]}
{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)))
:bold true
:border [:bottom]}
:border [:top]}
{:value ""
:border [:bottom]}
:border [:top]}
{:value ""
:border [:bottom]}
:border [:top]}
{:value (:total category)
:format :dollar
:bold true
:border [:bottom]}]]))
:border [:top]}]]))
)
[]