From 651e95832bcc884507fd2c42b59bbefb1021a035 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 21 Aug 2017 18:14:51 +0200
Subject: [PATCH] Fixed #152 - Report budget is calculated incorrectly
---
.../deadlocker8/budgetmaster/logic/report/ReportGenerator.java | 2 +-
.../budgetmaster/ui/controller/ReportController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
index ed56158bd..f67740ae4 100644
--- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
+++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
@@ -173,7 +173,7 @@ public class ReportGenerator
document.add(Chunk.NEWLINE);
document.add(new Paragraph("Einnahmen: " + Helpers.getCurrencyString(budget.getIncomeSum(), currency), fontGreen));
document.add(new Paragraph("Ausgaben: " + Helpers.getCurrencyString(budget.getPaymentSum(), currency), fontRed));
- document.add(new Paragraph("Restbudget: " + Helpers.getCurrencyString(budget.getIncomeSum()-budget.getPaymentSum(), currency), fontBlack));
+ document.add(new Paragraph("Restbudget: " + Helpers.getCurrencyString(budget.getIncomeSum() + budget.getPaymentSum(), currency), fontBlack));
document.add(Chunk.NEWLINE);
}
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
index 5839021d4..4df9f906d 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
@@ -529,7 +529,7 @@ public class ReportController implements Refreshable
}
else
{
- fileChooser.setInitialFileName( Localization.getString(initialReportPath));
+ fileChooser.setInitialFileName(initialReportPath);
}
fileChooser.getExtensionFilters().add(extFilter);
File file = fileChooser.showSaveDialog(controller.getStage());
--
GitLab