MK13/financer
1
0
Fork 0
Code Issues 10 Actions Activity

Add tax relevant flag to transaction and recc. transaction

Browse Source
This commit is contained in:
MK13
2020-01-21 18:15:10 +01:00
parent fe94a2781f
commit 1cc7fdf052
22 changed files with 151 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
financer-web-client/src/main/java/de/financer/controller/RecurringTransactionController.java
View File

@@ -62,7 +62,8 @@ public class RecurringTransactionController {
.queryParam("holidayWeekendType", form.getHolidayWeekendType())
.queryParam("intervalType", form.getIntervalType())
.queryParam("description", form.getDescription())
.queryParam("remind", form.getRemind());
.queryParam("remind", form.getRemind())
.queryParam("taxRelevant", form.getTaxRelevant());
final ResponseEntity<String> response = new StringTemplate().exchange(builder);

3
financer-web-client/src/main/java/de/financer/controller/TransactionController.java
View File

@@ -60,7 +60,8 @@ public class TransactionController {
.queryParam("toAccountKey", form.getToAccountKey())
.queryParam("amount", form.getAmount())
.queryParam("date", ControllerUtils.formatDate(this.financerConfig, form.getDate()))
.queryParam("description", form.getDescription());
.queryParam("description", form.getDescription())
.queryParam("taxRelevant", form.getTaxRelevant());
final ResponseEntity<String> response = new StringTemplate().exchange(builder);
final ResponseReason responseReason = ResponseReason.fromResponseEntity(response);

9
financer-web-client/src/main/java/de/financer/form/NewRecurringTransactionForm.java
View File

@@ -10,6 +10,7 @@ public class NewRecurringTransactionForm {
private String intervalType;
private String holidayWeekendType;
private Boolean remind;
private Boolean taxRelevant;
public String getFromAccountKey() {
return fromAccountKey;
@@ -82,4 +83,12 @@ public class NewRecurringTransactionForm {
public void setRemind(Boolean remind) {
this.remind = remind;
}
public Boolean getTaxRelevant() {
return taxRelevant;
}
public void setTaxRelevant(Boolean taxRelevant) {
this.taxRelevant = taxRelevant;
}
}

9
financer-web-client/src/main/java/de/financer/form/NewTransactionForm.java
View File

@@ -6,6 +6,7 @@ public class NewTransactionForm {
private String amount;
private String date;
private String description;
private Boolean taxRelevant;
public String getFromAccountKey() {
return fromAccountKey;
@@ -46,4 +47,12 @@ public class NewTransactionForm {
public void setDescription(String description) {
this.description = description;
}
public Boolean getTaxRelevant() {
return taxRelevant;
}
public void setTaxRelevant(Boolean taxRelevant) {
this.taxRelevant = taxRelevant;
}
}

14
financer-web-client/src/main/resources/i18n/message.properties
View File

@@ -42,6 +42,7 @@ financer.transaction-new.label.to-account=To account\:
financer.transaction-new.label.amount=Amount\:
financer.transaction-new.label.date=Date\:
financer.transaction-new.label.description=Description\:
financer.transaction-new.label.taxRelevant=Tax relevant\:
financer.transaction-new.submit=Create transaction
financer.transaction-new.account-type.BANK={0}|Bank|{1}{2}
financer.transaction-new.account-type.CASH={0}|Cash|{1}{2}
@@ -60,6 +61,7 @@ financer.recurring-transaction-new.label.interval-type=Interval\:
financer.recurring-transaction-new.label.holiday-weekend-type=Holiday/weekend rule\:
financer.recurring-transaction-new.label.description=Description\:
financer.recurring-transaction-new.label.remind=Remind if due\:
financer.recurring-transaction-new.label.taxRelevant=Tax relevant\:
financer.recurring-transaction-new.submit=Create recurring transaction
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}{2}
financer.recurring-transaction-new.account-type.CASH={0}|Cash|{1}{2}
@@ -80,11 +82,14 @@ financer.recurring-transaction-list.table-header.amount=Amount
financer.recurring-transaction-list.table-header.description=Description
financer.recurring-transaction-list.table-header.intervalType=Interval
financer.recurring-transaction-list.table-header.holidayWeekendType=Holiday/weekend rule
financer.recurring-transaction-list.table-header.taxRelevant=Tax relevant
financer.recurring-transaction-list.table-header.actions=Actions
financer.recurring-transaction-list.table.actions.createTransaction=Create transaction
financer.recurring-transaction-list.table.actions.createTransactionWithAmount=Create transaction with amount
financer.recurring-transaction-list.table.actions.editRecurringTransaction=Edit
financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=Delete
financer.recurring-transaction-list.table.taxRelevant.true=Yes
financer.recurring-transaction-list.table.taxRelevant.false=No
financer.recurring-transaction-list.back-to-overview=Back to overview
financer.account-details.title=financer\: account details
@@ -99,7 +104,8 @@ financer.account-details.table-header.toAccount=To account
financer.account-details.table-header.date=Date
financer.account-details.table-header.amount=Amount
financer.account-details.table-header.description=Description
financer.account-details.table-header.byRecurring=Recurring?
financer.account-details.table-header.byRecurring=Recurring
financer.account-details.table-header.taxRelevant=Tax relevant
financer.account-details.details.type=Type\:
financer.account-details.details.balance=Current balance\:
financer.account-details.details.group=Group\:
@@ -107,6 +113,8 @@ financer.account-details.table-header.actions=Actions
financer.account-details.table.actions.deleteTransaction=Delete
financer.account-details.table.recurring.yes=Yes
financer.account-details.table.recurring.no=No
financer.account-details.table.taxRelevant.true=Yes
financer.account-details.table.taxRelevant.false=No
financer.recurring-to-transaction-with-amount.title=financer\: create transaction from recurring with amount
financer.recurring-to-transaction-with-amount.label.amount=Amount\:
@@ -116,12 +124,12 @@ financer.chart-select.title=Select a chart to generate
financer.chart-select.submit=Select
financer.chart-config-account-group-expenses-for-period.title=Configure account group expenses for period chart
financer.chart-config-account-group-expenses-for-period.label.from-date=From date\:
financer.chart-config-account-group-expenses-for-period.label.from-date=From date\:
financer.chart-config-account-group-expenses-for-period.label.to-date=To date\:
financer.chart-config-account-group-expenses-for-period.submit=Generate
financer.chart-config-account-expenses-for-period.title=Configure account expenses for period chart
financer.chart-config-account-expenses-for-period.label.from-date=From date\:
financer.chart-config-account-expenses-for-period.label.from-date=From date\:
financer.chart-config-account-expenses-for-period.label.to-date=To date\:
financer.chart-config-account-expenses-for-period.submit=Generate

14
financer-web-client/src/main/resources/i18n/message_de_DE.properties
View File

@@ -40,6 +40,7 @@ financer.transaction-new.label.to-account=An Konto\:
financer.transaction-new.label.amount=Betrag\:
financer.transaction-new.label.date=Datum\:
financer.transaction-new.label.description=Beschreibung\:
financer.transaction-new.label.taxRelevant=Relevant f\u00FCr Steuererkl\u00E4rung\:
financer.transaction-new.submit=Buchung erstellen
financer.transaction-new.account-type.BANK={0}|Bank|{1}{2}
financer.transaction-new.account-type.CASH={0}|Bar|{1}{2}
@@ -58,6 +59,7 @@ financer.recurring-transaction-new.label.interval-type=Intervall\:
financer.recurring-transaction-new.label.holiday-weekend-type=Feiertag-/Wochenendregel\:
financer.recurring-transaction-new.label.description=Beschreibung\:
financer.recurring-transaction-new.label.remind=Erinnern wenn f\u00E4llig\:
financer.recurring-transaction-new.label.taxRelevant=Relevant f\u00FCr Steuererkl\u00E4rung\:
financer.recurring-transaction-new.submit=Wiederkehrende Buchung erstellen
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}{2}
financer.recurring-transaction-new.account-type.CASH={0}|Bar|{1}{2}
@@ -78,11 +80,14 @@ financer.recurring-transaction-list.table-header.amount=Betrag
financer.recurring-transaction-list.table-header.description=Beschreibung
financer.recurring-transaction-list.table-header.intervalType=Intervall
financer.recurring-transaction-list.table-header.holidayWeekendType=Feiertag-/Wochenendregel
financer.recurring-transaction-list.table-header.taxRelevant=Relevant f\u00FCr Steuererkl\u00E4rung
financer.recurring-transaction-list.table-header.actions=Aktionen
financer.recurring-transaction-list.table.actions.createTransaction=Erstelle Buchung
financer.recurring-transaction-list.table.actions.createTransactionWithAmount=Erstelle Buchung mit Betrag
financer.recurring-transaction-list.table.actions.editRecurringTransaction=Bearbeiten
financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=L\u00F6schen
financer.recurring-transaction-list.table.taxRelevant.true=Ja
financer.recurring-transaction-list.table.taxRelevant.false=Nein
financer.recurring-transaction-list.back-to-overview=Zur\u00FCck zur \u00DCbersicht
financer.account-details.title=financer\: Kontodetails
@@ -97,7 +102,8 @@ financer.account-details.table-header.toAccount=An Konto
financer.account-details.table-header.date=Datum
financer.account-details.table-header.amount=Betrag
financer.account-details.table-header.description=Beschreibung
financer.account-details.table-header.byRecurring=Wiederkehrend?
financer.account-details.table-header.byRecurring=Wiederkehrend
financer.account-details.table-header.taxRelevant=Relevant f\u00FCr Steuererkl\u00E4rung
financer.account-details.details.type=Typ\:
financer.account-details.details.balance=Kontostand\:
financer.account-details.details.group=Gruppe\:
@@ -105,6 +111,8 @@ financer.account-details.table-header.actions=Aktionen
financer.account-details.table.actions.deleteTransaction=L\u00F6schen
financer.account-details.table.recurring.yes=Ja
financer.account-details.table.recurring.no=Nein
financer.account-details.table.taxRelevant.true=Ja
financer.account-details.table.taxRelevant.false=Nein
financer.recurring-to-transaction-with-amount.title=financer\: Buchung mit Betrag aus wiederkehrender Buchung erstellen
financer.recurring-to-transaction-with-amount.label.amount=Betrag\:
@@ -114,12 +122,12 @@ financer.chart-select.title=Ein Diagramm zum Erzeugen ausw\u00E4hlen
financer.chart-select.submit=Ausw\u00E4hlen
financer.chart-config-account-group-expenses-for-period.title=Konfigurieren von Ausgaben f\u00FCr Periode gruppiert nach Konto-Gruppe Diagramm
financer.chart-config-account-group-expenses-for-period.label.from-date=Von Datum\:
financer.chart-config-account-group-expenses-for-period.label.from-date=Von Datum\:
financer.chart-config-account-group-expenses-for-period.label.to-date=Bis Datum\:
financer.chart-config-account-group-expenses-for-period.submit=Erzeugen
financer.chart-config-account-expenses-for-period.title=Konfigurieren von Ausgaben f\u00FCr Periode gruppiert nach Konto Diagramm
financer.chart-config-account-expenses-for-period.label.from-date=Von Datum\:
financer.chart-config-account-expenses-for-period.label.from-date=Von Datum\:
financer.chart-config-account-expenses-for-period.label.to-date=Bis Datum\:
financer.chart-config-account-expenses-for-period.submit=Erzeugen

2
financer-web-client/src/main/resources/static/changelog.txt
View File

@@ -1,6 +1,8 @@
v26 -> v27:
- Changed sort order of accounts in overview page. The accounts are now sorted by the account type first (BCILES), then
by the account group name and then by the account ID, leading to an overall more organic order of accounts
- Add tax relevance flag to transaction and recurring transaction creation. This flag denotes whether a transaction or
the instances of a recurring transaction are relevant for a tax declaration. This is preparation for extended reports.
v25 -> v26:
- Close of the current expense period now creates null statistic entries for accounts that have not been used in

2
financer-web-client/src/main/resources/templates/account/accountDetails.html
View File

@@ -44,6 +44,7 @@
<th th:text="#{financer.account-details.table-header.amount}"/>
<th th:text="#{financer.account-details.table-header.description}"/>
<th th:text="#{financer.account-details.table-header.byRecurring}"/>
<th th:text="#{financer.account-details.table-header.taxRelevant}"/>
<th th:text="#{financer.account-details.table-header.actions}"/>
</tr>
<tr th:each="transaction : ${transactions}">
@@ -55,6 +56,7 @@
<td th:text="${transaction.description}" />
<td th:if="${transaction.recurringTransaction != null}" th:text="#{financer.account-details.table.recurring.yes}" />
<td th:if="${transaction.recurringTransaction == null}" th:text="#{financer.account-details.table.recurring.no}" />
<td th:text="#{'financer.account-details.table.taxRelevant.' + ${transaction.taxRelevant}}" />
<td>
<div id="account-transaction-table-actions-container">
<a th:href="@{/deleteTransaction(transactionId=${transaction.id}, accountKey=${account.key})}"

2
financer-web-client/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html
View File

@@ -41,6 +41,8 @@
</select>
<label for="inputDescription" th:text="#{financer.recurring-transaction-new.label.description}"/>
<input type="text" id="inputDescription" th:field="*{description}"/>
<label for="inputTaxRelevant" th:text="#{financer.recurring-transaction-new.label.taxRelevant}" />
<input type="checkbox" id="inputTaxRelevant" th:field="*{taxRelevant}" />
<label for="inputRemind" th:text="#{financer.recurring-transaction-new.label.remind}" />
<input type="checkbox" id="inputRemind" th:field="*{remind}" />
<input type="submit" th:value="#{financer.recurring-transaction-new.submit}"/>

2
financer-web-client/src/main/resources/templates/recurringTransaction/recurringTransactionList.html
View File

@@ -22,6 +22,7 @@
<th th:text="#{financer.recurring-transaction-list.table-header.description}"/>
<th th:text="#{financer.recurring-transaction-list.table-header.intervalType}"/>
<th th:text="#{financer.recurring-transaction-list.table-header.holidayWeekendType}"/>
<th th:text="#{financer.recurring-transaction-list.table-header.taxRelevant}"/>
<th th:text="#{financer.recurring-transaction-list.table-header.actions}"/>
</tr>
<tr th:each="rt : ${recurringTransactions}">
@@ -38,6 +39,7 @@
<td th:text="${rt.description}"/>
<td th:text="#{'financer.interval-type.' + ${rt.intervalType}}"/>
<td th:text="#{'financer.holiday-weekend-type.' + ${rt.holidayWeekendType}}"/>
<td th:text="#{'financer.recurring-transaction-list.table.taxRelevant.' + ${rt.taxRelevant}}" />
<td>
<div id="recurring-transaction-list-table-actions-container">
<a th:href="@{/recurringToTransaction(recurringTransactionId=${rt.id}, sub=${subTitle})}"

2
financer-web-client/src/main/resources/templates/transaction/newTransaction.html
View File

@@ -29,6 +29,8 @@
<input type="date" id="inputDate" th:field="*{date}"/>
<label for="inputDescription" th:text="#{financer.transaction-new.label.description}"/>
<input type="text" id="inputDescription" th:field="*{description}"/>
<label for="inputTaxRelevant" th:text="#{financer.transaction-new.label.taxRelevant}" />
<input type="checkbox" id="inputTaxRelevant" th:field="*{taxRelevant}" />
<input type="submit" th:value="#{financer.transaction-new.submit}"/>
</form>
<div th:replace="includes/footer :: footer"/>