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

Progress on reporst

Browse Source
This commit is contained in:
Bryce Covert
2022-11-16 06:46:42 -08:00
parent dbedfec0da
commit 86532d2f74
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/pdf/ledger.clj
View File

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

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

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

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 60 20 20 20]
[rtable/table {:widths [20 10 20 8 8 8]
:table report}]]))