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

final fix.

Browse Source
This commit is contained in:
Bryce Covert
2022-11-16 11:27:57 -08:00
parent 2050c0da33
commit 4dff4cfb2a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/clj/auto_ap/graphql/ledger.clj
View File

@@ -540,7 +540,8 @@
:description (or (:name (:vendor je)) :description (or (:name (:vendor je))
(:alternate_description je)) (:alternate_description je))
:account (:account jel) :account (:account jel)
:location (:location jel)})))))) :location (:location jel)})))))
(into []))
_ (swap! category-totals assoc-in [client-id location category] _ (swap! category-totals assoc-in [client-id location category]
(- (or (reduce + 0.0 (map #(or (:credit %) 0.0) all-journal-entries)) 0.0) (- (or (reduce + 0.0 (map #(or (:credit %) 0.0) all-journal-entries)) 0.0)
(or (reduce + 0.0 (map #(or (:debit %) 0.0) all-journal-entries)) 0.0)) ) (or (reduce + 0.0 (map #(or (:debit %) 0.0) all-journal-entries)) 0.0)) )
@@ -575,8 +576,8 @@
:account {:name "Gross Profit"} :account {:name "Gross Profit"}
:journal_entries nil :journal_entries nil
:total (+ (get-in @category-totals [client-id location :sales] 0.0) :total (+ (get-in @category-totals [client-id location :sales] 0.0)
(- (get-in @category-totals [client-id location :cogs] 0.0)) (get-in @category-totals [client-id location :cogs] 0.0)
(- (get-in @category-totals [client-id location :payroll] 0.0)))} (get-in @category-totals [client-id location :payroll] 0.0))}
{:client_id client-id {:client_id client-id
:location location :location location
:account {:name "Overhead"} :account {:name "Overhead"}
@@ -589,8 +590,8 @@
:account {:name "Net Profit"} :account {:name "Net Profit"}
:journal_entries nil :journal_entries nil
:total (+ (get-in @category-totals [client-id location :sales] 0.0) :total (+ (get-in @category-totals [client-id location :sales] 0.0)
(- (get-in @category-totals [client-id location :cogs] 0.0)) (get-in @category-totals [client-id location :cogs] 0.0)
(- (get-in @category-totals [client-id location :payroll] 0.0)) (get-in @category-totals [client-id location :payroll] 0.0)
(- (+ (get-in @category-totals [client-id location :controllable] 0.0) (- (+ (get-in @category-totals [client-id location :controllable] 0.0)
(get-in @category-totals [client-id location :fixed-overhead] 0.0) (get-in @category-totals [client-id location :fixed-overhead] 0.0)
(get-in @category-totals [client-id location :ownership-controllable] 0.0))))}]] (get-in @category-totals [client-id location :ownership-controllable] 0.0))))}]]