Merge branch 'master' into get-transactions2-page-working
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
:address/city
|
||||
:address/state
|
||||
:address/zip]}
|
||||
{:vendor/default-account [:account/name]}
|
||||
:vendor/legal-entity-tin
|
||||
:vendor/legal-entity-name
|
||||
:vendor/legal-entity-first-name
|
||||
@@ -49,8 +50,8 @@
|
||||
:where
|
||||
[?p :payment/client ?c]
|
||||
[?p :payment/date ?d ]
|
||||
[(>= ?d #inst "2024-01-01T08:00")]
|
||||
[(< ?d #inst "2025-01-01T08:00")]
|
||||
[(>= ?d #inst "2025-01-01T08:00")]
|
||||
[(< ?d #inst "2026-01-01T08:00")]
|
||||
[?p :payment/type :payment-type/check]
|
||||
[?p :payment/amount ?a]
|
||||
[?p :payment/vendor ?v]]
|
||||
@@ -68,8 +69,8 @@
|
||||
:where
|
||||
[?p :payment/client ?c]
|
||||
[?p :payment/date ?d ]
|
||||
[(>= ?d #inst "2024-01-01T08:00")]
|
||||
[(< ?d #inst "2025-01-01T08:00")]
|
||||
[(>= ?d #inst "2025-01-01T08:00")]
|
||||
[(< ?d #inst "2026-01-01T08:00")]
|
||||
[?p :payment/type :payment-type/check]
|
||||
[?p :payment/amount ?a]
|
||||
[?p :payment/vendor ?v]]
|
||||
@@ -144,6 +145,14 @@
|
||||
:color :yellow}
|
||||
(name tin-type)))]
|
||||
)}
|
||||
{:key "expense-account"
|
||||
:name "Expense Account"
|
||||
:show-starting "md"
|
||||
:render (fn [[_ vendor]]
|
||||
[:div.flex.gap-4
|
||||
(when-let [tin (-> vendor :vendor/default-account :account/name)]
|
||||
[:span {:class "text-xs font-medium py-0.5 "}
|
||||
tin]) ])}
|
||||
{:key "address"
|
||||
:name "Address"
|
||||
:sort-key "address"
|
||||
|
||||
Reference in New Issue
Block a user