diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java index 1efdcf43367713a400a942267a19e23f339845b7..beefb24962eb41a9805bd13af786eba783c9497b 100644 --- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java +++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java @@ -76,17 +76,17 @@ public class TransactionService implements Resettable private List<Transaction> getTransactionsForMonthAndYearWithRest(Account account, int month, int year, FilterConfiguration filterConfiguration) { - List<Transaction> transactions = getTransactionsForMonthAndYearWithoutRest(account, month, year, filterConfiguration); + final List<Transaction> transactions = getTransactionsForMonthAndYearWithoutRest(account, month, year, filterConfiguration); - LocalDate endDate = LocalDate.of(year, month, 1).minusMonths(1).with(lastDayOfMonth()); + final LocalDate endDate = LocalDate.of(year, month, 1).minusMonths(1).with(lastDayOfMonth()); - Transaction transactionRest = new Transaction(); - transactionRest.setCategory(categoryService.findByType(CategoryType.REST)); - transactionRest.setName(Localization.getString(Strings.CATEGORY_REST)); - transactionRest.setDate(LocalDate.of(year, month, 1)); - transactionRest.setAmount(getRest(account, endDate)); - transactionRest.setTags(new ArrayList<>()); - transactions.add(transactionRest); + final Transaction transactionBalanceLastMonth = new Transaction(); + transactionBalanceLastMonth.setCategory(categoryService.findByType(CategoryType.REST)); + transactionBalanceLastMonth.setName(Localization.getString(Strings.TRANSACTION_BALANCE_LAST_MONTH)); + transactionBalanceLastMonth.setDate(LocalDate.of(year, month, 1)); + transactionBalanceLastMonth.setAmount(getRest(account, endDate)); + transactionBalanceLastMonth.setTags(new ArrayList<>()); + transactions.add(transactionBalanceLastMonth); return transactions; } diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java index 191b8515d4c5e1ccb9a11f75468fe70d99786fd5..a5f1e79aca37be8d8e8b2b7f412239fe6dfb8634 100644 --- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java +++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java @@ -13,6 +13,7 @@ public class Strings public static final String TITLE_EXPENDITURES = "title.expenditures"; public static final String TITLE_CATEGORY_BUDGETS = "title.category.budgets"; public static final String TEMPLATE_GROUP_DEFAULT = "template.group.default"; + public static final String TRANSACTION_BALANCE_LAST_MONTH = "transaction.balance.last.month"; //ACCOUNT public static final String ACCOUNT_DEFAULT_NAME = "account.default.name"; diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties index ea4c31cf81cfd80f80d80cf68881f18d7dfda959..c9045682e0a98908346a5a1d792b81cb3824081c 100644 --- a/BudgetMasterServer/src/main/resources/languages/base_de.properties +++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties @@ -84,6 +84,7 @@ transaction.warning.name.keyword.button.ignore=Ja transaction.warning.name.keyword.button.cancel=Abbrechen transaction.warning.name.keyword.button.edit=Schlüsselwörter editieren template.group.default=Ungruppiert +transaction.balance.last.month=Saldo letzter Monat # WEEK DAYS monday=Montag diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties index da97e17abe427d79e9dfb944d9cdc431cf23fe72..aa4e398cab3842e258c0d9563d8d0a063efaaffa 100644 --- a/BudgetMasterServer/src/main/resources/languages/base_en.properties +++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties @@ -85,6 +85,7 @@ transaction.warning.name.keyword.button.ignore=Yes transaction.warning.name.keyword.button.cancel=Cancel transaction.warning.name.keyword.button.edit=Edit keywords template.group.default=Not grouped +transaction.balance.last.month=Last month balance # WEEK DAYS monday=Monday