Preliminary payments filtering in member-payments.

src/Makefile

@@ -212,7 +212,8 @@ bank-fio.import.scm: $(BANK-FIO-SOURCES)
 
 MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm	\
 	dictionary.import.scm member-fees.import.scm			\
-	period.import.scm configuration.import.scm
+	period.import.scm configuration.import.scm utils.import.scm	\
+	month.import.scm
 
 members-payments.o: members-payments.import.scm
 members-payments.import.scm: $(MEMBERS-PAYMENTS-SOURCES)

src/members-payments.scm

@@ -49,7 +49,9 @@
 	 dictionary
 	 member-fees
 	 period
-	 configuration)
+	 configuration
+	 utils
+	 month)
 
  ;; Exchange rates
  (define exchange-rates-lookup-table
@@ -152,14 +154,20 @@
 
  ;; Total amount paid - calculated from payments
  (define (member-payments-total mr)
-   (foldl + 0 (map (lambda (tr)
+   (foldl + 0
-		     (let ((amount (bank-transaction-amount tr))
+	  (map (lambda (tr)
-			   (currency (bank-transaction-currency tr)))
+		 (let ((amount (bank-transaction-amount tr))
-		       (case currency
+		       (currency (bank-transaction-currency tr)))
-			 ((CZK) amount)
+		   (case currency
-			 ((EUR) (* amount (lookup-eur-rate)))
+		     ((CZK) amount)
-			 (else 0))))
+		     ((EUR) (* amount (lookup-eur-rate)))
-		   (member-payments mr))))
+		     (else 0))))
+	       (filter
+		(lambda (tr)
+		  (let* ((isodate (bank-transaction-date tr))
+			 (month (iso-date->month isodate)))
+		    (month<=? month (*current-month*))))
+		(member-payments mr)))))
 
 
  )

src/month.scm

@@ -41,6 +41,7 @@
   month>?
   month-diff
   month-add
+  iso-date->month
   month-tests!
   )