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

Remaining changes for statement of cash flows.

Browse Source
This commit is contained in:
Bryce Covert
2023-04-03 22:54:24 -07:00
parent b5310dffd8
commit df33854d25
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -679,15 +679,17 @@
:financing-activities :financing-activities
(str prefix " Financing Activities"))) (str prefix " Financing Activities")))
(conj (cashflow-subtotal-by-column-row (map #(-> %
(filter-categories [:operating-activities :investment-activities :financing-activities :sales :cogs :payroll :controllable :fixed-overhead :ownership-controllable])
(negate #{:cogs :payroll :controllable :fixed-overhead :ownership-controllable}))
pnl-datas)
"Change in Cash and Cash Equivalents"))
(into (cash-flow-detail-rows pnl-datas (into (cash-flow-detail-rows pnl-datas
:cash :cash
(str prefix " Bank Accounts / Cash"))) (str prefix " Bank Accounts / Cash")))
(conj (cashflow-subtotal-by-column-row (map #(-> % )]
(filter-categories [:operating-activities :investment-activities :financing-activities :cash])
#_(negate #{:cogs :payroll :controllable :fixed-overhead :ownership-controllable}))
pnl-datas)
"Change in Cash and Cash Equivalents")))]
{:header (cash-flow-headers pnl-datas "Cash Flow") {:header (cash-flow-headers pnl-datas "Cash Flow")
:rows table})) :rows table}))

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

@@ -416,7 +416,7 @@ NOTE: Please review the transactions we may have question for you here: https://
report (l-reports/summarize-cash-flows pnl-data) report (l-reports/summarize-cash-flows pnl-data)
table (rtable/concat-tables (:details report))] table (rtable/concat-tables (:details report))]
[:div [:div
[:h1.title "Profit and Loss - " (str/join ", " (map (comp :name :client) (:clients args)))] [:h1.title "Statement of Cash Flows - " (str/join ", " (map (comp :name :client) (:clients args)))]
(when (:warning report) (when (:warning report)
[:div.notification.is-warning.is-light [:div.notification.is-warning.is-light
(:warning report)]) (:warning report)])