Merge branch 'master' of bitbucket.org:brycecovertoperations/integreat

2018-06-16 18:57:40 -07:00
parent b0f401e87b 0de6075e6a
commit be139abb5d
13 changed files with 126 additions and 62 deletions
--- a/src/clj/auto_ap/db/companies.clj
+++ b/src/clj/auto_ap/db/companies.clj
@@ -19,7 +19,9 @@
  (-> x
      (assoc-in [:data :bank-accounts] (:bank-accounts x))
      (assoc-in [:data :address] (:address x))
+      (assoc-in [:data :locations] (:locations x))
      (dissoc :bank-accounts)
+      (dissoc :locations)
      (dissoc :address)))

 (defn get-all []