diff --git a/src/Makefile b/src/Makefile index 3fa3cef..a2c177c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -186,7 +186,7 @@ MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm \ primes.import.scm members-base.import.scm \ configuration.import.scm bank-account.import.scm \ member-fees.import.scm members-payments.import.scm \ - util-list.import.scm + util-list.import.scm brmember-format.import.scm members-print.o: members-print.import.scm members-print.import.scm: $(MEMBERS-PRINT-SOURCES) @@ -318,7 +318,8 @@ util-mail.import.scm: $(UTIL-MAIL-SOURCES) REMINDERS-SOURCES=reminders.scm member-record.import.scm \ util-mail.import.scm util-dict-list.import.scm \ - members-payments.import.scm util-format.import.scm + members-payments.import.scm util-format.import.scm \ + brmember-format.import.scm reminders.o: reminders.import.scm reminders.import.scm: $(REMINDERS-SOURCES) diff --git a/src/members-print.scm b/src/members-print.scm index 3b068f6..7a24d7d 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -59,7 +59,8 @@ configuration bank-account member-fees - members-payments) + members-payments + brmember-format) ;; Prints human-readable information (define (print-member-info mr) @@ -201,7 +202,7 @@ (cadr args)))) (string-intersperse (map (lambda (mr) - (member-format fmt mr)) + (brmember-format fmt mr)) mrs) sep))) @@ -329,7 +330,7 @@ (string-intersperse (map (lambda (id) (let ((mr (find-member-by-id MB id))) - (member-format + (brmember-format "~I - ~N" mr))) iids) diff --git a/src/reminders.scm b/src/reminders.scm index bed05b0..c28ca27 100644 --- a/src/reminders.scm +++ b/src/reminders.scm @@ -39,13 +39,14 @@ util-mail util-dict-list members-payments - util-format) + util-format + brmember-format) ;; Creates reminder email body (define (reminder-email-body mr) (let ((C identity) (M (lambda (s) - (member-format s mr))) + (brmember-format s mr))) (F format) (absdebt (format-amount (- (member-total-balance mr)))) (macc "2500079551/2010"))