From c2571863ca9174ea8184faa411f7f44881b991ef Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 21 Aug 2017 18:22:08 +0200
Subject: [PATCH] Fixed #157 - repeating payment entries are not inserted for
 future months

---
 .../budgetmaster/logic/report/ReportGenerator.java  |  1 -
 src/de/deadlocker8/budgetmaster/main/_de.properties |  6 +++---
 .../budgetmasterserver/main/_de.properties          |  6 +++---
 .../server/updater/RepeatingPaymentUpdater.java     | 13 ++++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
index 27cd67b46..fcf3ad8cd 100644
--- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
+++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
@@ -158,7 +158,6 @@ public class ReportGenerator
 		document.setMargins(50, 45, 50, 70);
 		Font headerFont = new Font(FontFamily.HELVETICA, 14, Font.BOLD);
 		Font smallHeaderFont = new Font(FontFamily.HELVETICA, 12, Font.BOLD);
-		Font paragraphFont = new Font(FontFamily.HELVETICA, 12, Font.NORMAL);
 
 		document.add(generateHeader());
 		document.add(Chunk.NEWLINE);
diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties
index fd5fb2a34..6c6a869a5 100644
--- a/src/de/deadlocker8/budgetmaster/main/_de.properties
+++ b/src/de/deadlocker8/budgetmaster/main/_de.properties
@@ -1,7 +1,7 @@
 app.name=BudgetMaster
-version.code=5
-version.name=1.3.1
-version.date=12.08.17
+version.code=6
+version.name=1.3.2
+version.date=21.08.17
 author=Robert Goldmann
 
 folder=Deadlocker/BudgetMaster
diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties
index cc0a0ccf4..18d434a32 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties
+++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties
@@ -1,5 +1,5 @@
 app.name=BudgetMasterServer
-version.code=5
-version.name=1.3.1
-version.date=12.08.17
+version.code=6
+version.name=1.3.2
+version.date=21.08.17
 author=Robert Goldmann
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
index 652994386..c43cd7cae 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
@@ -20,25 +20,28 @@ public class RepeatingPaymentUpdater
 		this.handler = handler;
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	public void updateRepeatingPayments(DateTime now)
 	{
 		try
-		{						
+		{
 			ArrayList<RepeatingPayment> repeatingPayments = handler.getAllRepeatingPayments();				
 			ArrayList<LatestRepeatingPayment> latest = handler.getLatestRepeatingPaymentEntries();
 			
 			for(RepeatingPayment currentPayment : repeatingPayments)
 			{
+				DateTime date = now;
 				int index = latest.indexOf(currentPayment);					
 				if(currentPayment.getRepeatEndDate() != null)
 				{
 					DateTime endDate = DateTime.parse(currentPayment.getRepeatEndDate());
-					if(endDate.isBefore(now))
-					{
-						now = endDate;
+					if(endDate.isBefore(date))
+					{						
+						date = endDate;
 					}
 				}
-				ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, now);				
+				ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, date);
+				
 				if(index != -1)
 				{
 					LatestRepeatingPayment currentLatest = latest.get(index);					
-- 
GitLab