diff --git a/src/Makefile b/src/Makefile index fd7c95b..60d71cd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -335,7 +335,7 @@ util-format.o: util-format.import.scm util-format.import.scm: $(UTIL-FORMAT-SOURCES) BRMEMBER-FORMAT-SOURCES=brmember-format.scm util-dict-list.import.scm \ - brmember.import.scm + brmember.import.scm bank-account.import.scm brmember-format.o: brmember-format.import.scm brmember-format.import.scm: $(BRMEMBER-FORMAT-SOURCES) diff --git a/src/brmember-format.scm b/src/brmember-format.scm index c7b4021..4a99387 100644 --- a/src/brmember-format.scm +++ b/src/brmember-format.scm @@ -36,7 +36,8 @@ (chicken string) (chicken format) util-dict-list - brmember) + brmember + bank-account) ;; Member formatting function for general use. (define (brmember-format fmt mr) @@ -56,6 +57,11 @@ (if (eq? n 0) "" (sprintf "[~A]" n)))) + ((#\P) + (let ((payments (brmember-payments mr))) + (if (null? payments) + "-" + (bank-transaction-date (car payments))))) ((#\~) "~")) resl)) (loop (cdr fmtl) diff --git a/src/brmember.scm b/src/brmember.scm index 0e994fd..41a15c8 100644 --- a/src/brmember.scm +++ b/src/brmember.scm @@ -348,7 +348,7 @@ (cons pt (ldict-ref mr 'payments '())))) - ;; Returns alist of member payments + ;; Returns a list of member payments (define (brmember-payments mr) (filter (lambda (tr) (let* ((isodate (bank-transaction-date tr))