From 1756051092dfec831f0ce0854eab7ec3bff82aca Mon Sep 17 00:00:00 2001 From: Bryce Date: Mon, 3 Jul 2023 12:21:27 -0700 Subject: [PATCH] fixes cash pay issue. --- scratch-sessions/fixing-duplicate-vendors.clj | 16 ++++++++++++++++ src/clj/auto_ap/graphql/checks.clj | 3 ++- src/clj/auto_ap/graphql/ledger.clj | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scratch-sessions/fixing-duplicate-vendors.clj b/scratch-sessions/fixing-duplicate-vendors.clj index 38e51b16..98001e97 100644 --- a/scratch-sessions/fixing-duplicate-vendors.clj +++ b/scratch-sessions/fixing-duplicate-vendors.clj @@ -163,3 +163,19 @@ best (dc/db conn)))] [:db/retractEntity bad]) {:user/name "fix-unused-vendors"}) + + + +(user/init-repl) + +(seq (datomic.api/q '[:find ?v ?vn ?code ?a + :in $ [?v ...] [?a ...] + :where [?x ?a ?v] + [?v :vendor/name ?vn] + [?x :journal-entry/client ?c] + [?c :client/code ?code]] + (datomic.api/db auto-ap.datomic/conn) + [17592298912094 17592298933107 17592299151482] + #{:expected-deposit/vendor, :invoice/vendor, :journal-entry/vendor, :payment/vendor, :sales-order/vendor, :sales-refund/vendor, :transaction/vendor, :transaction-rule/vendor, :cash-drawer-shift/vendor} + + )) diff --git a/src/clj/auto_ap/graphql/checks.clj b/src/clj/auto_ap/graphql/checks.clj index cec85d3b..3bcce871 100644 --- a/src/clj/auto_ap/graphql/checks.clj +++ b/src/clj/auto_ap/graphql/checks.clj @@ -366,7 +366,8 @@ :transaction/description-original memo :transaction/date (:payment/date payment) :transaction/approval-status :transaction-approval-status/approved - :transaction/accounts [{:transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"])) + :transaction/accounts [{:db/id (str "transaction-account-" (:db/id vendor)) + :transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"])) :transaction-account/location "A" :transaction-account/amount (Math/abs (:payment/amount base-payment))}]}]] (-> [] diff --git a/src/clj/auto_ap/graphql/ledger.clj b/src/clj/auto_ap/graphql/ledger.clj index da2573ce..8bd8540f 100644 --- a/src/clj/auto_ap/graphql/ledger.clj +++ b/src/clj/auto_ap/graphql/ledger.clj @@ -535,7 +535,7 @@ [:count (count success)] (for [[_ n] (:tempids (audit-transact-batch (map :tx success) (:id context)))] n))] - (future + (future ; (mu/log ::indexing-solr :count (count invalidated)) (mu/trace ::indexed-external-solr [:count (count invalidated)]