From 5e333a1a495cb7ec014668f75cea022a37faba48 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 26 Oct 2022 07:55:04 -0700 Subject: [PATCH] launch. --- src/cljc/auto_ap/ledger/reports.cljc | 16 +++++++++++----- .../auto_ap/views/pages/ledger/side_bar.cljs | 11 +++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc index 91e8cc81..5ebb37b9 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -573,7 +573,8 @@ {:value ""} {:value ""} {:value (:total category) - :format :dollar}]]) + :format :dollar + :bold true}]]) (map (fn [je] [{:value (user-friendly-date (:date je))} @@ -586,13 +587,18 @@ :format :dollar}]) (:journal-entries category)) [[{:value (str "Total" ) - :bold true} + :bold true + :border [:bottom]} {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) - :bold true} - {:value ""} + :bold true + :border [:bottom]} {:value ""} + {:value "" + :border [:bottom]} {:value (:total category) - :format :dollar}]])) + :format :dollar + :bold true + :border [:bottom]}]])) ) [] diff --git a/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs b/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs index ca4166c9..3683450e 100644 --- a/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs @@ -30,13 +30,12 @@ [:span {:class "icon icon-performance-increase-1" :style {:font-size "25px"}}] [:span {:class "name"} "Profit & Loss"]]] - (when (= "admin" (:user/role user)) - [:li.menu-item - [:a.item {:href (bidi/path-for routes/routes :profit-and-loss-detail) - :class [(active-when ap = :profit-and-loss-detail)]} + [:li.menu-item + [:a.item {:href (bidi/path-for routes/routes :profit-and-loss-detail) + :class [(active-when ap = :profit-and-loss-detail)]} - [:span {:class "icon icon-performance-increase-1" :style {:font-size "25px"}}] - [:span {:class "name"} "Profit & Loss Detail"]]]) + [:span {:class "icon icon-performance-increase-1" :style {:font-size "25px"}}] + [:span {:class "name"} "Profit & Loss Detail"]]] [:li.menu-item [:a.item {:href (bidi/path-for routes/routes :balance-sheet) :class [(active-when ap = :balance-sheet)]}