Skip to content
Snippets Groups Projects
Commit 4072e068 authored by Robert Goldmann's avatar Robert Goldmann Committed by GitHub
Browse files

Merge pull request #158 from deadlocker8/v1_3_2

merge v1_3_2 into master
parents 06ede00d c2571863
Branches
Tags
No related merge requests found
...@@ -158,7 +158,6 @@ public class ReportGenerator ...@@ -158,7 +158,6 @@ public class ReportGenerator
document.setMargins(50, 45, 50, 70); document.setMargins(50, 45, 50, 70);
Font headerFont = new Font(FontFamily.HELVETICA, 14, Font.BOLD); Font headerFont = new Font(FontFamily.HELVETICA, 14, Font.BOLD);
Font smallHeaderFont = new Font(FontFamily.HELVETICA, 12, 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(generateHeader());
document.add(Chunk.NEWLINE); document.add(Chunk.NEWLINE);
......
app.name=BudgetMaster app.name=BudgetMaster
version.code=5 version.code=6
version.name=1.3.1 version.name=1.3.2
version.date=12.08.17 version.date=21.08.17
author=Robert Goldmann author=Robert Goldmann
folder=Deadlocker/BudgetMaster folder=Deadlocker/BudgetMaster
......
app.name=BudgetMasterServer app.name=BudgetMasterServer
version.code=5 version.code=6
version.name=1.3.1 version.name=1.3.2
version.date=12.08.17 version.date=21.08.17
author=Robert Goldmann author=Robert Goldmann
\ No newline at end of file
...@@ -20,6 +20,7 @@ public class RepeatingPaymentUpdater ...@@ -20,6 +20,7 @@ public class RepeatingPaymentUpdater
this.handler = handler; this.handler = handler;
} }
@SuppressWarnings("unlikely-arg-type")
public void updateRepeatingPayments(DateTime now) public void updateRepeatingPayments(DateTime now)
{ {
try try
...@@ -29,16 +30,18 @@ public class RepeatingPaymentUpdater ...@@ -29,16 +30,18 @@ public class RepeatingPaymentUpdater
for(RepeatingPayment currentPayment : repeatingPayments) for(RepeatingPayment currentPayment : repeatingPayments)
{ {
DateTime date = now;
int index = latest.indexOf(currentPayment); int index = latest.indexOf(currentPayment);
if(currentPayment.getRepeatEndDate() != null) if(currentPayment.getRepeatEndDate() != null)
{ {
DateTime endDate = DateTime.parse(currentPayment.getRepeatEndDate()); DateTime endDate = DateTime.parse(currentPayment.getRepeatEndDate());
if(endDate.isBefore(now)) if(endDate.isBefore(date))
{ {
now = endDate; date = endDate;
} }
} }
ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, now); ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, date);
if(index != -1) if(index != -1)
{ {
LatestRepeatingPayment currentLatest = latest.get(index); LatestRepeatingPayment currentLatest = latest.get(index);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment