diff --git a/src/clj/auto_ap/db/invoices_expense_accounts.clj b/src/clj/auto_ap/db/invoices_expense_accounts.clj index ad588edf..0e03b365 100644 --- a/src/clj/auto_ap/db/invoices_expense_accounts.clj +++ b/src/clj/auto_ap/db/invoices_expense_accounts.clj @@ -24,15 +24,19 @@ (defn assign-defaults! [] (j/db-do-prepared (get-conn) - (sql/format {:insert-into [[:invoices-expense-accounts [:invoice-id :expense-account-id :amount :location]] - {:select [:i.id (sql/raw "COALESCE (i.default_expense_account, v.default_expense_account)") :i.total :i.default_location] - :from [[:invoices :i]] - :join [[:vendors :v] - [:= :v.id :i.vendor-id]] - :left-join [[:invoices-expense-accounts :nonexist] - [:= :i.id :nonexist.invoice-id]] - :where [:and [:= :nonexist.id nil] - [:not= :v.default-expense-account nil]] }] }))) + (doto + (sql/format {:insert-into [[:invoices-expense-accounts [:invoice-id :expense-account-id :amount :location]] + {:select [:i.id (sql/raw "COALESCE (i.default_expense_account, v.default_expense_account)") :i.total :i.default_location] + :from [[:invoices :i]] + :left-join [[:vendors :v] + [:= :v.id :i.vendor-id] + [:invoices-expense-accounts :nonexist] + [:= :i.id :nonexist.invoice-id]] + :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] (j/db-do-prepared (get-conn)