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

adding default expense account to export

Browse Source
This commit is contained in:
Bryce Covert
2018-07-27 09:01:21 -07:00
parent 05dbb7c11b
commit 9894bc72b3
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,13 @@
(catch Exception e
(throw (Exception. (str "Could not parse total from value '" (:amount i) "'") e)))))
(defn parse-default-expense-account [i]
(try
(when-let [default-expense-account (:default-expense-account i)]
(Integer/parseInt default-expense-account))
(catch Exception e
(throw (Exception. (str "Could not parse expense account from value '" (:default-expense-account i) "'") e)))))
(defn parse-account-id [i]
(try
(Integer/parseInt (second
@@ -125,7 +132,7 @@
(POST "/upload-integreat"
{{:keys [excel-rows]} :edn-params user :identity}
(assert-admin user)
(let [columns [:raw-date :vendor-name :check :location :invoice-number :amount :company :bill-entered :bill-rejected :added-on :exported-on]
(let [columns [:raw-date :vendor-name :check :location :invoice-number :amount :company :bill-entered :bill-rejected :added-on :exported-on :default-expense-account]
all-vendors (by :name (vendors/get-all))
@@ -141,6 +148,7 @@
(map (parse-or-error :company-id #(parse-company % all-companies)))
(map (parse-or-error :vendor-id #(parse-vendor % all-vendors)))
(map (parse-or-error :default-expense-account parse-default-expense-account))
(map (parse-or-error :invoice-number parse-invoice-number))
(map (parse-or-error :total parse-amount))
(map (parse-or-error :date parse-date)))
@@ -151,10 +159,11 @@
(map :vendor-name)
set)
insert-rows (vec (->> (filter #(not (seq (:errors %))) rows)
(map (fn [{:keys [vendor-id total company-id amount date invoice-number default-location]}]
(map (fn [{:keys [vendor-id total company-id amount date invoice-number default-location default-expense-account]}]
{:vendor-id vendor-id
:company-id company-id
:default-location default-location
:default-expense-account default-expense-account
:total total
:outstanding-balance total
:imported true