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

Fixes issues

Browse Source
This commit is contained in:
Bryce
2025-11-19 23:53:30 -08:00
parent ff8e7b3063
commit af7f9355e8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/parse/templates.clj
View File

@@ -738,7 +738,7 @@
{:vendor "Reel Produce" {:vendor "Reel Produce"
:keywords [#"reelproduce.com" #"Statem"] :keywords [#"reelproduce.com" #"Statem"]
:extract {:date #"\s*([0-9]+/[0-9]+/[0-9]+)" :extract {:date #"\s*([0-9]+/[0-9]+/[0-9]+)"
:customer-identifier #"To:\s*\n\s+(.*?)\s{2,}" :customer-identifier #"ELECTRONICALLY.*\n\s*(.*?)\s{2,}"
:invoice-number #"#(\d+)" :invoice-number #"#(\d+)"
:total #"([\d\-,]+\.\d{2,2})"} :total #"([\d\-,]+\.\d{2,2})"}
:parser {:date [:clj-time "MM/dd/yyyy"] :parser {:date [:clj-time "MM/dd/yyyy"]

7
src/clj/auto_ap/ssr/ledger/profit_and_loss.clj
View File

@@ -103,12 +103,15 @@
:numeric-code (:numeric_code account) :numeric-code (:numeric_code account)
:name (:name account) :name (:name account)
:sample sample :sample sample
:period {:start ( coerce/to-date (:start p)) :end (coerce/to-date (time/plus (:end p) (time/days 1)))}})) :period {:start ( coerce/to-date (:start p)) :end (coerce/to-date (:end p))}}))
args (assoc (:form-params request) args (assoc (:form-params request)
:periods (map (fn [d] {:start ( coerce/to-date (:start d)) :end ( coerce/to-date (:end d))}) periods)) :periods (map (fn [d]
{:start ( coerce/to-date (:start d)) :end ( coerce/to-date (:end d))}) periods))
clients (pull-many (dc/db conn) [:client/code :client/name :db/id :client/feature-flags] client-ids) clients (pull-many (dc/db conn) [:client/code :client/name :db/id :client/feature-flags] client-ids)
pnl-data (l-reports/->PNLData args data (by :db/id :client/code clients)) pnl-data (l-reports/->PNLData args data (by :db/id :client/code clients))
#_#__ (clojure.pprint/pprint pnl-data)
report (l-reports/summarize-pnl pnl-data)] report (l-reports/summarize-pnl pnl-data)]
(alog/info ::profit-and-loss :params args) (alog/info ::profit-and-loss :params args)
{:data report {:data report