This commit is contained in:
Bryce Covert
2022-10-26 07:55:04 -07:00
parent f53ad423c7
commit 5e333a1a49
2 changed files with 16 additions and 11 deletions

View File

@@ -573,7 +573,8 @@
{:value ""} {:value ""}
{:value ""} {:value ""}
{:value (:total category) {:value (:total category)
:format :dollar}]]) :format :dollar
:bold true}]])
(map (map
(fn [je] (fn [je]
[{:value (user-friendly-date (:date je))} [{:value (user-friendly-date (:date je))}
@@ -586,13 +587,18 @@
:format :dollar}]) :format :dollar}])
(:journal-entries category)) (:journal-entries category))
[[{:value (str "Total" ) [[{:value (str "Total" )
:bold true} :bold true
:border [:bottom]}
{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category))) {:value (str (client-codes (:client-id category)) " - " (:location category) " - " (:name (:account category)))
:bold true} :bold true
{:value ""} :border [:bottom]}
{:value ""} {:value ""}
{:value ""
:border [:bottom]}
{:value (:total category) {:value (:total category)
:format :dollar}]])) :format :dollar
:bold true
:border [:bottom]}]]))
) )
[] []

View File

@@ -30,13 +30,12 @@
[:span {:class "icon icon-performance-increase-1" :style {:font-size "25px"}}] [:span {:class "icon icon-performance-increase-1" :style {:font-size "25px"}}]
[:span {:class "name"} "Profit & Loss"]]] [:span {:class "name"} "Profit & Loss"]]]
(when (= "admin" (:user/role user)) [:li.menu-item
[:li.menu-item [:a.item {:href (bidi/path-for routes/routes :profit-and-loss-detail)
[:a.item {:href (bidi/path-for routes/routes :profit-and-loss-detail) :class [(active-when ap = :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 "icon icon-performance-increase-1" :style {:font-size "25px"}}]
[:span {:class "name"} "Profit & Loss Detail"]]]) [:span {:class "name"} "Profit & Loss Detail"]]]
[:li.menu-item [:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :balance-sheet) [:a.item {:href (bidi/path-for routes/routes :balance-sheet)
:class [(active-when ap = :balance-sheet)]} :class [(active-when ap = :balance-sheet)]}