diff --git a/scratch-sessions/bad_accounts_for_invoices.clj b/scratch-sessions/bad_accounts_for_invoices.clj new file mode 100644 index 00000000..6dcca901 --- /dev/null +++ b/scratch-sessions/bad_accounts_for_invoices.clj @@ -0,0 +1,1665 @@ +;; This buffer is for Clojure experiments and evaluation. + +;; Press C-j to evaluate the last expression. + +;; You can also press C-u C-j to evaluate the expression and pretty-print its result. + +(def bad-accounts + (-> #{} + (into (d/q '[:find [?a ...] + :in $ + :where [?a :account/type :account-type/revenue]] + (d/db auto-ap.datomic/conn))) + (into (d/q '[:find [?a ...] + :in $ + :where [?a :account/type :account-type/revenue]] + (d/db auto-ap.datomic/conn))) + )) + + +(def bad-accounts + (d/q '[:find [?a ...] + :in $ [?code ...] + :where [?a :account/numeric-code ?code]] + (d/db auto-ap.datomic/conn) + #{11000 + 11100 + 11101 + 11110 + 11111 + 11120 + 11121 + 11130 + 11140 + 11150 + 11160 + 11170 + 11180 + 11190 + 11200 + 12000 + 12001 + 12002 + 12003 + 12004 + 12100 + 12101 + 12200 + 12201 + 12202 + 12203 + 12204 + 12205 + 12206 + 12207 + 12208 + 12209 + 12210 + 12211 + 12212 + 12213 + 12214 + 12215 + 12216 + 12300 + 12385 + 12400 + 12401 + 12500 + 12600 + 12700 + 12800 + 12801 + 12820 + 12821 + 12822 + 12823 + 12824 + 12825 + 12826 + 12827 + 12828 + 12830 + 12831 + 12832 + 12833 + 12834 + 12835 + 12836 + 12837 + 12838 + 12839 + 12840 + 12841 + 12842 + 12980 + 12990 + 13000 + 13001 + 13002 + 13003 + 13004 + 13005 + 13006 + 13007 + 13008 + 13050 + 13100 + 13200 + 13201 + 13300 + 13301 + 13302 + 13303 + 13304 + 13305 + 13306 + 13400 + 13401 + 13402 + 13500 + 13600 + 13700 + 14100 + 14200 + 14300 + 14400 + 14401 + 15100 + 15200 + 15500 + 15600 + 15900 + 15920 + 15940 + 15960 + 15980 + 16100 + 16101 + 16102 + 16200 + 16400 + 16401 + 16402 + 16500 + 16501 + 16502 + 16510 + 16600 + 16666 + 17000 + 17001 + 17002 + 17003 + 21000 + 21001 + 21002 + 21003 + 21004 + 21005 + 21006 + 21007 + 21008 + 21009 + 21010 + 21011 + 22100 + 22200 + 22300 + 22400 + 22500 + 23000 + 24000 + 24100 + 24200 + 24300 + 24400 + 25100 + 25250 + 25300 + 25301 + 25400 + 25401 + 25510 + 25600 + 25700 + 25800 + 26000 + 26100 + 26200 + 26300 + 27000 + 28000 + 28010 + 28020 + 28030 + 28040 + 28050 + 28060 + 28070 + 28080 + 28090 + 28100 + 28101 + 28102 + 28103 + 28104 + 28105 + 28110 + 28111 + 28112 + 28113 + 28114 + 28115 + 28116 + 28117 + 28118 + 28120 + 28130 + 28140 + 28150 + 28160 + 28161 + 28500 + 28510 + 30000 + 31000 + 31500 + 32000 + 33000 + 33010 + 33011 + 33012 + 33020 + 33030 + 33040 + 33050 + 33060 + 33070 + 33080 + 34000 + 34010 + 34020 + 34030 + 34040 + 34050 + 34060 + 34070 + 34080 + 35000 + 35001 + 35003 + 35100 + 35200 + 40000 + 40110 + 40111 + 40112 + 40113 + 40114 + 40115 + 40116 + 40117 + 40118 + 40119 + 40120 + 40121 + 40122 + 40123 + 40124 + 40125 + 40126 + 40127 + 40128 + 40129 + 40130 + 40131 + 40132 + 40133 + 40134 + 40135 + 40136 + 40137 + 40138 + 40200 + 40300 + 40500 + 40900 + 40910 + 40920 + 40930 + 40940 + 40990 + 41000 + 41001 + 42000 + 42001 + 42002 + 42003 + 43000 + 43010 + 43100 + 44000 + 44100 + 44200 + 44201 + 45000 + 45001 + 45002 + 45100 + 45200 + 45300 + 45301 + 45302 + 46000 + 46001 + 46002 + 46003 + 46004 + 46005 + 46006 + 46007 + 46009 + 46010 + 46014 + 46015 + 46020 + 46030 + 46040 + 46050 + 46900 + 46901 + 46902 + 47000 + 47001 + 47002 + 48000 + 48100 + 48101 + 48200 + 48201 + 48202 + 48203 + 48204 + 48300 + 48301 + 49000 + 49001 + 49002 + 49003 + 49004 + 49005 + 49006 + 49007 + 49011 + 49012 + 49021 + 49022 + 49031 + 49032 + 49033 + 49034 + 49100 + 49101 + 49200 + 49500 + 49501 + 49510 + 49520 + 49600 + 49700 + 49701 + 49702 + 49703 + 49750 + 49800 + 49999 + 60000 + 60010 + 61000 + 61001 + 61002 + 61003 + 61100 + 61200 + 61300 + 61400 + 62000 + 62001 + 62100 + 62150 + 62200 + 62300 + 62400 + 62500 + 62600 + 62800 + 62900 + 62950 + 63000 + 63001 + 63100 + 63200 + 63210 + 63220 + 63230 + 63300 + 63400 + 63500 + 63600 + 63800 + 63900 + 64000 + 64100 + 64800 + 64900 + 65000 + 65001 + 66000 + 69000 + 69010 + 69090 + 69100 + 69200 + 69300 + 69400 + 69800 + 69801 + 69802 + 69810 + 69910 + 69930 + 81170 + 99700 + 99800 + }) + ) + +(count bad-accounts) + +(def result + (->> + (d/q '[:find (pull ?i [:db/id :invoice/date {:invoice/client [:client/code] :invoice/vendor [:vendor/name]} :invoice/invoice-number :invoice/total]) (pull ?iea [:db/id :invoice-expense-account/amount {:invoice-expense-account/account [:account/numeric-code :account/name]}]) + :in $ [?a ...] + :where [?iea :invoice-expense-account/account ?a] + [?i :invoice/expense-accounts ?iea] + (not [?i :invoice/status :invoice-status/voided]) + [?i :invoice/date ?date] + [(>= ?date #inst "2022-01-01T00:00:00-08:00")]] + (d/db auto-ap.datomic/conn) + bad-accounts) + (map (fn [[i iea]] + [(:db/id i) + (-> i :invoice/client :client/code) + (some-> i :invoice/date clj-time.coerce/to-date-time (auto-ap.time/unparse-local auto-ap.time/iso-date)) + (:invoice/invoice-number i) + (:invoice/total i) + (-> i :invoice/vendor :vendor/name) + (-> iea :db/id) + (-> iea :invoice-expense-account/amount) + (-> iea :invoice-expense-account/account :account/numeric-code) + (-> iea :invoice-expense-account/account :account/name)])) + (sort-by (fn [[_ x y]] + [x y])))) + + +(def vendor-result + (->> + (d/q '[:find (pull ?v [:db/id :vendor/name {:vendor/default-account [:account/numeric-code :account/name]}]) + :in $ [?a ...] + :where + [?v :vendor/default-account ?a] + ] + (d/db auto-ap.datomic/conn) + bad-accounts) + (map (fn [[v]] + [(-> v :db/id) + (-> v :vendor/name) + (-> v :vendor/default-account :account/name) + (-> v :vendor/default-account :account/numeric-code)])))) + + +(def vendor-account-override-result + (->> + (d/q '[:find (pull ?var [:db/id {:vendor/_account-overrides [:vendor/name] + :vendor-account-override/client [:client/code] + :vendor-account-override/account [:account/numeric-code :account/name]} ]) + :in $ [?a ...] + :where + [?var :vendor-account-override/account ?a] + ] + (d/db auto-ap.datomic/conn) + bad-accounts) + (map (fn [[var]] + [(-> var :db/id) + (-> var :vendor/_account-overrides :vendor/name) + (-> var :vendor-account-override/client :client/code) + (-> var :vendor-account-override/account :account/name) + (-> var :vendor-account-override/account :account/numeric-code)])))) + +(clojure.data.csv/write-csv *out* + vendor-result + :separator \tab) + + +(for [c (get-square-clients "NGPG") + l (:client/square-locations c) + :when (:square-location/client-location l)] + @(daily-results c l)) + +(def results *1) + + +(count results) + +(into #{} + (for [r results + o r + l (:sales-order/line-items o)] + (:order-line-item/category l) + )) + + +(def invoice-bulk-account-change-csv + "17592255254023 2022-02-16 17592255254024 25200 +17592255254031 2022-02-16 17592255254032 25200 +17592255253992 2022-02-16 17592255253993 25200 +17592255254094 2022-02-16 17592255254095 25200 +17592255254102 2022-02-16 17592255254103 25200 +17592255254569 2022-02-16 17592255254570 25200 +17592255254577 2022-02-16 17592255254578 25200 +17592255254338 2022-02-16 17592255254339 25200 +17592255254346 2022-02-16 17592255254347 25200 +17592255254354 2022-02-16 17592255254355 25200 +17592255241056 2022-02-16 17592255241057 25200 +17592255254330 2022-02-16 17592255254331 25200 +17592282347870 2022-12-18 17592282347871 25200 +17592282347835 2022-12-18 17592282347836 25500 +17592283072556 2022-12-23 17592283072557 25500 +17592283665344 2022-12-31 17592283665345 25500 +17592284300091 2023-01-08 17592284300092 74800 +17592284300067 2023-01-08 17592284300068 25500 +17592284300099 2023-01-09 17592284300100 74800 +17592285068894 2023-01-15 17592285068895 25500 +17592285760018 2023-01-22 17592285760019 25500 +17592285760002 2023-01-22 17592285760003 25500 +17592285759994 2023-01-22 17592285759995 25500 +17592286345484 2023-01-30 17592286345485 25500 +17592286345476 2023-01-30 17592286345477 25500 +17592286345468 2023-01-30 17592286345469 25500 +17592255638207 2022-02-21 17592255638208 25200 +17592274498335 2022-09-30 17592274498336 25200 +17592274498925 2022-09-30 17592274498926 25200 +17592278841126 2022-11-07 17592278841127 25200 +17592279449780 2022-11-23 17592279449781 25200 +17592279449799 2022-11-23 17592279449800 25200 +17592269347045 2022-08-03 17592269347046 25200 +17592269309816 2022-08-01 17592269309817 25200 +17592269347406 2022-08-03 17592269347407 25200 +17592269335351 2022-08-03 17592269335352 25200 +17592255667503 2022-02-21 17592255667504 41001 +17592269437740 2022-08-04 17592269437741 25200 +17592259049693 2022-04-07 17592259049694 28500 +17592258637830 2022-03-02 17592258637831 34000 +17592259394023 2022-04-12 17592259394024 34000 +17592262647369 2022-05-16 17592262647370 34000 +17592266258703 2022-06-27 17592266258704 34000 +17592273980167 2022-09-25 17592273980168 34000 +17592280481692 2022-11-29 17592280481693 34000 +17592275609286 2022-10-13 17592275609287 25200 +17592254050267 2022-01-29 17592254050268 34010 +17592252507402 2022-01-04 17592252507403 34010 +17592256206632 2022-02-28 17592256206633 34010 +17592255836343 2022-02-23 17592255836344 +17592269644992 2022-08-08 17592269644993 34010 +17592269641135 2022-08-08 17592269641136 34010 +17592263551936 2022-05-26 17592263551937 34010 +17592259295303 2022-04-11 17592259295304 34010 +17592273504167 2022-09-19 17592273504168 25500 +17592272796192 2022-09-13 17592272796193 25500 +17592274350351 2022-09-28 17592274350352 25500 +17592275326272 2022-10-10 17592275326273 25500 +17592283583846 2022-12-30 17592283583847 50000 +17592283988743 2023-01-01 17592283988744 25500 +17592285678929 2023-01-15 17592285678930 25500 +17592285678913 2023-01-15 17592285678914 25500 +17592285256578 2023-01-18 17592285256579 25500 +17592285256056 2023-01-18 17592285256057 25500 +17592285256018 2023-01-18 17592285256019 25500 +17592285256496 2023-01-18 17592285256497 25500 +17592285257534 2023-01-18 17592285257535 25500 +17592285256512 2023-01-18 17592285256513 25500 +17592285256504 2023-01-18 17592285256505 25500 +17592285256874 2023-01-18 17592285256875 25500 +17592285257293 2023-01-18 17592285257294 25500 +17592285867606 2023-01-24 17592285867607 25500 +17592285867590 2023-01-24 17592285867591 25500 +17592285867574 2023-01-24 17592285867575 25500 +17592285867550 2023-01-24 17592285867551 25500 +17592285867518 2023-01-24 17592285867519 25500 +17592259113853 2022-02-25 17592259113854 50000 +17592265672902 2022-06-22 17592265672903 25200 +17592265673035 2022-06-22 17592265673036 25200 +17592276246250 2022-10-21 17592276246251 11000 +17592270605546 2022-08-18 17592270605547 25200 +17592276246266 2022-10-21 17592276246267 11000 +17592275995258 2022-10-11 17592275995259 25200 +17592276244935 2022-10-21 17592276244936 11000 +17592276244899 2022-10-21 17592276244900 11000 +17592276244917 2022-10-21 17592276244918 11000 +17592276246412 2022-10-21 17592276246413 11000 +17592276244883 2022-10-21 17592276244884 11000 +17592276243533 2022-10-21 17592276243534 11000 +17592276246218 2022-10-21 17592276246219 11000 +17592276246184 2022-10-21 17592276246185 11000 +17592276246168 2022-10-21 17592276246169 11000 +17592274432301 2022-09-24 17592274432302 74800 +17592269773452 2022-08-05 17592269773453 74800 +17592279032820 2022-11-18 17592279032821 74800 +17592279032678 2022-11-18 17592279032679 74800 +17592254787683 2022-02-09 17592254787684 11000 +17592270786918 2022-08-20 17592270786919 74800 +17592273726187 2022-09-18 17592273726188 74800 +17592279903495 2022-11-16 17592279903496 74800 +17592279497688 2022-11-23 17592279497689 74800 +17592255387588 2022-02-17 17592255387589 74600 +17592261278697 2022-05-02 17592261278698 34000 +17592253854968 2022-01-10 17592253854969 34000 +17592253854976 2022-01-24 17592253854977 34000 +17592254757257 2022-02-07 17592254757258 34000 +17592259089061 2022-04-04 17592259089062 34000 +17592261332362 2022-05-06 17592261332363 25200 +17592264202725 2022-06-03 17592264202726 74800 +17592272889329 2022-09-09 17592272889330 74800 +17592263662930 2022-05-27 17592263662931 25200 +17592264202612 2022-06-03 17592264202613 25200 +17592259943760 2022-04-18 17592259943761 34000 +17592263422801 2022-05-25 17592263422802 34000 +17592266122332 2022-06-26 17592266122333 25200 +17592266311523 2022-07-01 17592266311524 25200 +17592266311525 2022-07-15 17592266311526 25200 +17592267746071 2022-07-15 17592267746072 25200 +17592266311527 2022-07-29 17592266311528 25200 +17592264802469 2022-06-09 17592264802470 34000 +17592258125142 2022-03-26 17592258125143 50000 +17592266311529 2022-08-12 17592266311530 25200 +17592276285919 2022-10-16 17592276285920 74800 +17592269618243 2022-07-31 17592269618244 74800 +17592275317979 2022-10-02 17592275317980 74800 +17592266311531 2022-08-26 17592266311532 25200 +17592277006821 2022-10-28 17592277006822 74800 +17592275106426 2022-08-30 17592275106427 50000 +17592275106466 2022-09-02 17592275106467 50000 +17592271598969 2022-08-21 17592271598970 74800 +17592275102974 2022-09-06 17592275102975 50000 +17592271598985 2022-08-28 17592271598986 74800 +17592274359235 2022-09-25 17592274359236 74800 +17592266311533 2022-09-09 17592266311534 25200 +17592275106498 2022-09-09 17592275106499 50000 +17592272845286 2022-09-12 17592272845287 74800 +17592275106059 2022-09-13 17592275106060 50000 +17592275106027 2022-09-16 17592275106028 50000 +17592277309438 2022-10-30 17592277309439 74800 +17592275103589 2022-09-20 17592275103590 50000 +17592266311535 2022-09-23 17592266311536 25200 +17592275106474 2022-09-23 17592275106475 50000 +17592274527930 2022-09-23 17592274527931 25200 +17592273917539 2022-09-23 17592273917540 25200 +17592255395978 2022-02-17 17592255395979 50000 +17592275106482 2022-09-30 17592275106483 50000 +17592260153597 2022-04-18 17592260153598 74800 +17592276278542 2022-10-07 17592276278543 50000 +17592266311537 2022-10-07 17592266311538 25200 +17592272889239 2022-09-09 17592272889240 74800 +17592263433162 2022-05-25 17592263433163 74800 +17592266311539 2022-10-21 17592266311540 25200 +17592269866006 2022-08-08 17592269866007 74800 +17592270809769 2022-08-15 17592270809770 74800 +17592277394667 2022-11-01 17592277394668 25200 +17592277768484 2022-11-04 17592277768485 25200 +17592266311541 2022-11-04 17592266311542 25200 +17592275506467 2022-10-09 17592275506468 74800 +17592272255865 2022-09-04 17592272255866 74800 +17592278130695 2022-11-06 17592278130696 74800 +17592266311543 2022-11-18 17592266311544 25200 +17592277901388 2022-11-05 17592277901389 25500 +17592266311545 2022-12-02 17592266311546 25200 +17592266311547 2022-12-16 17592266311548 25200 +17592280063026 2022-12-29 17592280063027 50000 +17592266311549 2022-12-30 17592266311550 25200 +17592266311551 2023-01-13 17592266311552 25200 +17592284945451 2023-01-15 17592284945452 25200 +17592266311553 2023-01-27 17592266311554 25200 +17592266311555 2023-02-10 17592266311556 25200 +17592266311557 2023-02-24 17592266311558 25200 +17592266311559 2023-03-10 17592266311560 25200 +17592266311561 2023-03-24 17592266311562 25200 +17592266311563 2023-04-07 17592266311564 25200 +17592266311565 2023-04-21 17592266311566 25200 +17592266311567 2023-05-05 17592266311568 25200 +17592266311569 2023-05-19 17592266311570 25200 +17592266311571 2023-06-02 17592266311572 25200 +17592266311573 2023-06-16 17592266311574 25200 +17592266311575 2023-06-30 17592266311576 25200 +17592266311577 2023-07-14 17592266311578 25200 +17592266311579 2023-07-28 17592266311580 25200 +17592254851972 2022-01-14 17592254851973 25200 +17592258000960 2022-03-17 17592258000961 25200 +17592260153170 2022-04-22 17592260153171 25200 +17592266664254 2022-07-01 17592266664255 25200 +17592271428905 2022-08-27 17592271428906 75100 +17592275214800 2022-10-01 17592275214801 25200 +17592274831116 2022-10-03 17592274831117 25200 +17592276484782 2022-10-21 17592276484783 25200 +17592286149877 2023-01-27 17592286149878 25200 +17592257995731 2022-03-21 17592257995732 25500 +17592263517992 2022-05-15 17592263517993 25500 +17592265837150 2022-06-21 17592265837151 54400 +17592268682049 2022-07-27 17592268682050 93100 +17592274010478 2022-09-26 17592274010479 50000 +17592253201388 2022-01-15 17592253201389 25200 +17592253201406 2022-01-15 17592253201407 25200 +17592253209599 2022-01-15 17592253209600 25200 +17592253201425 2022-01-15 17592253201426 25200 +17592253209617 2022-01-15 17592253209618 25200 +17592253201443 2022-01-15 17592253201444 25200 +17592253184059 2022-01-15 17592253184060 25200 +17592253201488 2022-01-15 17592253201489 25200 +17592253184084 2022-01-15 17592253184085 25200 +17592253184129 2022-01-15 17592253184130 25200 +17592253175945 2022-01-15 17592253175946 25200 +17592253184147 2022-01-15 17592253184148 25200 +17592253184172 2022-01-15 17592253184173 25200 +17592253175994 2022-01-15 17592253175995 25200 +17592253192384 2022-01-15 17592253192385 25200 +17592253184199 2022-01-15 17592253184200 25200 +17592253192402 2022-01-15 17592253192403 25200 +17592253184218 2022-01-15 17592253184219 25200 +17592253192420 2022-01-15 17592253192421 25200 +17592253192438 2022-01-15 17592253192439 25200 +17592253184249 2022-01-15 17592253184250 25200 +17592253192457 2022-01-15 17592253192458 25200 +17592253192475 2022-01-15 17592253192476 25200 +17592253201352 2022-01-15 17592253201353 25200 +17592253201370 2022-01-15 17592253201371 25200 +17592253732491 2022-01-24 17592253732492 25200 +17592254019752 2022-01-29 17592254019753 25200 +17592254020324 2022-01-29 17592254020325 25200 +17592254020340 2022-01-29 17592254020341 25200 +17592254020357 2022-01-29 17592254020358 25200 +17592254020373 2022-01-29 17592254020374 25200 +17592254020389 2022-01-29 17592254020390 25200 +17592254020405 2022-01-29 17592254020406 25200 +17592254020422 2022-01-29 17592254020423 25200 +17592254020439 2022-01-29 17592254020440 25200 +17592254020455 2022-01-29 17592254020456 25200 +17592254020471 2022-01-29 17592254020472 25200 +17592254020488 2022-01-29 17592254020489 25200 +17592254020504 2022-01-29 17592254020505 25200 +17592254020520 2022-01-29 17592254020521 25200 +17592254020542 2022-01-29 17592254020543 25200 +17592254168566 2022-02-01 17592254168567 25200 +17592254932996 2022-02-12 17592254932997 25200 +17592254932527 2022-02-12 17592254932528 25200 +17592254933153 2022-02-12 17592254933154 25200 +17592254933137 2022-02-12 17592254933138 25200 +17592254933170 2022-02-12 17592254933171 25200 +17592254933202 2022-02-12 17592254933203 25200 +17592254933186 2022-02-12 17592254933187 25200 +17592254933234 2022-02-12 17592254933235 25200 +17592254933218 2022-02-12 17592254933219 25200 +17592254933266 2022-02-12 17592254933267 25200 +17592254933250 2022-02-12 17592254933251 25200 +17592254933301 2022-02-12 17592254933302 25200 +17592254933284 2022-02-12 17592254933285 25200 +17592254933355 2022-02-12 17592254933356 25200 +17592254932877 2022-02-12 17592254932878 25200 +17592254933393 2022-02-12 17592254933394 25200 +17592254933435 2022-02-12 17592254933436 25200 +17592254933418 2022-02-12 17592254933419 25200 +17592256056904 2022-02-26 17592256056905 25200 +17592256056921 2022-02-26 17592256056922 25200 +17592256056937 2022-02-26 17592256056938 25200 +17592271656089 2022-08-31 17592271656090 74800 +17592256057030 2022-02-26 17592256057031 25200 +17592256057046 2022-02-26 17592256057047 25200 +17592256057014 2022-02-26 17592256057015 25200 +17592256057071 2022-02-26 17592256057072 25200 +17592257086996 2022-03-12 17592257086997 25200 +17592257087136 2022-03-12 17592257087137 25200 +17592257087120 2022-03-12 17592257087121 25200 +17592257087104 2022-03-12 17592257087105 25200 +17592257087077 2022-03-12 17592257087078 25200 +17592257087201 2022-03-12 17592257087202 25200 +17592257087185 2022-03-12 17592257087186 25200 +17592257087169 2022-03-12 17592257087170 25200 +17592257087152 2022-03-12 17592257087153 25200 +17592261321127 2022-05-07 17592261321128 25200 +17592261321111 2022-05-07 17592261321112 25200 +17592261321077 2022-05-07 17592261321078 25200 +17592261321093 2022-05-08 17592261321094 25200 +17592264286200 2022-06-04 17592264286201 25200 +17592264286794 2022-06-04 17592264286795 25200 +17592264456591 2022-06-07 17592264456592 25200 +17592264456574 2022-06-07 17592264456575 25200 +17592264456465 2022-06-07 17592264456466 25200 +17592264456447 2022-06-07 17592264456448 25200 +17592264546398 2022-06-08 17592264546399 25200 +17592264789861 2022-06-11 17592264789862 25200 +17592265336402 2022-06-18 17592265336403 25200 +17592265336386 2022-06-18 17592265336387 25200 +17592265341397 2022-06-18 17592265341398 25200 +17592266688113 2022-07-02 17592266688114 25200 +17592266688129 2022-07-02 17592266688130 25200 +17592266688145 2022-07-02 17592266688146 25200 +17592266688161 2022-07-02 17592266688162 25200 +17592266688097 2022-07-02 17592266688098 25200 +17592266687991 2022-07-02 17592266687992 25200 +17592266688008 2022-07-02 17592266688009 25200 +17592271396773 2022-08-28 17592271396774 74800 +17592266737494 2022-07-03 17592266737495 25200 +17592267442155 2022-07-13 17592267442156 25200 +17592267442138 2022-07-13 17592267442139 25200 +17592267755125 2022-07-16 17592267755126 25200 +17592267755099 2022-07-16 17592267755100 25200 +17592267754917 2022-07-16 17592267754918 25200 +17592281680008 2022-12-16 17592281680009 74800 +17592268904885 2022-07-29 17592268904886 25200 +17592269011678 2022-07-30 17592269011679 25200 +17592268988604 2022-07-30 17592268988605 25200 +17592268988584 2022-07-30 17592268988585 25200 +17592268988567 2022-07-30 17592268988568 25200 +17592268988391 2022-07-30 17592268988392 25200 +17592268988836 2022-07-30 17592268988837 25200 +17592268988820 2022-07-30 17592268988821 25200 +17592268988804 2022-07-30 17592268988805 25200 +17592268988786 2022-07-30 17592268988787 25200 +17592268988767 2022-07-30 17592268988768 25200 +17592269190620 2022-08-02 17592269190621 25200 +17592269555344 2022-08-06 17592269555345 25200 +17592271538840 2022-08-27 17592271538841 74800 +17592269946266 2022-08-11 17592269946267 25200 +17592270132982 2022-08-12 17592270132983 25200 +17592270031516 2022-08-12 17592270031517 25200 +17592270132949 2022-08-12 17592270132950 25200 +17592270151407 2022-08-13 17592270151408 25200 +17592270150921 2022-08-13 17592270150922 25200 +17592270150941 2022-08-13 17592270150942 25200 +17592270150957 2022-08-13 17592270150958 25200 +17592270150973 2022-08-13 17592270150974 25200 +17592270151066 2022-08-13 17592270151067 25200 +17592270151084 2022-08-13 17592270151085 25200 +17592270151102 2022-08-13 17592270151103 25200 +17592270151118 2022-08-13 17592270151119 25200 +17592270151135 2022-08-13 17592270151136 25200 +17592270293531 2022-08-13 17592270293532 25200 +17592270151227 2022-08-13 17592270151228 25200 +17592270151243 2022-08-13 17592270151244 25200 +17592270151259 2022-08-13 17592270151260 25200 +17592270162065 2022-08-13 17592270162066 25200 +17592270150828 2022-08-13 17592270150829 25200 +17592270218815 2022-08-14 17592270218816 25200 +17592271515182 2022-08-27 17592271515183 25200 +17592271514723 2022-08-27 17592271514724 25200 +17592266737477 2022-07-03 17592266737478 74800 +17592271396636 2022-08-28 17592271396637 25200 +17592271396620 2022-08-28 17592271396621 25200 +17592271396756 2022-08-28 17592271396757 25200 +17592271396740 2022-08-28 17592271396741 25200 +17592271396806 2022-08-28 17592271396807 74800 +17592268908245 2022-07-29 17592268908246 74800 +17592271396823 2022-08-28 17592271396824 25200 +17592271514059 2022-08-28 17592271514060 25200 +17592269827483 2022-08-10 17592269827484 74800 +17592271515597 2022-08-28 17592271515598 25200 +17592271396986 2022-08-28 17592271396987 25200 +17592271396519 2022-08-28 17592271396520 25200 +17592271655975 2022-08-31 17592271655976 25200 +17592272783029 2022-09-13 17592272783030 74800 +17592272515331 2022-09-10 17592272515332 25200 +17592272515347 2022-09-10 17592272515348 25200 +17592272514848 2022-09-10 17592272514849 25200 +17592272515298 2022-09-10 17592272515299 25200 +17592272515315 2022-09-10 17592272515316 25200 +17592272515397 2022-09-10 17592272515398 25200 +17592272515414 2022-09-10 17592272515415 25200 +17592272515365 2022-09-10 17592272515366 25200 +17592272515381 2022-09-10 17592272515382 25200 +17592272515460 2022-09-10 17592272515461 25200 +17592272515482 2022-09-10 17592272515483 25200 +17592272515438 2022-09-10 17592272515439 25200 +17592272515058 2022-09-10 17592272515059 25200 +17592272514560 2022-09-10 17592272514561 25200 +17592272515150 2022-09-10 17592272515151 25200 +17592272515166 2022-09-10 17592272515167 25200 +17592272514651 2022-09-10 17592272514652 25200 +17592272515117 2022-09-10 17592272515118 25200 +17592272515134 2022-09-10 17592272515135 25200 +17592272514706 2022-09-10 17592272514707 25200 +17592272515183 2022-09-10 17592272515184 25200 +17592272717217 2022-09-12 17592272717218 25200 +17592272717317 2022-09-12 17592272717318 25200 +17592276385146 2022-10-22 17592276385147 74800 +17592273946966 2022-09-24 17592273946967 25200 +17592273946948 2022-09-24 17592273946949 25200 +17592273946932 2022-09-24 17592273946933 25200 +17592273946916 2022-09-24 17592273946917 25200 +17592273947030 2022-09-24 17592273947031 25200 +17592273947014 2022-09-24 17592273947015 25200 +17592273946998 2022-09-24 17592273946999 25200 +17592273946982 2022-09-24 17592273946983 25200 +17592273946588 2022-09-24 17592273946589 25200 +17592274379319 2022-09-24 17592274379320 25200 +17592273946717 2022-09-24 17592273946718 25200 +17592273946701 2022-09-24 17592273946702 25200 +17592273946685 2022-09-24 17592273946686 25200 +17592273946781 2022-09-24 17592273946782 25200 +17592273946749 2022-09-24 17592273946750 25200 +17592273946733 2022-09-24 17592273946734 25200 +17592273946829 2022-09-24 17592273946830 25200 +17592274496126 2022-09-24 17592274496127 25200 +17592273946813 2022-09-24 17592273946814 25200 +17592273946797 2022-09-24 17592273946798 25200 +17592273946765 2022-09-25 17592273946766 25200 +17592274221701 2022-09-26 17592274221702 25200 +17592274221720 2022-09-26 17592274221721 25200 +17592274294519 2022-09-27 17592274294520 25200 +17592274294413 2022-09-27 17592274294414 25200 +17592275240752 2022-10-08 17592275240753 25200 +17592275240702 2022-10-08 17592275240703 25200 +17592275240686 2022-10-08 17592275240687 25200 +17592275240736 2022-10-08 17592275240737 25200 +17592275240720 2022-10-08 17592275240721 25200 +17592275296110 2022-10-08 17592275296111 25200 +17592256056953 2022-02-26 17592256056954 74800 +17592275240510 2022-10-08 17592275240511 25200 +17592275240494 2022-10-08 17592275240495 25200 +17592275240542 2022-10-08 17592275240543 25200 +17592275240526 2022-10-08 17592275240527 25200 +17592275240638 2022-10-08 17592275240639 25200 +17592275240622 2022-10-08 17592275240623 25200 +17592275240670 2022-10-08 17592275240671 25200 +17592275240654 2022-10-08 17592275240655 25200 +17592275240574 2022-10-08 17592275240575 25200 +17592275240558 2022-10-08 17592275240559 25200 +17592275240606 2022-10-08 17592275240607 25200 +17592275240590 2022-10-08 17592275240591 25200 +17592275369699 2022-10-11 17592275369700 25200 +17592275423593 2022-10-11 17592275423594 25200 +17592275900289 2022-10-15 17592275900290 25200 +17592276037080 2022-10-19 17592276037081 25200 +17592276368721 2022-10-22 17592276368722 25200 +17592276368737 2022-10-22 17592276368738 25200 +17592276368689 2022-10-22 17592276368690 25200 +17592276368657 2022-10-22 17592276368658 25200 +17592276368673 2022-10-22 17592276368674 25200 +17592276368625 2022-10-22 17592276368626 25200 +17592276368641 2022-10-22 17592276368642 25200 +17592276370399 2022-10-22 17592276370400 25200 +17592276368753 2022-10-22 17592276368754 25200 +17592275281797 2022-10-08 17592275281798 74800 +17592276368769 2022-10-22 17592276368770 25200 +17592276368585 2022-10-22 17592276368586 25200 +17592276368609 2022-10-22 17592276368610 25200 +17592276384917 2022-10-22 17592276384918 74800 +17592276369017 2022-10-22 17592276369018 25200 +17592276450057 2022-10-23 17592276450058 25200 +17592276450024 2022-10-23 17592276450025 25200 +17592276450041 2022-10-23 17592276450042 25200 +17592276450008 2022-10-23 17592276450009 25200 +17592276669798 2022-10-25 17592276669799 25200 +17592276639411 2022-10-25 17592276639412 25200 +17592277369962 2022-11-02 17592277369963 74800 +17592277860680 2022-11-05 17592277860681 25200 +17592277860820 2022-11-05 17592277860821 25200 +17592277860804 2022-11-05 17592277860805 25200 +17592277860746 2022-11-05 17592277860747 25200 +17592277855300 2022-11-05 17592277855301 25200 +17592277860868 2022-11-05 17592277860869 25200 +17592277860852 2022-11-05 17592277860853 25200 +17592277860836 2022-11-05 17592277860837 25200 +17592277859546 2022-11-05 17592277859547 25200 +17592277860021 2022-11-05 17592277860022 25200 +17592277860005 2022-11-05 17592277860006 25200 +17592277859989 2022-11-05 17592277859990 25200 +17592277921627 2022-11-06 17592277921628 25200 +17592277930216 2022-11-06 17592277930217 25200 +17592277860896 2022-11-12 17592277860897 25200 +17592279181583 2022-11-20 17592279181584 25200 +17592279185154 2022-11-20 17592279185155 25200 +17592279185170 2022-11-20 17592279185171 25200 +17592279184191 2022-11-20 17592279184192 25200 +17592279185204 2022-11-20 17592279185205 25200 +17592279180902 2022-11-20 17592279180903 25200 +17592279180986 2022-11-20 17592279180987 25200 +17592279180870 2022-11-20 17592279180871 25200 +17592279180886 2022-11-20 17592279180887 25200 +17592279255953 2022-11-21 17592279255954 25200 +17592279255870 2022-11-21 17592279255871 25200 +17592279633847 2022-11-26 17592279633848 25200 +17592279633928 2022-11-26 17592279633929 25200 +17592280367003 2022-12-03 17592280367004 25200 +17592280366987 2022-12-03 17592280366988 25200 +17592280367019 2022-12-03 17592280367020 25200 +17592280366847 2022-12-03 17592280366848 25200 +17592280366879 2022-12-03 17592280366880 25200 +17592280366863 2022-12-03 17592280366864 25200 +17592280366815 2022-12-03 17592280366816 25200 +17592280366831 2022-12-04 17592280366832 25200 +17592280714252 2022-12-05 17592280714253 25200 +17592280750160 2022-12-06 17592280750161 25200 +17592283105214 2022-12-24 17592283105215 74800 +17592282312665 2022-12-18 17592282312666 25200 +17592282312844 2022-12-18 17592282312845 25200 +17592282312828 2022-12-18 17592282312829 25200 +17592282312730 2022-12-18 17592282312731 25200 +17592282312714 2022-12-18 17592282312715 25200 +17592282312698 2022-12-18 17592282312699 25200 +17592282312681 2022-12-18 17592282312682 25200 +17592282312746 2022-12-18 17592282312747 25200 +17592282615559 2022-12-19 17592282615560 25200 +17592282615509 2022-12-19 17592282615510 25200 +17592271396790 2022-08-28 17592271396791 74800 +17592283643250 2022-12-31 17592283643251 25200 +17592283643234 2022-12-31 17592283643235 25200 +17592283643282 2022-12-31 17592283643283 25200 +17592283643266 2022-12-31 17592283643267 25200 +17592283643182 2022-12-31 17592283643183 25200 +17592283643218 2022-12-31 17592283643219 25200 +17592283643166 2022-12-31 17592283643167 25200 +17592283748156 2023-01-01 17592283748157 25200 +17592284276308 2023-01-08 17592284276309 25200 +17592284941762 2023-01-14 17592284941763 25200 +17592285000071 2023-01-14 17592285000072 25200 +17592285000087 2023-01-14 17592285000088 25200 +17592285000055 2023-01-14 17592285000056 25200 +17592285000020 2023-01-14 17592285000021 25200 +17592284999905 2023-01-14 17592284999906 25200 +17592285000206 2023-01-14 17592285000207 25200 +17592285492230 2023-01-19 17592285492231 25200 +17592285571633 2023-01-20 17592285571634 25200 +17592285633091 2023-01-21 17592285633092 25200 +17592285724242 2023-01-22 17592285724243 25200 +17592286307223 2023-01-29 17592286307224 25200 +17592286307207 2023-01-29 17592286307208 25200 +17592286307191 2023-01-29 17592286307192 25200 +17592286307317 2023-01-29 17592286307318 25200 +17592286307301 2023-01-29 17592286307302 25200 +17592286307284 2023-01-30 17592286307285 25200 +17592266779831 2022-07-04 17592266779832 74800 +17592260163078 2022-04-23 17592260163079 25200 +17592260163094 2022-04-23 17592260163095 25200 +17592269106652 2022-08-01 17592269106653 74800 +17592274783383 2022-10-02 17592274783384 74800 +17592255876726 2022-02-23 17592255876727 34000 +17592284625563 2023-01-10 17592284625564 25200 +17592284746596 2023-01-12 17592284746597 25200 +17592284749017 2023-01-12 17592284749018 25200 +17592285822279 2023-01-23 17592285822280 25200 +17592285821549 2023-01-23 17592285821550 25200 +17592285909898 2023-01-24 17592285909899 25200 +17592254738033 2022-02-09 17592254738034 34010 +17592254737987 2022-02-09 17592254737988 34010 +17592263568937 2022-05-26 17592263568938 25200 +17592276669403 2022-10-25 17592276669404 41001 +17592265233216 2022-06-16 17592265233217 25200 +17592261332051 2022-05-08 17592261332052 25200 +17592261331903 2022-05-08 17592261331904 25200 +17592263078105 2022-05-20 17592263078106 25200 +17592263077874 2022-05-20 17592263077875 25200 +17592263077858 2022-05-20 17592263077859 25200 +17592263077907 2022-05-20 17592263077908 25200 +17592263077939 2022-05-20 17592263077940 25200 +17592263077923 2022-05-20 17592263077924 25200 +17592263050825 2022-05-20 17592263050826 25200 +17592263077820 2022-05-20 17592263077821 25200 +17592263077837 2022-05-20 17592263077838 25200 +17592263160549 2022-05-20 17592263160550 25200 +17592263160681 2022-05-21 17592263160682 25200 +17592263160697 2022-05-22 17592263160698 25200 +17592264186512 2022-06-03 17592264186513 25200 +17592264188537 2022-06-03 17592264188538 25200 +17592264231618 2022-06-03 17592264231619 25200 +17592264215734 2022-06-03 17592264215735 25200 +17592264188436 2022-06-03 17592264188437 25200 +17592264186871 2022-06-03 17592264186872 25200 +17592264186273 2022-06-03 17592264186274 25200 +17592264186699 2022-06-03 17592264186700 25200 +17592265291423 2022-06-17 17592265291424 25200 +17592265291372 2022-06-17 17592265291373 25200 +17592265290608 2022-06-17 17592265290609 25200 +17592265290708 2022-06-17 17592265290709 25200 +17592265291037 2022-06-17 17592265291038 25200 +17592265291021 2022-06-17 17592265291022 25200 +17592265291001 2022-06-17 17592265291002 25200 +17592265291053 2022-06-17 17592265291054 25200 +17592266615500 2022-07-01 17592266615501 25200 +17592275947956 2022-10-17 17592275947957 74800 +17592266615409 2022-07-01 17592266615410 25200 +17592266643565 2022-07-01 17592266643566 25200 +17592266615344 2022-07-01 17592266615345 25200 +17592266615361 2022-07-01 17592266615362 25200 +17592266615328 2022-07-01 17592266615329 25200 +17592266615597 2022-07-01 17592266615598 25200 +17592266615614 2022-07-01 17592266615615 25200 +17592266615549 2022-07-01 17592266615550 25200 +17592266615581 2022-07-01 17592266615582 25200 +17592267680862 2022-07-15 17592267680863 25200 +17592267695117 2022-07-15 17592267695118 25200 +17592267680718 2022-07-15 17592267680719 25200 +17592267708696 2022-07-15 17592267708697 25200 +17592268942895 2022-07-29 17592268942896 25200 +17592268942753 2022-07-29 17592268942754 25200 +17592270075129 2022-08-12 17592270075130 25200 +17592270076736 2022-08-12 17592270076737 25200 +17592270076761 2022-08-12 17592270076762 25200 +17592270074215 2022-08-12 17592270074216 25200 +17592270073781 2022-08-12 17592270073782 25200 +17592270075335 2022-08-12 17592270075336 25200 +17592270074882 2022-08-12 17592270074883 25200 +17592270074905 2022-08-12 17592270074906 25200 +17592270074951 2022-08-12 17592270074952 25200 +17592270073963 2022-08-12 17592270073964 25200 +17592270076044 2022-08-12 17592270076045 25200 +17592271223528 2022-08-26 17592271223529 25200 +17592271221524 2022-08-26 17592271221525 25200 +17592271221555 2022-08-26 17592271221556 25200 +17592271222600 2022-08-26 17592271222601 25200 +17592271272857 2022-08-26 17592271272858 25200 +17592271223245 2022-08-26 17592271223246 25200 +17592271223270 2022-08-26 17592271223271 25200 +17592271222806 2022-08-26 17592271222807 25200 +17592271222787 2022-08-26 17592271222788 25200 +17592271221310 2022-08-26 17592271221311 25200 +17592271222827 2022-08-26 17592271222828 25200 +17592271222348 2022-08-26 17592271222349 25200 +17592271222373 2022-08-26 17592271222374 25200 +17592271223009 2022-08-26 17592271223010 25200 +17592271222989 2022-08-26 17592271222990 25200 +17592272453384 2022-09-09 17592272453385 25200 +17592272453368 2022-09-09 17592272453369 25200 +17592272453524 2022-09-09 17592272453525 25200 +17592272453572 2022-09-09 17592272453573 25200 +17592272453540 2022-09-09 17592272453541 25200 +17592272453556 2022-09-09 17592272453557 25200 +17592272453605 2022-09-09 17592272453606 25200 +17592272453621 2022-09-09 17592272453622 25200 +17592272441949 2022-09-09 17592272441950 25200 +17592272454255 2022-09-09 17592272454256 25200 +17592272453336 2022-09-09 17592272453337 25200 +17592273126004 2022-09-15 17592273126005 25200 +17592273913694 2022-09-23 17592273913695 25200 +17592273914836 2022-09-23 17592273914837 25200 +17592273915345 2022-09-23 17592273915346 25200 +17592273914820 2022-09-23 17592273914821 25200 +17592273914804 2022-09-23 17592273914805 25200 +17592273914788 2022-09-23 17592273914789 25200 +17592273914900 2022-09-23 17592273914901 25200 +17592273914884 2022-09-23 17592273914885 25200 +17592273914868 2022-09-23 17592273914869 25200 +17592273914852 2022-09-23 17592273914853 25200 +17592273913992 2022-09-23 17592273913993 25200 +17592274517854 2022-09-24 17592274517855 25200 +17592277766985 2022-11-04 17592277766986 74800 +17592277766139 2022-11-04 17592277766140 74800 +17592273995840 2022-09-25 17592273995841 74800 +17592275024837 2022-10-05 17592275024838 25200 +17592275193148 2022-10-07 17592275193149 25200 +17592275193132 2022-10-07 17592275193133 25200 +17592275193172 2022-10-07 17592275193173 25200 +17592275193188 2022-10-07 17592275193189 25200 +17592275192897 2022-10-07 17592275192898 25200 +17592275192881 2022-10-07 17592275192882 25200 +17592275192865 2022-10-07 17592275192866 25200 +17592275193017 2022-10-07 17592275193018 25200 +17592266699476 2022-07-01 17592266699477 74800 +17592276311824 2022-10-21 17592276311825 25200 +17592276282319 2022-10-21 17592276282320 25200 +17592276506000 2022-10-21 17592276506001 25200 +17592276282703 2022-10-22 17592276282704 25200 +17592276312021 2022-10-22 17592276312022 25200 +17592276311999 2022-10-22 17592276312000 25200 +17592276311968 2022-10-22 17592276311969 25200 +17592276312053 2022-10-22 17592276312054 25200 +17592277766919 2022-11-04 17592277766920 25200 +17592277766887 2022-11-04 17592277766888 25200 +17592277767088 2022-11-04 17592277767089 25200 +17592277766525 2022-11-04 17592277766526 25200 +17592277767022 2022-11-04 17592277767023 25200 +17592277767353 2022-11-04 17592277767354 25200 +17592277766793 2022-11-04 17592277766794 25200 +17592279083798 2022-11-18 17592279083799 25200 +17592279069295 2022-11-18 17592279069296 25200 +17592279069193 2022-11-18 17592279069194 25200 +17592279069041 2022-11-19 17592279069042 25200 +17592279069057 2022-11-19 17592279069058 25200 +17592279069129 2022-11-19 17592279069130 25200 +17592279069145 2022-11-19 17592279069146 25200 +17592279069311 2022-11-19 17592279069312 25200 +17592279069177 2022-11-19 17592279069178 25200 +17592279069209 2022-11-19 17592279069210 25200 +17592279069225 2022-11-19 17592279069226 25200 +17592279069241 2022-11-19 17592279069242 25200 +17592279069257 2022-11-19 17592279069258 25200 +17592279342588 2022-11-22 17592279342589 25200 +17592280263565 2022-12-02 17592280263566 25200 +17592280297082 2022-12-02 17592280297083 25200 +17592280297104 2022-12-02 17592280297105 25200 +17592280306161 2022-12-02 17592280306162 25200 +17592280264736 2022-12-02 17592280264737 25200 +17592280264717 2022-12-02 17592280264718 25200 +17592280264768 2022-12-02 17592280264769 25200 +17592280264752 2022-12-02 17592280264753 25200 +17592280297210 2022-12-03 17592280297211 25200 +17592280297194 2022-12-03 17592280297195 25200 +17592280297127 2022-12-03 17592280297128 25200 +17592280297172 2022-12-03 17592280297173 25200 +17592280297156 2022-12-03 17592280297157 25200 +17592280298180 2022-12-03 17592280298181 25200 +17592283537648 2022-12-30 17592283537649 74800 +17592282148119 2022-12-16 17592282148120 25200 +17592282148103 2022-12-16 17592282148104 25200 +17592282148684 2022-12-16 17592282148685 25200 +17592282148167 2022-12-16 17592282148168 25200 +17592282148151 2022-12-16 17592282148152 25200 +17592282148135 2022-12-16 17592282148136 25200 +17592282147975 2022-12-16 17592282147976 25200 +17592273995818 2022-09-25 17592273995819 74800 +17592282148016 2022-12-16 17592282148017 25200 +17592282147927 2022-12-16 17592282147928 25200 +17592283537699 2022-12-30 17592283537700 25200 +17592274318631 2022-09-27 17592274318632 74800 +17592283537664 2022-12-30 17592283537665 25200 +17592283537680 2022-12-30 17592283537681 25200 +17592283537584 2022-12-30 17592283537585 25200 +17592283537600 2022-12-30 17592283537601 25200 +17592283537616 2022-12-30 17592283537617 25200 +17592283537632 2022-12-30 17592283537633 25200 +17592283534457 2022-12-30 17592283534458 25200 +17592284779663 2023-01-13 17592284779664 25200 +17592284779679 2023-01-13 17592284779680 25200 +17592284779631 2023-01-13 17592284779632 25200 +17592284779647 2023-01-13 17592284779648 25200 +17592284779599 2023-01-13 17592284779600 25200 +17592284779615 2023-01-13 17592284779616 25200 +17592284779567 2023-01-13 17592284779568 25200 +17592284779583 2023-01-13 17592284779584 25200 +17592284779551 2023-01-13 17592284779552 25200 +17592284779519 2023-01-13 17592284779520 25200 +17592285598306 2023-01-23 17592285598307 25200 +17592286153831 2023-01-27 17592286153832 25200 +17592286150254 2023-01-27 17592286150255 25200 +17592286150236 2023-01-27 17592286150237 25200 +17592286177977 2023-01-28 17592286177978 25200 +17592286177961 2023-01-28 17592286177962 25200 +17592277188257 2022-10-31 17592277188258 34000 +17592282669352 2022-12-20 17592282669353 34000 +17592282669360 2022-12-20 17592282669361 34020 +17592277188411 2022-10-31 17592277188412 34020 +17592279032190 2022-11-18 17592279032191 34020 +17592279032299 2022-11-18 17592279032300 34000 +17592270697894 2022-08-20 17592270697895 34020 +17592272424956 2022-09-09 17592272424957 34020 +17592281212880 2022-12-08 17592281212881 34020 +17592281212872 2022-12-08 17592281212873 34000 +17592275326214 2022-10-10 17592275326215 34020 +17592273554701 2022-09-20 17592273554702 34020 +17592276861183 2022-11-07 17592276861184 74800 +17592264402196 2022-06-06 17592264402197 15300 +17592266919574 2022-07-06 17592266919575 15300 +17592267179840 2022-07-11 17592267179841 15300 +17592268563563 2022-07-26 17592268563564 15300 +17592270334167 2022-08-15 17592270334168 15300 +17592271501508 2022-08-29 17592271501509 15300 +17592273549066 2022-09-20 17592273549067 15300 +17592274432379 2022-09-29 17592274432380 15300 +17592276861140 2022-10-31 17592276861141 15300 +17592258540529 2022-03-31 17592258540530 74800 +17592281150433 2022-12-07 17592281150434 15300 +17592281150401 2022-12-07 17592281150402 15300 +17592260212622 2022-04-25 17592260212623 28010 +17592285986733 2023-01-25 17592285986734 25200 +17592286352749 2023-01-30 17592286352750 25200 +17592253192611 2022-01-15 17592253192612 54100 +17592255221348 2022-02-16 17592255221349 74700 +17592258979169 2022-04-07 17592258979170 54100 +17592255943255 2022-02-24 17592255943256 54100 +17592274432034 2022-09-29 17592274432035 54100 +17592281986877 2022-12-15 17592281986878 54100 +17592259304102 2022-04-12 17592259304103 25200 +17592262769243 2022-05-18 17592262769244 25200 +17592258935384 2022-04-06 17592258935385 74800 +17592275506292 2022-10-12 17592275506293 74800 +17592252515906 2022-01-04 17592252515907 50000 +17592272475629 2022-09-09 17592272475630 74800 +17592259032707 2022-04-07 17592259032708 25200 +17592274975679 2022-10-05 17592274975680 74800 +17592281210985 2022-12-08 17592281210986 74800 +17592268033063 2022-07-20 17592268033064 74800 +17592268400613 2022-07-23 17592268400614 74800 +17592271974069 2022-09-02 17592271974070 74800 +17592269107884 2022-08-01 17592269107885 91100 +17592272475226 2022-09-09 17592272475227 25200 +17592272615831 2022-09-11 17592272615832 25200 +17592272961613 2022-09-14 17592272961614 25200 +17592281211592 2022-12-08 17592281211593 74800 +17592273287894 2022-09-16 17592273287895 25200 +17592273287767 2022-09-16 17592273287768 74800 +17592273773985 2022-09-22 17592273773986 25200 +17592273927064 2022-09-23 17592273927065 25200 +17592272276098 2022-09-07 17592272276099 74800 +17592274975695 2022-10-05 17592274975696 25200 +17592274976753 2022-10-05 17592274976754 25200 +17592275080148 2022-10-06 17592275080149 25200 +17592275106011 2022-10-06 17592275106012 25200 +17592282147895 2022-12-16 17592282147896 74800 +17592275508882 2022-10-12 17592275508883 25200 +17592276112638 2022-10-20 17592276112639 25200 +17592277475900 2022-11-03 17592277475901 25200 +17592273446835 2022-09-18 17592273446836 74800 +17592279099252 2022-11-18 17592279099253 74800 +17592253152481 2022-01-14 17592253152482 74800 +17592279599064 2022-11-25 17592279599065 74800 +17592281783993 2022-12-13 17592281783994 74800 +17592253201274 2022-01-15 17592253201275 74800 +17592284843851 2023-01-13 17592284843852 25200 +17592275169638 2022-10-07 17592275169639 34000 +17592264894745 2022-06-12 17592264894746 34000 +17592260390513 2022-04-27 17592260390514 34000 +17592260352978 2022-04-26 17592260352979 25200 +17592260352941 2022-04-26 17592260352942 25200 +17592261888963 2022-05-13 17592261888964 34000 +17592263899219 2022-05-31 17592263899220 25200 +17592284393896 2023-01-09 17592284393897 25200 +17592256314259 2022-03-02 17592256314260 25200 +17592261409330 2022-05-09 17592261409331 25200 +17592265059192 2022-06-10 17592265059193 25200 +17592277987758 2022-11-07 17592277987759 25200 +17592284391941 2023-01-09 17592284391942 25200 +17592259077732 2022-04-02 17592259077733 50000 +17592261649538 2022-05-03 17592261649539 50000 +17592262670465 2022-05-15 17592262670466 50000 +17592261009984 2022-05-03 17592261009985 15300 +17592283834084 2022-01-01 17592283834085 25200 +17592283834054 2022-01-01 17592283834055 25200 +17592253969941 2022-01-28 17592253969942 34000 +17592259156028 2022-04-09 17592259156029 25200 +17592259156050 2022-04-09 17592259156051 25200 +17592259141186 2022-04-09 17592259141187 25200 +17592259146769 2022-04-09 17592259146770 25200 +17592259155983 2022-04-09 17592259155984 25200 +17592259164892 2022-04-09 17592259164893 25200 +17592259165016 2022-04-09 17592259165017 25200 +17592259164997 2022-04-09 17592259164998 25200 +17592259164929 2022-04-09 17592259164930 25200 +17592259164911 2022-04-09 17592259164912 25200 +17592259155927 2022-04-09 17592259155928 25200 +17592259419335 2022-04-13 17592259419336 74800 +17592260133419 2022-04-22 17592260133420 25200 +17592260211160 2022-04-25 17592260211161 25200 +17592257068402 2022-03-12 17592257068403 74800 +17592284849514 2023-01-13 17592284849515 25200 +17592284849482 2023-01-13 17592284849483 25200 +17592284849498 2023-01-13 17592284849499 25200 +17592284849442 2023-01-13 17592284849443 25200 +17592284849466 2023-01-13 17592284849467 25200 +17592284849418 2023-01-13 17592284849419 25200 +17592284849434 2023-01-13 17592284849435 25200 +17592285492213 2023-01-20 17592285492214 25200 +17592263422785 2022-05-24 17592263422786 25500 +17592263736023 2022-05-27 17592263736024 25500 +17592263736035 2022-05-27 17592263736036 25500 +17592273287191 2022-09-14 17592273287192 25500 +17592273725257 2022-09-18 17592273725258 74800 +17592275317810 2022-10-09 17592275317811 25500 +17592276962343 2022-10-27 17592276962344 25500 +17592279511367 2022-11-20 17592279511368 74800 +17592279525399 2022-11-21 17592279525400 74800 +17592263996238 2022-05-30 17592263996239 34000 +17592276677533 2022-10-25 17592276677534 74800 +17592264075420 2022-06-03 17592264075421 25200 +17592264074976 2022-06-03 17592264074977 25200 +17592282879736 2022-12-21 17592282879737 74800 +17592272425305 2022-09-09 17592272425306 74800 +17592264075078 2022-06-03 17592264075079 25200 +17592264278278 2022-06-03 17592264278279 74800 +17592264202620 2022-06-03 17592264202621 74800 +17592263207864 2022-05-16 17592263207865 34000 +17592265408161 2022-06-13 17592265408162 34000 +17592273639539 2022-07-29 17592273639540 25200 +17592266719036 2022-07-01 17592266719037 34000 +17592267806445 2022-07-15 17592267806446 34000 +17592273639541 2022-08-12 17592273639542 25200 +17592276285855 2022-10-16 17592276285856 74800 +17592279214536 2022-11-13 17592279214537 74800 +17592273639543 2022-08-26 17592273639544 25200 +17592272845142 2022-09-11 17592272845143 74800 +17592274359198 2022-09-25 17592274359199 74800 +17592277309224 2022-10-30 17592277309225 74800 +17592273639545 2022-09-09 17592273639546 25200 +17592280637040 2022-11-27 17592280637041 74800 +17592269618212 2022-07-31 17592269618213 74800 +17592271598909 2022-08-21 17592271598910 74800 +17592273639547 2022-09-23 17592273639548 25200 +17592271598939 2022-08-28 17592271598940 74800 +17592275317950 2022-10-09 17592275317951 74800 +17592273639549 2022-10-07 17592273639550 25200 +17592277006297 2022-10-23 17592277006298 74800 +17592275854768 2022-10-15 17592275854769 74800 +17592263551856 2022-05-26 17592263551857 74800 +17592269866037 2022-08-08 17592269866038 74800 +17592270809739 2022-08-14 17592270809740 74800 +17592276910780 2022-10-20 17592276910781 25200 +17592276285062 2022-10-20 17592276285063 25500 +17592273639551 2022-10-21 17592273639552 25200 +17592272255835 2022-09-04 17592272255836 74800 +17592275506406 2022-10-09 17592275506407 74800 +17592278130666 2022-11-06 17592278130667 74800 +17592264188562 2022-06-03 17592264188563 74800 +17592273639553 2022-11-04 17592273639554 25200 +17592265560013 2022-06-17 17592265560014 74800 +17592279368053 2022-11-13 17592279368054 25200 +17592263735133 2022-05-27 17592263735134 25500 +17592273639555 2022-11-18 17592273639556 25200 +17592263932877 2022-05-29 17592263932878 25500 +17592264076950 2022-06-01 17592264076951 25500 +17592275196391 2022-10-07 17592275196392 25500 +17592280154421 2022-12-01 17592280154422 33000 +17592273639557 2022-12-02 17592273639558 25200 +17592263783574 2022-05-28 17592263783575 25500 +17592285635815 2022-12-30 17592285635816 25200 +17592275196316 2022-10-07 17592275196317 25500 +17592253770650 2022-01-25 17592253770651 25200 +17592259911608 2022-04-20 17592259911609 74700 +17592283014666 2022-12-15 17592283014667 74800 +17592278444193 2022-11-12 17592278444194 74800 +17592279018014 2022-11-18 17592281874424 25200 +17592280035547 2022-11-30 17592281874423 25200 +17592271898648 2022-09-02 17592271898649 74800 +17592259098540 2022-04-08 17592259098541 25200 +17592261266602 2022-05-06 17592261266603 25200 +17592268819214 2022-07-29 17592268819215 25200 +17592271357058 2022-08-27 17592271357059 25200 +17592271904240 2022-09-02 17592271904241 74800 +17592256029083 2022-02-25 17592256029084 74800 +17592274242582 2022-09-26 17592274242583 12300 +17592282070464 2022-12-16 17592282070465 25200 +17592282616091 2022-12-19 17592282616092 25200 +17592284586320 2023-01-10 17592284586321 25200 +17592285596490 2023-01-13 17592285596491 25200 +17592236720667 2022-01-15 17592236720668 93400 +17592255088563 2022-02-14 17592255088564 28117 +17592255088563 2022-02-14 17592255088565 28117 +17592255088563 2022-02-14 17592255088566 28117 +17592236720669 2022-02-15 17592236720670 93400 +17592260003767 2022-04-21 17592260003768 15300 +17592261164473 2022-05-05 17592261164474 34020 +17592261164465 2022-05-05 17592261164466 34010 +17592270118134 2022-06-30 17592270118135 34010 +17592270118159 2022-06-30 17592270118160 34020 +17592269372450 2022-08-03 17592269372451 25200 +17592269761307 2022-08-09 17592269761308 15300 +17592277526205 2022-11-03 17592277526206 15300 +17592278991479 2022-11-17 17592278991480 15300 +17592252735755 2022-01-07 17592252735756 15300 +17592252742247 2022-01-07 17592252742248 15300 +17592252845226 2022-01-10 17592252845227 15300 +17592253353242 2022-01-18 17592253353243 15300 +17592253988696 2022-01-28 17592253988697 15300 +17592254446981 2022-02-04 17592254446982 15300 +17592254765783 2022-02-09 17592254765784 15300 +17592255219269 2022-02-16 17592255219270 15300 +17592256256826 2022-03-01 17592256256827 15300 +17592257691365 2022-03-19 17592257691366 15300 +17592257850382 2022-03-22 17592257850383 15300 +17592258105831 2022-03-26 17592258105832 15300 +17592260152449 2022-04-23 17592260152450 15300 +17592261709302 2022-05-11 17592261709303 15300 +17592261708065 2022-05-11 17592261708066 15300 +17592261875863 2022-05-13 17592261875864 15300 +17592263007492 2022-05-20 17592263007493 25200 +17592264203177 2022-06-03 17592264203178 25200 +17592266699565 2022-07-02 17592266699566 25200 +17592269000414 2022-07-29 17592269000415 25200 +17592269029809 2022-07-29 17592269029810 25200 +17592269000508 2022-07-29 17592269000509 25200 +17592269000527 2022-07-30 17592269000528 25200 +17592271838708 2022-09-01 17592271838709 15300 +17592273465259 2022-09-19 17592273465260 25200 +17592273953178 2022-09-23 17592273953179 25200 +17592280481481 2022-12-03 17592280481482 25200 +17592282918277 2022-12-22 17592282918278 25200 +17592282993158 2022-12-22 17592282993159 25200 +17592283050604 2022-12-23 17592283050605 25200 +17592283868206 2023-01-03 17592283868207 25200 +17592284605219 2023-01-10 17592284605220 54100 +17592284586166 2023-01-10 17592284586167 54100 +17592285248239 2023-01-18 17592285248240 25200 +17592257078119 2022-03-12 17592257078120 25200 +17592257850613 2022-03-22 17592257850614 28050 +17592261889355 2022-05-13 17592261889356 15300 +17592264489968 2022-06-07 17592264489969 15300 +17592282731712 2022-12-20 17592282731713 15300 +17592253560153 2022-01-21 17592253560154 50000 +17592253988654 2022-01-28 17592253988655 50000 +17592254757176 2022-02-09 17592254757177 50000 +17592274454244 2022-09-27 17592274454245 50000 +17592262902612 2022-05-19 17592262902613 50000 +17592274789426 2022-10-01 17592274789427 50000 +17592268694837 2022-07-27 17592268694838 50000 +17592273417975 2022-09-13 17592273417976 50000 +17592273420207 2022-09-13 17592273420208 50000 +17592258316455 2022-03-29 17592258316456 50000 +17592266965796 2022-07-01 17592266965797 50000 +17592278257071 2022-10-31 17592278257072 86500 +17592253161205 2022-01-17 17592253161206 74800 +17592261332156 2022-05-08 17592261332157 25200 +17592264188177 2022-06-03 17592264188178 25200 +17592265291234 2022-06-17 17592265291235 25200 +17592266615533 2022-07-01 17592266615534 25200 +17592268618658 2022-07-27 17592268618659 25200 +17592268942684 2022-07-29 17592268942685 25200 +17592271224557 2022-08-26 17592271224558 25200 +17592271224879 2022-08-26 17592271224880 25200 +17592271224911 2022-08-26 17592271224912 25200 +17592271225171 2022-08-27 17592271225172 25200 +17592273576001 2022-09-09 17592273576002 25200 +17592273915361 2022-09-23 17592273915362 25200 +17592275192993 2022-10-07 17592275192994 25200 +17592277229510 2022-10-31 17592277229511 25200 +17592277766744 2022-11-04 17592277766745 25200 +17592279069161 2022-11-19 17592279069162 25200 +17592280297475 2022-12-02 17592280297476 25200 +17592281460417 2022-12-10 17592281460418 11000 +17592282148087 2022-12-16 17592282148088 25200 +17592283537568 2022-12-30 17592283537569 25200 +17592284779535 2023-01-13 17592284779536 25200 +17592286177931 2023-01-27 17592286177932 25200 +17592255919055 2022-02-24 17592255919056 74800 +17592256708398 2022-03-07 17592256708399 74800 +17592265651651 2022-06-22 17592265651652 50000 +17592266311212 2022-06-28 17592266311213 50000 +17592267081037 2022-07-08 17592267081038 50000 +17592267410999 2022-07-13 17592267411000 50000 +17592267965267 2022-07-19 17592267965268 50000 +17592268670595 2022-07-27 17592268670596 50000 +17592269409987 2022-08-03 17592269409988 50000 +17592269599108 2022-08-07 17592269599109 50000 +17592270755596 2022-08-20 17592270755597 50000 +17592271043476 2022-08-24 17592271043477 50000 +17592271024042 2022-08-24 17592271024043 50000 +17592272276082 2022-09-07 17592272276083 50000 +17592274568425 2022-10-01 17592274568426 50000 +17592275502685 2022-10-12 17592275502686 50000 +17592276083743 2022-10-19 17592276083744 50000 +17592277304971 2022-11-01 17592277304972 50000 +17592279640256 2022-11-26 17592279640257 50000 +17592279734622 2022-11-27 17592279734623 50000 +17592281360979 2022-12-09 17592281360980 50000 +17592282203823 2022-12-16 17592282203824 50000 +17592283261908 2022-12-27 17592283261909 50000 +17592285188610 2023-01-17 17592285188611 50000 +17592277332428 2022-11-01 17592277332429 11000 +17592257802736 2022-03-22 17592257802737 74800 +17592259804852 2022-04-19 17592259804853 74800 +17592261875023 2022-05-13 17592261875024 74800 +17592283072358 2022-12-23 17592283072359 11000 +17592283072422 2022-12-24 17592283072423 11000 +17592283072440 2022-12-24 17592283072441 11000 +17592283072374 2022-12-24 17592283072375 11000 +17592283072390 2022-12-24 17592283072391 11000 +17592283072406 2022-12-24 17592283072407 11000 +17592283458379 2022-12-29 17592283458380 74800 +17592284215997 2023-01-07 17592284215998 25500 +17592284216013 2023-01-07 17592284216014 25500 +17592284215866 2023-01-07 17592284215867 25500 +17592284215850 2023-01-07 17592284215851 25500 +17592284215898 2023-01-07 17592284215899 25500 +17592284215882 2023-01-07 17592284215883 25500 +17592284391266 2023-01-09 17592284391267 25500 +17592285235547 2023-01-17 17592285235548 25500 +17592285798305 2023-01-23 17592285798306 25500 +17592285798258 2023-01-23 17592285798259 25500 +17592285798215 2023-01-23 17592285798216 25500 +17592285798141 2023-01-23 17592285798142 25500 +17592285798125 2023-01-23 17592285798126 25500 +17592285811831 2023-01-23 17592285811832 25500 +17592285798393 2023-01-23 17592285798394 25500 +17592285901676 2023-01-24 17592285901677 25500 +17592256769163 2022-03-08 17592256769164 28500 +17592260315511 2022-04-20 17592260315512 50000 +17592260315519 2022-04-26 17592260315520 50000 +17592269510284 2022-07-21 17592269510285 50000 +17592269510416 2022-08-02 17592269510417 50000 +17592269510293 2022-08-04 17592269510294 50000 +17592271320980 2022-08-09 17592271320981 50000 +17592270009952 2022-08-11 17592270009953 50000 +17592270682625 2022-08-16 17592270682626 50000 +17592270737069 2022-08-18 17592270737070 50000 +17592272321113 2022-08-23 17592272321114 50000 +17592271983217 2022-08-30 17592271983218 50000 +17592271983202 2022-09-01 17592271983203 50000 +17592272766585 2022-09-07 17592272766586 50000 +17592273557972 2022-09-14 17592273557973 50000 +17592273558710 2022-09-15 17592273558711 50000 +17592276849210 2022-09-22 17592276849211 50000 +17592274551305 2022-09-22 17592274551306 50000 +17592274811225 2022-09-28 17592274811226 50000 +17592275636189 2022-10-06 17592275636190 50000 +17592275636173 2022-10-13 17592275636174 50000 +17592278714024 2022-10-20 17592278714025 50000 +17592277332452 2022-10-27 17592277332453 50000 +17592277527459 2022-11-03 17592277527460 50000 +17592280137608 2022-11-10 17592280137609 50000 +17592279268075 2022-11-17 17592279268076 50000 +17592280157111 2022-11-25 17592280157112 50000 +17592280187032 2022-11-30 17592280187033 50000 +17592280295496 2022-12-02 17592280295497 74800 +17592281141173 2022-12-07 17592281141174 74800 +17592281503548 2022-12-11 17592281503549 74800 +17592281503532 2022-12-11 17592281503533 74800 +17592276772899 2022-10-26 17592276772900 50000 +17592276773440 2022-10-26 17592276773441 50000 +17592276772032 2022-10-26 17592276772033 50000 +17592279640337 2022-11-26 17592279640338 50000 +17592281307871 2022-12-08 17592281307872 11000 +17592283107693 2022-12-24 17592283107694 74800 +17592283483530 2022-12-29 17592283483531 74800 +17592283483546 2022-12-30 17592283483547 74800 +17592283123063 2022-12-25 17592283123064 74800 +17592274452671 2022-09-30 17592274452672 74800 +17592258711692 2022-04-04 17592258711693 74800 +17592274568300 2022-10-01 17592274568301 74800 +17592274832638 2022-10-03 17592274832639 74800 +17592280215131 2022-12-01 17592280215132 74800 +17592281280321 2022-12-08 17592281280322 11000 +17592284877047 2023-01-13 17592284877048 25200 + +") + +(user/init-repl) + +(let [account-lookup (->> (d/q '[:find ?nc ?a + :in $ + :where [?a :account/numeric-code ?nc]] + (d/db auto-ap.datomic/conn)) + (into {}))] + + (doseq [[invoice-id _ invoice-expense-account-id target-code] (-> invoice-bulk-account-change-csv + (clojure.data.csv/read-csv :separator \tab)) + :when (not-empty target-code)] + + (print ".") + (flush) + + (if (account-lookup (Long/parseLong target-code)) + (auto-ap.ledger/transact-with-ledger + [{:db/id (Long/parseLong invoice-expense-account-id) + :invoice-expense-account/account (account-lookup (Long/parseLong target-code))}] + {:user/role "admin" + :user/name "Fixup from https://docs.google.com/spreadsheets/d/1WE0oVcgGoNC-Nvzcsm69Rcr-3Mcm8wpUHcugAxBE77U/edit#gid=1436126881"}) + (println "ACCOUNT " target-code "NOT FOUND.")))) + + + + diff --git a/src/clj/auto_ap/datomic/accounts.clj b/src/clj/auto_ap/datomic/accounts.clj index 7d8e6bbf..5e597121 100644 --- a/src/clj/auto_ap/datomic/accounts.clj +++ b/src/clj/auto_ap/datomic/accounts.clj @@ -9,11 +9,13 @@ (defn <-datomic [a] (-> a (update :account/applicability :db/ident) - (update :account/invoice-allowance :db/ident))) + (update :account/invoice-allowance :db/ident) + (update :account/vendor-allowance :db/ident))) (def default-read ['* {:account/type [:db/ident :db/id] :account/applicability [:db/ident :db/id] :account/invoice-allowance [:db/ident :db/id] + :account/vendor-allowance [:db/ident :db/id] :account/client-overrides [:db/id :account-client-override/name {:account-client-override/client [:db/id :client/name]}]}]) diff --git a/src/clj/auto_ap/datomic/migrate.clj b/src/clj/auto_ap/datomic/migrate.clj index cc4257c1..a5de0f36 100644 --- a/src/clj/auto_ap/datomic/migrate.clj +++ b/src/clj/auto_ap/datomic/migrate.clj @@ -176,6 +176,16 @@ :account/invoice-allowance :allowance/allowed}))) ]) +(defn backfill-account-options2 [conn] + [(->> (d/q '[:find [?a ...] + :in $ + :where [?a :account/name]] + (d/db conn)) + (map (fn [i] + {:db/id i + :account/vendor-allowance :allowance/allowed}))) + ]) + (defn migrate [conn] (let [ @@ -541,22 +551,32 @@ :requires [:auto-ap/add-account-overrides]} :auto-ap/add-search-terms-accounts {:txes-fn `add-account-search-terms :requires [:auto-ap/fulltext-accounts]} - :auto-ap/add-account-options {:txes [[{:db/ident :account/invoice-allowance - :db/valueType :db.type/ref - :db/cardinality :db.cardinality/one - :db/doc "Whether this account can be used for invoices"} - {:db/ident :allowance/allowed - :db/doc "Allowed to be used"} - {:db/ident :allowance/denied - :db/doc "Denied usage"} - {:db/ident :allowance/warn - :db/doc "Warn on usage"} - {:db/ident :allowance/admin-only - :db/doc "Only admins can use it"} - :requires [:auto-ap/add-search-terms-accounts]]]} + :auto-ap/add-account-options {:txes [[{:db/ident :account/invoice-allowance + :db/valueType :db.type/ref + :db/cardinality :db.cardinality/one + :db/doc "Whether this account can be used for invoices"} + {:db/ident :allowance/allowed + :db/doc "Allowed to be used"} + {:db/ident :allowance/denied + :db/doc "Denied usage"} + {:db/ident :allowance/warn + :db/doc "Warn on usage"} + {:db/ident :allowance/admin-only + :db/doc "Only admins can use it"}]] + :requires [:auto-ap/add-search-terms-accounts]} :auto-ap/backfill-account-options {:txes-fn `backfill-account-options - - :requires [:auto-ap/add-account-options]}} + + :requires [:auto-ap/add-account-options]} + + :auto-ap/add-vendor-account-options {:txes [[{:db/ident :account/vendor-allowance + :db/valueType :db.type/ref + :db/cardinality :db.cardinality/one + :db/doc "Whether this account can be used for vendors"} + ]] + :requires [:auto-ap/backfill-account-options]} + :auto-ap/backfill-account-options2 {:txes-fn `backfill-account-options2 + + :requires [:auto-ap/add-vendor-account-options]}} diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj index 6aa5a26f..e5c9ed83 100644 --- a/src/clj/auto_ap/graphql.clj +++ b/src/clj/auto_ap/graphql.clj @@ -247,6 +247,7 @@ :account {:fields {:id {:type :id} :numeric_code {:type 'Int} :invoice_allowance {:type :allowance} + :vendor_allowance {:type :allowance} :type {:type :ident} :applicability {:type :applicability} :account_set {:type 'String} @@ -502,6 +503,7 @@ :type {:type :account_type} :applicability {:type :applicability} :invoice_allowance {:type :allowance} + :vendor_allowance {:type :allowance} :numeric_code {:type 'Int} :location {:type 'String} :account_set {:type 'String} diff --git a/src/clj/auto_ap/graphql/accounts.clj b/src/clj/auto_ap/graphql/accounts.clj index 9ae33ccf..5c66fe42 100644 --- a/src/clj/auto_ap/graphql/accounts.clj +++ b/src/clj/auto_ap/graphql/accounts.clj @@ -30,7 +30,7 @@ (->graphql (d-accounts/clientize result (:client_id args))))) (defn upsert-account [context args _] - (let [{{:keys [id client-overrides numeric-code location applicability account-set name invoice-allowance type]} :account} (<-graphql args)] + (let [{{:keys [id client-overrides numeric-code location applicability account-set name invoice-allowance vendor-allowance type]} :account} (<-graphql args)] (when-not id (when (seq (d/query {:query {:find ['?e] :in '[$ ?account-set ?numeric-code] @@ -53,6 +53,7 @@ :account-applicability/global) :account/invoice-allowance (some-> invoice-allowance (enum->keyword "allowance")) + :account/vendor-allowance (some-> vendor-allowance (enum->keyword "allowance")) :account/account-set account-set :account/location location :account/numeric-code (when-not id diff --git a/src/cljs/auto_ap/views/pages/admin/accounts.cljs b/src/cljs/auto_ap/views/pages/admin/accounts.cljs index c7c21de9..02a9d21c 100644 --- a/src/cljs/auto_ap/views/pages/admin/accounts.cljs +++ b/src/cljs/auto_ap/views/pages/admin/accounts.cljs @@ -16,7 +16,7 @@ [reagent.core :as reagent] [vimsical.re-frame.fx.track :as track])) -(def default-read [:numeric-code :name :location :type :account_set :applicability :invoice-allowance :id [:client-overrides [:name [:client [:name :id]]]]]) +(def default-read [:numeric-code :name :location :type :account_set :applicability :invoice-allowance :vendor-allowance :id [:client-overrides [:name [:client [:name :id]]]]]) diff --git a/src/cljs/auto_ap/views/pages/admin/accounts/form.cljs b/src/cljs/auto_ap/views/pages/admin/accounts/form.cljs index 2fcc46b4..4e95721a 100644 --- a/src/cljs/auto_ap/views/pages/admin/accounts/form.cljs +++ b/src/cljs/auto_ap/views/pages/admin/accounts/form.cljs @@ -20,11 +20,12 @@ (re-frame/reg-sub ::request :<- [::forms/form ::form] - (fn [{{:keys [id location type client-overrides applicability invoice-allowance numeric-code name account-set]} :data}] + (fn [{{:keys [id location type client-overrides applicability invoice-allowance vendor-allowance numeric-code name account-set]} :data}] {:id id :type (keyword type) :applicability (keyword applicability) :invoice-allowance (keyword invoice-allowance) + :vendor-allowance (keyword vendor-allowance) :location (if (clojure.string/blank? location) nil location) @@ -44,7 +45,6 @@ (re-frame/reg-event-db ::editing (fn [db [_ which complete-listener]] - (println "WHICH" which) (-> db (forms/start-form ::form which complete-listener)))) @@ -66,7 +66,7 @@ :operation/name "UpsertAccount"} :venia/queries [{:query/data [:upsert-account {:account request} - [:id :type :name :account-set :numeric-code :location :applicability :invoice-allowance [:client-overrides [:name :id [:client [:id :name]]]]]]}]} + [:id :type :name :account-set :numeric-code :location :applicability :invoice-allowance :vendor-allowance [:client-overrides [:name :id [:client [:id :name]]]]]]}]} :on-success [::edited] :on-error [::forms/save-error ::form]}}))) @@ -84,6 +84,7 @@ [:location {:optional true} [:maybe :string]] [:applicability [:enum :global :optional :customized]] [:invoice-allowance [:enum :allowed :denied :warn :admin-only]] + [:vendor-allowance [:enum :allowed :denied :warn :admin-only]] [:client-overrides {:optional true} [:maybe [:sequential account-customization-schema]]]])) @@ -131,6 +132,15 @@ :allow-nil? true :keywordize? true}]] + [form-builder/field-v2 {:field :vendor-allowance} + "Vendor Allowance" + [com/select-field {:options (map (fn [l] + [l + (str/capitalize (name l))]) + allowances) + :allow-nil? true + :keywordize? true}]] + [form-builder/section {:title "Client"} [:h2.subtitle "Client"] [form-builder/field-v2 {:field :applicability}