Handle types correctly, fix body membership.

src/members-fees.scm

@@ -83,7 +83,8 @@
 	   (reverse cal)
 	   (loop (cal-month-add cm)
 		 (cons (list cm
-			     (parameterize ((*current-month* cm))
+			     (parameterize ((*current-month* cm)
+					    (*current-day* (cal-ensure-day cm)))
 			       (brmember-flags mr)))
 		       cal))))))
 

src/members-payments.scm

@@ -249,7 +249,8 @@
 		  (- fee)
 		  'CZK
 		  (cadr mce)
-		  (- fee))))
+		  (- fee)
+		  "Fee")))
 	mc))
 
  ;; Converts bank transactions to transactions usable in balance
@@ -266,7 +267,8 @@
 		  (if (eq? curr 'CZK)
 		      amt
 		      (parameterize ((*current-month* (cal-ensure-month day)))
-			(* amt (lookup-eur-rate)))))))
+			(* amt (lookup-eur-rate))))
+		  "Payment")))
 	bts))
 
  ;; Returns a single credit/debit list of payments and fees calendar

src/members-print.scm

@@ -548,6 +548,7 @@
  (define (print-member-balances-table mr)
    (let ((data (map (lambda (r)
 		      (list (cal-day->string (cadr r))
+			    (list-ref r 6)
 			    (list-ref r 4)
 			    (format "\t~A" (exact->inexact (list-ref r 5)))
 			    (format "\t~A" (exact->inexact (car r)))
@@ -557,7 +558,7 @@
       #:border '(((#:bottom #:right light) ... (#:bottom light))
 		 ((#:right light) ... none)
 		 ...)
-      (cons '("\tDate\t" "\tComment\t" "\tAmount\t" "\tBalance\t")
+      (cons '("\tDate\t" "\tType\t" "\tComment\t" "\tAmount\t" "\tBalance\t")
 	    data))))
 
  )