diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc index 67f2a28c..68c52698 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -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}]]])) ) [] diff --git a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs index 77e53b37..99f748c6 100644 --- a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs @@ -193,7 +193,7 @@ NOTE: Please review the transactions we may have question for you here: https:// (when (:warning report) [:div.notification.is-warning.is-light (:warning report)]) - [rtable/table {:widths [20 20 60 20 20] + [rtable/table {:widths [20 60 20 20 20] :table report}]]))