fixed bug: import was missing

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

core/src/main/java/de/srsoftware/umbrella/core/model/Document.java

@@ -1,6 +1,7 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.core.model;
 
+import static de.srsoftware.tools.Optionals.emptyIfNull;
 import static de.srsoftware.umbrella.core.Constants.*;
 import static de.srsoftware.umbrella.core.Field.*;
 import static de.srsoftware.umbrella.core.Field.COMPANY;
@@ -57,14 +58,14 @@ public final class Document implements Mappable {
 	private final Type type;
 	private LocalDate date;
 	private State state;
-	private Template template;
+	private String template;
 	private final Sender sender;
 	private final Customer customer;
 	private final PositionList positions;
 	private final Set<String> dirtyFields = new HashSet<>();
 
 
-	public Document(long id, long companyId, String number, Type type, LocalDate date, State state, Template template, String delivery, String head, String footer, String currency, String decimalSeparator, Sender sender, Customer customer, PositionList positions) {
+	public Document(long id, long companyId, String number, Type type, LocalDate date, State state, String template, String delivery, String head, String footer, String currency, String decimalSeparator, Sender sender, Customer customer, PositionList positions) {
 		this.id = id;
 		this.companyId = companyId;
 		this.number = number;
@@ -206,7 +207,7 @@ public final class Document implements Mappable {
 				case SENDER:         if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
 				case STATE:          state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
 				case POS:      if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
-				case TEMPLATE_ID: if (json.get(key) instanceof Number num) template = new Template(num.longValue(),companyId,null,null); break;
+				case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
 				default:             key = null;
 			}
 			if (key != null) dirtyFields.add(key);
@@ -225,7 +226,7 @@ public final class Document implements Mappable {
 		map.put(TYPE, type.name());
 		map.put(DATE, date);
 		map.put(STATE, state.code);
-		map.put(DELIVERY, delivery == null ? "" : delivery);
+		map.put(DELIVERY, emptyIfNull(delivery));
 		map.put(HEAD, mapMarkdown(head));
 		map.put(FOOTER, mapMarkdown(footer));
 		map.put(CURRENCY, currency);
@@ -235,7 +236,7 @@ public final class Document implements Mappable {
 		map.put("taxes",positions.taxNetSums(true));
 		map.put(NET_SUM, netSum());
 		map.put(GROSS_SUM, grossSum());
-		if (template != null) map.put("template", template.toMap());
+		map.put("template", emptyIfNull(template));
 		return map;
 	}
 
@@ -286,7 +287,7 @@ public final class Document implements Mappable {
 		);
 	}
 
-	public Template template() {
+	public String template() {
 		return template;
 	}
 
@@ -309,7 +310,7 @@ public final class Document implements Mappable {
 		map.put("taxes",positions.taxNetSums(true));
 		map.put(NET_SUM, netSum());
 		map.put(GROSS_SUM, grossSum());
-		if (template != null) map.put("template", template.toMap());
+		if (template != null) map.put("template", template);
 		return map;
 	}
 

core/src/main/java/de/srsoftware/umbrella/core/model/Template.java

@@ -1,23 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.core.model;
-
-import static de.srsoftware.umbrella.core.Constants.*;
-import static de.srsoftware.umbrella.core.Field.COMPANY;
-import static de.srsoftware.umbrella.core.Field.COMPANY_ID;
-
-import de.srsoftware.tools.Mappable;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-
-public record Template(long id, long company, String name, byte[] data) implements Mappable {
-
-	public static Template of(ResultSet rs) throws SQLException {
-		return new Template(rs.getLong(ID),rs.getLong(COMPANY_ID),rs.getString(NAME),rs.getBytes(TEMPLATE));
-	}
-
-	@Override
-	public Map<String, Object> toMap() {
-		return Map.of(ID,id, COMPANY,company, NAME,name);
-	}
-}

documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java

@@ -363,7 +363,7 @@ public class DocumentApi extends BaseHandler implements DocumentService {
 	}
 
 	private Content renderDocument(Document document, UmbrellaUser user) throws UmbrellaException {
-		var template = document.template().name();
+		var template = document.template();
 		var templateName = template+".html.pdf";
 		var type = document.type().name();
 		var zugferd = "invoice".equals(type);
@@ -517,8 +517,10 @@ public class DocumentApi extends BaseHandler implements DocumentService {
 		if (!(json.has(COMPANY) && json.get(COMPANY) instanceof Number companyId)) throw missingFieldException(COMPANY);
 		var company = companyService().get(companyId.longValue());
 		if (!companyService().membership(companyId.longValue(),user.id())) throw forbidden("You are not a member of {0}",company.name());
-		var templates = db.getCompanyTemplates(companyId.longValue());
-		return sendContent(ex,templates.stream().map(Template::toMap));
+		var templates = registry.documents()
+				.filter(d -> d.name().endsWith(".template"))
+				.map(d -> d.name().replaceAll("(\\.[^.]+)?\\.template$",""));
+		return sendContent(ex,templates);
 	}
 
 	private boolean postSearch(HttpExchange ex, UmbrellaUser user) throws IOException {

documents/src/main/java/de/srsoftware/umbrella/documents/DocumentDb.java

@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.documents;
 import de.srsoftware.tools.Pair;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.Document;
-import de.srsoftware.umbrella.core.model.Template;
 import de.srsoftware.umbrella.core.model.Type;
 import de.srsoftware.umbrella.documents.model.*;
 import java.util.*;
@@ -27,8 +26,6 @@ public interface DocumentDb {
 
 	CustomerSettings getCustomerSettings(long companyId, Type docType, String customerId) throws UmbrellaException;
 
-	Collection<Template> getCompanyTemplates(long l) throws UmbrellaException;
-
 	Type getType(int typeId) throws UmbrellaException;
 
 		Map<Long, Document> listDocs(long companyId) throws UmbrellaException;

documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java

@@ -42,6 +42,15 @@ public class SqliteDb extends BaseDb implements DocumentDb{
 		super(connection);
 	}
 
+	private void addTemplateColumn() {
+		try {
+			var sql = format("ALTER TABLE {0} ADD COLUMN {1} VARCHAR(255)",TABLE_DOCUMENTS,TEMPLATE);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException("Failed to update column {0} → {1} of {2}",TEMPLATE_ID,TEMPLATE,TABLE_DOCUMENTS);
+		}
+	}
+
 	protected int createTables() {
 		int currentVersion = createSettingsTable();
 		switch (currentVersion) {
@@ -52,22 +61,15 @@ public class SqliteDb extends BaseDb implements DocumentDb{
 				createTablePositions();
 				createTableCustomerPrices();
 				createTableCustomerSettings();
+			case 1:
+				addTemplateColumn();
+				moveTemplateNames();
+				dropTemplateTable();
+				dropTemplateIdColumn();
 		}
-		return setCurrentVersion(1);
+		return setCurrentVersion(2);
 	}
 
-	/*private void createTableCompanySettings() {
-		var sql = "CREATE TABLE IF NOT EXISTS {0} ({1} INT NOT NULL, {2} INT NOT NULL, {3} TEXT DEFAULT \"A\", {4} TEXT DEFAULT NULL, {5} INT NOT NULL DEFAULT 1, PRIMARY KEY ({1}, {2}))";
-		try {
-			var stmt = db.prepareStatement(format(sql,TABLE_COMPANY_SETTINGS, COMPANY_ID,DOC_TYPE_ID,TYPE_PREFIX,TYPE_SUFFIX,TYPE_NUMBER));
-			stmt.execute();
-			stmt.close();
-		} catch (SQLException e) {
-			LOG.log(ERROR,ERROR_FAILED_CREATE_TABLE,TABLE_COMPANY_SETTINGS,e);
-			throw new RuntimeException(e);
-		}
-	}*/
-
 	private void createTableCustomerPrices() {
 		var sql = "CREATE TABLE IF NOT EXISTS {0} ({1} INT NOT NULL, {2} VARCHAR(255), {3} VARCHAR(50), {4} INTEGER)";
 		try {
@@ -172,36 +174,6 @@ CREATE TABLE IF NOT EXISTS {0} (
 		}
 	}
 
-	private int createTableSettings() {
-		var createTable = """
-CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) NOT NULL);
-""";
-		try {
-			var stmt = db.prepareStatement(format(createTable,TABLE_SETTINGS, KEY, VALUE));
-			stmt.execute();
-			stmt.close();
-		} catch (SQLException e) {
-			LOG.log(ERROR,ERROR_FAILED_CREATE_TABLE,TABLE_SETTINGS,e);
-			throw new RuntimeException(e);
-		}
-
-		Integer version = null;
-		try {
-			var rs = select(VALUE).from(TABLE_SETTINGS).where(KEY, equal(DB_VERSION)).exec(db);
-			if (rs.next()) version = rs.getInt(VALUE);
-			rs.close();
-			if (version == null) {
-				version = INITIAL_DB_VERSION;
-				insertInto(TABLE_SETTINGS, KEY, VALUE).values(DB_VERSION,version).execute(db).close();
-			}
-
-			return version;
-		} catch (SQLException e) {
-			LOG.log(ERROR,ERROR_READ_TABLE,DB_VERSION,TABLE_SETTINGS,e);
-			throw new RuntimeException(e);
-		}
-	}
-
 	private void createTableTemplates() {
 		var createTable = "CREATE TABLE IF NOT EXISTS {0} ({1} INTEGER PRIMARY KEY, {2} INT NOT NULL, {3} VARCHAR(255) NOT NULL, {4} BLOB)";
 		try {
@@ -252,17 +224,21 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 		return pos;
 	}
 
-	@Override
-	public Collection<Template> getCompanyTemplates(long companyId) throws UmbrellaException {
+	private void dropTemplateIdColumn() {
 		try {
-
-			var rs = select(ALL).from(TABLE_TEMPLATES).where(COMPANY_ID,equal(companyId)).exec(db);
-			var templates = new HashSet<Template>();
-			while (rs.next()) templates.add(Template.of(rs));
-			rs.close();
-			return templates;
+			var sql = format("ALTER TABLE {0} DROP COLUMN {1}",TABLE_DOCUMENTS,TEMPLATE_ID);
+			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
-			throw databaseException("Failed to load templates for company {0}",companyId);
+			throw databaseException("Failed to update column {0} → {1} of {2}",TEMPLATE_ID,TEMPLATE,TABLE_DOCUMENTS);
+		}
+	}
+
+	private void dropTemplateTable() {
+		try {
+			var sql = format("DROP TABLE IF EXISTS {0};",TABLE_TEMPLATES);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException("Failed to drop table {0}",TABLE_TEMPLATES);
 		}
 	}
 
@@ -307,11 +283,7 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 		}
 		throw new UmbrellaException(500,"No type with id = {0}",typeId);
 	}
-
-	private void init() {
-		var version = createTables();
-	}
-
+	
 	@Override
 	public Map<Long, Map<Long, String>> docReferencedByTimes(Set<Long> timeIds) throws UmbrellaException {
 		try {
@@ -430,7 +402,7 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 			while (rs.next()) types.put(rs.getInt(ID),toType(rs));
 			rs.close();
 
-			rs = Query.select(ALL).from(TABLE_DOCUMENTS).leftJoin(TEMPLATE_ID,TABLE_TEMPLATES, ID).where(TABLE_DOCUMENTS+"."+ ID,equal(docId)).exec(db);
+			rs = Query.select(ALL).from(TABLE_DOCUMENTS).where(TABLE_DOCUMENTS+"."+ ID,equal(docId)).exec(db);
 			Document doc = null;
 			while (rs.next()) doc = toDoc(rs,types);
 			rs.close();
@@ -452,6 +424,15 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 		throw new UmbrellaException(500,"Failed to load document {0}.",docId);
 	}
 
+	private void moveTemplateNames() {
+		try {
+			var sql = format("UPDATE {0} SET template = (SELECT name FROM templates WHERE templates.id = documents.template_id);",TABLE_DOCUMENTS);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException("Failed to move template.names to document.templates!");
+		}
+	}
+
 	@Override
 	public String nextDocId(String language, long companyId, Type type) {
 		try {
@@ -499,9 +480,8 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 			var timestamp = doc.date().atStartOfDay(UTC).toInstant().getEpochSecond();
 			var sender = doc.sender();
 			var custom = doc.customer();
-			var templateId = doc.template() == null ? null : doc.template().id();
-			var stmt = insertInto(TABLE_DOCUMENTS,TYPE_ID,COMPANY_ID, DATE, DELIVERY_DATE,FOOTER,HEAD, NUMBER, STATE, SENDER,TAX_NUMBER,BANK_ACCOUNT,COURT,CUSTOMER,CUSTOMER_EMAIL,CUSTOMER_NUMBER,CUSTOMER_TAX_NUMBER,TEMPLATE_ID,CURRENCY)
-					.values(doc.type().id(),doc.companyId(),timestamp,doc.delivery(),doc.footer(),doc.head(),doc.number(),doc.state().code(),sender.name(),sender.taxNumber(),sender.bankAccount(),sender.court(),custom.name(),custom.email(),custom.id(),custom.taxNumber(),templateId, doc.currency())
+			var stmt = insertInto(TABLE_DOCUMENTS,TYPE_ID,COMPANY_ID, DATE, DELIVERY_DATE,FOOTER,HEAD, NUMBER, STATE, SENDER,TAX_NUMBER,BANK_ACCOUNT,COURT,CUSTOMER,CUSTOMER_EMAIL,CUSTOMER_NUMBER,CUSTOMER_TAX_NUMBER,TEMPLATE,CURRENCY)
+					.values(doc.type().id(),doc.companyId(),timestamp,doc.delivery(),doc.footer(),doc.head(),doc.number(),doc.state().code(),sender.name(),sender.taxNumber(),sender.bankAccount(),sender.court(),custom.name(),custom.email(),custom.id(),custom.taxNumber(),doc.template(), doc.currency())
 				.execute(db);
 			var rs = stmt.getGeneratedKeys();
 			Long newId = null;
@@ -523,10 +503,10 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 			var sender = doc.sender();
 			var custom = doc.customer();
 			update(TABLE_DOCUMENTS)
-					.set(DATE, DELIVERY_DATE,FOOTER,HEAD, NUMBER, STATE, SENDER,TAX_NUMBER,BANK_ACCOUNT,COURT,CUSTOMER,CUSTOMER_EMAIL,CUSTOMER_NUMBER,CUSTOMER_TAX_NUMBER,TEMPLATE_ID)
+					.set(DATE, DELIVERY_DATE,FOOTER,HEAD, NUMBER, STATE, SENDER,TAX_NUMBER,BANK_ACCOUNT,COURT,CUSTOMER,CUSTOMER_EMAIL,CUSTOMER_NUMBER,CUSTOMER_TAX_NUMBER,TEMPLATE)
 					.where(ID,equal(doc.id()))
 					.prepare(db)
-					.apply(timestamp,doc.delivery(),doc.footer(),doc.head(),doc.number(),doc.state().code(),sender.name(),sender.taxNumber(),sender.bankAccount(),sender.court(),custom.name(),custom.email(),custom.id(),custom.taxNumber(),doc.template().id())
+					.apply(timestamp,doc.delivery(),doc.footer(),doc.head(),doc.number(),doc.state().code(),sender.name(),sender.taxNumber(),sender.bankAccount(),sender.court(),custom.name(),custom.email(),custom.id(),custom.taxNumber(),doc.template())
 					.close();
 			sender.clean();
 			custom.clean();
@@ -635,23 +615,10 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 		var customerEmail = rs.getString(CUSTOMER_EMAIL);
 		var customer = new Customer(customerId, customerName, customerEmail, customerTaxNumber,FALLBACK_LANG);
 		var sender = new Sender(senderName,bankAccount,taxNumber,court);
-		var template = toTemplate(rs);
+		var template = rs.getString(TEMPLATE);
 		return new Document(id,company,number,type,date, Document.State.of(state).orElse(State.ERROR),template,delivery,head,footer,currency, DEFAULT_THOUSANDS_SEPARATOR,sender,customer,new PositionList());
 	}
 
-	private Template toTemplate(ResultSet rs) throws SQLException {
-		try {
-			var id = rs.getLong(TEMPLATE_ID);
-			var company = rs.getLong(COMPANY_ID);
-			var name = rs.getString(NAME);
-			var data = rs.getBytes(TEMPLATE);
-			if (id == 0) return new Template(0,company,"",null);
-			return new Template(id,company,name,data);
-		} catch (SQLException ignored){
-			return null;
-		}
-	}
-
 	private Position toPosition(ResultSet rs) throws SQLException {
 		var num = rs.getInt(POS);
 		var itemCode = rs.getString(ITEM_CODE);

frontend/src/routes/document/TemplateSelector.svelte

@@ -30,8 +30,8 @@
 {#if templates}
 <select bind:value onchange={onchange}>
     <option value={0}>{caption}</option>
-    {#each Object.entries(templates) as [id,template]}
-    <option value={template.id}>{template.name}</option>
+    {#each templates as template}
+    <option value={template}>{template}</option>
     {/each}
 </select>
 {:else}

frontend/src/routes/document/View.svelte

@@ -214,9 +214,9 @@
                     <th>{t('template')}:</th>
                     <td>
                     {#if editable}
-                    <TemplateSelector company={doc.company.id} bind:value={doc.template.id} onchange={() => update('template_id',doc.template.id)} />
+                    <TemplateSelector company={doc.company.id} bind:value={doc.template} onchange={() => update('template',doc.template)} />
                     {:else}
-                    {doc.template.name}
+                    {doc.template}
                     {/if}
                     </td>
                 </tr>

frontend/src/routes/stock/Index.svelte

@@ -145,7 +145,6 @@
             error(res);
             return null;
         }
-
     }
 
     async function loadProperties(){

frontend/src/routes/stock/Locations.svelte

@@ -1,7 +1,7 @@
 <script>
-    import { api, get } from '../../urls.svelte';
-    import { error, yikes } from '../../warn.svelte';
-    import { t }   from '../../translations.svelte';
+    import { api, get, post } from '../../urls.svelte';
+    import { error, yikes }   from '../../warn.svelte';
+    import { t }              from '../../translations.svelte';
 
     import LineEditor from '../../Components/LineEditor.svelte';