diff --git a/src/clj/auto_ap/datomic/migrate/sales.clj b/src/clj/auto_ap/datomic/migrate/sales.clj index 9c3ad46e..d498acf6 100644 --- a/src/clj/auto_ap/datomic/migrate/sales.clj +++ b/src/clj/auto_ap/datomic/migrate/sales.clj @@ -217,5 +217,10 @@ {:db/ident :sales-refund/vendor :db/doc "Which vendor is this refund for? CCP Square?" :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/import/transactions.clj b/src/clj/auto_ap/import/transactions.clj index c9316165..b34d19f7 100644 --- a/src/clj/auto_ap/import/transactions.clj +++ b/src/clj/auto_ap/import/transactions.clj @@ -253,7 +253,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)])) (defn get-existing [bank-account] diff --git a/src/clj/auto_ap/ledger.clj b/src/clj/auto_ap/ledger.clj index de8a0a17..dc6c3bd0 100644 --- a/src/clj/auto_ap/ledger.clj +++ b/src/clj/auto_ap/ledger.clj @@ -48,10 +48,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))