notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another small improvement.

Browse Source
This commit is contained in:
Bryce Covert
2022-10-25 06:59:04 -07:00
parent 55e1a3386c
commit c36602ef09
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cljc/auto_ap/ledger/reports.cljc
View File

@@ -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}]]]))
)
[]

2
src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs
View File

@@ -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}]]))