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

Merge branch 'master' into datomic

Browse Source
This commit is contained in:
Bryce Covert
2018-11-06 09:17:25 -08:00
parent b177e1702e 9c389396fe
commit e8acfd618f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/clj/auto_ap/db/invoices_expense_accounts.clj
View File

@@ -24,15 +24,19 @@
(defn assign-defaults! [] (defn assign-defaults! []
(j/db-do-prepared (get-conn) (j/db-do-prepared (get-conn)
(sql/format {:insert-into [[:invoices-expense-accounts [:invoice-id :expense-account-id :amount :location]] (doto
{:select [:i.id (sql/raw "COALESCE (i.default_expense_account, v.default_expense_account)") :i.total :i.default_location] (sql/format {:insert-into [[:invoices-expense-accounts [:invoice-id :expense-account-id :amount :location]]
:from [[:invoices :i]] {:select [:i.id (sql/raw "COALESCE (i.default_expense_account, v.default_expense_account)") :i.total :i.default_location]
:join [[:vendors :v] :from [[:invoices :i]]
[:= :v.id :i.vendor-id]] :left-join [[:vendors :v]
:left-join [[:invoices-expense-accounts :nonexist] [:= :v.id :i.vendor-id]
[:= :i.id :nonexist.invoice-id]] [:invoices-expense-accounts :nonexist]
:where [:and [:= :nonexist.id nil] [:= :i.id :nonexist.invoice-id]]
[:not= :v.default-expense-account nil]] }] }))) :where [:and [:= :nonexist.id nil]
[:or [:not= :v.default-expense-account nil]
[:not= :i.default-expense-account nil]]] }] })
println)
))
(defn replace-for-invoice [invoice-id expense-accounts] (defn replace-for-invoice [invoice-id expense-accounts]
(j/db-do-prepared (get-conn) (j/db-do-prepared (get-conn)