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

dates should be inclusive.

Browse Source
This commit is contained in:
Bryce
2024-12-16 22:30:18 -08:00
parent da2702f9e8
commit a0bfeb51a7
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/clj/auto_ap/ssr/ledger/balance_sheet.clj
View File

@@ -27,6 +27,7 @@
[bidi.bidi :as bidi]
[clj-pdf.core :as pdf]
[clj-time.coerce :as coerce]
[clj-time.core :as time]
[clojure.java.io :as io]
[clojure.string :as str]
[config.core :refer [env] :as env]
@@ -78,7 +79,7 @@
data (into []
(for [client-id client-ids
d date
[client-id account-id location debits credits balance count] (iol-ion.query/detailed-account-snapshot (dc/db conn) client-id (coerce/to-date d))
[client-id account-id location debits credits balance count] (iol-ion.query/detailed-account-snapshot (dc/db conn) client-id (coerce/to-date (time/plus d (time/days 1))))
:let [account ((or (lookup-account client-id) {}) account-id)]]
{:client-id client-id
:account-id account-id

2
src/clj/auto_ap/ssr/ledger/cash_flows.clj
View File

@@ -78,7 +78,7 @@
data (into []
(for [client-id client-ids
p periods
[client-id account-id location debits credits balance count] (iol-ion.query/detailed-account-snapshot (dc/db conn) client-id (coerce/to-date (:end p)))
[client-id account-id location debits credits balance count] (iol-ion.query/detailed-account-snapshot (dc/db conn) client-id (coerce/to-date (time/plus (:end p) (time/days 1))))
:let [account ((or (lookup-account client-id) {}) account-id)]]
{:client-id client-id
:account-id account-id

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

@@ -102,7 +102,7 @@
:account-type (:account_type account)
:numeric-code (:numeric_code account)
:name (:name account)
:period {:start ( coerce/to-date (:start p)) :end ( coerce/to-date (:end p))}}))
:period {:start ( coerce/to-date (:start p)) :end (coerce/to-date (time/plus (:end p) (time/days 1)))}}))
args (assoc (:form-params request)
: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-ids)