Fixes issue with JFC import, fixes issue where overriden account ids did not take effect.

src/clj/auto_ap/datomic/invoices.clj

@@ -293,7 +293,10 @@
       vec)
     []))
 
-(defn code-invoice [invoice]
+(defn code-invoice
+  ([invoice]
+   (code-invoice invoice nil))
+  ([invoice override-account-id]
    (mu/log ::trying-to-code-invoice
            :invoice invoice)
    (let [db                     (dc/db auto-ap.datomic/conn)
@@ -333,12 +336,12 @@
                                      coerce/to-date)
                                  :else nil)
          default-expense-account #:invoice-expense-account {:db/id    (random-tempid)
-                                                           :account  (d-vendors/account-for-client-id vendor client-id)
+                                                            :account  (or override-account-id (d-vendors/account-for-client-id vendor client-id))
                                                             :location (:invoice/location invoice)
                                                             :amount   (:invoice/total invoice)}]
      (cond-> invoice
        true              (assoc :invoice/expense-accounts [default-expense-account])
        due               (assoc :invoice/due due)
-      scheduled-payment (assoc :invoice/scheduled-payment scheduled-payment))))
+       scheduled-payment (assoc :invoice/scheduled-payment scheduled-payment)))))
 
 

src/clj/auto_ap/parse/templates.clj

@@ -555,8 +555,8 @@
    {:vendor "JFC International"
     :keywords [#"48490 MILMONT DRIVE"]
     :extract {:date #"([0-9]+/[0-9]+/[0-9]+)"
-              :customer-identifier #"SOLD\s+([\S ]+?)(?=(\s{2,}|\n))"
+              :customer-identifier #"SOLD\s+(?:TO\s+)?([\S ]+?)(?=(\s{2,}|\n))"
-              :invoice-number #"(\S+)\s+(?=[0-9]+/[0-9]+/[0-9]+)"
+              :invoice-number #"(\S+)\s+(?:[0-9]+/[0-9]+/[0-9]+)"
               :total #"(?:INVOICE|TOTAL|CREDIT)\s+([\d\.,\-]+\.[\d\-]+( CR)?)"}
     :parser {:date [:clj-time "MM/dd/yyyy"]
              :total [:trim-commas-and-negate nil]}}

src/clj/auto_ap/routes/invoices.clj

@@ -22,7 +22,8 @@
    [digest]
    [iol-ion.tx :refer [random-tempid]]
    [ring.middleware.json :refer [wrap-json-response]]
-   [unilog.context :as lc])
+   [unilog.context :as lc]
+   [auto-ap.logging :as alog])
   (:import
    (java.util UUID)))
 
@@ -105,6 +106,8 @@
                   (map (c/parse-or-error :invoice-number parse-invoice-number))
                   (map (c/parse-or-error :total c/parse-amount))
                   (map (c/parse-or-error :date c/parse-date)))]
+    (alog/info ::parsed
+               :rows (take 10 rows))
 
     rows))
 
@@ -179,7 +182,7 @@
 
 (defn invoice-rows->transaction [rows user]
   (->> rows
-       (mapcat (fn [{:keys [vendor-id total client-id date invoice-number default-location check automatically-paid-when-due]}]
+       (mapcat (fn [{:keys [vendor-id total client-id date invoice-number default-location check automatically-paid-when-due account-id]}]
                  (let [payment-id (.toString (java.util.UUID/randomUUID))
                        transaction-id (.toString (java.util.UUID/randomUUID))
                        invoice #:invoice {:db/id                       (.toString (java.util.UUID/randomUUID))
@@ -234,7 +237,8 @@
                                                                                                    :transaction-account/amount   (Math/abs (:invoice/total invoice))}]}]))
                        ]
                    [[:propose-invoice (d-invoices/code-invoice (validate-invoice (remove-nils invoice)
-                                                                                 user))]
+                                                                                 user)
+                                                               account-id)]
                     (some-> payment remove-nils)
                     transaction])))
        (filter identity)))