From 70b90e0051ad8369ee6e6459c893b33c67c2f162 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 29 Dec 2021 13:12:52 -0800 Subject: [PATCH 1/2] fixing bug --- src/clj/auto_ap/import/transactions.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/clj/auto_ap/import/transactions.clj b/src/clj/auto_ap/import/transactions.clj index b3cd30fd..c947d2d6 100644 --- a/src/clj/auto_ap/import/transactions.clj +++ b/src/clj/auto_ap/import/transactions.clj @@ -246,7 +246,8 @@ (assoc :transaction/bank-account bank-account-id) (assoc :transaction/approval-status :transaction-approval-status/unapproved) maybe-assoc-check-number - code-fn)])) + code-fn + remove-nils)])) From 81399584502cd087c95838b4571e6fd3cfc69ea8 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 29 Dec 2021 17:47:01 -0800 Subject: [PATCH 2/2] fixing a couple of bugs. --- src/clj/auto_ap/datomic/migrate/sales.clj | 7 ++++++- src/clj/auto_ap/ledger.clj | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/clj/auto_ap/datomic/migrate/sales.clj b/src/clj/auto_ap/datomic/migrate/sales.clj index 1c26f98d..08a84158 100644 --- a/src/clj/auto_ap/datomic/migrate/sales.clj +++ b/src/clj/auto_ap/datomic/migrate/sales.clj @@ -205,5 +205,10 @@ {:db/ident :transaction/expected-deposit :db/doc "If this transaction is a deposit, the deposit that we anticipated" :db/valueType :db.type/ref - :db/cardinality :db.cardinality/one}]]}}) + :db/cardinality :db.cardinality/one}]]} + :add-refund-type {:txes [[{:db/ident :sales-refund/type + :db/doc "The type of refund" + :db/valueType :db.type/string + :db/cardinality :db.cardinality/one}]] + :requires [:add-refunds]}}) diff --git a/src/clj/auto_ap/ledger.clj b/src/clj/auto_ap/ledger.clj index 67a5cf82..0e68b6c7 100644 --- a/src/clj/auto_ap/ledger.clj +++ b/src/clj/auto_ap/ledger.clj @@ -45,10 +45,12 @@ :invoice/status '[:db/ident] :invoice/import-status '[:db/ident]}] id) credit-invoice? (< (:invoice/total entity) 0.0)] - (when-not (or (= true (:invoice/exclude-from-ledger entity)) - (= :import-status/pending (:db/ident (:invoice/import-status entity))) - (= :invoice-status/voided (:db/ident (:invoice/status entity))) - (dollars-0? (:invoice/total entity))) + (when-not (or + (not (:invoice/total entity)) + (= true (:invoice/exclude-from-ledger entity)) + (= :import-status/pending (:db/ident (:invoice/import-status entity))) + (= :invoice-status/voided (:db/ident (:invoice/status entity))) + (dollars-0? (:invoice/total entity))) (remove-nils {:journal-entry/source "invoice" :journal-entry/client (:db/id (:invoice/client entity))