diff --git a/src/clj/auto_ap/pdf/ledger.clj b/src/clj/auto_ap/pdf/ledger.clj index e92a40d1..d0cb4269 100644 --- a/src/clj/auto_ap/pdf/ledger.clj +++ b/src/clj/auto_ap/pdf/ledger.clj @@ -244,7 +244,7 @@ (conj [:paragraph {:color [128 0 0] :size 9} (:warning report)]) (conj (table->pdf report - [20 80 20 20 20]))) + [80 25 80 20 20 20]))) output-stream) (.toByteArray output-stream))) diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc index 6fa14ba2..762caa75 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -556,7 +556,8 @@ (defn journal-detail-report [args data client-codes] - {:header [[{:value "Date"} + {:header [[{:value "Category"} + {:value "Date"} {:value "Description"} {:value "Debit"} {:value "Credit"} @@ -566,14 +567,17 @@ (into rows ;; TODO colspan ? (concat (when (seq (:journal-entries category)) - [[{:value (str "" )} + [[ {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)))} {:value ""} {:value ""} + {:value ""} + {:value ""} {:value ""}]]) (map (fn [je] - [{:value (user-friendly-date (:date je))} + [{:value ""} + {:value (user-friendly-date (:date je))} {:value (:description je "")} {:value (get je :debit) :format :dollar} @@ -582,20 +586,24 @@ {:value (get je :running-balance) :format :dollar}]) (:journal-entries category)) - [[{:value (str "Total" ) - :bold true - :border [:top]} - {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) - :bold true - :border [:top]} - {:value "" - :border [:top]} - {:value "" - :border [:top]} - {:value (:total category) - :format :dollar - :bold true - :border [:top]}]])) + (when (seq (:journal-entries category)) + [[ + {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) + :bold true + :border [:top]} + {:value "" + :border [:top]} + {:value (str "Total" ) + :bold true + :border [:top]} + {:value "" + :border [:top]} + {:value "" + :border [:top]} + {:value (:total category) + :format :dollar + :bold true + :border [:top]}]]))) ) [] 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 99f748c6..ec5cf48e 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 60 20 20 20] + [rtable/table {:widths [20 10 20 8 8 8] :table report}]]))