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

Simple excel invoice fix

Browse Source
This commit is contained in:
Bryce Covert
2021-11-22 21:31:42 -08:00
parent a857b45024
commit 42bd65357f
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/clj/auto_ap/routes/invoices.clj
View File

@@ -164,13 +164,13 @@
(:db/id (d-vendors/account-for-client-id vendor client-id))) (:db/id (d-vendors/account-for-client-id vendor client-id)))
:location default-location :location default-location
:amount total}]} :amount total}]}
(:vendor/terms vendor) (assoc :invoice/due (coerce/to-date (:vendor/terms vendor) (assoc :invoice/due (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id))))) (time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id)))))
automatically-paid-when-due (assoc :invoice/scheduled-payment (coerce/to-date automatically-paid-when-due (assoc :invoice/scheduled-payment (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id))))) (time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id)))))
schedule-payment-dom (assoc :invoice/scheduled-payment (coerce/to-date schedule-payment-dom (assoc :invoice/scheduled-payment (coerce/to-date
(next-dom date schedule-payment-dom) (next-dom date schedule-payment-dom)
))) )))
payment (if (= :invoice-status/paid (:invoice/status invoice)) payment (if (= :invoice-status/paid (:invoice/status invoice))
#:invoice-payment {:invoice (:db/id invoice) #:invoice-payment {:invoice (:db/id invoice)
:amount (:invoice/total invoice) :amount (:invoice/total invoice)
@@ -182,10 +182,9 @@
:status :payment-status/cleared :status :payment-status/cleared
:date (:invoice/date invoice)})} :date (:invoice/date invoice)})}
)] )]
[[:propose-invoice invoice] payment]))) [[:propose-invoice (remove-nils invoice)]
(filter identity) (some-> payment remove-nils)])))
(map remove-nils) (filter identity)))
))
(defn match-vendor [vendor-code forced-vendor] (defn match-vendor [vendor-code forced-vendor]