From 51747cfe84434612528e30fcbc00d4169f5b79db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Thu, 30 Mar 2023 14:00:06 +0200 Subject: [PATCH] Fix destroyed detection. --- Makefile | 3 ++- member-record.scm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f1fe4a6..8a2546a 100644 --- a/Makefile +++ b/Makefile @@ -241,7 +241,8 @@ bank-account.so: bank-account.o bank-account.o: bank-account.import.scm bank-account.import.scm: $(BANK-ACCOUNT-SOURCES) -BANK-FIO-SOURCES=bank-fio.scm bank-account.import.scm +BANK-FIO-SOURCES=bank-fio.scm bank-account.import.scm \ + csv-simple.import.scm bank-fio.so: bank-fio.o bank-fio.o: bank-fio.import.scm diff --git a/member-record.scm b/member-record.scm index 78c9323..1207d43 100644 --- a/member-record.scm +++ b/member-record.scm @@ -269,7 +269,7 @@ ;; Returns true if the member is active (not suspended or destroyed). (define (member-active? mr) - (and (not (member-destroyed? mr)) + (and (month-in-periods? (member-record-info mr 'member)) (not (member-suspended? mr)))) ;; Returns true if the member is currently a member