NPO-Accounting/payroll-import
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move grouping into the separate report functions

Browse source 
A little simpler this way because the data each report function receives looks
more like the CSV. Also avoids the need to ungroup for `employer-taxes`.
This commit is contained in:
Ben Sturmfels 2024-02-23 10:09:49 +11:00
parent 4c863ea4d7
commit f91302fbd4
Signed by: bsturmfels
GPG key ID: 023C05E2C9C068F0
2 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/core.clj
View file

@ -37,12 +37,12 @@
(when (:help options) (when (:help options)
(println summary) (println summary)
(System/exit 0)) (System/exit 0))
(let [grouped-data (import/read-grouped-csv (:csv options)) (let [data (import/read-csv (:csv options))
imported (concat (import/payroll date period pay-receipt-no grouped-data) imported (concat (import/payroll date period pay-receipt-no data)
(import/individual-taxes date period pay-receipt-no pay-invoice-no grouped-data) (import/individual-taxes date period pay-receipt-no pay-invoice-no data)
(import/employer-taxes date period pay-receipt-no grouped-data) (import/employer-taxes date period pay-receipt-no data)
(import/payroll-fees date period fees-receipt-no fees-invoice-no total-fees grouped-data) (import/payroll-fees date period fees-receipt-no fees-invoice-no total-fees data)
(import/retirement date period retirement-receipt-no retirement-invoice-no grouped-data))] (import/retirement date period retirement-receipt-no retirement-invoice-no data))]
(doseq [i imported] (doseq [i imported]
(println (import/render-transaction i)))))) (println (import/render-transaction i))))))
@ -55,25 +55,25 @@
;; These examples are not included with the code for privacy reasons. ;; These examples are not included with the code for privacy reasons.
(require '[examples]) (require '[examples])
(def grouped-data (import/read-grouped-csv "/home/ben/Downloads/2023-12-27_Pay-Item-Details_2023-12-2.csv")) (def data (import/read-csv "/home/ben/Downloads/2023-12-27_Pay-Item-Details_2023-12-2.csv"))
(def imported (def imported
(concat (import/payroll "2023-12-29" "December 2023" "rt:19462/674660" grouped-data) (concat (import/payroll "2023-12-29" "December 2023" "rt:19462/674660" data)
(import/individual-taxes "2023-12-29" "December 2023" "rt:19462/674660" "rt:19403/675431" grouped-data) (import/individual-taxes "2023-12-29" "December 2023" "rt:19462/674660" "rt:19403/675431" data)
(import/employer-taxes "2023-12-29" "December 2023" "rt:19462/674660" grouped-data) (import/employer-taxes "2023-12-29" "December 2023" "rt:19462/674660" data)
(import/payroll-fees "2023-12-29" "December 2023" "rt:19459/675387" "rt:19459/674887" 206.50M grouped-data) (import/payroll-fees "2023-12-29" "December 2023" "rt:19459/675387" "rt:19459/674887" 206.50M data)
(import/retirement "2024-01-02" "December 2023" "rt:19403/676724" "rt:19403/675431" grouped-data))) (import/retirement "2024-01-02" "December 2023" "rt:19403/676724" "rt:19403/675431" data)))
(dd/pretty-print (dd/pretty-print
(dd/diff (dd/diff
(sort-postings (parse examples/dec-2023)) (sort-postings (parse examples/dec-2023))
(sort-postings imported))) (sort-postings imported)))
(def grouped-data (import/read-grouped-csv "/home/ben/Downloads/2024-01-29_Pay-Item-Details_2024-01.csv")) (def data (import/read-csv "/home/ben/Downloads/2024-01-29_Pay-Item-Details_2024-01.csv"))
(def imported (def imported
(concat (import/payroll "2024-01-31" "January 2024" "rt:19462/685751" grouped-data) (concat (import/payroll "2024-01-31" "January 2024" "rt:19462/685751" data)
(import/individual-taxes "2024-01-31" "January 2024" "rt:19462/685751" "rt:19403/685602" grouped-data) (import/individual-taxes "2024-01-31" "January 2024" "rt:19462/685751" "rt:19403/685602" data)
(import/employer-taxes "2024-01-31" "January 2024" "rt:19462/685751" grouped-data) (import/employer-taxes "2024-01-31" "January 2024" "rt:19462/685751" data)
(import/payroll-fees "2024-01-31" "January 2024" "rt:19459/675387" "rt:19459/674887" 206.50M grouped-data) (import/payroll-fees "2024-01-31" "January 2024" "rt:19459/675387" "rt:19459/674887" 206.50M data)
(import/retirement "2024-01-31" "January 2024" "rt:19403/685929" "rt:19403/685602" grouped-data))) (import/retirement "2024-01-31" "January 2024" "rt:19403/685929" "rt:19403/685602" data)))
;; Compare hand-written transactions with imported (ignoring ordering). ;; Compare hand-written transactions with imported (ignoring ordering).
(dd/pretty-print (dd/pretty-print

32
src/import.clj
View file

@ -17,19 +17,17 @@
(str/replace ", " "-") (str/replace ", " "-")
(str/replace #" \w$" "")))) (str/replace #" \w$" ""))))
(defn read-grouped-csv (defn read-csv
"Read in CSV and return a vector of maps with only the fields we want. "Read in CSV and return a vector of maps with only the fields we want.
Merges the various number fields into a single \"amount\" field." Merges the various number fields into a single \"amount\" field."
[filename] [filename]
(with-open [reader (io/reader filename)] (with-open [reader (io/reader filename)]
(doall (doall
(group-by
:name
(for [[_ name _ category type & totals] (csv/read-csv reader)] (for [[_ name _ category type & totals] (csv/read-csv reader)]
{:name (employee-name->entity-tag name) {:name (employee-name->entity-tag name)
:category category :category category
:type type :type type
:amount (apply max (map bigdec (remove str/blank? totals)))}))))) :amount (apply max (map bigdec (remove str/blank? totals)))}))))
(defn- cat->payroll-type (defn- cat->payroll-type
"Map the CSV withholding categories to Beancount payroll-type tags." "Map the CSV withholding categories to Beancount payroll-type tags."
@ -118,8 +116,8 @@
(defn payroll (defn payroll
"Return a net pay transaction." "Return a net pay transaction."
[date period receipt-no groups] [date period receipt-no data]
(let [postings (for [[name records] groups] (let [postings (for [[name records] (group-by :name data)]
(let [total-net-pay (->> records (let [total-net-pay (->> records
(filter #(= (:type %) "Net Pay")) (filter #(= (:type %) "Net Pay"))
(map :amount) (map :amount)
@ -156,8 +154,8 @@
(defn individual-taxes (defn individual-taxes
"Return a transaction of expenses/witholding for each employee." "Return a transaction of expenses/witholding for each employee."
[date period receipt-no invoice-no groups] [date period receipt-no invoice-no data]
(for [[name records] groups] (for [[name records] (group-by :name data)]
(let [retirement-lines (filter #(= (:type %) "Retirement") records) (let [retirement-lines (filter #(= (:type %) "Retirement") records)
witholding-lines (filter #(= (:type %) "Withholding") records) witholding-lines (filter #(= (:type %) "Withholding") records)
;; TODO: We seem to add these extra insurance/asset postings for ;; TODO: We seem to add these extra insurance/asset postings for
@ -217,10 +215,9 @@
(defn employer-taxes (defn employer-taxes
"Return an employer taxes transaction." "Return an employer taxes transaction."
[date period receipt-no groups] [date period receipt-no data]
(let [ungrouped (apply concat (vals groups)) ; Grouping by employee not useful here (let [liability-lines (filter #(and (= (:type %) "Liability")
liability-lines (filter #(and (= (:type %) "Liability") (not (str/includes? (:category %) "Unemploy"))) data)
(not (str/includes? (:category %) "Unemploy"))) ungrouped)
liability-postings (for [{:keys [amount name category]} liability-lines] liability-postings (for [{:keys [amount name category]} liability-lines]
{:account "Expenses:Payroll:Tax" {:account "Expenses:Payroll:Tax"
:amount amount :amount amount
@ -232,7 +229,7 @@
:payroll-type (str/replace (cat->payroll-type category) "Tax:" "")})}) :payroll-type (str/replace (cat->payroll-type category) "Tax:" "")})})
total-liabilities (->> liability-postings (map :amount) (reduce +)) total-liabilities (->> liability-postings (map :amount) (reduce +))
unemploy-lines (filter #(and (= (:type %) "Liability") unemploy-lines (filter #(and (= (:type %) "Liability")
(str/includes? (:category %) "Unemploy")) ungrouped) (str/includes? (:category %) "Unemploy")) data)
unemploy-postings (for [{:keys [amount name category]} unemploy-lines] unemploy-postings (for [{:keys [amount name category]} unemploy-lines]
{:account "Expenses:Payroll:Tax" {:account "Expenses:Payroll:Tax"
:amount amount :amount amount
@ -257,8 +254,9 @@
(defn payroll-fees (defn payroll-fees
"Return a payroll fees transaction." "Return a payroll fees transaction."
[date period receipt-no invoice-no total-fees groups] [date period receipt-no invoice-no total-fees data]
(let [employees (keys groups) (let [employees (distinct (map :name data))
_ (println employees)
exact-fee-allocation (split-fee total-fees (count employees)) exact-fee-allocation (split-fee total-fees (count employees))
employee-fees (map vector employees exact-fee-allocation) employee-fees (map vector employees exact-fee-allocation)
expense-postings (for [[name fee] employee-fees] expense-postings (for [[name fee] employee-fees]
@ -280,8 +278,8 @@
(defn retirement (defn retirement
"Return a retirement transaction." "Return a retirement transaction."
[date period receipt-no invoice-no groups] [date period receipt-no invoice-no data]
(let [liability-postings (for [[name records] groups] (let [liability-postings (for [[name records] (group-by :name data)]
(let [total-retirement (->> records (let [total-retirement (->> records
(filter #(= (:type %) "Retirement")) (filter #(= (:type %) "Retirement"))
(map :amount) (map :amount)