diff --git a/hotdeploy.sh b/hotdeploy.sh deleted file mode 100755 index f11b218..0000000 --- a/hotdeploy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -############################################################ -# Setup hotdeploy -# -############################################################ - -cd office-alexander-logistics-app -mvn manik-hotdeploy:hotdeploy - -cd .. \ No newline at end of file diff --git a/office-alexander-logistics-app/.gitignore b/office-alexander-logistics-app/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/office-alexander-logistics-app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml deleted file mode 100644 index 30f9f42..0000000 --- a/office-alexander-logistics-app/pom.xml +++ /dev/null @@ -1,430 +0,0 @@ - - - 4.0.0 - - office-alexander-logistics - com.alexander-logistics - 1.3.6 - - office-alexander-logistics-app - war - Imixs Office Workflow App - - - - docker - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - install - - - - - - - - - - - - run - - - - - - - - - - - debug - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - install - - - - - - - - - - - - - - run - - - - - - - - - - - kubernetes - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - install - - - - - - - - - - - - - - - - - - - - - run - - - - - - - - - - - - - ${basedir}/../reports - - - ${basedir}/../workflow - - - ${basedir}/src/test/resources - - - - - - maven-war-plugin - 3.3.2 - - false - - - true - - ${custom.webResources} - - **/WEB-INF/* - - - - - target/overlay-war-folder - - - - org.imixs.workflow - imixs-office-workflow-app - - WEB-INF/lib/*.jar - - - - - - - - org.imixs.maven - manik-hotdeploy-maven-plugin - 2.0.0 - - - install - - deploy - - - - - - - - - target/*.{war,ear,jar} - ../docker/deployments/ - true - - - - - src/main/webapp - ../docker/deployments/office-alexander-logistics.war - - - - - - - - - - - - - - - - org.imixs.workflow - imixs-workflow-core - jar - compile - - - org.imixs.workflow - imixs-workflow-engine - jar - compile - - - org.imixs.workflow - imixs-workflow-jax-rs - jar - compile - - - org.imixs.workflow - imixs-workflow-faces - jar - compile - - - org.imixs.workflow - imixs-workflow-index-lucene - compile - - - - - org.imixs.workflow - imixs-marty - jar - compile - - - - - org.imixs.workflow - imixs-office-workflow-app - war - - - - org.imixs.workflow - imixs-office-workflow-util - compile - - - - - org.imixs.workflow - imixs-archive-api - compile - - - - - - org.imixs.workflow - imixs-data-groups - - - org.imixs.workflow - imixs-data-views - - - org.imixs.workflow - imixs-data-documents - compile - - - org.imixs.workflow - imixs-data-importer - compile - - - - - org.imixs.workflow - imixs-adapters-sepa - compile - - - - org.imixs.workflow - imixs-adapters-datev - compile - - - - org.imixs.workflow - imixs-adapters-qrcode - compile - - - - org.imixs.workflow - imixs-adapters-poi - compile - - - org.imixs.workflow - imixs-ai-workflow - ${org.imixs.ai.version} - compile - - - - - org.imixs.util - imixs-e-invoice - ${org.imixs.e-invoice.version} - - - - - net.sf.saxon - Saxon-HE - - - - org.apache.pdfbox - pdfbox - ${apache.pdfbox.version} - compile - - - - - commons-net - commons-net - 3.6 - - - - - com.sun.mail - javax.mail - 1.6.2 - test - - - org.apache.httpcomponents - httpclient - 4.5.10 - test - - - com.fasterxml.jackson.core - jackson-databind - 2.13.3 - test - - - - - - - org.glassfish.jersey.core - jersey-client - 3.1.2 - test - - - org.apache.cxf - cxf-rt-rs-client - 3.3.6 - test - - - org.glassfish.jersey.inject - jersey-hk2 - 3.1.2 - test - - - - jakarta.ws.rs - jakarta.ws.rs-api - 3.1.0 - test - - - - - - - - - \ No newline at end of file diff --git a/office-alexander-logistics-testclient/pom.xml b/office-alexander-logistics-testclient/pom.xml deleted file mode 100644 index fd2ff67..0000000 --- a/office-alexander-logistics-testclient/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - - office-alexander-logistics - com.alexander-logistics - 1.3.6 - - office-alexander-logistics-testclient - jar - Imixs Office Workflow Remote Test Client - - - - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 11 - 11 - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - ${project.build.sourceEncoding} - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - - - imixs-process-manager - - - - - - jakarta.platform - jakarta.jakartaee-api - 10.0.0 - provided - - - - - - org.imixs.workflow - imixs-workflow-core - ${org.imixs.workflow.version} - - - - org.imixs.workflow - imixs-melman - ${org.imixs.melman.version} - - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - test - - - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.0 - test - - - org.eclipse.parsson - jakarta.json - 1.1.1 - test - - - org.glassfish.jaxb - jaxb-runtime - 3.0.0 - test - - - org.glassfish.jersey.media - jersey-media-jaxb - 3.1.5 - test - - - - org.glassfish.jersey.core - jersey-client - 3.1.5 - - - - - \ No newline at end of file diff --git a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestCargosoftEvents.java b/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestCargosoftEvents.java deleted file mode 100644 index 6ed86cc..0000000 --- a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestCargosoftEvents.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.alexanderlogistics.rest; - -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import org.imixs.melman.EventLogClient; -import org.imixs.melman.FormAuthenticator; -import org.imixs.melman.RestAPIException; -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.exceptions.PluginException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -/** - * A test to explore a corgosoft invoice event - * - */ -@Disabled -public class TestCargosoftEvents { - - private static Logger logger = Logger.getLogger(TestCargosoftEvents.class.getName()); - - EventLogClient client = null; - - String restAPI = "https://test.alexander-logistics.office-workflow.de/api"; - // String restAPI = "http://localhost:8080/api"; - String userID = "kutzner-service"; - String password = "imixs"; - - /** - * Setup a new Rest Client - * - * @throws PluginException - */ - @BeforeEach - public void setup() throws PluginException { - - client = new EventLogClient(restAPI); - FormAuthenticator aut; - try { - aut = new FormAuthenticator(restAPI, userID, password); - client.registerClientRequestFilter(aut); - } catch (RestAPIException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Disabled - @Test - public void getXMLData() { - logger.info("start..."); - try { - List list = client.searchEventLog("TOPIC_CARGOSOFT_INVOICE"); - logger.info("found " + list.size() + " log entries"); - for (ItemCollection entry : list) { - List dataList = entry.getItemValue("data"); - if (dataList != null && dataList.size() > 0) { - ItemCollection data = new ItemCollection((Map>) dataList.get(0)); - logger.info("Data=" + data.getItemValueString("some-data")); - logger.info("XML Data=" + data.getItemValueString("xml-data")); - } - } - } catch (RestAPIException e) { - logger.severe("Failed to read event log entry: " + e.getMessage()); - e.printStackTrace(); - } - } - - /** - * Deletes the 10 last topics - */ - @Test - public void deleteXMLData() { - logger.info("start..."); - int count = 0; - try { - client.setPageSize(1000); - List list = client.searchEventLog("topictest", "TOPIC_CARGOSOFT_INVOICE"); - // List list = client.searchEventLog(""); - - logger.info("found " + list.size() + " log entries"); - for (ItemCollection entry : list) { - String id = entry.getItemValueString("id"); - logger.info("delete event log entry id=" + id); - client.deleteEventLogEntry(id); - - count++; - if (count >= 635000) { - break; - } - - } - logger.info(count + " log entries deleted"); - } catch ( - - RestAPIException e) { - logger.severe("Failed to read event log entry: " + e.getMessage()); - e.printStackTrace(); - } - } - -} diff --git a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestEventLog.java b/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestEventLog.java deleted file mode 100644 index 32a9bc7..0000000 --- a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestEventLog.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.alexanderlogistics.rest; - -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import org.imixs.melman.EventLogClient; -import org.imixs.melman.FormAuthenticator; -import org.imixs.melman.RestAPIException; -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.WorkflowKernel; -import org.imixs.workflow.exceptions.PluginException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -/** - * A simple example how to create a new event log entry remote. - * - */ -@Disabled -public class TestEventLog { - - private static Logger logger = Logger.getLogger(TestEventLog.class.getName()); - - EventLogClient client = null; - - // String restAPI = "https://test.alexander-logistics.office-workflow.de/api"; - String restAPI = "http://localhost:8080/api"; - String userID = "kutzner-service"; - String password = "imixs"; - - /** - * Setup a new Rest Client - * - * @throws PluginException - */ - @BeforeEach - public void setup() throws PluginException { - - client = new EventLogClient(restAPI); - FormAuthenticator aut; - try { - aut = new FormAuthenticator(restAPI, userID, password); - client.registerClientRequestFilter(aut); - } catch (RestAPIException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - /** - * Create an event log entry.... - * - */ - @Test - public void sendXMLData() { - - logger.info("start..."); - ItemCollection payLoad = new ItemCollection(); - String uid = WorkflowKernel.generateUniqueID(); - try { - // set data.... - payLoad.setItemValue("some-data", "abc"); - String xmlString = "" - + "" - + " " - + " 224225" - + " " - + " "; - payLoad.setItemValue("xml-data", xmlString); - - client.createEventLogEntry("TOPIC_CARGOSOFT_INVOICE", uid, payLoad); - logger.info("completed"); - } catch (RestAPIException e) { - logger.severe("Failed to send event log entry: " + e.getMessage()); - e.printStackTrace(); - } - } - - @Test - public void getXMLData() { - logger.info("start..."); - try { - List list = client.searchEventLog("TOPIC_CARGOSOFT_INVOICE"); - logger.info("found " + list.size() + " log entries"); - for (ItemCollection entry : list) { - List dataList = entry.getItemValue("data"); - if (dataList != null && dataList.size() > 0) { - ItemCollection data = new ItemCollection((Map>) dataList.get(0)); - logger.info("Data=" + data.getItemValueString("some-data")); - logger.info("XML Data=" + data.getItemValueString("xml-data")); - } - } - } catch (RestAPIException e) { - logger.severe("Failed to read event log entry: " + e.getMessage()); - e.printStackTrace(); - } - } - -} diff --git a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestSendInvoice.java b/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestSendInvoice.java deleted file mode 100644 index ee50923..0000000 --- a/office-alexander-logistics-testclient/src/test/java/com/alexanderlogistics/rest/TestSendInvoice.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.alexanderlogistics.rest; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.IOException; -import java.util.List; -import java.util.logging.Logger; - -import org.imixs.melman.FormAuthenticator; -import org.imixs.melman.RestAPIException; -import org.imixs.melman.WorkflowClient; -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.exceptions.PluginException; -import org.imixs.workflow.xml.XMLDataCollectionAdapter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import jakarta.xml.bind.JAXBException; - -/** - * A simple example how to send an invoice document remote. - * - */ -@Disabled -public class TestSendInvoice { - - private static Logger logger = Logger.getLogger(TestSendInvoice.class.getName()); - - WorkflowClient client = null; - - // String restAPI = "https://test.alexander-logistics.office-workflow.de/api"; - String restAPI = "http://localhost:8080/api"; - String userID = "kutzner-service"; - String password = "imixs"; - - /** - * Setup a new Rest Client - * - * @throws PluginException - */ - @BeforeEach - public void setup() throws PluginException { - - client = new WorkflowClient(restAPI); - FormAuthenticator aut; - try { - aut = new FormAuthenticator(restAPI, userID, password); - client.registerClientRequestFilter(aut); - } catch (RestAPIException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - /** - * Create an event log entry.... - * - */ - @Test - public void sendXMLData() { - - logger.info("send invoice..."); - ItemCollection payLoad = new ItemCollection(); - ItemCollection result = null; - try { - // read test data - List col = null; - // read default content - - col = XMLDataCollectionAdapter - .readCollectionFromInputStream(getClass().getResourceAsStream("/invoice-01.xml")); - assertEquals(1, col.size()); - // set invoice data.... - // XMLDataCollection result = client.postXMLDocument("workflow/workitem", - // XMLDocumentAdapter.getDocument(col.get(0))); - result = client.processWorkitem(col.get(0)); - - logger.info("completed"); - } catch (RestAPIException | JAXBException | IOException e) { - logger.severe("Failed to send event log entry: " + e.getMessage()); - - fail(e); - } - } - -} diff --git a/office-alexander-logistics-testclient/src/test/resources/invoice-01.xml b/office-alexander-logistics-testclient/src/test/resources/invoice-01.xml deleted file mode 100644 index e6ee361..0000000 --- a/office-alexander-logistics-testclient/src/test/resources/invoice-01.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - workitem - - - Rechnungsausgang - - - 5001 - - - 980 - - - - - - - application/pdf - - JVBERi0xLjMgCiXi48............................ - - - - - - - - - - NACHL40 - - - EUR - - - 252.84 - - - Container transport from port - to warehouse in Antwerp - - - H - - - SEE - - - LA-PAP-2508-012 - - - - - FC - - - EUR - - - 22.38 - - - Fuel Charge as per fuel floater August - 2025 - - - H - - - DIESEL - - - LA-PAP-2508-012 - - - - - ZOLLABF - - - EUR - - - 16.2 - - - custom clearance fiscal representation - VAT reporting - - - H - - - SEE - - - LA-PAP-2508-012 - - - - - - - - - Graphic Packaging International (NL) - - - D12495 - - - 0.0 - - - 202508 - - - IM-ZEL - - - - - - EUR - - - 2025-09-01T00:00:00+02:00 - - - 2025-10-16T00:00:00+02:00 - - - EN - - - 245956 - - - LA-PAP-2508-012 - LA-PAP-2508-012 - LA-PAP-2508-012 - - - 0.0 - - - 2025-10-16T00:00:00+02:00 - - - 469.07 - - - LA-PAP-2508-012 - - - 469.07 - - - 469.07 - - - 0.0 - - - R - - - Ausgangsrechnung - - - 0.0 - - - 001 - - - 10 - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 77e800e..ad8a636 100644 --- a/pom.xml +++ b/pom.xml @@ -5,38 +5,72 @@ 4.0.0 com.alexander-logistics office-alexander-logistics - 1.3.6 - pom + 1.4.0 + war Imixs Office Workflow - Custom Build + + Imixs Software Solutions GmbH + http://www.imixs.com + + 2024 + + + rsoika + Ralph Soika + ralph.soika@imixs.com + http://blog.imixs.org/ + Imixs Software Solutions GmbH + http://www.imixs.com + + developer + testing + + 2 + + + gaheinle + Gaby Heinle + + + Imixs Software Solutions GmbH + http://www.imixs.com + + developer + testing + + 2 + + - - office-alexander-logistics-app - office-alexander-logistics-testclient - - 11 - 11 + 17 + 17 UTF-8 UTF-8 + + src/main/webapp + war + ${maven.build.timestamp} yyyyMMddHHmmss - - 10.0.0 - 5.0.5 - 6.0.9 - 5.0.0 - 3.1.3 - 3.0.3 - 2.1.1 - 1.0.3 - 1.0.3-SNAPSHOT - 6.0 - 9.9.1-4 - 2.0.26 + + 10.0.0 + 6.0 + + 6.2.8-SNAPSHOT + 5.1.8 + 5.2.0 + 3.2.3 + 1.0.3 + 1.0.3-SNAPSHOT + + 4.0.0 + 9.9.1-4 + 2.0.24 1.1.1 src/main/webapp @@ -56,6 +90,7 @@ war + Production java:/mail/org.imixs.workflow.mail @@ -67,9 +102,9 @@ - sonatype-snaptshots - Sonatype Snapshot repository - http://oss.sonatype.org/content/repositories/snapshots + central-portal-snapshots + Central Portal Snapshots + https://central.sonatype.com/repository/maven-snapshots/ false @@ -82,19 +117,114 @@ docker - + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + install + + + + + + + + + + + + run + + + + + + + + debug - + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + install + + + + + + + + + + + + + + run + + + + + + - kubernetes - + imixs-cloud + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + install + + + + + + + + + + + + + + + + + + + + + run + + + + + + + - @@ -103,7 +233,21 @@ true + + + + ${basedir}/./reports + + + ${basedir}/./workflow + + + ${basedir}/src/test/resources + + + + maven-compiler-plugin @@ -117,8 +261,58 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.3.1 + + + default-test + test + + test + + + + --add-opens java.base/java.lang=ALL-UNNAMED + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.2.0 + + false + + + true + + ${custom.webResources} + + **/WEB-INF/* + + + + + + + + org.apache.maven.plugins maven-resources-plugin @@ -128,196 +322,49 @@ - + + + + target/*.{war,ear,jar} + ./docker/deployments/ + true + + + + + src/main/webapp + ./docker/deployments/${imixs-office.applicationname}.war + + + + + org.apache.maven.plugins - maven-checkstyle-plugin - 3.3.0 - - - https://raw.githubusercontent.com/imixs/imixs-workflow/master/imixs-checkstyle-8.44.xml - true - - - - verify - - check - - - + maven-release-plugin - --> - - office-alexander-logistics + + office-alexander-logistics - - - - - org.imixs.workflow - imixs-workflow-core - ${org.imixs.workflow.version} - provided - - - org.imixs.workflow - imixs-workflow-engine - ${org.imixs.workflow.version} - provided - - - org.imixs.workflow - imixs-workflow-faces - ${org.imixs.workflow.version} - - - org.imixs.workflow - imixs-workflow-jax-rs - ${org.imixs.workflow.version} - - - org.imixs.workflow - imixs-workflow-index-lucene - ${org.imixs.workflow.version} - - - - - org.imixs.workflow - imixs-marty - ${org.imixs.marty.version} - provided - - - - - org.imixs.workflow - imixs-office-workflow-app - ${org.imixs.office.version} - war - - - - - org.imixs.workflow - imixs-office-workflow-util - ${org.imixs.office.version} - provided - - - - - - org.imixs.workflow - imixs-adapters-sepa - ${org.imixs.adapters.version} - provided - - - - org.imixs.workflow - imixs-adapters-datev - ${org.imixs.adapters.version} - provided - - - - org.imixs.workflow - imixs-adapters-qrcode - ${org.imixs.adapters.version} - provided - - - - org.imixs.workflow - imixs-adapters-poi - ${org.imixs.adapters.version} - provided - - - - - org.imixs.workflow - imixs-archive-api - ${org.imixs.archive.version} - provided - - - - - - org.imixs.workflow - imixs-ai-workflow - ${org.imixs.ai.version} - compile - - - - - - org.imixs.workflow - imixs-data-groups - ${org.imixs.data.version} - compile - - - org.imixs.workflow - imixs-data-views - ${org.imixs.data.version} - compile - - - org.imixs.workflow - imixs-data-documents - ${org.imixs.data.version} - provided - - - org.imixs.workflow - imixs-data-importer - ${org.imixs.data.version} - compile - - - - - - org.imixs.workflow - imixs-melman - ${org.imixs.melman.version} - compile - - - - - net.sf.saxon - Saxon-HE - ${net.sf.saxon.version} - - - @@ -326,8 +373,6 @@ ${jakarta.version} provided - - org.eclipse.microprofile @@ -337,6 +382,166 @@ provided + + + org.imixs.workflow + imixs-workflow-core + jar + ${org.imixs.workflow.version} + + + org.imixs.workflow + imixs-workflow-engine + jar + ${org.imixs.workflow.version} + + + org.imixs.workflow + imixs-workflow-jax-rs + jar + ${org.imixs.workflow.version} + + + org.imixs.workflow + imixs-workflow-faces + jar + ${org.imixs.workflow.version} + + + org.imixs.workflow + imixs-workflow-index-lucene + ${org.imixs.workflow.version} + + + + + org.imixs.workflow + imixs-office-workflow-app + war + ${org.imixs.office.version} + + + org.imixs.workflow + imixs-office-workflow-util + ${org.imixs.office.version} + + + + + org.imixs.workflow + imixs-data-groups + ${org.imixs.data.version} + + + org.imixs.workflow + imixs-data-views + ${org.imixs.data.version} + + + org.imixs.workflow + imixs-data-documents + ${org.imixs.data.version} + + + org.imixs.workflow + imixs-data-importer + ${org.imixs.data.version} + + + + org.apache.pdfbox + pdfbox + ${apache.pdfbox.version} + + + + + + org.imixs.workflow + imixs-adapters-sepa + ${org.imixs.adapter.version} + + + + org.imixs.workflow + imixs-adapters-datev + ${org.imixs.adapter.version} + + + + org.imixs.workflow + imixs-adapters-poi + ${org.imixs.adapter.version} + + + + org.imixs.workflow + imixs-adapters-qrcode + ${org.imixs.adapter.version} + + + + org.imixs.util + imixs-e-invoice + ${org.imixs.e-invoice.version} + + + + + commons-net + commons-net + 3.6 + + + + + com.sun.mail + javax.mail + 1.6.2 + test + + + org.apache.httpcomponents + httpclient + 4.5.10 + test + + + com.fasterxml.jackson.core + jackson-databind + 2.13.3 + test + + + + + + org.glassfish.jersey.core + jersey-client + 3.1.2 + test + + + org.apache.cxf + cxf-rt-rs-client + 3.3.6 + test + + + org.glassfish.jersey.inject + jersey-hk2 + 3.1.2 + test + + + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + test + + + @@ -365,7 +570,6 @@ ${mockito.version} test - org.eclipse.parsson jakarta.json diff --git a/sepa_PKO_Bank_Polski_SA_(PLN)_2024-06-20T0933-fix.xml b/sepa_PKO_Bank_Polski_SA_(PLN)_2024-06-20T0933-fix.xml deleted file mode 100644 index a5aec11..0000000 --- a/sepa_PKO_Bank_Polski_SA_(PLN)_2024-06-20T0933-fix.xml +++ /dev/null @@ -1,523 +0,0 @@ - - - - - 885e0519099f4ef5876b1b721d4b605f - 2024-06-20T09:33:46 - 20 - 67913,22 - - PKO Bank Polski SA (PLN) - - - - 885e0519099f4ef5876b1b721d4b605f-1 - TRF - 20 - 67913,22 - - - SEPA - - - 2024-06-20 - - PKO Bank Polski SA (PLN) - - - - PL61102010260000120203993128 - - - - - BPKOPLPW - - - SHAR - - - NOTPROVIDED - - - 2337.00 - - - - ALBPPLPW - - - - Blaszkiewicz - - - - PL35249000050000453034973384 - - - - 701528 / 540/05/2024 - - - - - NOTPROVIDED - - - 4059.00 - - - - GBWCPLPP - - - - KOWALEWSKI - - - - PL33823300040017753920140001 - - - - 701515 / FS 318/04/2024 - - - - - NOTPROVIDED - - - 2337.00 - - - - PKOPPLPW - - - - GEODIS - - - - PL85124062921111001069083502 - - - - 701779 / FWA/24FTD/01725 - - - - - NOTPROVIDED - - - 2337.00 - - - - PKOPPLPW - - - - GEODIS - - - - PL85124062921111001069083502 - - - - 701780 / FWA/24FTD/01732 - - - - - NOTPROVIDED - - - 2337.00 - - - - PKOPPLPW - - - - GEODIS - - - - PL85124062921111001069083502 - - - - 701781 / FWA/24FTD/01736 - - - - - NOTPROVIDED - - - 3013.50 - - - - INGBPLPW - - - - adex - - - - PL42105015911000009135641521 - - - - 701800 / FS 34/05/2024 - - - - - NOTPROVIDED - - - 2952.00 - - - - PPABPLPK - - - - Danuta Bedkowska - - - - PL50102024300000860200294058 - - - - 701801 / FT/948/2024 - - - - - NOTPROVIDED - - - 2952.00 - - - - INGBPLPW - - - - Easy Way - - - - PL31105017221000009142459099 - - - - 701817 / FV/106/2024 - - - - - NOTPROVIDED - - - 2337.00 - - - - PPABPLPK - - - - RABEN - - - - PL67203000745059000010201640 - - - - 701809 / 8742530343 - - - - - NOTPROVIDED - - - 2337.00 - - - - PPABPLPK - - - - RABEN - - - - PL67203000745059000010201640 - - - - 701808 / 8742530342 - - - - - NOTPROVIDED - - - 2337.00 - - - - WBKPPLPP - - - - ZASADA TRANS - - - - PL08150017481217400107410000 - - - - 701815 / TKP/0211/05/2024/FV - - - - - NOTPROVIDED - - - 2337.00 - - - - PPABPLPKXXX - - - - Wielkopolska - - - - PL73203000451110000002046170 - - - - 701802 / V 00043/05/2024 - - - - - NOTPROVIDED - - - 2337.00 - - - - PKOPPLPW - - - - EXWIS - - - - PL88124060871111001053542790 - - - - 701823 / 381/2024 - - - - - NOTPROVIDED - - - 1230.00 - - - - PKOPPLPW - - - - GEODIS - - - - PL85124062921111001069083502 - - - - 701782 / FKA/24FTD/01907 - - - - - NOTPROVIDED - - - 2029.50 - - - - PKOPPLPW - - - - STALKO - - - - PL51124063351111000051278199 - - - - 701813 / 3814/04/2024/TR - - - - - NOTPROVIDED - - - 2029.50 - - - - PKOPPLPW - - - - STALKO - - - - PL51124063351111000051278199 - - - - 701811 / 3812/04/2024/TR - - - - - NOTPROVIDED - - - 3075.00 - - - - POLUPLPR - - - - Klajnowski - - - - PL21888210322001002691790001 - - - - 701816 / 751/2024 - - - - - NOTPROVIDED - - - 1848.00 - - - - INGBPLPW - - - - BULK CARGO - - - - PL97105000995381000010009580 - - - - 702441 / VAT/2043/E /2024 - - - - - NOTPROVIDED - - - 16961.40 - - - - PPABPLPK - - - - Baltic Hub - - - - PL52160014753166100000000793 - - - - 702466 / FV/24/06/0304 - - - - - NOTPROVIDED - - - 6730.32 - - - - PPABPLPK - - - - Baltic Hub - - - - PL52160014753166100000000793 - - - - 702467 / FV/24/06/0309 - - - - - \ No newline at end of file diff --git a/setup_dev.sh b/setup_dev.sh deleted file mode 100755 index 5eed491..0000000 --- a/setup_dev.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -############################################################ -# Setup Imixs-Documents Training Environment -# -############################################################ - -sudo chmod -R 777 docker/deployments/ - -echo "#############################################" -echo " building Imixs-ML Docker images..." -echo "#############################################" -mvn -f ~/git/imixs-ml/ clean install -Pdocker -DskipTests - -echo "#############################################" -echo " starting dev enrvionment..." -echo "#############################################" -mvn clean install -Pdebug -cp ./*-app/target/*.war ./docker/deployments/ -docker-compose -f docker-compose.yml up \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/deprecated/CargosoftController.java b/src/main/deprecated/CargosoftController.java similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/CargosoftController.java rename to src/main/deprecated/CargosoftController.java diff --git a/office-alexander-logistics-app/src/main/deprecated/DatevCargosoftImportAdapter.java b/src/main/deprecated/DatevCargosoftImportAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/DatevCargosoftImportAdapter.java rename to src/main/deprecated/DatevCargosoftImportAdapter.java diff --git a/office-alexander-logistics-app/src/main/deprecated/KreditorDebitorService.java b/src/main/deprecated/KreditorDebitorService.java similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/KreditorDebitorService.java rename to src/main/deprecated/KreditorDebitorService.java diff --git a/office-alexander-logistics-app/src/main/deprecated/KreditorSearchEntry.java b/src/main/deprecated/KreditorSearchEntry.java similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/KreditorSearchEntry.java rename to src/main/deprecated/KreditorSearchEntry.java diff --git a/office-alexander-logistics-app/src/main/deprecated/cargsoft-creditor-search.xhtml b/src/main/deprecated/cargsoft-creditor-search.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/cargsoft-creditor-search.xhtml rename to src/main/deprecated/cargsoft-creditor-search.xhtml diff --git a/office-alexander-logistics-app/src/main/deprecated/cargsoft-debitor-search.xhtml b/src/main/deprecated/cargsoft-debitor-search.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/cargsoft-debitor-search.xhtml rename to src/main/deprecated/cargsoft-debitor-search.xhtml diff --git a/office-alexander-logistics-app/src/main/deprecated/cdtreingabe.xhtml b/src/main/deprecated/cdtreingabe.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/cdtreingabe.xhtml rename to src/main/deprecated/cdtreingabe.xhtml diff --git a/office-alexander-logistics-app/src/main/deprecated/debitor_search.xhtml b/src/main/deprecated/debitor_search.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/deprecated/debitor_search.xhtml rename to src/main/deprecated/debitor_search.xhtml diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapter.java b/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapter.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java b/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java similarity index 97% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java index b3e8e93..2e5caeb 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java +++ b/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java @@ -25,7 +25,7 @@ import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.office.config.ConfigService; import org.imixs.workflow.poi.POIFindReplaceAdapter; -import org.imixs.workflow.poi.POIUtil; +import org.imixs.workflow.poi.XSSFUtil; import org.imixs.workflow.util.XMLParser; import jakarta.inject.Inject; @@ -174,7 +174,7 @@ public class AGLAnalyticExcelAdapterDebitor extends POIFindReplaceAdapter { int newColumns = (currencyList.size() - 1) * 2; for (int i = 0; i < newColumns; i++) { logger.info(".. add currency column..."); - POIUtil.insertColumn(sheet, 6, 8 + i); + XSSFUtil.insertColumn(sheet, 6, 8 + i); } // Beschriftungen eintragen @@ -247,7 +247,7 @@ public class AGLAnalyticExcelAdapterDebitor extends POIFindReplaceAdapter { // jetzt füge alle Rechnungen an. int totalRowCount = invoices.size(); - POIUtil.insertRows(sheet, "A11", totalRowCount - 0); + XSSFUtil.insertRows(sheet, "A11", totalRowCount - 0); for (ItemCollection invoice : invoices) { logger.fine("......add invoice " + invoice.getUniqueID()); @@ -285,8 +285,8 @@ public class AGLAnalyticExcelAdapterDebitor extends POIFindReplaceAdapter { // setze Summen Formeln for (int column = 6; column < currencyList.size() * 2 + 6; column++) { XSSFCell cell = sheet.getRow(totalRowCount + 11).getCell(column); // G11 - String cellRefFrom = POIUtil.getCellReference(column, 10); - String cellRefTo = POIUtil.getCellReference(column, totalRowCount + 10); + String cellRefFrom = XSSFUtil.getCellReference(column, 10); + String cellRefTo = XSSFUtil.getCellReference(column, totalRowCount + 10); String formula = "SUM(" + cellRefFrom + ":" + cellRefTo + ")"; cell.setCellFormula(formula); } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java b/src/main/java/com/alexanderlogistics/AGLConfigController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java rename to src/main/java/com/alexanderlogistics/AGLConfigController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLTimestampAdapter.java b/src/main/java/com/alexanderlogistics/AGLTimestampAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLTimestampAdapter.java rename to src/main/java/com/alexanderlogistics/AGLTimestampAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java b/src/main/java/com/alexanderlogistics/BusinessPartnerController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java rename to src/main/java/com/alexanderlogistics/BusinessPartnerController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerSearchEntry.java b/src/main/java/com/alexanderlogistics/BusinessPartnerSearchEntry.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerSearchEntry.java rename to src/main/java/com/alexanderlogistics/BusinessPartnerSearchEntry.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java b/src/main/java/com/alexanderlogistics/BusinessPartnerService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java rename to src/main/java/com/alexanderlogistics/BusinessPartnerService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftExportAdapter.java b/src/main/java/com/alexanderlogistics/CargosoftExportAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftExportAdapter.java rename to src/main/java/com/alexanderlogistics/CargosoftExportAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java b/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java rename to src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java b/src/main/java/com/alexanderlogistics/CustomSearchController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java rename to src/main/java/com/alexanderlogistics/CustomSearchController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java b/src/main/java/com/alexanderlogistics/DebitorStatistikController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java rename to src/main/java/com/alexanderlogistics/DebitorStatistikController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java b/src/main/java/com/alexanderlogistics/DebitorStatistikData.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java rename to src/main/java/com/alexanderlogistics/DebitorStatistikData.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/FTPConnector.java b/src/main/java/com/alexanderlogistics/FTPConnector.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/FTPConnector.java rename to src/main/java/com/alexanderlogistics/FTPConnector.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceAnalyseController.java b/src/main/java/com/alexanderlogistics/InvoiceAnalyseController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceAnalyseController.java rename to src/main/java/com/alexanderlogistics/InvoiceAnalyseController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java b/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java rename to src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java b/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java rename to src/main/java/com/alexanderlogistics/InvoiceDispatchController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java b/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java rename to src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java b/src/main/java/com/alexanderlogistics/InvoicePlugin.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java rename to src/main/java/com/alexanderlogistics/InvoicePlugin.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java b/src/main/java/com/alexanderlogistics/InvoiceService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java rename to src/main/java/com/alexanderlogistics/InvoiceService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceUtil.java b/src/main/java/com/alexanderlogistics/InvoiceUtil.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceUtil.java rename to src/main/java/com/alexanderlogistics/InvoiceUtil.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/src/main/java/com/alexanderlogistics/OPListController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java rename to src/main/java/com/alexanderlogistics/OPListController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java b/src/main/java/com/alexanderlogistics/OPListExportAdapter.java similarity index 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java rename to src/main/java/com/alexanderlogistics/OPListExportAdapter.java index 68a4a05..e28b938 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java +++ b/src/main/java/com/alexanderlogistics/OPListExportAdapter.java @@ -26,7 +26,7 @@ import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.office.config.ConfigService; import org.imixs.workflow.poi.POIFindReplaceAdapter; -import org.imixs.workflow.poi.POIUtil; +import org.imixs.workflow.poi.XSSFUtil; import org.imixs.workflow.util.XMLParser; import jakarta.inject.Inject; @@ -179,7 +179,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { int newColumns = (currencyList.size() - 1) * 1; for (int i = 0; i < newColumns; i++) { logger.fine(".. add currency column..."); - POIUtil.insertColumn(sheet, 5, 6 + i); + XSSFUtil.insertColumn(sheet, 5, 6 + i); } // Beschriftungen eintragen diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java b/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java similarity index 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java rename to src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java index b110389..90a3093 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java +++ b/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java @@ -37,7 +37,7 @@ import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.office.config.ConfigService; import org.imixs.workflow.poi.POIFindReplaceAdapter; -import org.imixs.workflow.poi.POIUtil; +import org.imixs.workflow.poi.XSSFUtil; import org.imixs.workflow.util.XMLParser; import jakarta.inject.Inject; @@ -199,13 +199,13 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter { int newColumns = (currencyList.size() * (spaces.size())) - 1; for (int i = 0; i < newColumns; i++) { logger.fine(".. add currency column..."); - POIUtil.insertColumn(sheet, 1, 2 + i); + XSSFUtil.insertColumn(sheet, 1, 2 + i); } // Total spalten einfuegen for (int i = 0; i < currencyList.size() - 1; i++) { logger.fine(".. add total column..."); - POIUtil.insertColumn(sheet, 2 + newColumns, 3 + newColumns + i); + XSSFUtil.insertColumn(sheet, 2 + newColumns, 3 + newColumns + i); } newColumns = newColumns + currencyList.size(); diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportController.java b/src/main/java/com/alexanderlogistics/OPListExportController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportController.java rename to src/main/java/com/alexanderlogistics/OPListExportController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportScheduler.java b/src/main/java/com/alexanderlogistics/OPListExportScheduler.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportScheduler.java rename to src/main/java/com/alexanderlogistics/OPListExportScheduler.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/RenameFilenamesAdapter.java b/src/main/java/com/alexanderlogistics/RenameFilenamesAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/RenameFilenamesAdapter.java rename to src/main/java/com/alexanderlogistics/RenameFilenamesAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SEPAExportControllerAGL.java b/src/main/java/com/alexanderlogistics/SEPAExportControllerAGL.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SEPAExportControllerAGL.java rename to src/main/java/com/alexanderlogistics/SEPAExportControllerAGL.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SteuerListController.java b/src/main/java/com/alexanderlogistics/SteuerListController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SteuerListController.java rename to src/main/java/com/alexanderlogistics/SteuerListController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SteuerbescheidPlugin.java b/src/main/java/com/alexanderlogistics/SteuerbescheidPlugin.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/SteuerbescheidPlugin.java rename to src/main/java/com/alexanderlogistics/SteuerbescheidPlugin.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisAppendAdapter.java b/src/main/java/com/alexanderlogistics/ZahlungsavisAppendAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisAppendAdapter.java rename to src/main/java/com/alexanderlogistics/ZahlungsavisAppendAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisController.java b/src/main/java/com/alexanderlogistics/ZahlungsavisController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisController.java rename to src/main/java/com/alexanderlogistics/ZahlungsavisController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java b/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java similarity index 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java rename to src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java index 2eaeebb..3b8f6e8 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java +++ b/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java @@ -22,6 +22,7 @@ import org.imixs.workflow.exceptions.AdapterException; import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.poi.POIFindReplaceAdapter; +import org.imixs.workflow.poi.XSSFUtil; import jakarta.inject.Inject; @@ -171,7 +172,7 @@ public class ZahlungsavisExportAdapter extends POIFindReplaceAdapter { sheet.shiftRows(referenceRowPos, lastRow + invoiceIDs.size(), -1, true, true); // finally update the total formula... - evalXSSFSheet(doc, sheet, "TOTAL"); + XSSFUtil.evalXSSFSheet(doc, sheet, "TOTAL"); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); // write back the file diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java b/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java rename to src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangService.java b/src/main/java/com/alexanderlogistics/ZahlungseingangService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangService.java rename to src/main/java/com/alexanderlogistics/ZahlungseingangService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java b/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java rename to src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/CargosoftMigrationRestService.java b/src/main/java/com/alexanderlogistics/api/CargosoftMigrationRestService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/CargosoftMigrationRestService.java rename to src/main/java/com/alexanderlogistics/api/CargosoftMigrationRestService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java b/src/main/java/com/alexanderlogistics/api/DataRestService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java rename to src/main/java/com/alexanderlogistics/api/DataRestService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java b/src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java similarity index 97% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java rename to src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java index 439b87f..eb1bc89 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java +++ b/src/main/java/com/alexanderlogistics/dataview/AGLDataViewDebitorAdapter.java @@ -19,7 +19,7 @@ import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.office.config.ConfigService; import org.imixs.workflow.poi.POIFindReplaceAdapter; -import org.imixs.workflow.poi.POIUtil; +import org.imixs.workflow.poi.XSSFUtil; import com.alexanderlogistics.InvoiceService; @@ -189,7 +189,7 @@ public class AGLDataViewDebitorAdapter extends POIFindReplaceAdapter { int newColumns = (currencyList.size() - 1) * 2; for (int i = 0; i < newColumns; i++) { logger.info(".. add currency column..."); - POIUtil.insertColumn(sheet, 6, 8 + i); + XSSFUtil.insertColumn(sheet, 6, 8 + i); } // Beschriftungen eintragen @@ -259,7 +259,7 @@ public class AGLDataViewDebitorAdapter extends POIFindReplaceAdapter { // jetzt füge alle Rechnungen an. int totalRowCount = invoices.size(); - POIUtil.insertRows(sheet, "A11", totalRowCount - 0); + XSSFUtil.insertRows(sheet, "A11", totalRowCount - 0); for (ItemCollection invoice : invoices) { logger.fine("......add invoice " + invoice.getUniqueID()); @@ -297,8 +297,8 @@ public class AGLDataViewDebitorAdapter extends POIFindReplaceAdapter { // setze Summen Formeln for (int column = 6; column < currencyList.size() * 2 + 6; column++) { XSSFCell cell = sheet.getRow(totalRowCount + 11).getCell(column); // G11 - String cellRefFrom = POIUtil.getCellReference(column, 10); - String cellRefTo = POIUtil.getCellReference(column, totalRowCount + 10); + String cellRefFrom = XSSFUtil.getCellReference(column, 10); + String cellRefTo = XSSFUtil.getCellReference(column, totalRowCount + 10); String formula = "SUM(" + cellRefFrom + ":" + cellRefTo + ")"; cell.setCellFormula(formula); } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/datev/CargosoftExportController.java b/src/main/java/com/alexanderlogistics/datev/CargosoftExportController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/datev/CargosoftExportController.java rename to src/main/java/com/alexanderlogistics/datev/CargosoftExportController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/datev/CargosoftExportScheduler.java b/src/main/java/com/alexanderlogistics/datev/CargosoftExportScheduler.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/datev/CargosoftExportScheduler.java rename to src/main/java/com/alexanderlogistics/datev/CargosoftExportScheduler.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/EInvoiceAdapter.java b/src/main/java/com/alexanderlogistics/einvoice/EInvoiceAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/EInvoiceAdapter.java rename to src/main/java/com/alexanderlogistics/einvoice/EInvoiceAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFAPIAdapter.java b/src/main/java/com/alexanderlogistics/einvoice/KSeFAPIAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFAPIAdapter.java rename to src/main/java/com/alexanderlogistics/einvoice/KSeFAPIAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFAdapter.java b/src/main/java/com/alexanderlogistics/einvoice/KSeFAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFAdapter.java rename to src/main/java/com/alexanderlogistics/einvoice/KSeFAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFInvoiceLineBuilder.java b/src/main/java/com/alexanderlogistics/einvoice/KSeFInvoiceLineBuilder.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/KSeFInvoiceLineBuilder.java rename to src/main/java/com/alexanderlogistics/einvoice/KSeFInvoiceLineBuilder.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/QRTest.java b/src/main/java/com/alexanderlogistics/einvoice/QRTest.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/QRTest.java rename to src/main/java/com/alexanderlogistics/einvoice/QRTest.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/TaxCode.java b/src/main/java/com/alexanderlogistics/einvoice/TaxCode.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/einvoice/TaxCode.java rename to src/main/java/com/alexanderlogistics/einvoice/TaxCode.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFAPIService.java b/src/main/java/com/alexanderlogistics/ksef/api/KSeFAPIService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFAPIService.java rename to src/main/java/com/alexanderlogistics/ksef/api/KSeFAPIService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFAuthManager.java b/src/main/java/com/alexanderlogistics/ksef/api/KSeFAuthManager.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFAuthManager.java rename to src/main/java/com/alexanderlogistics/ksef/api/KSeFAuthManager.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFEncryptionHelper.java b/src/main/java/com/alexanderlogistics/ksef/api/KSeFEncryptionHelper.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/KSeFEncryptionHelper.java rename to src/main/java/com/alexanderlogistics/ksef/api/KSeFEncryptionHelper.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/SessionEncryption.java b/src/main/java/com/alexanderlogistics/ksef/api/SessionEncryption.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ksef/api/SessionEncryption.java rename to src/main/java/com/alexanderlogistics/ksef/api/SessionEncryption.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java b/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java rename to src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoAppendAdapter.java b/src/main/java/com/alexanderlogistics/mahnlauf/InkassoAppendAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoAppendAdapter.java rename to src/main/java/com/alexanderlogistics/mahnlauf/InkassoAppendAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoController.java b/src/main/java/com/alexanderlogistics/mahnlauf/InkassoController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoController.java rename to src/main/java/com/alexanderlogistics/mahnlauf/InkassoController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java b/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java similarity index 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java rename to src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java index 4016091..8e5c10e 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java +++ b/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java @@ -22,6 +22,7 @@ import org.imixs.workflow.exceptions.AdapterException; import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; import org.imixs.workflow.poi.POIFindReplaceAdapter; +import org.imixs.workflow.poi.XSSFUtil; import jakarta.inject.Inject; @@ -164,7 +165,7 @@ public class InkassoExportAdapter extends POIFindReplaceAdapter { sheet.shiftRows(referenceRowPos, lastRow + invoiceIDs.size(), -1, true, true); // finally update the total formula... - evalXSSFSheet(doc, sheet, "TOTAL"); + XSSFUtil.evalXSSFSheet(doc, sheet, "TOTAL"); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); // write back the file diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java similarity index 78% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java rename to src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java index ed5a2c2..7c73c41 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java +++ b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java @@ -9,13 +9,14 @@ import java.util.Map; import java.util.logging.Logger; import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.Model; import org.imixs.workflow.SignalAdapter; import org.imixs.workflow.engine.ModelService; import org.imixs.workflow.engine.WorkflowService; import org.imixs.workflow.exceptions.AdapterException; import org.imixs.workflow.exceptions.ModelException; import org.imixs.workflow.exceptions.PluginException; +import org.imixs.workflow.office.model.SharedModelManager; +import org.openbpmn.bpmn.BPMNModel; import com.alexanderlogistics.InvoiceUtil; @@ -50,6 +51,9 @@ public class MahnlaufExecuteAdapter implements SignalAdapter { @Inject MahnlaufService mahnlaufService; + @Inject + SharedModelManager sharedModelManager; + /** * This method finds all invices ($workitemref) and tirgges event 300 * @@ -96,10 +100,15 @@ public class MahnlaufExecuteAdapter implements SignalAdapter { if (isInDue(invoice)) { try { // first fetch the event of the invoice to be processed - Model invoiceModel; - invoiceModel = this.modelService.getModel(invoice.getModelVersion()); - ItemCollection invoiceEvent = invoiceModel.getEvent(invoice.getTaskID(), - MahnlaufService.EVENT_MAHNLAUF_EXECUTE); + + BPMNModel bpmnModel = modelService.getBPMNModel(invoice.getModelVersion()); + ItemCollection invoiceEvent = sharedModelManager.getModelManager().findEventByID(bpmnModel, + invoice.getTaskID(), MahnlaufService.EVENT_MAHNLAUF_EXECUTE); + + // Model invoiceModel; + // invoiceModel = this.modelService.getModel(invoice.getModelVersion()); + // ItemCollection invoiceEvent = invoiceModel.getEvent(invoice.getTaskID(), + // MahnlaufService.EVENT_MAHNLAUF_EXECUTE); if (invoiceEvent != null) { ItemCollection eventDunningConfig = this.workflowService.evalWorkflowResult(invoiceEvent, "dunning", invoice); @@ -125,24 +134,24 @@ public class MahnlaufExecuteAdapter implements SignalAdapter { } switch (invoice.getTaskID()) { - case 5200: - case 5201: - if (dunningLevel < 1) - dunningLevel = 1; - break; - case 5210: - case 5211: - if (dunningLevel < 2) - dunningLevel = 2; - break; - case 5220: - if (dunningLevel < 3) - dunningLevel = 3; - break; - default: - if (dunningLevel < 1) - dunningLevel = 1; - break; + case 5200: + case 5201: + if (dunningLevel < 1) + dunningLevel = 1; + break; + case 5210: + case 5211: + if (dunningLevel < 2) + dunningLevel = 2; + break; + case 5220: + if (dunningLevel < 3) + dunningLevel = 3; + break; + default: + if (dunningLevel < 1) + dunningLevel = 1; + break; } // create a workitem stub for the mail message @@ -179,18 +188,18 @@ public class MahnlaufExecuteAdapter implements SignalAdapter { // compute subject switch (dunningLevel) { - case 2: - mahnLaufWorkitem.setItemValue("mail.subject_de", "2. MAHNUNG"); - mahnLaufWorkitem.setItemValue("mail.subject_en", "2. REMINDER"); - break; - case 3: - mahnLaufWorkitem.setItemValue("mail.subject_de", "LETZTE AUSSERGERICHTLICHE MAHNUNG"); - mahnLaufWorkitem.setItemValue("mail.subject_en", "LAST REMINDER"); - break; - default: - mahnLaufWorkitem.setItemValue("mail.subject_de", "1. MAHNUNG"); - mahnLaufWorkitem.setItemValue("mail.subject_en", "1. REMINDER"); - break; + case 2: + mahnLaufWorkitem.setItemValue("mail.subject_de", "2. MAHNUNG"); + mahnLaufWorkitem.setItemValue("mail.subject_en", "2. REMINDER"); + break; + case 3: + mahnLaufWorkitem.setItemValue("mail.subject_de", "LETZTE AUSSERGERICHTLICHE MAHNUNG"); + mahnLaufWorkitem.setItemValue("mail.subject_en", "LAST REMINDER"); + break; + default: + mahnLaufWorkitem.setItemValue("mail.subject_de", "1. MAHNUNG"); + mahnLaufWorkitem.setItemValue("mail.subject_en", "1. REMINDER"); + break; } // Verify the dbtr.mail item (split into multi value) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java similarity index 94% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java rename to src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java index c95b3a4..3463879 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java +++ b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufRefAddAdapter.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.logging.Logger; import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.Model; import org.imixs.workflow.SignalAdapter; import org.imixs.workflow.WorkflowKernel; import org.imixs.workflow.engine.ModelService; @@ -14,7 +13,9 @@ import org.imixs.workflow.exceptions.AdapterException; import org.imixs.workflow.exceptions.ModelException; import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.QueryException; +import org.imixs.workflow.office.model.SharedModelManager; import org.imixs.workflow.sepa.services.SepaWorkflowService; +import org.openbpmn.bpmn.BPMNModel; import com.alexanderlogistics.BusinessPartnerService; import com.alexanderlogistics.InvoiceUtil; @@ -50,6 +51,9 @@ public class MahnlaufRefAddAdapter implements SignalAdapter { @Inject BusinessPartnerService businessPartnerService; + @Inject + SharedModelManager sharedModelManager; + /** * This method finds or create the Mahnlauf and adds a reference ($workitemref) * to the current invoice. @@ -167,8 +171,11 @@ public class MahnlaufRefAddAdapter implements SignalAdapter { mahnlaufWorkitem.setItemValue("invoice.language", invoice.getItemValue("invoice.language")); // set workflow group name from the Task Element to identify document in xslt - Model model = modelService.getModel(modelVersion); - ItemCollection task = model.getTask(taskID); + BPMNModel bpmnModel = modelService.getBPMNModel(modelVersion); + ItemCollection task = sharedModelManager.getModelManager().findTaskByID(bpmnModel, taskID); + + // Model model = modelService.getModel(modelVersion); + // ItemCollection task = model.getTask(taskID); String modelTaskGroupName = task.getItemValueString("txtworkflowgroup"); // DO NOT CHANGE! mahnlaufWorkitem.setItemValue(WorkflowKernel.WORKFLOWGROUP, modelTaskGroupName); diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java rename to src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mail/MailPlugin.java b/src/main/java/com/alexanderlogistics/mail/MailPlugin.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mail/MailPlugin.java rename to src/main/java/com/alexanderlogistics/mail/MailPlugin.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/sepa/SEPAExportAdapterExcel.java b/src/main/java/com/alexanderlogistics/sepa/SEPAExportAdapterExcel.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/sepa/SEPAExportAdapterExcel.java rename to src/main/java/com/alexanderlogistics/sepa/SEPAExportAdapterExcel.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/BusinessPartnerImportService.java b/src/main/java/com/alexanderlogistics/xml/BusinessPartnerImportService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/BusinessPartnerImportService.java rename to src/main/java/com/alexanderlogistics/xml/BusinessPartnerImportService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java b/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java rename to src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java b/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java rename to src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/TokenResponse.java b/src/main/java/com/alexanderlogistics/zoho/TokenResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/TokenResponse.java rename to src/main/java/com/alexanderlogistics/zoho/TokenResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoAPIService.java b/src/main/java/com/alexanderlogistics/zoho/ZohoAPIService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoAPIService.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoAPIService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoController.java b/src/main/java/com/alexanderlogistics/zoho/ZohoController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoController.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoController.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoExportAdapter.java b/src/main/java/com/alexanderlogistics/zoho/ZohoExportAdapter.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoExportAdapter.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoExportAdapter.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthCallbackService.java b/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthCallbackService.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthCallbackService.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoOAuthCallbackService.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java b/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBill.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBill.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBill.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoBill.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillCreateResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillCreateResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillCreateResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillCreateResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillItem.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillItem.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillItem.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoBillItem.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContact.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContact.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContact.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoContact.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactCreateResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactCreateResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactCreateResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactCreateResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactFindResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactFindResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactFindResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoContactFindResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnote.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnote.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnote.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnote.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteCreateResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteCreateResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteCreateResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteCreateResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteInvoiceItem.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteInvoiceItem.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteInvoiceItem.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoCreditnoteInvoiceItem.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoice.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoice.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoice.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoice.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceCreateResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceCreateResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceCreateResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceCreateResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceFindResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceFindResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceFindResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceFindResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceItem.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceItem.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceItem.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoInvoiceItem.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTax.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTax.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTax.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoTax.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTaxListResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTaxListResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoTaxListResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoTaxListResponse.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCredit.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCredit.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCredit.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCredit.java diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCreditCreateResponse.java b/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCreditCreateResponse.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCreditCreateResponse.java rename to src/main/java/com/alexanderlogistics/zoho/dto/ZohoVendorCreditCreateResponse.java diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java b/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java rename to src/main/java/org/imixs/workflow/office/forms/AnalyticController.java diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java b/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java rename to src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java b/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java rename to src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java b/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java similarity index 100% rename from office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java rename to src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java diff --git a/office-alexander-logistics-app/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from office-alexander-logistics-app/src/main/resources/META-INF/MANIFEST.MF rename to src/main/resources/META-INF/MANIFEST.MF diff --git a/office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml similarity index 100% rename from office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml rename to src/main/resources/META-INF/persistence.xml diff --git a/office-alexander-logistics-app/src/main/resources/agl_wandlung_20250822.csv b/src/main/resources/agl_wandlung_20250822.csv similarity index 100% rename from office-alexander-logistics-app/src/main/resources/agl_wandlung_20250822.csv rename to src/main/resources/agl_wandlung_20250822.csv diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/src/main/resources/bundle/custom_de.properties similarity index 100% rename from office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties rename to src/main/resources/bundle/custom_de.properties diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/src/main/resources/bundle/custom_en.properties similarity index 100% rename from office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties rename to src/main/resources/bundle/custom_en.properties diff --git a/office-alexander-logistics-app/src/main/resources/customform.expressions b/src/main/resources/customform.expressions similarity index 100% rename from office-alexander-logistics-app/src/main/resources/customform.expressions rename to src/main/resources/customform.expressions diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/src/main/resources/imixs.properties similarity index 100% rename from office-alexander-logistics-app/src/main/resources/imixs.properties rename to src/main/resources/imixs.properties diff --git a/office-alexander-logistics-app/src/main/resources/system-de-1.1.0.bpmn b/src/main/resources/system-de-1.1.0.bpmn similarity index 100% rename from office-alexander-logistics-app/src/main/resources/system-de-1.1.0.bpmn rename to src/main/resources/system-de-1.1.0.bpmn diff --git a/office-alexander-logistics-app/src/main/resources/system-en-1.0.0.bpmn b/src/main/resources/system-en-1.0.0.bpmn similarity index 100% rename from office-alexander-logistics-app/src/main/resources/system-en-1.0.0.bpmn rename to src/main/resources/system-en-1.0.0.bpmn diff --git a/office-alexander-logistics-app/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/WEB-INF/beans.xml rename to src/main/webapp/WEB-INF/beans.xml diff --git a/office-alexander-logistics-app/src/main/webapp/WEB-INF/faces-config-custom.xml b/src/main/webapp/WEB-INF/faces-config-custom.xml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/WEB-INF/faces-config-custom.xml rename to src/main/webapp/WEB-INF/faces-config-custom.xml diff --git a/office-alexander-logistics-app/src/main/webapp/js/chartjs-plugin-trendline.min.js b/src/main/webapp/js/chartjs-plugin-trendline.min.js similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/js/chartjs-plugin-trendline.min.js rename to src/main/webapp/js/chartjs-plugin-trendline.min.js diff --git a/office-alexander-logistics-app/src/main/webapp/js/imixs-office.workitem.custom.js b/src/main/webapp/js/imixs-office.workitem.custom.js similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/js/imixs-office.workitem.custom.js rename to src/main/webapp/js/imixs-office.workitem.custom.js diff --git a/office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml b/src/main/webapp/layout/commandbox_admin_custom.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml rename to src/main/webapp/layout/commandbox_admin_custom.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/layout/css/custom.css b/src/main/webapp/layout/css/custom.css similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/layout/css/custom.css rename to src/main/webapp/layout/css/custom.css diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml b/src/main/webapp/pages/admin/agl_params.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml rename to src/main/webapp/pages/admin/agl_params.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml b/src/main/webapp/pages/admin/analyse_invoicing.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml rename to src/main/webapp/pages/admin/analyse_invoicing.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml b/src/main/webapp/pages/admin/cargosoft_export.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml rename to src/main/webapp/pages/admin/cargosoft_export.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/dataViewDefinition.xhtml b/src/main/webapp/pages/admin/dataViewDefinition.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/dataViewDefinition.xhtml rename to src/main/webapp/pages/admin/dataViewDefinition.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/datev_log.xhtml b/src/main/webapp/pages/admin/datev_log.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/datev_log.xhtml rename to src/main/webapp/pages/admin/datev_log.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml b/src/main/webapp/pages/admin/document_import.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml rename to src/main/webapp/pages/admin/document_import.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml b/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml rename to src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml b/src/main/webapp/pages/admin/kreditor.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml rename to src/main/webapp/pages/admin/kreditor.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml b/src/main/webapp/pages/admin/oplist_export.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml rename to src/main/webapp/pages/admin/oplist_export.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml b/src/main/webapp/pages/admin/sepa_config.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml rename to src/main/webapp/pages/admin/sepa_config.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_log.xhtml b/src/main/webapp/pages/admin/sepa_log.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_log.xhtml rename to src/main/webapp/pages/admin/sepa_log.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sub_scheduler_control.xhtml b/src/main/webapp/pages/admin/sub_scheduler_control.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/sub_scheduler_control.xhtml rename to src/main/webapp/pages/admin/sub_scheduler_control.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sub_space_custom.xhtml b/src/main/webapp/pages/admin/sub_space_custom.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/sub_space_custom.xhtml rename to src/main/webapp/pages/admin/sub_space_custom.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/xxxdataViewDefinition.xhtml b/src/main/webapp/pages/admin/xxxdataViewDefinition.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/xxxdataViewDefinition.xhtml rename to src/main/webapp/pages/admin/xxxdataViewDefinition.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/xxxdataViewDefinitions.xhtml b/src/main/webapp/pages/admin/xxxdataViewDefinitions.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/xxxdataViewDefinitions.xhtml rename to src/main/webapp/pages/admin/xxxdataViewDefinitions.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/zoho.xhtml b/src/main/webapp/pages/admin/zoho.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/admin/zoho.xhtml rename to src/main/webapp/pages/admin/zoho.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/dbtr-stats.xhtml b/src/main/webapp/pages/dbtr-stats.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/dbtr-stats.xhtml rename to src/main/webapp/pages/dbtr-stats.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/portlet_startprocess.xhtml b/src/main/webapp/pages/portlet_startprocess.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/portlet_startprocess.xhtml rename to src/main/webapp/pages/portlet_startprocess.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml b/src/main/webapp/pages/workitems/agl_archive.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml rename to src/main/webapp/pages/workitems/agl_archive.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml b/src/main/webapp/pages/workitems/agl_archive_filter.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml rename to src/main/webapp/pages/workitems/agl_archive_filter.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml b/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic_read.xhtml b/src/main/webapp/pages/workitems/forms/alexander/form_basic_read.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic_read.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/form_basic_read.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_default.xhtml b/src/main/webapp/pages/workitems/forms/alexander/form_default.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_default.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/form_default.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_dunnings.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_bp_dunnings.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_dunnings.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_bp_dunnings.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_in.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_in.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_in.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_in.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_out.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_out.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_out.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_bp_invoices_out.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_businesspartner_banklist.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_businesspartner_banklist.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_businesspartner_banklist.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_businesspartner_banklist.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_datagroup_invoices.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_datagroup_invoices.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_datagroup_invoices.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_datagroup_invoices.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_datevbuchung.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_datevbuchung.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_datevbuchung.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_datevbuchung.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_debitor_statistic.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_debitor_statistic.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_debitor_statistic.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_debitor_statistic.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_dunnings.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_dunnings.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_dunnings.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_dunnings.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_details.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_details.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_details.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_details.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_invoices.xhtml b/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_invoices.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_invoices.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/section_steuerbescheid_invoices.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type_read.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type_read.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type_read.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_payment_type_read.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible_delegation.xhtml b/src/main/webapp/pages/workitems/forms/alexander/sub_responsible_delegation.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible_delegation.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/sub_responsible_delegation.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml b/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml rename to src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/datagroup.xhtml b/src/main/webapp/pages/workitems/forms/datagroup.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/datagroup.xhtml rename to src/main/webapp/pages/workitems/forms/datagroup.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/dataview.xhtml b/src/main/webapp/pages/workitems/forms/dataview.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/dataview.xhtml rename to src/main/webapp/pages/workitems/forms/dataview.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/dataview_old.xhtml b/src/main/webapp/pages/workitems/forms/dataview_old.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/dataview_old.xhtml rename to src/main/webapp/pages/workitems/forms/dataview_old.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/import_log.xhtml b/src/main/webapp/pages/workitems/forms/import_log.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/import_log.xhtml rename to src/main/webapp/pages/workitems/forms/import_log.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml b/src/main/webapp/pages/workitems/forms/inkasso.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml rename to src/main/webapp/pages/workitems/forms/inkasso.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml b/src/main/webapp/pages/workitems/forms/sepa_export.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml rename to src/main/webapp/pages/workitems/forms/sepa_export.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml b/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml rename to src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/zahlungsavis.xhtml b/src/main/webapp/pages/workitems/forms/zahlungsavis.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/zahlungsavis.xhtml rename to src/main/webapp/pages/workitems/forms/zahlungsavis.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_chart.xhtml b/src/main/webapp/pages/workitems/parts/alexander/analyze_chart.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_chart.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/analyze_chart.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_currency.xhtml b/src/main/webapp/pages/workitems/parts/alexander/analyze_currency.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_currency.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/analyze_currency.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_plain.xhtml b/src/main/webapp/pages/workitems/parts/alexander/analyze_plain.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/analyze_plain.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/analyze_plain.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml b/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml b/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/cdtreingabe.xhtml b/src/main/webapp/pages/workitems/parts/alexander/cdtreingabe.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/cdtreingabe.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/cdtreingabe.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml b/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_out.xhtml b/src/main/webapp/pages/workitems/parts/alexander/currency_out.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_out.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/currency_out.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml b/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml b/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml b/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml b/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml b/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref_old.xhtml b/src/main/webapp/pages/workitems/parts/alexander/spaceref_old.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref_old.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/spaceref_old.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml b/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart_old.xhtml b/src/main/webapp/pages/workitems/parts/alexander/zahlungsart_old.xhtml similarity index 100% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart_old.xhtml rename to src/main/webapp/pages/workitems/parts/alexander/zahlungsart_old.xhtml diff --git a/office-alexander-logistics-app/src/oidc/WEB-INF/jboss-web.xml b/src/oidc/WEB-INF/jboss-web.xml similarity index 100% rename from office-alexander-logistics-app/src/oidc/WEB-INF/jboss-web.xml rename to src/oidc/WEB-INF/jboss-web.xml diff --git a/office-alexander-logistics-app/src/oidc/WEB-INF/oidc copy.1 b/src/oidc/WEB-INF/oidc copy.1 similarity index 100% rename from office-alexander-logistics-app/src/oidc/WEB-INF/oidc copy.1 rename to src/oidc/WEB-INF/oidc copy.1 diff --git a/office-alexander-logistics-app/src/oidc/WEB-INF/oidc.json b/src/oidc/WEB-INF/oidc.json similarity index 100% rename from office-alexander-logistics-app/src/oidc/WEB-INF/oidc.json rename to src/oidc/WEB-INF/oidc.json diff --git a/office-alexander-logistics-app/src/oidc/WEB-INF/web.xml b/src/oidc/WEB-INF/web.xml similarity index 100% rename from office-alexander-logistics-app/src/oidc/WEB-INF/web.xml rename to src/oidc/WEB-INF/web.xml diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFTP.java b/src/test/java/com/alexanderlogistics/TestFTP.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFTP.java rename to src/test/java/com/alexanderlogistics/TestFTP.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFormat.java b/src/test/java/com/alexanderlogistics/TestFormat.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFormat.java rename to src/test/java/com/alexanderlogistics/TestFormat.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java b/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java rename to src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java rename to src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java rename to src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestLoggerConfig.java b/src/test/java/com/alexanderlogistics/TestLoggerConfig.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestLoggerConfig.java rename to src/test/java/com/alexanderlogistics/TestLoggerConfig.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestModelMatcher.java b/src/test/java/com/alexanderlogistics/TestModelMatcher.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestModelMatcher.java rename to src/test/java/com/alexanderlogistics/TestModelMatcher.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestOPListen.java b/src/test/java/com/alexanderlogistics/TestOPListen.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestOPListen.java rename to src/test/java/com/alexanderlogistics/TestOPListen.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestPostionsnummernRegex.java b/src/test/java/com/alexanderlogistics/TestPostionsnummernRegex.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestPostionsnummernRegex.java rename to src/test/java/com/alexanderlogistics/TestPostionsnummernRegex.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestRunden.java b/src/test/java/com/alexanderlogistics/TestRunden.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestRunden.java rename to src/test/java/com/alexanderlogistics/TestRunden.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/einvoice/AGLEInvoiceAdapterTest.java b/src/test/java/com/alexanderlogistics/einvoice/AGLEInvoiceAdapterTest.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/einvoice/AGLEInvoiceAdapterTest.java rename to src/test/java/com/alexanderlogistics/einvoice/AGLEInvoiceAdapterTest.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/imap-imixs.log b/src/test/java/com/alexanderlogistics/imap-imixs.log similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/imap-imixs.log rename to src/test/java/com/alexanderlogistics/imap-imixs.log diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/imap-imixsbhv.log b/src/test/java/com/alexanderlogistics/imap-imixsbhv.log similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/imap-imixsbhv.log rename to src/test/java/com/alexanderlogistics/imap-imixsbhv.log diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAPIServiceTest.java b/src/test/java/com/alexanderlogistics/ksef/api/KSeFAPIServiceTest.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAPIServiceTest.java rename to src/test/java/com/alexanderlogistics/ksef/api/KSeFAPIServiceTest.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAdapterTest.java b/src/test/java/com/alexanderlogistics/ksef/api/KSeFAdapterTest.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAdapterTest.java rename to src/test/java/com/alexanderlogistics/ksef/api/KSeFAdapterTest.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAuthManagerTest.java b/src/test/java/com/alexanderlogistics/ksef/api/KSeFAuthManagerTest.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/KSeFAuthManagerTest.java rename to src/test/java/com/alexanderlogistics/ksef/api/KSeFAuthManagerTest.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/Params.java b/src/test/java/com/alexanderlogistics/ksef/api/Params.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/ksef/api/Params.java rename to src/test/java/com/alexanderlogistics/ksef/api/Params.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/DueDateBugfix.java b/src/test/java/com/alexanderlogistics/migration/DueDateBugfix.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/DueDateBugfix.java rename to src/test/java/com/alexanderlogistics/migration/DueDateBugfix.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java b/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java rename to src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerDatev.java b/src/test/java/com/alexanderlogistics/migration/MigrationMahnerDatev.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerDatev.java rename to src/test/java/com/alexanderlogistics/migration/MigrationMahnerDatev.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java b/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java rename to src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/rest/TestDataClient.java b/src/test/java/com/alexanderlogistics/rest/TestDataClient.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/rest/TestDataClient.java rename to src/test/java/com/alexanderlogistics/rest/TestDataClient.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/sepa/TestSEPATransform.java b/src/test/java/com/alexanderlogistics/sepa/TestSEPATransform.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/sepa/TestSEPATransform.java rename to src/test/java/com/alexanderlogistics/sepa/TestSEPATransform.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/sepa/XSLTester.java b/src/test/java/com/alexanderlogistics/sepa/XSLTester.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/sepa/XSLTester.java rename to src/test/java/com/alexanderlogistics/sepa/XSLTester.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/EAkteImportTester.java b/src/test/java/com/alexanderlogistics/xml/EAkteImportTester.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/EAkteImportTester.java rename to src/test/java/com/alexanderlogistics/xml/EAkteImportTester.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/InvoiceImportTester.java b/src/test/java/com/alexanderlogistics/xml/InvoiceImportTester.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/InvoiceImportTester.java rename to src/test/java/com/alexanderlogistics/xml/InvoiceImportTester.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/TimestampTester.java b/src/test/java/com/alexanderlogistics/xml/TimestampTester.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/xml/TimestampTester.java rename to src/test/java/com/alexanderlogistics/xml/TimestampTester.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java b/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java rename to src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/test.json b/src/test/java/com/alexanderlogistics/zoho/test.json similarity index 100% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/test.json rename to src/test/java/com/alexanderlogistics/zoho/test.json diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_220048_163414060_file.xml b/src/test/resources/cargosoft/001_R_220048_163414060_file.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_220048_163414060_file.xml rename to src/test/resources/cargosoft/001_R_220048_163414060_file.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224225_115103063.xml b/src/test/resources/cargosoft/001_R_224225_115103063.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224225_115103063.xml rename to src/test/resources/cargosoft/001_R_224225_115103063.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224295_155613470.xml b/src/test/resources/cargosoft/001_R_224295_155613470.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224295_155613470.xml rename to src/test/resources/cargosoft/001_R_224295_155613470.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224298_160502680.xml b/src/test/resources/cargosoft/001_R_224298_160502680.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224298_160502680.xml rename to src/test/resources/cargosoft/001_R_224298_160502680.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224380_110136787.xml b/src/test/resources/cargosoft/001_R_224380_110136787.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224380_110136787.xml rename to src/test/resources/cargosoft/001_R_224380_110136787.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224442_165949610.xml b/src/test/resources/cargosoft/001_R_224442_165949610.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224442_165949610.xml rename to src/test/resources/cargosoft/001_R_224442_165949610.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224443_170612027.xml b/src/test/resources/cargosoft/001_R_224443_170612027.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/001_R_224443_170612027.xml rename to src/test/resources/cargosoft/001_R_224443_170612027.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864.xml b/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864.xml rename to src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864_DEBUG.xml b/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864_DEBUG.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864_DEBUG.xml rename to src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-116N-001-ATC400012650820242452-_20240806164256864_DEBUG.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-197N-001-ATC401857360820244851_20240821064045586.xml b/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-197N-001-ATC401857360820244851_20240821064045586.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-197N-001-ATC401857360820244851_20240821064045586.xml rename to src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2408-197N-001-ATC401857360820244851_20240821064045586.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-021N-005-ATC401471770920244851_20240912064210939.xml b/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-021N-005-ATC401471770920244851_20240912064210939.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-021N-005-ATC401471770920244851_20240912064210939.xml rename to src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-021N-005-ATC401471770920244851_20240912064210939.xml diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-162N-001-ATC402185560920244851.pdf b/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-162N-001-ATC402185560920244851.pdf similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-162N-001-ATC402185560920244851.pdf rename to src/test/resources/cargosoft/Abgabenbescheid-IM-GCA-2409-162N-001-ATC402185560920244851.pdf diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/VendorBank.csv b/src/test/resources/cargosoft/VendorBank.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/VendorBank.csv rename to src/test/resources/cargosoft/VendorBank.csv diff --git a/office-alexander-logistics-app/src/test/resources/cargosoft/Vendors.csv b/src/test/resources/cargosoft/Vendors.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/cargosoft/Vendors.csv rename to src/test/resources/cargosoft/Vendors.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_202206_202207210604_1125.csv b/src/test/resources/datev/EXTF_202206_202207210604_1125.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_202206_202207210604_1125.csv rename to src/test/resources/datev/EXTF_202206_202207210604_1125.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_202206_TEST.csv b/src/test/resources/datev/EXTF_202206_TEST.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_202206_TEST.csv rename to src/test/resources/datev/EXTF_202206_TEST.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_202208_202208250601_1155.csv b/src/test/resources/datev/EXTF_202208_202208250601_1155.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_202208_202208250601_1155.csv rename to src/test/resources/datev/EXTF_202208_202208250601_1155.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_202208_202208250601_short.csv b/src/test/resources/datev/EXTF_202208_202208250601_short.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_202208_202208250601_short.csv rename to src/test/resources/datev/EXTF_202208_202208250601_short.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2021.csv b/src/test/resources/datev/EXTF_OPD_migration_2021.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2021.csv rename to src/test/resources/datev/EXTF_OPD_migration_2021.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022-test-1.csv b/src/test/resources/datev/EXTF_OPD_migration_2022-test-1.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022-test-1.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022-test-1.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022.csv b/src/test/resources/datev/EXTF_OPD_migration_2022.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022a.csv b/src/test/resources/datev/EXTF_OPD_migration_2022a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022a.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022b.csv b/src/test/resources/datev/EXTF_OPD_migration_2022b.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022b.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022b.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022c.csv b/src/test/resources/datev/EXTF_OPD_migration_2022c.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022c.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022c.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022d.csv b/src/test/resources/datev/EXTF_OPD_migration_2022d.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_OPD_migration_2022d.csv rename to src/test/resources/datev/EXTF_OPD_migration_2022d.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_Testdatei.csv b/src/test/resources/datev/EXTF_Testdatei.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_Testdatei.csv rename to src/test/resources/datev/EXTF_Testdatei.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/EXTF_Testdatei.ods b/src/test/resources/datev/EXTF_Testdatei.ods similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/EXTF_Testdatei.ods rename to src/test/resources/datev/EXTF_Testdatei.ods diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPD2.csv b/src/test/resources/datev/OPD2.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPD2.csv rename to src/test/resources/datev/OPD2.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPD28.csv b/src/test/resources/datev/OPD28.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPD28.csv rename to src/test/resources/datev/OPD28.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPD28.txt b/src/test/resources/datev/OPD28.txt similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPD28.txt rename to src/test/resources/datev/OPD28.txt diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPDTest_Headers.csv b/src/test/resources/datev/OPDTest_Headers.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPDTest_Headers.csv rename to src/test/resources/datev/OPDTest_Headers.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPDTest_Headers.txt b/src/test/resources/datev/OPDTest_Headers.txt similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPDTest_Headers.txt rename to src/test/resources/datev/OPDTest_Headers.txt diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPD_migration_230125.txt b/src/test/resources/datev/OPD_migration_230125.txt similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPD_migration_230125.txt rename to src/test/resources/datev/OPD_migration_230125.txt diff --git a/office-alexander-logistics-app/src/test/resources/datev/OPD_migration_230126.csv b/src/test/resources/datev/OPD_migration_230126.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/OPD_migration_230126.csv rename to src/test/resources/datev/OPD_migration_230126.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302030602_1295.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302030602_1295.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302030602_1295.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302030602_1295.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302060601_1296.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302060601_1296.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302060601_1296.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302060601_1296.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302070603_1297.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302070603_1297.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302070603_1297.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302070603_1297.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302080603_1298.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302080603_1298.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302080603_1298.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302080603_1298.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302090604_1299.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302090604_1299.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302090604_1299.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302090604_1299.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302100603_1300.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302100603_1300.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302100603_1300.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302100603_1300.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302130601_1301.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302130601_1301.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302130601_1301.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302130601_1301.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302140604_1302.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302140604_1302.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302140604_1302.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302140604_1302.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302141840_1303.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302141840_1303.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302141840_1303.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302141840_1303.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302160944_1304.csv b/src/test/resources/datev/duedate-bug/EXTF_202301_202302160944_1304.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202301_202302160944_1304.csv rename to src/test/resources/datev/duedate-bug/EXTF_202301_202302160944_1304.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302020601_1294.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302020601_1294.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302020601_1294.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302020601_1294.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302030602_1295.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302030602_1295.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302030602_1295.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302030602_1295.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302060601_1296.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302060601_1296.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302060601_1296.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302060601_1296.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302070603_1297.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302070603_1297.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302070603_1297.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302070603_1297.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302080603_1298.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302080603_1298.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302080603_1298.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302080603_1298.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302090604_1299.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302090604_1299.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302090604_1299.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302090604_1299.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302100604_1300.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302100604_1300.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302100604_1300.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302100604_1300.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302130601_1301.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302130601_1301.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302130601_1301.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302130601_1301.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302140604_1302.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302140604_1302.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302140604_1302.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302140604_1302.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302141840_1303.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302141840_1303.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302141840_1303.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302141840_1303.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302160944_1304.csv b/src/test/resources/datev/duedate-bug/EXTF_202302_202302160944_1304.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202302_202302160944_1304.csv rename to src/test/resources/datev/duedate-bug/EXTF_202302_202302160944_1304.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302070603_1297.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302070603_1297.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302070603_1297.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302070603_1297.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302080603_1298.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302080603_1298.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302080603_1298.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302080603_1298.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302090604_1299.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302090604_1299.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302090604_1299.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302090604_1299.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302100603_1300.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302100603_1300.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302100603_1300.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302100603_1300.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302130601_1301.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302130601_1301.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302130601_1301.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302130601_1301.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302140604_1302.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302140604_1302.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302140604_1302.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302140604_1302.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302141840_1303.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302141840_1303.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302141840_1303.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302141840_1303.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302160944_1304.csv b/src/test/resources/datev/duedate-bug/EXTF_202303_202302160944_1304.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/duedate-bug/EXTF_202303_202302160944_1304.csv rename to src/test/resources/datev/duedate-bug/EXTF_202303_202302160944_1304.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021-a.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021-a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021-a.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021-a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2021.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1a.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1a.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part1a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2a.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2a.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part2a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3a.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3a.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part3a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4a.csv b/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4a.csv similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4a.csv rename to src/test/resources/datev/fehlerhaft/EXTF_OPD_migration_2022_part4a.csv diff --git a/office-alexander-logistics-app/src/test/resources/datev/protokoll_2021 b/src/test/resources/datev/protokoll_2021 similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/protokoll_2021 rename to src/test/resources/datev/protokoll_2021 diff --git a/office-alexander-logistics-app/src/test/resources/datev/protokoll_2022 b/src/test/resources/datev/protokoll_2022 similarity index 100% rename from office-alexander-logistics-app/src/test/resources/datev/protokoll_2022 rename to src/test/resources/datev/protokoll_2022 diff --git a/office-alexander-logistics-app/src/test/resources/einvoice/output/einvoice-simple.xml b/src/test/resources/einvoice/output/einvoice-simple.xml similarity index 74% rename from office-alexander-logistics-app/src/test/resources/einvoice/output/einvoice-simple.xml rename to src/test/resources/einvoice/output/einvoice-simple.xml index d0bad44..0a8fafa 100644 --- a/office-alexander-logistics-app/src/test/resources/einvoice/output/einvoice-simple.xml +++ b/src/test/resources/einvoice/output/einvoice-simple.xml @@ -1,39 +1,60 @@ - - + + + + - urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_3.0.2 + + urn:cen.eu:en16931:2017 + + + + FV/2025/001 + 380 + + 20250210 + + + Payment Instructions: + + + Please ensure that the payment reference includes the invoice number, BL or AWB number, container or shipment number and place of loading and discharge. The full invoice amount must be transferred without any deductions and all bank charges must be covered by the sender. Otherwise, the beneficiary’s bank will be unable to process the incoming payment. + + + Alexander Global Logistics + + + Numer NIP: PL9552521552 + + + + 1 @@ -93,32 +114,59 @@ + n/a + + Alexander Global Logistics + + n/a + + +49 421 566 46 0 + + + info@alexander-logistics.com + + + + 70-660 + Gdanska 36 + Szczecin + PL + + + info@alexander-logistics.com + + + PL9552521552 + + + + Test Sp. z o.o. 00-001 @@ -130,8 +178,11 @@ PL1234567890 + + + Test Sp. z o.o. @@ -142,40 +193,68 @@ + + PLN + + 30 + + PL79116022020000000654306674 + + + BIGBPLPWXXX + + + + - 2300.0 + 2300.00 VAT - 10000.0 + 10000.00 S 23.0 + Payment due by 10.03.2025 + 20250310 + - 10000.0 + + 10000.00 + 0.00 + 0.00 - 10000.0 - 2300.0 - 12300.0 + + 10000.00 + + 2300.00 + + 12300.00 + 0.00 - 12300.0 + + 12300.00 + + + + diff --git a/office-alexander-logistics-app/src/test/resources/einvoice/output/invoice-mixed-rates.xml b/src/test/resources/einvoice/output/invoice-mixed-rates.xml similarity index 79% rename from office-alexander-logistics-app/src/test/resources/einvoice/output/invoice-mixed-rates.xml rename to src/test/resources/einvoice/output/invoice-mixed-rates.xml index e357e10..b3bf32d 100644 --- a/office-alexander-logistics-app/src/test/resources/einvoice/output/invoice-mixed-rates.xml +++ b/src/test/resources/einvoice/output/invoice-mixed-rates.xml @@ -1,39 +1,60 @@ - - + + + + + urn:cen.eu:en16931:2017 + + + + FV/2025/7471 + 380 + + 20250210 + + + Payment Instructions: + + + Please ensure that the payment reference includes the invoice number, BL or AWB number, container or shipment number and place of loading and discharge. The full invoice amount must be transferred without any deductions and all bank charges must be covered by the sender. Otherwise, the beneficiary’s bank will be unable to process the incoming payment. + + + Alexander Global Logistics + + + Numer NIP: PL9552521552 + + + + 1 @@ -93,32 +114,59 @@ + n/a + + Alexander Global Logistics + + n/a + + +49 421 566 46 0 + + + info@alexander-logistics.com + + + + 70-660 + Gdanska 36 + Szczecin + PL + + + info@alexander-logistics.com + + + PL9552521552 + + + + Test Sp. z o.o. 00-001 @@ -130,8 +178,11 @@ PL1234567890 + + + Test Sp. z o.o. @@ -142,47 +193,75 @@ + + PLN + + 30 + + PL79116022020000000654306674 + + + BIGBPLPWXXX + + + + 0.00 VAT - 14040.0 + 14040.00 Z 0.0 910.80 VAT - 3960.0 + 3960.00 S 23.0 + Payment due by 10.03.2025 + 20250310 + + 18000.00 + 0.00 + 0.00 + 18000.00 + 910.80 + 18910.80 + 0.00 + 18910.80 + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/2020-06+Lexware+Haufe+lx2020060007832.pdf b/src/test/resources/ksef/2020-06+Lexware+Haufe+lx2020060007832.pdf similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/2020-06+Lexware+Haufe+lx2020060007832.pdf rename to src/test/resources/ksef/2020-06+Lexware+Haufe+lx2020060007832.pdf diff --git a/office-alexander-logistics-app/src/test/resources/ksef/StrukturyDanych_v10-0E.xsd b/src/test/resources/ksef/StrukturyDanych_v10-0E.xsd similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/StrukturyDanych_v10-0E.xsd rename to src/test/resources/ksef/StrukturyDanych_v10-0E.xsd diff --git a/office-alexander-logistics-app/src/test/resources/ksef/cargosoft-example-01.xml b/src/test/resources/ksef/cargosoft-example-01.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/cargosoft-example-01.xml rename to src/test/resources/ksef/cargosoft-example-01.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/example-invoice-KOR.xml b/src/test/resources/ksef/example-invoice-KOR.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/example-invoice-KOR.xml rename to src/test/resources/ksef/example-invoice-KOR.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/example-invoice-VAT.xml b/src/test/resources/ksef/example-invoice-VAT.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/example-invoice-VAT.xml rename to src/test/resources/ksef/example-invoice-VAT.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/invoice-6555-ksef.xml b/src/test/resources/ksef/invoice-6555-ksef.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/invoice-6555-ksef.xml rename to src/test/resources/ksef/invoice-6555-ksef.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/invoice-6562-ksef.xml b/src/test/resources/ksef/invoice-6562-ksef.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/invoice-6562-ksef.xml rename to src/test/resources/ksef/invoice-6562-ksef.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-old.xml b/src/test/resources/ksef/ksef-old.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-old.xml rename to src/test/resources/ksef/ksef-old.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test01.xml b/src/test/resources/ksef/ksef-test01.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test01.xml rename to src/test/resources/ksef/ksef-test01.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test02.xml b/src/test/resources/ksef/ksef-test02.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test02.xml rename to src/test/resources/ksef/ksef-test02.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test03.xml b/src/test/resources/ksef/ksef-test03.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test03.xml rename to src/test/resources/ksef/ksef-test03.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test04.xml b/src/test/resources/ksef/ksef-test04.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test04.xml rename to src/test/resources/ksef/ksef-test04.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test05.xml b/src/test/resources/ksef/ksef-test05.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test05.xml rename to src/test/resources/ksef/ksef-test05.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef-test06.xml b/src/test/resources/ksef/ksef-test06.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef-test06.xml rename to src/test/resources/ksef/ksef-test06.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/ksef_valide.xml b/src/test/resources/ksef/ksef_valide.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/ksef_valide.xml rename to src/test/resources/ksef/ksef_valide.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/003_6602_251212_R.pdf b/src/test/resources/ksef/output/003_6602_251212_R.pdf similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/output/003_6602_251212_R.pdf rename to src/test/resources/ksef/output/003_6602_251212_R.pdf diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/003_6811_260123_R.pdf b/src/test/resources/ksef/output/003_6811_260123_R.pdf similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/output/003_6811_260123_R.pdf rename to src/test/resources/ksef/output/003_6811_260123_R.pdf diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/003_6816_260123_R.pdf b/src/test/resources/ksef/output/003_6816_260123_R.pdf similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/output/003_6816_260123_R.pdf rename to src/test/resources/ksef/output/003_6816_260123_R.pdf diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/6602.xml b/src/test/resources/ksef/output/6602.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/output/6602.xml rename to src/test/resources/ksef/output/6602.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-eu-service-np.xml b/src/test/resources/ksef/output/invoice-eu-service-np.xml similarity index 56% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-eu-service-np.xml rename to src/test/resources/ksef/output/invoice-eu-service-np.xml index 87c201b..c8dd093 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-eu-service-np.xml +++ b/src/test/resources/ksef/output/invoice-eu-service-np.xml @@ -1,68 +1,156 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.410517Z + + 2026-08-15T10:44:53.056973507Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + DE310968950 Muster GmbH + + DE + Museumstr. 2-6 + 28195 Bremen + + + D-18804 + 2 + + 2 + + + + + EUR + 2025-02-10 + + Szczecin + FV/2025/7470 - 2026-07-24 + + + 2026-08-15 + + + + + + + + + + + + 4620.00 + 4620.00 + 0.2326 + + + 2 + + 2 + + 1 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 International transport service Germany - Poland @@ -75,28 +163,52 @@ np II + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-mixed-rates.xml b/src/test/resources/ksef/output/invoice-mixed-rates.xml similarity index 59% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-mixed-rates.xml rename to src/test/resources/ksef/output/invoice-mixed-rates.xml index 93c9064..41cf06d 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-mixed-rates.xml +++ b/src/test/resources/ksef/output/invoice-mixed-rates.xml @@ -1,69 +1,158 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.547969Z + + 2026-08-15T10:44:53.099870156Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + PLN + 2025-02-10 + + Szczecin + FV/2025/7471 - 2026-07-24 + + + 2026-08-15 + + + + 3960.00 + 910.80 + + + + + 14040.00 + + + 18910.80 + + + + + 2 + + 2 + + 2 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 Forwarding service for export shipment @@ -87,28 +176,52 @@ 23 + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml b/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml similarity index 61% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml rename to src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml index 50f57ad..1049025 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml +++ b/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml @@ -1,68 +1,156 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.000225Z + + 2026-08-15T10:44:53.032587863Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + USD + 2026-05-22 + + Szczecin + FV/2026/7795 + + 2026-05-21 + + + + + + + + + + 2640.00 + + + 2640.00 + 3.6711 + + + 2 + + 2 + + 2 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 Usługa spedycyjna: Fracht morski, + ubezpieczenie @@ -97,28 +185,52 @@ 0 KR + + 2026-06-21 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-np.xml b/src/test/resources/ksef/output/invoice-np.xml similarity index 58% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-np.xml rename to src/test/resources/ksef/output/invoice-np.xml index 0a24a79..fbed70f 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-np.xml +++ b/src/test/resources/ksef/output/invoice-np.xml @@ -1,67 +1,156 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.517086Z + + 2026-08-15T10:44:53.088734478Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + PLN + 2025-02-10 + + Szczecin + FV/2025/001 - 2026-07-24 + + + 2026-08-15 + + + + + + + + + + + + 10000.00 + 10000.00 + + + + + 2 + + 2 + + 1 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 Transport Berlin - Warsaw @@ -85,28 +174,52 @@ np II + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-npt.xml b/src/test/resources/ksef/output/invoice-npt.xml similarity index 58% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-npt.xml rename to src/test/resources/ksef/output/invoice-npt.xml index b46b139..32ddebe 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-npt.xml +++ b/src/test/resources/ksef/output/invoice-npt.xml @@ -1,67 +1,156 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.468487Z + + 2026-08-15T10:44:53.072046007Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + PLN + 2025-02-10 + + Szczecin + FV/2025/001 - 2026-07-24 + + + 2026-08-15 + + + + + + + + + + + 10000.00 + + 10000.00 + + + + + 2 + + 2 + + 1 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 Transport Berlin - Warsaw @@ -85,28 +174,52 @@ np I + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-simple.xml b/src/test/resources/ksef/output/invoice-simple.xml similarity index 58% rename from office-alexander-logistics-app/src/test/resources/ksef/output/invoice-simple.xml rename to src/test/resources/ksef/output/invoice-simple.xml index 6be9ba5..00c8934 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/invoice-simple.xml +++ b/src/test/resources/ksef/output/invoice-simple.xml @@ -1,68 +1,157 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.644379Z + + 2026-08-15T10:44:53.132180648Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + PLN + 2025-02-10 + + Szczecin + FV/2025/001 - 2026-07-24 + + + 2026-08-15 + + + + 10000.00 + 2300.00 + + + + + + + + 12300.00 + + + + + 2 + + 2 + + 2 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + VAT + + + 1 Transport Berlin - Warsaw @@ -86,28 +175,52 @@ 23 + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/ksef-output.xml b/src/test/resources/ksef/output/ksef-output.xml similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/output/ksef-output.xml rename to src/test/resources/ksef/output/ksef-output.xml diff --git a/office-alexander-logistics-app/src/test/resources/ksef/output/test-korrekturrechnung.xml b/src/test/resources/ksef/output/test-korrekturrechnung.xml similarity index 58% rename from office-alexander-logistics-app/src/test/resources/ksef/output/test-korrekturrechnung.xml rename to src/test/resources/ksef/output/test-korrekturrechnung.xml index 3a82ed0..91c75a4 100644 --- a/office-alexander-logistics-app/src/test/resources/ksef/output/test-korrekturrechnung.xml +++ b/src/test/resources/ksef/output/test-korrekturrechnung.xml @@ -1,70 +1,158 @@ - - + + + + FA + 3 - 2026-07-24T10:11:51.591043Z + + 2026-08-15T10:44:53.112255623Z + Imixs eInvoice + + + + PL + + 9552521552 + ALEXANDER GLOBAL LOGISTICS POLAND sp. z o.o. + + + PL + ul. Gdańska 36, 70-660 Szczecin + + + MBudas@alexander-logistics.com + + + + + + + + 1234567890 Test Sp. z o.o. + + PL + ul. Testowa 1 + 00-001 Warszawa + + + D-12345 + 2 + + 2 + + + + + EUR + 2025-02-10 + + Szczecin + FV/2025/001 - 2026-07-24 + + + 2026-08-15 + + + + -900.00 + -207.00 + -48.15 + + + + + + + -1107.00 + 0.2326 + + + 2 + + 2 + + 2 + + 2 + + + 1 + + + + 1 + + + 2 + + + 1 + + + + KOR + + + 2025-02-10 6551 @@ -82,28 +170,52 @@ 23 + + 2025-03-10 6 + + + PL79116022020000000654306674 + BIGBPLPWXXX + Bank Millennium S.A. + Konto PLN + + + PL16116022020000000654910469 + BIGBPLPWXXX + Bank Millennium S.A. + Konto EUR + + + PL72116022020000000654911595 + BIGBPLPWXXX + Bank Millennium S.A. + Konto USD + + + + diff --git a/office-alexander-logistics-app/src/test/resources/ksef/result.json b/src/test/resources/ksef/result.json similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/result.json rename to src/test/resources/ksef/result.json diff --git a/office-alexander-logistics-app/src/test/resources/ksef/schemat-FA(3)-v1-0E.xsd b/src/test/resources/ksef/schemat-FA(3)-v1-0E.xsd similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/schemat-FA(3)-v1-0E.xsd rename to src/test/resources/ksef/schemat-FA(3)-v1-0E.xsd diff --git a/office-alexander-logistics-app/src/test/resources/ksef/test.json b/src/test/resources/ksef/test.json similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/test.json rename to src/test/resources/ksef/test.json diff --git a/office-alexander-logistics-app/src/test/resources/ksef/validate_xml.sh b/src/test/resources/ksef/validate_xml.sh similarity index 100% rename from office-alexander-logistics-app/src/test/resources/ksef/validate_xml.sh rename to src/test/resources/ksef/validate_xml.sh diff --git a/office-alexander-logistics-app/src/test/resources/zoho/response.json b/src/test/resources/zoho/response.json similarity index 100% rename from office-alexander-logistics-app/src/test/resources/zoho/response.json rename to src/test/resources/zoho/response.json diff --git a/test.xml b/test.xml deleted file mode 100644 index 3119169..0000000 --- a/test.xml +++ /dev/null @@ -1,6599 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Task_2 - ExclusiveGateway_1 - StartEvent_1 - IntermediateCatchEvent_3 - IntermediateCatchEvent_6 - IntermediateCatchEvent_27 - Task_14 - EventBasedGateway_1 - Task_13 - IntermediateCatchEvent_30 - Task_10 - IntermediateCatchEvent_13 - EndEvent_4 - EndEvent_5 - IntermediateCatchEvent_5000-20 - IntermediateCatchEvent_31 - IntermediateCatchEvent_40 - IntermediateThrowEvent_4 - EventBasedGateway_3 - IntermediateCatchEvent_19 - IntermediateThrowEvent_3 - - - EndEvent_1 - IntermediateCatchEvent_12 - Task_4 - IntermediateCatchEvent_25 - Task_12 - Task_5005 - IntermediateCatchEvent_32 - EventBasedGateway_2 - IntermediateCatchEvent_42 - IntermediateCatchEvent_26 - IntermediateCatchEvent_21 - IntermediateThrowEvent_2 - IntermediateCatchEvent_28 - IntermediateCatchEvent_2 - ExclusiveGateway_6 - IntermediateCatchEvent_5005-20 - IntermediateCatchEvent_5005-30 - IntermediateThrowEvent_8 - IntermediateCatchEvent_36 - IntermediateCatchEvent_5005-10 - ExclusiveGateway_7 - - - ExclusiveGateway_3 - Task_18 - IntermediateCatchEvent_51 - IntermediateThrowEvent_6 - IntermediateCatchEvent_53 - Task_17 - EventBasedGateway_6 - IntermediateCatchEvent_47 - EventBasedGateway_5 - IntermediateCatchEvent_43 - IntermediateCatchEvent_44 - IntermediateCatchEvent_54 - IntermediateThrowEvent_7 - ExclusiveGateway_8 - IntermediateCatchEvent_52 - - - IntermediateCatchEvent_10 - IntermediateCatchEvent_11 - IntermediateThrowEvent_5 - IntermediateCatchEvent_1 - IntermediateCatchEvent_9 - IntermediateCatchEvent_45 - Task_1 - - - Task_3 - IntermediateCatchEvent_35 - EndEvent_3 - Task_5000 - IntermediateCatchEvent_5000-10 - IntermediateCatchEvent_33 - IntermediateCatchEvent_4 - IntermediateCatchEvent_38 - ExclusiveGateway_2 - IntermediateCatchEvent_15 - EndEvent_6 - Task_6 - IntermediateCatchEvent_39 - IntermediateCatchEvent_17 - Task_15 - EventBasedGateway_4 - IntermediateCatchEvent_14 - Task_16 - Task_7 - IntermediateCatchEvent_5 - IntermediateCatchEvent_37 - IntermediateCatchEvent_18 - IntermediateCatchEvent_24 - Task_8 - IntermediateCatchEvent_20 - IntermediateCatchEvent_22 - Task_11 - IntermediateCatchEvent_34 - IntermediateCatchEvent_8 - IntermediateCatchEvent_16 - Task_5 - Task_9 - IntermediateThrowEvent_1 - IntermediateCatchEvent_7 - IntermediateCatchEvent_23 - IntermediateCatchEvent_41 - EndEvent_2 - IntermediateCatchEvent_46 - IntermediateCatchEvent_48 - IntermediateCatchEvent_29 - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_31 - SequenceFlow_1 - SequenceFlow_32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_31 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - space.name]]> - - - false - - - - - - - SequenceFlow_46 - SequenceFlow_24 - - - SequenceFlow_0 - SequenceFlow_15 - SequenceFlow_21 - SequenceFlow_33 - - - - SequenceFlow_0 - - - - - - - - - txtlastcomment]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_38 - SequenceFlow_75 - SequenceFlow_83 - SequenceFlow_106 - SequenceFlow_37 - SequenceFlow_10 - - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name - -cargosoft-export-1.0 -1000 -100 -(?!txtworkflowhistory)(^[a-zA-Z]|^_) -]]> - - - - - - - - - - - - false - - - 0 && (parseFloat(a)!=parseFloat(b)) ) { - result.isValid=false; - result.errorMessage="Der Rechnungsbetrag " + a+ " stimmt nicht mit dem Positionsbetrag " + b + " überein."; - }]]> - - - - SequenceFlow_8 - SequenceFlow_111 - SequenceFlow_51 - - - DataOutput_1 - - - DataOutput_1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -false]]> - - - - - - - - - - - - false - - - - SequenceFlow_38 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_10 - SequenceFlow_97 - SequenceFlow_110 - - - SequenceFlow_37 - SequenceFlow_8 - SequenceFlow_54 - SequenceFlow_96 - - - - - - - - - - txtlastcomment]]> - - - - - - - - - cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_33 - SequenceFlow_49 - SequenceFlow_20 - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -suggest -false]]> - - - - - - - - - - - - false - - - - - SequenceFlow_22 - SequenceFlow_77 - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_67 - SequenceFlow_56 - SequenceFlow_55 - SequenceFlow_50 - SequenceFlow_81 - SequenceFlow_88 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_29 - SequenceFlow_2 - - - SequenceFlow_32 - SequenceFlow_29 - SequenceFlow_30 - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_30 - SequenceFlow_72 - SequenceFlow_67 - - - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_25 - SequenceFlow_44 - SequenceFlow_52 - SequenceFlow_58 - SequenceFlow_90 - SequenceFlow_47 - - - SequenceFlow_47 - - - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - SequenceFlow_55 - SequenceFlow_12 - - - - SequenceFlow_18 - SequenceFlow_1 - SequenceFlow_68 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - SequenceFlow_6 - SequenceFlow_18 - - - SequenceFlow_51 - SequenceFlow_6 - - - - SequenceFlow_15 - - - - - - - - SequenceFlow_12 - SequenceFlow_53 - SequenceFlow_19 - SequenceFlow_25 - SequenceFlow_4 - - - - - - - - - - - - - - SequenceFlow_19 - SequenceFlow_23 - - - - - - workitem['payment.type'][0]=="direct_debit" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Rechnungscontrolling]]> - - - - - - - - - - - - false - - - - SequenceFlow_21 - - - - - - - - - - - txtlastcomment]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_24 - SequenceFlow_26 - SequenceFlow_11 - SequenceFlow_118 - SequenceFlow_28 - SequenceFlow_36 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_26 - - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_28 - SequenceFlow_105 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_36 - SequenceFlow_35 - - - SequenceFlow_35 - - - - - - SequenceFlow_39 - - - - - - - - - txtlastcomment]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_39 - SequenceFlow_59 - SequenceFlow_40 - - - SequenceFlow_40 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - space.name]]> - - - false - - - - SequenceFlow_11 - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_23 - SequenceFlow_45 - SequenceFlow_41 - SequenceFlow_14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - SequenceFlow_14 - SequenceFlow_42 - - - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_42 - SequenceFlow_3 - SequenceFlow_43 - SequenceFlow_27 - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - SequenceFlow_43 - SequenceFlow_5 - SequenceFlow_44 - - - - - - - - - - Wollen Sie den SEPA Export wirklich wiederholen?]]> - - - SequenceFlow_27 - SequenceFlow_45 - - - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - - - - - - - - - - - - SequenceFlow_50 - SequenceFlow_53 - - - - - - - - - - - cdtr.name invoice.number]]> - - - - - - - - - cdtr.name -Rechnungsnummer: invoice.number -Betrag: invoice.total invoice.currency - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false]]> - - - - - - - - - - - - false - - - - - - - - - - SequenceFlow_54 - SequenceFlow_7 - - - - - SequenceFlow_63 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_17 - SequenceFlow_60 - SequenceFlow_9 - - - SequenceFlow_9 - - - - SequenceFlow_17 - - - - - SequenceFlow_20 - SequenceFlow_65 - SequenceFlow_71 - SequenceFlow_22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -Wollen Sie den Vorgang wirklich löschen?]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_49 - SequenceFlow_76 - SequenceFlow_48 - - - SequenceFlow_48 - - - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_2 - SequenceFlow_78 - SequenceFlow_89 - SequenceFlow_72 - SequenceFlow_86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_52 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_60 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_59 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - suggest -false - - gutschriftabgleich-de-1.0 - 5001 - 980 - ]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_65 - SequenceFlow_69 - - - - - - workitem['payment.type'][0]=="credit" - - - - - - - - txtlastcomment]]> - - - - - - - - - cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_69 - SequenceFlow_70 - - - - SequenceFlow_70 - - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_4 - SequenceFlow_34 - SequenceFlow_5 - - - workitem['payment.type'][0]=="no_sepa" - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - txtlastcomment]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_7 - SequenceFlow_62 - SequenceFlow_61 - SequenceFlow_73 - - - - - - - - - cdtr.name invoice.number]]> - - - - - - - - - cdtr.name -Rechnungsnummer: invoice.number -Betrag: invoice.total invoice.currency - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -Wollen Sie den Vorgang wirklich archivieren?]]> - - - - - - - - - - - - false - - - - - - - - SequenceFlow_61 - SequenceFlow_63 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_62 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_56 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - suggest -false - - rechnungseingang-sachrechnung-de-1.0 - 5001 - 980 - ]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_71 - SequenceFlow_64 - - - - - - - - - txtlastcomment]]> - - - - - - - - - cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_64 - SequenceFlow_66 - - - SequenceFlow_66 - - - - - - - - - - - txtlastcomment]]> - - - - - - - - - cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_74 - SequenceFlow_77 - SequenceFlow_46 - SequenceFlow_85 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - - SequenceFlow_74 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_73 - SequenceFlow_75 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_78 - - - - - - - - - txtlastcomment]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_68 - SequenceFlow_79 - SequenceFlow_57 - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - SequenceFlow_57 - SequenceFlow_58 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_79 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -Wollen Sie den Vorgang wirklich löschen?]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_81 - SequenceFlow_80 - - - SequenceFlow_80 - - - - - - SequenceFlow_82 - - - - - - - - txtlastcomment -numsequencenumber_sub]]> - - - - - - - - - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_84 - SequenceFlow_87 - SequenceFlow_82 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_84 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_86 - SequenceFlow_87 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_88 - SequenceFlow_89 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_83 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -Wollen Sie den Vorgang wirklich archivieren?]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_16 - SequenceFlow_13 - - - SequenceFlow_13 - - - - - - SequenceFlow_85 - SequenceFlow_76 - SequenceFlow_16 - - - - SequenceFlow_90 - - - - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -space.name]]> - - - - - - - - - sb.assist]]> - - - false - - - - - - - SequenceFlow_96 - SequenceFlow_91 - - - - - - - - txtlastcomment]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_91 - SequenceFlow_92 - SequenceFlow_94 - SequenceFlow_117 - SequenceFlow_101 - SequenceFlow_93 - - - - - - - - - txtlastcomment]]> - - - - - - - - - _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> - - - true - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_102 - SequenceFlow_114 - SequenceFlow_109 - SequenceFlow_112 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_94 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_92 - - - - - - SequenceFlow_101 - SequenceFlow_98 - SequenceFlow_111 - - - - - - - - cdtr.name invoice.number]]> - - - - - - - - - cdtr.name -Rechnungsnummer: invoice.number -Betrag: invoice.total invoice.currency - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false]]> - - - - - - - - - - - - false - - - - - - - - - - SequenceFlow_98 - SequenceFlow_102 - - - - - - - - - - - - cdtr.name invoice.number]]> - - - - - - - - - cdtr.name -Rechnungsnummer: invoice.number -Betrag: invoice.total invoice.currency - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -false -Wollen Sie den Vorgang wirklich archivieren?]]> - - - - - - - - - - - - false - - - - - - - - SequenceFlow_109 - SequenceFlow_108 - - - - SequenceFlow_108 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home -space.name -false]]> - - - - - - - - - - - - false - - - - - - - SequenceFlow_112 - SequenceFlow_113 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_114 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - SequenceFlow_99 - SequenceFlow_103 - - - - - SequenceFlow_93 - SequenceFlow_97 - SequenceFlow_99 - - - - - - SequenceFlow_105 - SequenceFlow_106 - SequenceFlow_107 - - - - - workitem['sb.assist'] && workitem['sb.assist'][0]!="-" - - - SequenceFlow_103 - - - - SequenceFlow_110 - - - - - SequenceFlow_113 - SequenceFlow_107 - SequenceFlow_117 - - - - SequenceFlow_118 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_34 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_41 - - - - - Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden. - -Ändern von IBAN und Fälligkeit ist hier möglich - - - - Datenübergabe an Cargosoft. - -Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - - - Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt - - - - Buchhaltung setzt Flag, wenn Mahnung eingetroffen ist - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file