tweaks

src/clj/auto_ap/datomic/ledger.clj

@@ -67,6 +67,12 @@
                                               '[?li :journal-entry-line/account ?a]]}
                               :args [(:bank-account-id args)]})
 
+                (:account-id args) 
+                (merge-query {:query {:in ['?a2]
+                                      :where ['[?e :journal-entry/line-items ?li2]
+                                              '[?li2 :journal-entry-line/account ?a2]]}
+                              :args [(:account-id args)]})
+
                 (:to-numeric-code args) 
                 (merge-query {:query {:in ['?to-numeric-code]
                                       :where ['[?e :journal-entry/line-items ?li]

src/clj/auto_ap/graphql.clj

@@ -460,6 +460,7 @@
     :ledger_page {:type :ledger_page
                   :args {:client_id {:type :id}
                          :vendor_id {:type :id}
+                         :account_id {:type :id}
                          :bank_account_id {:type :id}
                          :date_range {:type :date_range}
                          :location {:type 'String}

src/clj/auto_ap/graphql/checks.clj

@@ -116,12 +116,14 @@
           (into
            [:cell {:colspan 9}]
            (let [{:keys [:client/name]
-                  {:keys [:address/street1 :address/city :address/state :address/zip ]} :client/address} client]
-             (list
-              [:paragraph "  " name]
-              [:paragraph "  " street1]
-              [:paragraph "  " city ", " state " " zip]
-              )))
+                  {:keys [:address/street1 :address/street2 :address/city :address/state :address/zip ]} :client/address} client]
+             (filter identity
+                     (list
+                      [:paragraph "  " name]
+                      [:paragraph "  " street1]
+                      (when (not (str/blank? street2)) 
+                            [:paragraph "  " street2])
+                      [:paragraph "  " city ", " state " " zip]))))
           [:cell {:colspan 2 :size 13}
            check]]
 
@@ -131,6 +133,9 @@
           [:cell {:colspan 5}  [:paragraph 
                                 "             " vendor-name "\n"
                                 "             " (:address/street1 (:vendor/address vendor)) "\n"
+                                (when (not (str/blank? (:address/street2 (:vendor/address vendor))))
+                                  (str "             " (:address/street2 (:vendor/address vendor)) "\n")
+                                  )
                                 "             " (:address/city (:vendor/address vendor)) ", " (:address/state (:vendor/address vendor)) " " (:address/zip (:vendor/address vendor))]]
           [:cell {:align :right}
            "Paid to:\n"

src/clj/auto_ap/graphql/ledger.clj

@@ -104,8 +104,9 @@
         
 
         [comparable-results] (l/get-graphql {:client-id (:client_id args)
-                                             :to-date (coerce/to-date (time/minus (:date args) (time/years 1)))
+                                             :date-range {:end  (coerce/to-date (time/minus (:date args) (time/years 1)))}
                                              :count Integer/MAX_VALUE})]
+    (println "count" (take 3 comparable-results))
     (->graphql
      {:balance-sheet-accounts (roll-up client results)
       :comparable-balance-sheet-accounts (roll-up client comparable-results)})))

src/clj/auto_ap/parse/csv.clj

@@ -45,6 +45,10 @@
      (comp (drop 1)
            (map (fn [row]
                   (into {} (map vector header row))))
+           (filter (fn [row]
+                     (and (not (str/blank? (get row "Invoice Date")))
+                          (not (str/blank? (get row "Orig Amt")))
+                          (not (str/blank? (get row "Inv #"))))))
            (map (fn [row]
                   {:vendor-code nil
                    :customer-identifier nil

src/clj/auto_ap/parse/templates.clj

@@ -176,15 +176,15 @@
 
    ;; Young's Market Co new statement
    {:vendor "Youngs Market"
-    :keywords [#"YOUNG'S MARKET COMPANY"]
+    :keywords [#"(YOUNG'S MARKET COMPANY|Young.*Statement)"]
     :extract {:date #"([0-9]+/[0-9]+/[0-9]+)"
-              :customer-identifier #"SHIP TO SITE: ([\w ]+)"
-              :invoice-number #"^([0-9]+)"
-              :total #"\$([0-9\.,]+)"}
+              :customer-identifier #"Customer Name +([\w ]+)"
+              :invoice-number #"\s{2,}([0-9]+)"
+              :total #"\$?([0-9,]+\.[0-9]+)"}
     :parser {:date [:clj-time "MM/dd/yyyy"]
              :total [:trim-commas nil]}
     :multi #"\n"
-    :multi-match? #"^[0-9]+"}
+    :multi-match? #"^[0-9]+.*\$?([0-9,]+\.[0-9]+).*\$?([0-9,]+\.[0-9]+)"}
 
    ;; Young's Market Co - INVOICE
    {:vendor "Youngs Market"