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

Added Notes and cleared against fields.

Browse Source
This commit is contained in:
Bryce Covert
2019-09-30 22:01:09 -07:00
parent c7c63f6a02
commit 70e5c84716
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/clj/auto_ap/datomic/migrate/add_general_ledger.clj
View File

@@ -52,7 +52,14 @@
:db/valueType :db.type/boolean
:db/cardinality :db.cardinality/one
:db/doc "Has this cleared?"}
{:db/ident :journal-entry/cleared-against
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one
:db/doc "Cleared against"}
{:db/ident :journal-entry/note
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one
:db/doc "notes about this journal-entry"}
{:db/ident :journal-entry-line/expense-account
:db/valueType :db.type/long
:db/cardinality :db.cardinality/one

4
src/clj/auto_ap/graphql.clj
View File

@@ -137,6 +137,8 @@
{:fields {:id {:type :id}
:source {:type 'String}
:amount {:type 'String}
:note {:type 'String}
:cleared_against {:type 'String}
:client {:type :client}
:vendor {:type :vendor}
:date {:type 'String}
@@ -454,6 +456,8 @@
:date {:type 'String}
:vendor_name {:type 'String}
:amount {:type 'String}
:note {:type 'String}
:cleared_against {:type 'String}
:line_items {:type '(list :import_ledger_line_item)}}}
:edit_client {:fields {:id {:type :id}

4
src/clj/auto_ap/graphql/ledger.clj
View File

@@ -200,6 +200,8 @@
:journal-entry/external-id (:external_id entry)
:journal-entry/vendor (all-vendors (:vendor_name entry))
:journal-entry/amount (:amount entry)
:journal-entry/note (:note entry)
:journal-entry/cleared-against (:cleared_against entry)
:journal-entry/line-items
(mapv (fn [ea]
@@ -207,12 +209,10 @@
(get all-client-locations (:client_code entry))
(:location ea))
(throw (Exception. (str "Location '" (:location ea) "' not found."))))
(when (and (not (all-accounts (:account_identifier ea)))
(not (get
(get all-client-bank-accounts (:client_code entry))
(:account_identifier ea))))
(throw (Exception. (str "Account '" (:account_identifier ea) "' not found."))))
(remove-nils {:journal-entry-line/account
(if (re-matches #"^[0-9]+$" (:account_identifier ea))