diff --git a/src/clj/auto_ap/graphql/transactions.clj b/src/clj/auto_ap/graphql/transactions.clj
index 3c1ec465..a273a8f5 100644
--- a/src/clj/auto_ap/graphql/transactions.clj
+++ b/src/clj/auto_ap/graphql/transactions.clj
@@ -199,13 +199,15 @@
                                  :args [(d/db conn) (:db/id payment)]} ))))
        (:id context))
       (audit-transact
-       (into [{:db/id (:db/id payment)
-               :payment/status :payment-status/pending}
-              {:db/id transaction-id
-               :transaction/approval-status :transaction-approval-status/unapproved}
-              [:db/retract transaction-id :transaction/payment (:db/id payment)]
-              [:db/retract transaction-id :transaction/vendor (:db/id (:transaction/vendor transaction))]
-              [:db/retract transaction-id :transaction/location (:transaction/location transaction)]]
+        (into (cond-> [{:db/id (:db/id payment)
+                        :payment/status :payment-status/pending}
+                       {:db/id transaction-id
+                        :transaction/approval-status :transaction-approval-status/unapproved}
+                       [:db/retract transaction-id :transaction/payment (:db/id payment)]
+                       [:db/retract transaction-id :transaction/vendor (:db/id (:transaction/vendor transaction))]
+                       ]
+                (:transaction/location transaction)
+                (conj [:db/retract transaction-id :transaction/location (:transaction/location transaction)]))
 
              (map (fn [a]
                     [:db/retract transaction-id :transaction/accounts (:db/id a)])
diff --git a/src/clj/auto_ap/routes/invoices.clj b/src/clj/auto_ap/routes/invoices.clj
index a50d06dd..6b3249a4 100644
--- a/src/clj/auto_ap/routes/invoices.clj
+++ b/src/clj/auto_ap/routes/invoices.clj
@@ -220,7 +220,8 @@
                                                                  :where [?c :client/bank-accounts ?ba]
                                                                  [?ba :bank-account/type :bank-account-type/cash]
                                                                  ]
-                                                               (d/db conn))]
+                                                               (d/db conn)
+                                                               client-id)]
                                        #:transaction {:amount               (- (:invoice/total invoice))
                                                       :payment              payment-id
                                                       :client               (:invoice/client invoice)
@@ -230,7 +231,7 @@
                                                       :raw-id               transaction-id
                                                       :vendor               (:invoice/vendor invoice)
                                                       :description-original "Cash payment"
-                                                      :date                 date
+                                                      :date                 (to-date date)
                                                       :approval-status      :transaction-approval-status/approved
                                                       :accounts             [{:transaction-account/account  (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"]))
                                                                               :transaction-account/location "A"