notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

merged.

Browse Source
This commit is contained in:
Bryce Covert
2021-12-29 18:01:33 -08:00
parent 4e6b6802ba 8139958450
commit 3b19f15bc9
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/clj/auto_ap/datomic/migrate/sales.clj
View File

@@ -217,5 +217,10 @@
{:db/ident :sales-refund/vendor {:db/ident :sales-refund/vendor
:db/doc "Which vendor is this refund for? CCP Square?" :db/doc "Which vendor is this refund for? CCP Square?"
:db/valueType :db.type/ref :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]}})

3
src/clj/auto_ap/import/transactions.clj
View File

@@ -253,7 +253,8 @@
(assoc :transaction/bank-account bank-account-id) (assoc :transaction/bank-account bank-account-id)
(assoc :transaction/approval-status :transaction-approval-status/unapproved) (assoc :transaction/approval-status :transaction-approval-status/unapproved)
maybe-assoc-check-number maybe-assoc-check-number
code-fn)])) code-fn
remove-nils)]))
(defn get-existing [bank-account] (defn get-existing [bank-account]

10
src/clj/auto_ap/ledger.clj
View File

@@ -48,10 +48,12 @@
:invoice/status '[:db/ident] :invoice/status '[:db/ident]
:invoice/import-status '[:db/ident]}] id) :invoice/import-status '[:db/ident]}] id)
credit-invoice? (< (:invoice/total entity) 0.0)] credit-invoice? (< (:invoice/total entity) 0.0)]
(when-not (or (= true (:invoice/exclude-from-ledger entity)) (when-not (or
(= :import-status/pending (:db/ident (:invoice/import-status entity))) (not (:invoice/total entity))
(= :invoice-status/voided (:db/ident (:invoice/status entity))) (= true (:invoice/exclude-from-ledger entity))
(dollars-0? (:invoice/total 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 (remove-nils
{:journal-entry/source "invoice" {:journal-entry/source "invoice"
:journal-entry/client (:db/id (:invoice/client entity)) :journal-entry/client (:db/id (:invoice/client entity))