Merge branch 'accounting' into dev
This commit is contained in:
@@ -27,7 +27,6 @@ import java.io.IOException;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import de.srsoftware.tools.jdbc.Query;
|
|||||||
import de.srsoftware.umbrella.core.BaseDb;
|
import de.srsoftware.umbrella.core.BaseDb;
|
||||||
import de.srsoftware.umbrella.core.constants.Field;
|
import de.srsoftware.umbrella.core.constants.Field;
|
||||||
import de.srsoftware.umbrella.core.constants.Text;
|
import de.srsoftware.umbrella.core.constants.Text;
|
||||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
|
||||||
import de.srsoftware.umbrella.core.model.Account;
|
import de.srsoftware.umbrella.core.model.Account;
|
||||||
import de.srsoftware.umbrella.core.model.Transaction;
|
import de.srsoftware.umbrella.core.model.Transaction;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
/* © SRSoftware 2025 */
|
/* © SRSoftware 2025 */
|
||||||
package de.srsoftware.umbrella.core.model;
|
package de.srsoftware.umbrella.core.model;
|
||||||
|
|
||||||
|
import static java.text.MessageFormat.format;
|
||||||
|
|
||||||
import de.srsoftware.tools.Mappable;
|
import de.srsoftware.tools.Mappable;
|
||||||
import de.srsoftware.umbrella.core.constants.Field;
|
import de.srsoftware.umbrella.core.constants.Field;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
@@ -12,8 +14,6 @@ import java.util.HashSet;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import static java.text.MessageFormat.format;
|
|
||||||
|
|
||||||
public class Transaction implements Mappable {
|
public class Transaction implements Mappable {
|
||||||
private long accountId, id;
|
private long accountId, id;
|
||||||
private LocalDateTime date;
|
private LocalDateTime date;
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
{#if account}
|
{#if account}
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>{account.name}</legend>
|
<legend>{account.name}</legend>
|
||||||
<table>
|
<table class="account">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t('date')}</th>
|
<th>{t('date')}</th>
|
||||||
|
|||||||
@@ -355,12 +355,12 @@ textarea{
|
|||||||
margin: 5px 0 5px auto;
|
margin: 5px 0 5px auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.taglist .tag.editor,
|
.account .taglist .tag.editor,
|
||||||
.taglist .tag button{
|
.taglist .tag button{
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.taglist:hover .editor,
|
.account .taglist:hover .editor,
|
||||||
.taglist:hover .tag button{
|
.taglist:hover .tag button{
|
||||||
display: inherit;
|
display: inherit;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user