diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc index ce08b8d0..4b07bc50 100644 --- a/src/cljc/auto_ap/ledger/reports.cljc +++ b/src/cljc/auto_ap/ledger/reports.cljc @@ -679,15 +679,17 @@ :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 :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") :rows table})) diff --git a/src/cljs/auto_ap/views/pages/ledger/cash_flows.cljs b/src/cljs/auto_ap/views/pages/ledger/cash_flows.cljs index b135dcfc..5102cc1a 100644 --- a/src/cljs/auto_ap/views/pages/ledger/cash_flows.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/cash_flows.cljs @@ -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) table (rtable/concat-tables (:details report))] [: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) [:div.notification.is-warning.is-light (:warning report)])