Filter brmember-credit properly.

src/brmember.scm

@@ -70,6 +70,8 @@
   brmember-add-payment
   brmember-payments
 
+  brmember-credit
+
   brmember-mailman
   brmember-add-mailman
 
@@ -357,6 +359,18 @@
 		    (cal-month<=? month (*current-month*))))
 	   (ldict-ref mr 'payments '())))
 
+ ;; Returns credit records - respects *current-month*
+ (define (brmember-credit mr)
+   (filter (lambda (cr)
+	     (let* ((cmon (cadr cr))
+		    (mon (if cmon
+			     (cal-ensure-month cmon)
+			     #f)))
+	       (if mon
+		   (cal-month<=? mon (*current-month*))
+		   #t)))
+	   (brmember-info mr 'credit '())))
+
  ;; Returns a list of MLs this member is subscribed to
  (define (brmember-mailman mr)
    (ldict-ref mr 'mailman '()))

src/members-fees.scm

@@ -163,15 +163,7 @@
 
  ;; Total credit manually recorded in member record
  (define (member-credit-total mr)
-   (let* ((credit (filter (lambda (cr)
+   (let* ((credit (brmember-credit mr))
-			    (let* ((cmon (cadr cr))
-				   (mon (if cmon
-					    (cal-ensure-month cmon)
-					    #f)))
-			      (if mon
-				  (cal-month<=? mon (*current-month*))
-				  #t)))
-			  (brmember-info mr 'credit '())))
 	  (amounts (map car credit)))
      (foldl + 0 amounts)))
 

src/members-print.scm

@@ -103,7 +103,7 @@
 					  (list (car c)
 						(cal-format (cadr c))
 						(caddr c)))
-					v)
+					(brmember-credit mr))
 				   #:col-border #t)))
 			   ((suspend student member)
 			    (list k