diff --git a/.gitignore b/.gitignore index 5577f61..49fe8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,11 @@ target/ .metadata/ .project .classpath +.env # ignore docker deployments docker/deployments/ +docker/keys/imixs-llm.xml # Sepa Report reports/sepa/result_sepa* diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c1fc951..0ad1114 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,5 +1,17 @@ # Versionen +## 1.4.0 (Development) + +- neuer AGLAIInvoiceAdapter + der Adapter `AGLAIInvoiceAdapter` muss künftig in das Import Event der Rechnungseingangs Modelle. Dieser Adapter Findet den Space und den Mandanten. + +Neue Modelle: + +- Posteingang + - posteingang-de-3.0 +- AMS + - rechnungseingang-ams-1.1.0.bpmn + ## 1.3.6 (Development) **KSeF Produktiname II.** diff --git a/backup/README.md b/backup/README.md new file mode 100644 index 0000000..f850a97 --- /dev/null +++ b/backup/README.md @@ -0,0 +1,204 @@ +# Eigenes Backup-System (Backup-Mirror) +## Architektur, Einrichtung und Disaster-Recovery-Konzept + +--- + +## 1. Idee und Architektur + +### 1.1 Ausgangslage + +Imixs-Office-Workflow wird von uns als eine transaktionale, hochverfügbare +Geschäftsprozessmanagement-Suite betrieben. Die Basis ist ein Open Source Kernel, +der frei zugänglich ist ([https://github.com/imixs/](https://github.com/imixs/)). +Unabhängig vom gewählten Betriebsmodell (SaaS, Public Cloud, Private Cloud, On +Premise) sind und bleiben Sie Eigentümer Ihrer Geschäftsdaten. Über den +Backup-Service haben Sie die Möglichkeit, jederzeit eigenständig auf eine +vollständige Kopie Ihrer Daten zuzugreifen – unabhängig davon, wie und wo Ihre +Instanz aktuell betrieben wird. + +### 1.2 Architektur – Own your Data + +Auch wenn wir den Betrieb Ihrer Instanz übernehmen, bedeutet das nicht, dass Sie +von uns abhängig sind. Über den Backup-Mirror betreiben Sie bei sich einen eigenen, +unabhängigen Backup-Dienst. Dieser Dienst wird von Ihnen selbst eingerichtet, +verwaltet und überwacht und läuft vollständig autark – wir müssen ihn technisch +weder kennen noch verwalten. Dadurch gilt: + +> **Sie verfügen über eine eigenständige, vollständige Kopie Ihrer +> Geschäftsdaten – unabhängig von unserer Infrastruktur. Mit dieser Kopie kann +> Ihr System bei Bedarf komplett neu aufgebaut werden.** + +Das ist ein bewusst einfaches und robustes Prinzip: Es kommt nicht darauf an, *wo* +Ihre Daten zusätzlich liegen, sondern *wer* die Kontrolle über diesen zusätzlichen +Sicherungsort hat. Nur wenn diese Kontrolle bei Ihnen liegt, sind Sie wirklich +unabhängig. + +### 1.3 Wie es funktioniert + +Technisch basiert das Konzept auf dem Open-Source-Projekt +[Imixs-Archive](https://github.com/imixs/imixs-archive), konkret auf dem Baustein +*Imixs-Archive-Backup*. Der Ablauf im Überblick: + +1. Bei jeder Änderung an einem Geschäftsvorgang erzeugt Ihre Workflow-Instanz + automatisch einen unveränderlichen Snapshot (eine vollständige Kopie des + Vorgangs inkl. aller angehängten Dokumente). +2. Diese Snapshots werden über die REST-Schnittstelle Ihrer Workflow-Instanz + bereitgestellt. +3. Ein bei Ihnen installierter Backup-Dienst (siehe Abschnitt 2) ruft diese + Snapshots eigenständig ab und speichert sie auf einem Speicherort Ihrer Wahl + (z. B. eigener FTP-/Storage-Server). + +Wichtig: Die Verbindung erfolgt **von Ihrem System zu unserer Workflow-Instanz** +(„Pull-Prinzip"). Sie benötigen dafür lediglich einen Netzwerkzugriff auf die +REST-Schnittstelle Ihrer Instanz – wir müssen keinen Zugriff auf Ihre Infrastruktur +haben und erhalten auch keinen. + +--- + +## 2. Technische Einrichtung + +Der Backup-Dienst kann als Docker-Container in unterschiedlichen Umgebungen betrieben werden: + + - **Local**: lokal über Docker oder Docker Compose, + - **Private Cloud**: in einer Private Cloud (z.b. Kubernetes, OpenShift) + - **Public Cloud**: in einer Public Cloud Umgebung (z.b. AWS, Microsoft Azure) + + +### 2.1 Voraussetzungen + +- Eine eigene Server- bzw. Container-Umgebung (Docker) auf Ihrer Seite +- Ein eigener Speicherort für die Backup-Daten (z. B. FTP-Storage, NAS mit + FTP-Anbindung) +- Eine sogenannte **Mirror-ID**, die wir Ihnen bereitstellen + +### 2.2 Mirror-ID anfragen + +Die Mirror-ID ist eine organisatorische Kennung, mit der wir Ihre eigene +Backup-Verbindung für Ihre Instanz freischalten. Sie ist kein Sicherheitsmerkmal im +engeren Sinn, sondern eine Vereinbarung zwischen uns: *„Kunde X betreibt ein eigenes +Backup."* Bitte fordern Sie diese ID formlos bei uns an. + +### 2.3 Backup-Nutzer in Ihrer eigenen Instanz anlegen + +Ein zentraler Punkt für die Autarkie des Systems: **Sie legen den technischen +Benutzer für den Backup-Zugriff selbst in Ihrer Imixs-Instanz an.** Dieser Nutzer +gehört ausschließlich Ihnen – wir kennen weder das Passwort noch verwalten wir +dieses Konto. Vergeben Sie dem Nutzer ausreichende Leserechte, damit er alle +relevanten Vorgänge und Dokumente sichern kann. + +### 2.4 Docker-Compose Beispielkonfiguration + +Das folgende Beispiel zeigt eine Docker Compose Konfiguraiton für den Betrieb des Backup-Dienstes: + +```yaml +version: "3.6" +services: + backup: + image: imixs/imixs-archive-backup:latest + environment: + TZ: "Europe/Berlin" + WORKFLOW_SERVICE_ENDPOINT: "https://.office-workflow.de/api/" + WORKFLOW_SERVICE_USER: "" + WORKFLOW_SERVICE_PASSWORD: "" + WORKFLOW_SERVICE_AUTHMETHOD: "form" + BACKUP_FTP_HOST: "" + BACKUP_FTP_PATH: "" + BACKUP_FTP_PORT: "21" + BACKUP_FTP_USER: "" + BACKUP_FTP_PASSWORD: "" + BACKUP_MIRROR_ID: "" + ports: + - "8084:8080" + - "9990:9990" +``` + +**Erläuterung der wichtigsten Parameter:** + +| Parameter | Bedeutung | +|---|---| +| `WORKFLOW_SERVICE_ENDPOINT` | Die REST-API-Adresse Ihrer bei uns gehosteten Workflow-Instanz | +| `WORKFLOW_SERVICE_USER/PASSWORD` | Der von Ihnen selbst angelegte Backup-Nutzer | +| `BACKUP_FTP_*` | Ihr eigener Speicherort für die Backup-Daten | +| `BACKUP_MIRROR_ID` | Die von uns bereitgestellte Freischalt-ID | + +Nach dem Start prüft der Dienst regelmäßig auf neue zu sichernde Vorgänge und +überträgt diese automatisch auf Ihren Speicherort. + +### 2.5 Monitoring des eigenen Backup-Dienstes + +Da der Dienst vollständig in Ihrer Verantwortung läuft, sollten Sie ihn aktiv +überwachen. Ein einfacher Ping-Check zeigt zwar, dass der Container erreichbar +ist – sagt aber nichts darüber aus, ob der Dienst tatsächlich funktionsfähig ist +und Backups erfolgreich durchführt. + +Der Imixs-Archive-Backup-Service stellt hierfür standardisierte **MicroProfile-Endpunkte** mit, die auf Port `9990` +bereitgestellt werden: + +| Endpunkt | Beschreibung | +|---|---| +| `/health` | Liefert den Health-Status des Dienstes nach dem MicroProfile-Health-Standard – inklusive Readiness (ist der Dienst betriebsbereit, z. B. Verbindung zur Workflow-API und zum FTP-Storage vorhanden?) und Liveness (läuft der Prozess korrekt?) | +| `/metrics` | Liefert Betriebskennzahlen im MicroProfile-Metrics-Format (Prometheus-kompatibel), z. B. Anzahl verarbeiteter Backups, Fehlerzähler, Laufzeiten | + +Damit lässt sich der Dienst professionell überwachen: + +- **Health-Checks** binden Sie direkt in gängige Monitoring-Systeme ein (z. B. + Kubernetes Liveness-/Readiness-Probes, Uptime-Kuma, Nagios, Icinga) und erkennen + so nicht nur einen abgestürzten Container, sondern auch einen Dienst, der zwar + läuft, aber z. B. keine Verbindung mehr zu Ihrer Workflow-Instanz oder zum + FTP-Ziel herstellen kann. +- **Metrics** lassen sich direkt von Prometheus abgegriffen und in Grafana + visualisiert werden – so erkennen Sie auf einen Blick, ob regelmäßig Backups + durchgeführt werden, oder ob z. B. die Fehlerrate ansteigt. + +**Voraussetzung:** Sie müssen Port `9990` in Ihrer Docker-Umgebung entsprechend +freigeben bzw. mappen, damit Ihr Monitoring-System auf die Endpunkte zugreifen kann +(siehe Port-Mapping im Beispiel aus Abschnitt 2.4). + +Ein Backup, das unbemerkt seit Wochen nicht mehr funktioniert, bietet keinen Schutz. +Die Überwachung über Health- und Metrics-Endpunkte ist daher ein integraler +Bestandteil des Konzepts, nicht optional. + +--- + +## 3. Notfall- und Wiederherstellungsfall (Disaster Recovery) + +Im Falle eines Disaster-Recovery-Prozesses stellen Sie uns Ihr Backup zur Verfügung, damit Ihr System auf dessen Basis wiederhergestellt werden kann. Dieser Abschnitt beschreibt das Vorgehen nur in Stichpunkten. +Die vollständige technische Dokumentation der +Imixs-Workflow-Architektur ist Open Source und öffentlich einsehbar unter +[github.com/imixs](https://github.com/imixs). + +**Grundprinzip der Wiederherstellung:** + +- Ihre gesicherten Snapshot-Daten liegen vollständig und unverändert in Ihrem + eigenen Speicher (FTP/Storage) vor. +- Diese Daten liegen in einem offenen, plattformunabhängigen XML-Format vor und + sind nicht an unsere konkrete Infrastruktur gebunden. +- Auf Basis dieser Daten kann eine neue Imixs-Workflow-Instanz (bei Ihnen oder bei + einem anderen Dienstleister) aufgesetzt werden. +- Über die Restore-Funktion der Imixs-Archive-Komponenten werden die Snapshots in + die neue Instanz zurückgespielt – jeder Geschäftsvorgang wird dabei inklusive + seiner Historie und aller Dokumente wiederhergestellt. + +**Wichtige Stichpunkte für den Ernstfall:** + +- Backup-Daten sind vollständig bei Ihnen vorhanden → keine Abhängigkeit von uns +- Wiederherstellung erfordert eine lauffähige Imixs-Workflow-Umgebung (Open Source, + frei verfügbar) +- Die technische Vorgehensweise zum Restore ist Teil der öffentlichen + Imixs-Archive-Dokumentation +- Wir unterstützen Sie im Ernstfall selbstverständlich gerne beim Wiederaufbau – + diese Unterstützung ist jedoch **keine Voraussetzung**, da die Daten und das + Wiederherstellungsverfahren vollständig unabhängig von uns nutzbar sind + +--- + +## 4. Zusammenfassung + +Mit dem Backup-Mirror bleiben Sie jederzeit Eigentümer Ihrer Geschäftsdaten – unabhängig +davon, wie und wo Ihre Instanz betrieben wird. Sie richten den Dienst selbst ein, verwalten +ihn eigenständig und behalten so die volle Kontrolle über Ihre zusätzliche Datenkopie. Genau +diese Unabhängigkeit ist es, die Ihnen im Bedarfsfall den vollständigen Wiederaufbau Ihres +Systems ermöglicht. + +Bei Fragen zur Einrichtung oder zur Anforderung Ihrer Mirror-ID kontaktieren Sie uns +gerne. \ No newline at end of file diff --git a/backup/docker-compose.yaml b/backup/docker-compose.yaml new file mode 100644 index 0000000..dbcd64e --- /dev/null +++ b/backup/docker-compose.yaml @@ -0,0 +1,22 @@ +version: "3.6" +services: + ############################################### + # Backup Service + ############################################### + backup: + image: imixs/imixs-archive-backup:latest + environment: + TZ: "Europe/Berlin" + WORKFLOW_SERVICE_ENDPOINT: "https://alexander-logistics-ams.office-workflow.de/api/" + WORKFLOW_SERVICE_USER: "kutzner-backup-service" + WORKFLOW_SERVICE_PASSWORD: "16e-7ede-4c1c-bdeb-e16ce" + WORKFLOW_SERVICE_AUTHMETHOD: "form" + BACKUP_FTP_HOST: "u248962.your-storagebox.de" + BACKUP_FTP_PATH: "/test/agl/ams-test" + BACKUP_FTP_PORT: "21" + BACKUP_FTP_USER: "u248962" + BACKUP_FTP_PASSWORD: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + BACKUP_MIRROR_ID: "backup-mirror-local" + WORKFLOW_REST_JPQL_DOUBLEDECODE_WORKAROUND: "true" + ports: + - "8084:8080" diff --git a/cargosoft-migration/AGL_ADRESSEN_GLEICHENUMMER_VERSCHIEDENEFELDER.xls b/cargosoft-migration/AGL_ADRESSEN_GLEICHENUMMER_VERSCHIEDENEFELDER.xls deleted file mode 100644 index 3667504..0000000 Binary files a/cargosoft-migration/AGL_ADRESSEN_GLEICHENUMMER_VERSCHIEDENEFELDER.xls and /dev/null differ diff --git a/devi b/devi index d0fcf0c..beda5f3 100755 --- a/devi +++ b/devi @@ -53,9 +53,7 @@ fi if [[ "$(strip_dash $1)" == "hot" ]]; then echo "* Hotdeploy..." - cd *-app mvn manik-hotdeploy:hotdeploy - cd .. fi if [[ "$(strip_dash $1)" == "deploy" ]]; then diff --git a/doc/FTP.md b/doc/FTP.md deleted file mode 100644 index 46356ce..0000000 --- a/doc/FTP.md +++ /dev/null @@ -1,99 +0,0 @@ -# FTP Server - -Wir stellen verschiedene FTP Laufwerke auf dem Hetzner bereit um Daten mit Cargosoft und anderen Partnern auszutauschen - -# Cargosoft - -**ACHTUNG:** Frau Beste bittet darum den public key für alle Sub Accounts zu installieren: - -$ cat id_rsa_cargosoft.pub | ssh -p23 u248962-sub12@u248962.your-storagebox.de install-ssh-key - -## Cargosoft Schnittstelle (Bremen - Mandant 001) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft - Benutzername: u248962-sub2 - Passwort: aXa61n9Un3jDNQlL - -## Cargosoft Schnittstelle (AMS - Mandant 002) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-ams - Benutzername: u248962-sub12 - Passwort: RA9N0V8EB8_1Dnw - -## Cargosoft Schnittstelle (Bremerhaven Mandant 005) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-bhv - Benutzername: u248962-sub5 - Passwort: 5hKKzv6TFCKRrAdR - -## Cargosoft Schnittstelle (Polen Mandant 003) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-pl - Benutzername: u248962-sub7 - Passwort: PGPzzqmtZ8BSxkbs - -## Cargosoft Schnittstelle (Dubai Mandant 006) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-dwc - Benutzername: u248962-sub3 - Passwort: enHjxs9h4nJ6EgsZ - - Wir stellen Herrn Hoelzl in Dubai ein eigenes FTP Laufwerk bereit, in das wir die Rechnungen per Imixs-Exporter verschieben. - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/filetransfer-dwc - Benutzername: u248962-sub11 - Passwort: mH9mAS77QhuA5XJi - -Herr Hoelzl überträgt dann die Daten in eine app von einer Steuerkanzlei. - -Es wird dazu ein FTP Server bereitgestellt der von Herrn Hölzl und Frau Geisler lokal eingebunden werden kann. - -Der aktuelle Workflow für Eingangs- und Ausgangsrechnungen wird dahingehend angepasst, dass die Belege automatisch nach folgenden Format exportiert werden: - -``` -├── invoice-out -│ ├── 2024 -│ │ ├── 06 -│ │ │ ├── 198_EX-DWC-2406-013.pdf -│ │ │ ├── 199_EX-DWC-2406-013.pdf -│ │ ├── 07 -│ │ │ ├── 200_IM-DWC-2407-010.pdf -├── invoice-in -│ ├── 2024 -│ │ ├── 06 -│ │ │ ├── 700045_EX-DWC-2406-005.pdf -│ │ │ ├── 700045_59475.pdf -``` - -sequencenumer + - -firmename + positionsnummer + rechnungsnummer + - -Der Export erfolgt automatisch nach Empfang der Rechnung bzw. nach Prüfung der Rechnung (Review->Approved). Die Dateinamen werden vom System berechnet (siehe oben). Bei Sachrechnungen wird das Rechnungsdatum verwendet um die Buchungsperiode zu berechnen. - -## Cargosoft Schnittstelle (USA Mandant 004) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-usa - Benutzername: u248962-sub9 - Passwort: GMk7NgDBrmb2QqXg - -## Cargosoft Schnittstelle (China Mandant 007) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-chn - Benutzername: u248962-sub10 - Passwort: yswBeN83jMqkMqJa - -## Cargosoft Schnittstelle (Brazil - Mandant 008) - - Server: u248962.your-storagebox.de - Pfad: /office-alexander-logistics/cargosoft-br - Benutzername: u248962-sub13 - Passwort: YjQ5u5Nzz535-eGR diff --git a/doc/HETZNER_SUPPORT/2025-07-28.md b/doc/HETZNER_SUPPORT/2025-07-28.md deleted file mode 100644 index 692622e..0000000 --- a/doc/HETZNER_SUPPORT/2025-07-28.md +++ /dev/null @@ -1,49 +0,0 @@ -Hallo, -wir nutzen oben genannte Storage Box für den Datenaustausch mit verschiedenen Kunden. -Einer der Kunden kann seit dem 25. Juli nicht mehr von seinem Firmennetzwerk darauf zugreifen. - -Wir haben auf dem Linux Server beim Kunden folgende Tests durchgeführt: - -cargodb@cargodb:~$ sftp -v -oPort=22 u248962-sub1@u248962.your-storagebox.de -OpenSSH_8.2p1 Ubuntu-4ubuntu0.3, OpenSSL 1.1.1f 31 Mar 2020 -debug1: Reading configuration data /etc/ssh/ssh_config -debug1: /etc/ssh/ssh_config line 19: include /etc/ssh/ssh_config.d/_.conf matched no files -debug1: /etc/ssh/ssh_config line 21: Applying options for _ -debug2: resolving "u248962.your-storagebox.de" port 22 -debug2: ssh_connect_direct -debug1: Connecting to u248962.your-storagebox.de [78.47.94.120] port 22. -debug1: connect to address 78.47.94.120 port 22: Connection refused -debug1: Connecting to u248962.your-storagebox.de [2a01:4f8:2b01:db::2] port 22. -debug1: connect to address 2a01:4f8:2b01:db::2 port 22: Network is unreachable -ssh: connect to host u248962.your-storagebox.de port 22: Network is unreachable -Connection closed. - -cargodb@cargodb:~$ nc -zv u248962-sub1@u248962.your-storagebox.de 22 -nc: getaddrinfo for host u248962-sub1@u248962.your-storagebox.de port 22: Name or service not known - -cargodb@cargodb:~$ tcptraceroute u248962.your-storagebox.de 22 -Selected device ens160, address 192.168.83.3, port 52113 for outgoing packets -Tracing the path to u248962.your-storagebox.de (78.47.94.120) on TCP port 22 (ssh), 30 hops max -1 192.168.83.254 0.233 ms 0.175 ms 0.242 ms -2 82-198-218-38.briteline.de (82.198.218.38) 1.470 ms 1.103 ms 2.286 ms -3 10.200.48.254 0.930 ms 0.915 ms 0.776 ms -4 82-198-192-194.briteline.de (82.198.192.194) 1.092 ms 1.114 ms 0.902 ms -5 82-198-216-168.briteline.de (82.198.216.168) 1.101 ms 1.168 ms 1.034 ms -6 ae0-201.cr11.bre04.lwlcom.net (31.209.93.121) 1.543 ms 1.650 ms 1.528 ms -7 ae0-30.cr10.bre09.lwlcom.net (185.146.230.97) 7.713 ms 7.440 ms 11.215 ms -8 ae0-10.cr11.bre09.lwlcom.net (185.146.230.53) 7.647 ms 7.652 ms 7.617 ms -9 ae0-20.cr10.bre03.lwlcom.net (185.146.230.99) 7.530 ms 7.716 ms 7.505 ms -10 ae7-90.cr10.bre11.lwlcom.net (185.146.230.34) 7.723 ms 7.661 ms 7.578 ms -11 ae7-100.cr10.lut01.lwlcom.net (185.146.230.39) 7.446 ms 7.509 ms 7.673 ms -12 ae6-100.cr10.fra03.lwlcom.net (185.146.230.27) 7.980 ms 7.281 ms 7.981 ms -13 ae2-100.cr10.fra04.lwlcom.net (185.146.230.51) 7.287 ms 7.392 ms 7.406 ms -14 213-133-121-205.clients.your-server.de (213.133.121.205) 10.464 ms 10.542 ms 10.573 ms -15 core24.fsn1.hetzner.com (213.239.224.85) 16.458 ms 16.381 ms 16.338 ms -16 mx10k1.dc3.fsn1.hetzner.com (213.239.254.142) 16.632 ms 16.687 ms 24.837 ms -17 static.120.94.47.78.clients.your-server.de (78.47.94.120) 16.526 ms !p 16.509 ms !p 16.505 ms !p - -Können Sie anhand dieser Daten erkennen worin das Problem besteht? Andere Kunden können die Storage Box problemlos nutzen. - -Vielen Dank für Ihre Hilfe -Mit freundlichen Grüßen -Ralph Soika diff --git a/doc/KSeF/FEEDBACK.md b/doc/KSeF/FEEDBACK.md deleted file mode 100644 index c35ad33..0000000 --- a/doc/KSeF/FEEDBACK.md +++ /dev/null @@ -1,25 +0,0 @@ -# Feedback zum PDF FIle - -| Feld / Komponente | Status | -| :------------------------------------------------------- | :----------------------- | -| **1. Podmiot 1 — Daten des Rechnungsausstellers (AGLP)** | | -| `` | **FIXED** | -| `` | **FIXED** | -| `PL` | **FIXED** | -| **2. Podmiot 2 — Daten des Rechnungsempfängers** | | -| ` ` | **ALREADY IMPLEMENTED** | -| EU-Rechnungsempfänger | **UNCLEAR!** | -| Anschrift des Rechnungsempfängers | **CARGOSOFT TOPIC** | -| **3. Abschnitt — Rechnungskopf** | **FIXED** | -| `` | **FIXED** | -| `` | **FIXED** | -| **4. Rechnungspositionen — Pflichtfelder** | | -| `` | **FIXED** | -| `` | **IGNORED - NOT FIXED!** | -| `` | **????** | -| `` | **????** | -| **5. Rechnungssummen — / ** | | -| _Noch keine Details_ | — | -| **6. Zahlung — ** | | -| `` | **FIXED** | -| `` | **FIXED** | diff --git a/doc/KSeF/SECRETS.md b/doc/KSeF/SECRETS.md deleted file mode 100644 index 9a78aa4..0000000 --- a/doc/KSeF/SECRETS.md +++ /dev/null @@ -1,3 +0,0 @@ -NIP = "9552521552" - -TOKEN = "20251113-EC-2751AC3000-5C5466924B-62|nip-9552521552|fc0c95d020dc45d4af491fb0aa755f3f3f674b33ecbf4250a88ea6e36fa8340b diff --git a/doc/MAIL.md b/doc/MAIL.md deleted file mode 100644 index e1a13c6..0000000 --- a/doc/MAIL.md +++ /dev/null @@ -1,9 +0,0 @@ -# Mail - -Testen von Mailing kann man über - -https://www.mail-tester.com/ - -Kutzner Mail gateway - -PW: 26W%R#Xe4^Z2Gyz1 diff --git a/doc/id_rsa_cargosoft.pub b/doc/id_rsa_cargosoft.pub deleted file mode 100644 index 1c83088..0000000 --- a/doc/id_rsa_cargosoft.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnGiu0PUBl+G++vHrGP5wDRit4mXF4hXTyzUem3BPADaV0DUuYN1Fx5RpDl2F8mhnqDYcyCTBzLTJ+0jFqq1pzoJW5ZWZ+hSChabVCV4m8UkFkhbRmjxNkPx26ZMhfTD1mDqgCKQ+bbt1mi04UZppDKBr+9ZrMG3d0odHblEJHixtJ7Hqr9vvXXbvNv4E9B/9dlW57oyEUk/vKmwuLyGAsDjxjfB3W+Faab+gev8VDwJxdbD90HX0O2Az05wy9EC7M3pujcawsHdaFXgFFRRwlVuUkX3z9hp1Uekqg0N81hty7/i8GiZ9/m3Y6hIA5eRM4ZpDQFEF8SY9TLSzDehNoQ== seesped@cargodb diff --git a/doc/zoho/SECRETS.md b/doc/zoho/SECRETS.md deleted file mode 100644 index f35c1bd..0000000 --- a/doc/zoho/SECRETS.md +++ /dev/null @@ -1,78 +0,0 @@ -# Zoho Web API - -AGL Dubai nutzt Zoho als Platform zusammen mit einer lokalen Steuerkanzlei - -## Test/Prod Account Imixs - -https://api-console.zoho.eu/ -https://api-console.zoho.eu/client/1000.NLTM2KUEHI696MSLGEIANATVGGX7IN - -``` -zoho.accesstoken 1000.18f5fbeaf572425b8062d015d541aad5.a704efa994774ef33d7af75106468a13 -zoho.apidomain https://www.zohoapis.eu -zoho.clientid 1000.GR5FTPZYB06HEWSFSSX4DJU3OBD4EJ -zoho.clientsecret 3f3e74c5212bbc924a7ebf77f887c6296db1106c47 -zoho.code 1000.c184c7592a218fee58f7b7855b56eb77.7b533ff9f570fd6ab3296784caeec072 -zoho.organization 20105697367 -zoho.refreshtoken 1000.98fe4d0c4f676237b400bf8a3dc219f3.03d6bacf5b988d339eb788c4ecff440e -zoho.scope ZohoBooks.contacts.ALL ZohoBooks.invoices.CREATE ZohoBooks.invoices.READ ZohoBooks.invoices.UPDATE - -``` - -## Atari - -atari.600xl@gmail.com -800xlAtari - -``` -zoho.apidomain https://www.zohoapis.eu -zoho.clientid 1000.86O4P321HDYDRX0Q0N1G7YOJRJ9D5W -zoho.clientsecret 2a67b6cfc364f5df27cc8eb33e9b0e4e8a0221ebc3 -zoho.code 1000.c7dc89c06111b93f1242b587fabed4ac.44c591dffbd978a316e3d90ed3fefc78 -zoho.organization 886924765 -zoho.scope ZohoBooks.contacts.ALL,ZohoBooks.invoices.ALL,ZohoBooks.bills.ALL -``` - -## Prod DWC - -info@imixs.com -imixs4zoho - -Für Drecks Forum -Imixs4#zoho -Imixs4#zoho - -http://books.zoho.com/ - -https://api-console.zoho.com/ - -ZohoBooks.contacts.ALL,ZohoBooks.invoices.ALL,ZohoBooks.bills.ALL - -``` - -zoho.apidomain https://www.zohoapis.com -zoho.clientid 1000.MQE1SU8UGY6F2PBPASOXGTLWYQD1FS -zoho.clientsecret 1ca70e1ab803b3fed6b1b5e00858c316e2003d289b -zoho.organization 884218508 -zoho.scope ZohoBooks.contacts.ALL,ZohoBooks.invoices.ALL,ZohoBooks.bills.ALL - -``` - -# API Dokumentation - -- API Docu: https://www.zoho.com/books/api/v3/introduction/ -- Authentication: https://www.zoho.com/books/api/v3/oauth/ - -# Testumgebung - -https://books.zoho.eu/app/20105697367 -https://accounts.zoho.eu/home# - -Base API URI= https://accounts.zoho.eu/ - -# AGL Organisation - -https://api-console.zoho.com - -info@imixs.com -password imixs4zoho diff --git a/docker-compose.yml b/docker-compose.yml index 959af24..3048492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,8 +41,8 @@ services: WORKFLOW_SERVICE_USER: "admin" WORKFLOW_SERVICE_PASSWORD: "adminadmin" - LLM_SERVICE_ENDPOINT_USER: "admin" - LLM_SERVICE_ENDPOINT_PASSWORD: "imixs4.null" + # LLM Integration + LLM_CONFIG_FILE: /opt/jboss/imixs-llm.xml # KSeF - Polen Test KSEF_API_NIP: "9552521552" @@ -57,6 +57,7 @@ services: - "8787:8787" volumes: - ./docker/deployments:/opt/jboss/wildfly/standalone/deployments/ + - ./docker/keys/imixs-llm.xml:/opt/jboss/imixs-llm.xml - ./docker/transfer:/opt/jboss/wildfly/transfer/ ############################################### 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-app/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java b/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java deleted file mode 100644 index 3952bd6..0000000 --- a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticController.java +++ /dev/null @@ -1,181 +0,0 @@ -package org.imixs.workflow.office.forms; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.faces.data.WorkflowController; - -import jakarta.enterprise.context.ConversationScoped; -import jakarta.enterprise.event.Event; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -/** - * The AnalyticController is a conversationScoped controller that provides - * values for the analytic-custom parts. - *

- * A custom implementation can react on AnalyticEvent to compute values and - * datasets. - *

- * The controller implements a caching mechanism to avoid repeated calls for new - * analytic values. If the analytic value is already stored in the current - * workitem, no new value will be fired. - * - * - * @author rsoika - * - */ -@Named -@ConversationScoped -public class AnalyticController implements Serializable { - - private static final long serialVersionUID = 1L; - private static Logger logger = Logger.getLogger(AnalyticController.class.getName()); - - @Inject - protected Event analyticEvents; - - @Inject - protected WorkflowController workflowController; - - /** - * Returns a analytic value as a String for a given key. - * - * @param key - * @return - */ - public String getAsString(String key) { - ItemCollection analyticData = computeValue(key); - return analyticData.getItemValueString("value"); - } - - /** - * Returns a analytic value as a Json String for a given key. - * - * @param key - * @return - */ - public String getAsJson(String key) { - ItemCollection analyticData = computeValue(key); - String jsonval = analyticData.getItemValueString("value"); - if (jsonval == null || jsonval.isEmpty()) { - return "null"; - } else { - return jsonval; - } - } - - /** - * Returns a analytic value as a Double for a given key. - * - * @param key - * @return - */ - public double getAsDouble(String key) { - ItemCollection analyticData = computeValue(key); - return analyticData.getItemValueDouble("value"); - } - - /** - * Returns the analytic label for a given key - * - * @param key - * @return - */ - public String getLabel(String key) { - ItemCollection analyticData = computeValue(key); - return analyticData.getItemValueString("label"); - } - - /** - * Returns the analytic optional link for a given key - * - * @param key - * @return - */ - public String getLink(String key) { - ItemCollection analyticData = computeValue(key); - return analyticData.getItemValueString("link"); - } - - /** - * Returns the analytic description for a given key - * - * @param key - * @return - */ - public String getDescription(String key) { - ItemCollection analyticData = computeValue(key); - return analyticData.getItemValueString("description"); - } - - /** - * Computes an analytic value. The method cache the value in the item key. - * - * An observer controller is responsible to cache or reset the cached values if - * needed. - * - * @param key - * @return - */ - protected ItemCollection computeValue(String key) { - if (workflowController.getWorkitem() != null) { - logger.fine("fire analytic event for key '" + key + "'"); - // Fire the Analytics Event for this key - AnalyticEvent event = new AnalyticEvent(key, workflowController.getWorkitem()); - if (analyticEvents != null) { - analyticEvents.fire(event); - if (event.getValue() != null) { - ItemCollection details = new ItemCollection(); - details.setItemValue("value", event.getValue()); - details.setItemValue("label", event.getLabel()); - details.setItemValue("description", event.getDescription()); - details.setItemValue("link", event.getLink()); - // cache result - implodeDetails(key, details); - } - } - } - - // analytic value is now already cached! - return explodeDetails(key); - } - - /** - * Convert the List of ItemCollections back into a List of Map elements - * - * @param workitem - */ - @SuppressWarnings({ "rawtypes" }) - private void implodeDetails(String key, ItemCollection details) { - // convert the child ItemCollection elements into a List of Map - List detailsList = new ArrayList(); - detailsList.add(details.getAllItems()); - workflowController.getWorkitem().replaceItemValue(key, detailsList); - } - - /** - * converts the Map List of a workitem into a List of ItemCollectons - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - private ItemCollection explodeDetails(String key) { - // convert current list of childItems into ItemCollection elements - List mapOrderItems = workflowController.getWorkitem().getItemValue(key); - if (mapOrderItems != null && mapOrderItems.size() > 0) { - ItemCollection itemCol = new ItemCollection((Map) mapOrderItems.get(0)); - return itemCol; - } - // return empty collection - ItemCollection dummy = new ItemCollection(); - dummy.setItemValue("value", ""); - dummy.setItemValue("label", ""); - dummy.setItemValue("description", "No data available"); - - return dummy; - } - -} diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java b/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java deleted file mode 100644 index 365583a..0000000 --- a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/AnalyticEvent.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.imixs.workflow.office.forms; - -import org.imixs.workflow.ItemCollection; - -/** - * An AnalyticEvent is send by the AnalyticController during initialization - */ -public class AnalyticEvent { - - private String key; - private Object value = null; - private String label = ""; - private String description = ""; - private String link = ""; - private ItemCollection workitem = null; - - public AnalyticEvent(String key, ItemCollection workitem) { - this.key = key; - this.workitem = workitem; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getLink() { - return link; - } - - public void setLink(String link) { - this.link = link; - } - - public ItemCollection getWorkitem() { - return workitem; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - -} diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java b/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java deleted file mode 100644 index ba532ac..0000000 --- a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionController.java +++ /dev/null @@ -1,173 +0,0 @@ -/******************************************************************************* - * Imixs Workflow Technology - * Copyright (C) 2003, 2008 Imixs Software Solutions GmbH, - * http://www.imixs.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You can receive a copy of the GNU General Public - * License at http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * Imixs Software Solutions GmbH - initial API and implementation - * Ralph Soika - * - *******************************************************************************/ -package org.imixs.workflow.office.forms; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.imixs.workflow.dataview.DataViewService; -import org.imixs.workflow.exceptions.QueryException; -import org.imixs.workflow.faces.data.WorkflowController; - -import jakarta.annotation.PostConstruct; -import jakarta.enterprise.context.Conversation; -import jakarta.enterprise.context.ConversationScoped; -import jakarta.faces.context.FacesContext; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.servlet.http.HttpServletRequest; - -/** - * The DataViewFormSectionController provides methods to display a data view in - * a custom form section - * - * @see pages/workitems/sections/dataview.xhtml - * @author rsoika - * @version 1.0 - */ - -@Named -@ConversationScoped -public class DataViewSectionController implements Serializable { - private static final long serialVersionUID = 1L; - - public static final int MAX_SEARCH_RESULT = 1000; - public static Logger logger = Logger.getLogger(DataViewSectionController.class.getName()); - - @Inject - WorkflowController workflowController; - - @Inject - private Conversation conversation; - - @Inject - DataViewService dataViewService; - - private Map dataSets = null; - - @PostConstruct - public void init() { - startConversation(); - dataSets = new HashMap<>(); - } - - /** - * Starts a new conversation - */ - protected void startConversation() { - if (conversation.isTransient()) { - conversation.setTimeout( - ((HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest()) - .getSession().getMaxInactiveInterval() * 1000); - conversation.begin(); - logger.log(Level.FINEST, "......start new conversation, id={0}", - conversation.getId()); - } - } - - /** - * Returns a single value from a Option key/value list - * - * @param options - options - * @param key - option key - * @return option value - */ - public String getOptionValue(String options, String key) { - // Null checks - if (options == null || key == null || options.trim().isEmpty() || key.trim().isEmpty()) { - return null; - } - - // Split options into key/value pairs (separated by semicolon) - String[] pairs = options.split(";"); - - for (String pair : pairs) { - // Split each pair into key and value (separated by equals sign) - String[] keyValue = pair.split("=", 2); // Limit to 2 in case value contains "=" - - if (keyValue.length == 2) { - String currentKey = keyValue[0].trim(); - String currentValue = keyValue[1].trim(); - - // Check if the searched key was found - if (key.equals(currentKey)) { - return currentValue; - } - } - } - - // Key not found - return null; - } - - /** - * Initializes a new DataViewSectionDataSet based on the given options - * (parameter 'name'). - * - * The expected format of the options string is: - *

- * "name=DATAVIEWNAME" - *

- * The method loads the corresponding dataView definition immediately and stores - * the dataSet in a local cache. - * - * @return view result - * @throws QueryException - */ - public DataViewSectionDataSet loadDataSet(String options) throws QueryException { - DataViewSectionDataSet dataSet = dataSets.get(options); - // Extract and set dataViewName from options - if (dataSet == null) { - String _dataViewName = getOptionValue(options, "name"); - if (_dataViewName != null) { - logger.info("...build new dataSet by options: " + options); - dataSet = new DataViewSectionDataSet(_dataViewName, workflowController.getWorkitem(), dataViewService); - if (dataSet.getDataViewDefinition() != null) { - dataSets.put(options, dataSet); - } - } - } - return dataSet; - } - - public boolean hasDataSet(String options) { - DataViewSectionDataSet dataSet = dataSets.get(options); - // Extract and set dataViewName from options - if (dataSet != null) { - return true; - } - - // test if view exists.. - String _dataViewName = getOptionValue(options, "name"); - if (dataViewService.loadDataViewDefinition(_dataViewName) != null) { - return true; - } - - return false; - } - -} diff --git a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java b/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java deleted file mode 100644 index 5f7a00e..0000000 --- a/office-alexander-logistics-app/src/main/java/org/imixs/workflow/office/forms/DataViewSectionDataSet.java +++ /dev/null @@ -1,279 +0,0 @@ -package org.imixs.workflow.office.forms; - -import java.io.IOException; -import java.io.Serializable; -import java.util.List; -import java.util.UUID; -import java.util.logging.Logger; - -import org.imixs.workflow.FileData; -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.dataview.DataViewController; -import org.imixs.workflow.dataview.DataViewExportEvent; -import org.imixs.workflow.dataview.DataViewPOIHelper; -import org.imixs.workflow.dataview.DataViewService; -import org.imixs.workflow.exceptions.PluginException; -import org.imixs.workflow.exceptions.QueryException; - -public class DataViewSectionDataSet implements Serializable { - private static final long serialVersionUID = 1L; - - public static Logger logger = Logger.getLogger(DataViewSectionController.class.getName()); - - List data = null; - private ItemCollection dataViewDefinition; - private String dataViewName; - private List viewItemDefinitions = null; - private String query = null; - private boolean endOfList = false; - - private long totalCount = 0; - private long totalPages = 0; - - private String sortBy = null; - private boolean sortReverse = false; - private int pageSize = 10; - private int pageIndex = 0; - - private String viewId; - - private DataViewService dataViewService; - - private ItemCollection workitem; - - public DataViewSectionDataSet(String dataViewName, ItemCollection workitem, DataViewService dataViewService) { - this.dataViewName = dataViewName; - this.workitem = workitem; - this.dataViewService = dataViewService; - - // Generate a unique view ID for JSF component identification - this.viewId = "dv_" + UUID.randomUUID().toString().replace("-", ""); - - dataViewDefinition = dataViewService.loadDataViewDefinition(dataViewName); - if (dataViewDefinition == null) { - return; - } - boolean debug = dataViewDefinition.getItemValueBoolean("debug"); - if (debug) { - logger.info("resolve query by dataView '" + dataViewName + "'"); - } - - // preload the viewItem definitions - viewItemDefinitions = this.dataViewService.computeDataViewItemDefinitions(dataViewDefinition); - - // resove query by dataView - query = this.dataViewService.parseQuery(dataViewDefinition, this.workitem); - sortBy = dataViewDefinition.getItemValueString("sort.by"); - sortReverse = dataViewDefinition.getItemValueBoolean("sort.reverse"); - - loadData(); - } - - /** - * return unique data view id for jsf pages - * - * @return - */ - public String getViewId() { - return viewId; - } - - public void forward() { - if (!isEndOfList()) { - pageIndex++; - loadData(); - } - } - - public void back() { - if (pageIndex > 0) { - pageIndex--; - loadData(); - } - } - - /** - * load current page - */ - private void loadData() { - try { - data = dataViewService.getWorkflowService().getDocumentService().find(query, getPageSize(), getPageIndex(), - getSortBy(), isSortReverse()); - - // The end of a list is reached when the size is below or equal the - // pageSize. See issue #287 - totalCount = dataViewService.getWorkflowService().getDocumentService().count(query); - totalPages = (long) Math.ceil((double) totalCount / pageSize); - - if (data.size() < pageSize) { - setEndOfList(true); - } else { - // look ahead if we have more entries... - int iAhead = (getPageSize() * (getPageIndex() + 1)) + 1; - if (totalCount < iAhead) { - // there is no more data - setEndOfList(true); - } else { - setEndOfList(false); - } - } - } catch (QueryException e) { - logger.warning("Failed to load data: " + e.getMessage()); - } - } - - public List getData() { - return data; - } - - public ItemCollection getDataViewDefinition() { - return dataViewDefinition; - } - - public long getTotalCount() { - return totalCount; - } - - public long getTotalPages() { - return totalPages; - } - - public int getPageIndex() { - return pageIndex; - } - - public void setPageIndex(int pageIndex) { - this.pageIndex = pageIndex; - } - - public boolean isEndOfList() { - return endOfList; - } - - public void setEndOfList(boolean endOfList) { - this.endOfList = endOfList; - } - - public String getDataViewName() { - return dataViewName; - } - - public List getViewItemDefinitions() { - return viewItemDefinitions; - } - - /** - * returns the maximum size of a search result - * - * @return - */ - public int getPageSize() { - return pageSize; - } - - /** - * set the maximum size of a search result - * - * @param searchCount - */ - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public String getSortBy() { - return sortBy; - } - - public void setSortBy(String sortBy) { - this.sortBy = sortBy; - } - - public boolean isSortReverse() { - return sortReverse; - } - - public void setSortReverse(boolean sortReverse) { - this.sortReverse = sortReverse; - } - - /** - * Exports data into a excel template processed by apache-poi. The method sends - * a DataViewExport event to allow clients to adapt the export process. - * - * @see DataViewExportEvent - * - * @throws PluginException - * @throws QueryException - */ - public String export() throws PluginException, QueryException { - - // Build target filename - boolean debug = dataViewDefinition.getItemValueBoolean("debug"); - - // start export - if (debug) { - logger.info("│ ├── Query: " + query); - } - - try { - - // test if query exceeds max count - int totalCount = dataViewService.getWorkflowService().getDocumentService().count(query); - // start export - if (debug) { - logger.info("│ ├── Count: " + totalCount); - } - if (totalCount > DataViewService.MAX_ROWS) { - throw new PluginException(DataViewController.class.getSimpleName(), DataViewService.ERROR_CONFIG, - "Data can not be exported into Excel because dataset exceeds " + DataViewService.MAX_ROWS - + " rows!"); - } - String sortBy = dataViewDefinition.getItemValueString("sort.by"); - if (sortBy.isEmpty()) { - sortBy = "$modified"; // default - } - List workitems = dataViewService.getWorkflowService().getDocumentService().find(query, - DataViewService.MAX_ROWS, 0, sortBy, - dataViewDefinition.getItemValueBoolean("sort.reverse")); - - FileData fileDataExport = dataViewService.poiExport(workitems, dataViewDefinition, viewItemDefinitions); - - // create a temp event - ItemCollection event = new ItemCollection().setItemValue("txtActivityResult", - dataViewDefinition.getItemValue("poi.update")); - ItemCollection poiConfig = dataViewService.getWorkflowService().evalWorkflowResult(event, "poi-update", - dataViewDefinition, - false); - - // merge workitem fields (Workaround because custom forms did hard coded map to - // workflowController instead of workitem - - DataViewPOIHelper.poiUpdate(workitem, fileDataExport, poiConfig, dataViewService.getWorkflowService()); - - if (debug) { - logger.info("├── POI Export completed!"); - } - // See: - // https://stackoverflow.com/questions/9391838/how-to-provide-a-file-download-from-a-jsf-backing-bean - DataViewPOIHelper.downloadExcelFile(fileDataExport); - } catch (IOException | QueryException e) { - throw new PluginException(DataViewController.class.getSimpleName(), DataViewService.ERROR_CONFIG, - "Failed to generate Excel Export: " + e.getMessage()); - } - - // return "/pages/admin/excel_export_rechnungsausgang.jsf?faces-redirect=true"; - return ""; - } - - /** - * Returns true if a poi export is defined - * - * @return - */ - public boolean hasPoiExport() { - if (dataViewDefinition != null && !dataViewDefinition.getItemValueString("poi.targetfilename").isBlank()) { - return true; - } - return false; - } -} \ 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..e493807 100644 --- a/pom.xml +++ b/pom.xml @@ -5,40 +5,73 @@ 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 + 5.1.9-SNAPSHOT + 6.2.8-SNAPSHOT + 5.2.0 + 1.0.3-SNAPSHOT + 3.2.4-SNAPSHOT + 1.0.4-SNAPSHOT + + 4.0.0 + 9.9.1-4 + 2.0.24 - 1.1.1 + 1.1.9-SNAPSHOT src/main/webapp @@ -56,6 +89,7 @@ war + Production java:/mail/org.imixs.workflow.mail @@ -67,9 +101,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 +116,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 +232,21 @@ true + + + + ${basedir}/./reports + + + ${basedir}/./workflow + + + ${basedir}/src/test/resources + + + + maven-compiler-plugin @@ -117,8 +260,59 @@ 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,131 @@ provided + + + 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-importer + ${org.imixs.data.version} + + + org.apache.pdfbox + pdfbox + ${apache.pdfbox.version} + + + + + org.imixs.workflow + imixs-ai-workflow + ${org.imixs.ai.version} + + + org.imixs.workflow + imixs-ai-bpmn + ${org.imixs.ai.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-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 +535,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/src/main/java/com/alexanderlogistics/AGLAIInvoiceAdapter.java b/src/main/java/com/alexanderlogistics/AGLAIInvoiceAdapter.java new file mode 100644 index 0000000..097a69c --- /dev/null +++ b/src/main/java/com/alexanderlogistics/AGLAIInvoiceAdapter.java @@ -0,0 +1,167 @@ +package com.alexanderlogistics; + +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import org.imixs.workflow.ItemCollection; +import org.imixs.workflow.SignalAdapter; +import org.imixs.workflow.engine.DocumentService; +import org.imixs.workflow.exceptions.AdapterException; +import org.imixs.workflow.exceptions.PluginException; +import org.imixs.workflow.exceptions.QueryException; + +import com.alexanderlogistics.mahnlauf.MahnlaufService; + +import jakarta.inject.Inject; + +/** + * Der AGLAIInvoiceAdapter weist eien Rechnung dem richtigen Space zu und sucht + * nach dem passenden Business Partner + * + * + * + * @version 1.0 + * @author rsoika + */ +public class AGLAIInvoiceAdapter implements SignalAdapter { + + private static Logger logger = Logger.getLogger(AGLAIInvoiceAdapter.class.getName()); + + public static final String ERROR_MISSING_DATA = "MISSING_DATA"; + public static final String ERROR_CONFIG = "CONFIG_ERROR"; + + @Inject + MahnlaufService mahnlaufService; + + @Inject + DocumentService documentService; + + /** + * This method finds or create the Zahlungsavis and adds a reference + * ($workitemref) to the current invoice. + * + * @throws PluginException + */ + @Override + public ItemCollection execute(ItemCollection workitem, ItemCollection event) + throws AdapterException, PluginException { + + // Inbound Invoice? + if (workitem.getModelVersion().startsWith("rechnungseingang")) { + + // Initialize invoice.positions and Space + initInvoicePositions(workitem); + initInvoiceSpace(workitem); + initInvoiceBusinessPartner(workitem); + } + + return workitem; + + } + + /** + * Diese Methode prüft ob es bei einer Eingangsrechnung zwar das feld + * 'invoice.positions' gibt, aber noch keine Positionsliste + * Die Methode erzeugt eine Default Zeile. + * + * @param workitem + */ + private void initInvoicePositions(ItemCollection workitem) { + + List childList = InvoiceUtil.explodeChildList(workitem); + if (childList.size() == 0 && !workitem.getItemValueString("invoice.positions").isEmpty()) { + String positionNumber = workitem.getItemValueString("invoice.positions"); + + logger.info("├── init invoice.positions: " + positionNumber); + + ItemCollection child = new ItemCollection(); + child.setItemValue("numPos", 1); + child.setItemValue("name", positionNumber); + childList.add(child); + InvoiceUtil.implodeChildList(workitem, childList); + + } + } + + /** + * Die Methode findet den passenden Space anhand + * der REgex in space sofern das workitem noch keinem Space zugewiesen ist + * + * @param workitem + */ + private void initInvoiceSpace(ItemCollection workitem) { + + if (workitem.getItemValueString("space.ref").isEmpty() + && !workitem.getItemValueString("invoice.positions").isEmpty()) { + String positionNumber = workitem.getItemValueString("invoice.positions"); + logger.info("├── init space for position : " + positionNumber); + // Jetzt noch das Space mapping + Map> spacePosMappings = mahnlaufService.loadSpacePosMappings(); + mahnlaufService.mapInvoiceTextToSpace(workitem, spacePosMappings, positionNumber); + } + } + + /** + * Find creditor cdtr.name + * based on the field + * 'document.company' or cdtr.name + * + * Zunächst versuchen wir falls ein cdtr.name von der KI gefunden wurde dieesn + * über das Businesspartner Interface aufzulösne. + * Falls das nicht gelingt, suchen wir nach einer alten Rechnung mit der selben + * document.company + * + */ + private void initInvoiceBusinessPartner(ItemCollection workitem) { + if (workitem.getItemValueString("partner.id").isEmpty() + && !workitem.getItemValueString("document.company").isEmpty()) { + + String companyName = workitem.getItemValueString("document.company"); + String cdtrName = workitem.getItemValueString("cdtr.name"); + logger.info("├── init cdtr.name for document.company: " + companyName); + + // erster versuch über Busienss partner. + String query = "(type:workitem OR type:workitemarchive) AND ($modelversion:businesspartner*) AND (partner.name:\"" + + cdtrName + "\")"; + + try { + List result = documentService.find(query, 1, 0, "$created", true); + if (result.size() == 1) { + logger.info("│ ├── found business partner by cdtr.name"); + ItemCollection businessPartner = result.get(0); + workitem.setItemValue("cdtr.number", businessPartner.getItemValueString("cdtr.number")); + workitem.setItemValue("cdtr.name", businessPartner.getItemValueString("cdtr.name")); + workitem.setItemValue("partner.id", businessPartner.getItemValueString("partner.id")); + workitem.setItemValue("partner.name", businessPartner.getItemValueString("cdtr.name")); + return; + } + } catch (QueryException e) { + // not found! + logger.warning("Failed to lookup company name '" + companyName + "' : " + e.getMessage()); + } + + // Eine Suche über den exakten Namen ist sinnlos gewesen, daher versuchen wir + // nun über den letzten Treffer + query = "(type:workitem OR type:workitemarchive) AND ($modelversion:rechnungseingang*) AND (document.company:\"" + + companyName + "\") AND NOT (partner.id=\"\") AND ($taskid:[5010 TO 5900])"; + + try { + List result = documentService.find(query, 1, 0, "$created", true); + if (result.size() == 1) { + logger.info("│ ├── found business partner by last invoice"); + ItemCollection invoice = result.get(0); + workitem.setItemValue("cdtr.number", invoice.getItemValueString("cdtr.number")); + workitem.setItemValue("cdtr.name", invoice.getItemValueString("cdtr.name")); + workitem.setItemValue("partner.id", invoice.getItemValueString("partner.id")); + workitem.setItemValue("partner.name", invoice.getItemValueString("cdtr.name")); + } + } catch (QueryException e) { + // not found! + logger.warning("Failed to lookup company name '" + companyName + "' : " + e.getMessage()); + } + + } + + } +} \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java similarity index 90% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java index ae2d4f5..449ac2b 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java +++ b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerDebitor.java @@ -120,55 +120,57 @@ public class AGLAnalyticControllerDebitor implements Serializable { link = link + "&processref=" + process.getUniqueID() + "&phrase=" + getDbtNr(); } if ("analytic.invoices.count.all".equals(event.getKey())) { - event.setValue("" + countAll); - event.setLabel(formatTotals(totalAllCurrency1, totalAllCurrency2)); - event.setDescription("Total invoices"); - event.getWorkitem().setItemValue("invoices.total", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", countAll); + event.getData().setItemValue("label", formatTotals(totalAllCurrency1, totalAllCurrency2)); + event.getData().setItemValue("description", "Total invoices"); + event.getWorkitem().setItemValue("invoices.total", countAll); + event.getWorkitem().setItemValue("link", link); } if ("analytic.invoices.count.open".equals(event.getKey())) { - event.setValue("" + countOpen); - event.setLabel(formatTotals(totalOpenCurrency1, totalOpenCurrency2)); - event.setDescription("Total invoices not yet in due"); - event.getWorkitem().setItemValue("invoices.total.open", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countOpen); + event.getData().setItemValue("label", formatTotals(totalOpenCurrency1, totalOpenCurrency2)); + event.getData().setItemValue("description", "Total invoices not yet in due"); + event.getWorkitem().setItemValue("invoices.total.open", countOpen); + event.getWorkitem().setItemValue("link", link); } if ("analytic.invoices.count.due".equals(event.getKey())) { - event.setValue("" + countDue); - event.setLabel(formatTotals(totalDueCurrency1, totalDueCurrency2)); - event.setDescription("Total invoices in due"); - event.getWorkitem().setItemValue("invoices.total.due", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countDue); + event.getData().setItemValue("label", formatTotals(totalDueCurrency1, totalDueCurrency2)); + event.getData().setItemValue("description", "Total invoices in due"); + event.getWorkitem().setItemValue("invoices.total.due", countDue); + event.getWorkitem().setItemValue("link", link); } + if ("analytic.invoices.count.dunning".equals(event.getKey())) { - event.setValue("" + countDunning); - event.setLabel(formatTotals(totalDunningCurrency1, totalDunningCurrency2)); - event.setDescription("Total invoices in dunning"); - event.getWorkitem().setItemValue("invoices.total.dunning", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countDunning); + event.getData().setItemValue("label", formatTotals(totalDunningCurrency1, totalDunningCurrency2)); + event.getData().setItemValue("description", "Total invoices in dunning"); + event.getWorkitem().setItemValue("invoices.total.dunning", countDunning); + event.getWorkitem().setItemValue("link", link); } if ("analytic.payment.avg.due".equals(event.getKey())) { - event.setValue("" + averagePaymentDue); - event.setLabel("days"); - event.setDescription("Average terms of credit in the last 12 months."); - event.getWorkitem().setItemValue("payment.avg.due", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + averagePaymentDue); + event.getData().setItemValue("label", "days"); + event.getData().setItemValue("description", "Average terms of credit in the last 12 months."); + event.getWorkitem().setItemValue("payment.avg.due", averagePaymentDue); + event.getWorkitem().setItemValue("link", link); } + if ("analytic.payment.avg.days".equals(event.getKey())) { - event.setValue("" + averagePaymentDays); - event.setLabel("days"); - event.setDescription("Average duration for payment during the last 12 months."); - event.getWorkitem().setItemValue("payment.avg.days", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + averagePaymentDays); + event.getData().setItemValue("label", "days"); + event.getData().setItemValue("description", "Average duration for payment during the last 12 months."); + event.getWorkitem().setItemValue("payment.avg.days", averagePaymentDays); + event.getWorkitem().setItemValue("link", link); } if ("analytic.invoices.trend".equals(event.getKey())) { - event.setValue(chartData); - event.setLabel("Payment duration in days"); - event.setDescription("Payment practice by week"); + event.getData().setItemValue("value", chartData); + event.getData().setItemValue("label", "Payment duration in days"); + event.getData().setItemValue("description", "Payment practice by week"); } } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java similarity index 80% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java index d20f511..76d3f7b 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java +++ b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java @@ -100,34 +100,39 @@ public class AGLAnalyticControllerOPListe implements Serializable { + "&spaceref=" + departmentID; } if ("analytic.invoices.count.all".equals(event.getKey())) { - event.setValue("" + countAll); - event.setLabel(resourceBundleHandler.findMessage("oplist.invoices")); - event.setDescription(resourceBundleHandler.findMessage("oplist.invoices.description.all")); - event.getWorkitem().setItemValue("invoices.total", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countAll); + event.getData().setItemValue("label", resourceBundleHandler.findMessage("oplist.invoices")); + event.getData().setItemValue("description", + resourceBundleHandler.findMessage("oplist.invoices.description.all")); + event.getWorkitem().setItemValue("invoices.total", countAll); + event.getWorkitem().setItemValue("link", link); } if ("analytic.invoices.count.open".equals(event.getKey())) { - event.setValue("" + (countOpen)); - event.setLabel(resourceBundleHandler.findMessage("oplist.invoices")); - event.setDescription(resourceBundleHandler.findMessage("oplist.invoices.description.open")); - event.getWorkitem().setItemValue("invoices.total.open", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + (countOpen)); + event.getData().setItemValue("label", resourceBundleHandler.findMessage("oplist.invoices")); + event.getData().setItemValue("description", + resourceBundleHandler.findMessage("oplist.invoices.description.open")); + event.getWorkitem().setItemValue("invoices.total.open", countOpen); + event.getWorkitem().setItemValue("link", link); } if ("analytic.invoices.count.due".equals(event.getKey())) { - event.setValue("" + countDue); - event.setLabel(resourceBundleHandler.findMessage("oplist.invoices")); - event.setDescription(resourceBundleHandler.findMessage("oplist.invoices.description.due")); - event.getWorkitem().setItemValue("invoices.total.due", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countDue); + event.getData().setItemValue("label", resourceBundleHandler.findMessage("oplist.invoices")); + event.getData().setItemValue("description", + resourceBundleHandler.findMessage("oplist.invoices.description.due")); + event.getWorkitem().setItemValue("invoices.total.due", countDue); + event.getWorkitem().setItemValue("link", link); } + if ("analytic.invoices.count.dunning".equals(event.getKey())) { - event.setValue("" + countDunning); - event.setLabel(resourceBundleHandler.findMessage("oplist.invoices")); - event.setDescription(resourceBundleHandler.findMessage("oplist.invoices.description.dunning")); - event.getWorkitem().setItemValue("invoices.total.dunning", event.getValue()); - event.setLink(link); + event.getData().setItemValue("value", "" + countDunning); + event.getData().setItemValue("label", resourceBundleHandler.findMessage("oplist.invoices")); + event.getData().setItemValue("description", + resourceBundleHandler.findMessage("oplist.invoices.description.dunning")); + event.getWorkitem().setItemValue("invoices.total.dunning", countDunning); + event.getWorkitem().setItemValue("link", link); } } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java similarity index 88% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java rename to src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java index 2f3682a..942cadf 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java +++ b/src/main/java/com/alexanderlogistics/AGLAnalyticControllerSteuer.java @@ -69,53 +69,57 @@ public class AGLAnalyticControllerSteuer implements Serializable { link = link + "?processref=" + process.getUniqueID() + "&workflowgroup=Steuerbescheid"; } if ("analytic.steuer.eust".equals(event.getKey())) { - event.setValue(computeSteuerbescheideEUST()); - event.setLabel("EUR"); - event.setDescription("Gesamt Einfuhrumsatzsteuer (EUSt)"); - event.getWorkitem().setItemValue("eust.total", event.getValue()); - event.setLink(link); + Object eustTotal = computeSteuerbescheideEUST(); + event.getData().setItemValue("value", eustTotal); + event.getData().setItemValue("label", "EUR"); + event.getData().setItemValue("description", "Gesamt Einfuhrumsatzsteuer (EUSt)"); + event.getWorkitem().setItemValue("eust.total", eustTotal); + event.getWorkitem().setItemValue("link", link); } + if ("analytic.steuer.zoll".equals(event.getKey())) { - event.setValue(computeSteuerbescheideZoll()); - event.setLabel("EUR"); - event.setDescription("Gesamt Zölle (ZOLLEU)"); - event.setLink(link); + event.getData().setItemValue("value", computeSteuerbescheideZoll()); + event.getData().setItemValue("label", "EUR"); + event.getData().setItemValue("description", "Gesamt Zölle (ZOLLEU)"); + event.getWorkitem().setItemValue("link", link); } if ("analytic.steuer.total".equals(event.getKey())) { - event.setValue(computeSteuerbescheideTotal()); - event.setLabel("EUR"); - event.setDescription("Alle Steuerbescheide die noch nicht abgerechnet wurden."); - event.setLink(link); + event.getData().setItemValue("value", computeSteuerbescheideTotal()); + event.getData().setItemValue("label", "EUR"); + event.getData().setItemValue("description", "Alle Steuerbescheide die noch nicht abgerechnet wurden."); + event.getWorkitem().setItemValue("link", link); } if ("analytic.steuer.saldo".equals(event.getKey())) { - event.setValue(computeSteuerbescheideSaldo()); - event.setLabel("EUR"); - event.setDescription("Saldo aller Steuerbescheide die noch nicht abgerechnet wurden."); - event.setLink(link); + event.getData().setItemValue("value", computeSteuerbescheideSaldo()); + event.getData().setItemValue("label", "EUR"); + event.getData().setItemValue("description", + "Saldo aller Steuerbescheide die noch nicht abgerechnet wurden."); + event.getWorkitem().setItemValue("link", link); } if ("analytic.steuer.due".equals(event.getKey())) { - event.setValue(computeSteuerbescheideSaldoDue()); - event.setLabel("EUR"); - event.setDescription("Saldo aller überfälligen Steuerbescheide die noch nicht abgerechnet wurden."); - // event.setLink(link + "&task=Überfällig"); - event.setLink(link + "&task=1200"); + event.getData().setItemValue("value", computeSteuerbescheideSaldoDue()); + event.getData().setItemValue("label", "EUR"); + event.getData().setItemValue("description", + "Saldo aller überfälligen Steuerbescheide die noch nicht abgerechnet wurden."); + // event.getWorkitem().setItemValue("link", link + "&task=Überfällig"); + event.getWorkitem().setItemValue("link", link + "&task=1200"); } // Charts if ("analytic.steuer.trend".equals(event.getKey())) { - event.setValue(accumulateSteuerbescheideByWeek()); - event.setLabel("Zoll & EUST"); - event.setDescription("Fälligkeiten nach KW"); + event.getData().setItemValue("value", accumulateSteuerbescheideByWeek()); + event.getData().setItemValue("label", "Zoll & EUST"); + event.getData().setItemValue("description", "Fälligkeiten nach KW"); } if ("analytic.steuer.trend.abteilung".equals(event.getKey())) { - event.setValue(accumulateSteuerbescheideAbteilungByWeek()); - event.setLabel("Nach Abteilungen"); - event.setDescription("Offene Salden nach KW pro Abteilung"); + event.getData().setItemValue("value", accumulateSteuerbescheideAbteilungByWeek()); + event.getData().setItemValue("label", "Nach Abteilungen"); + event.getData().setItemValue("description", "Offene Salden nach KW pro Abteilung"); } } 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 97% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java rename to src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java index 2516dda..004180a 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java +++ b/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufService.java @@ -129,10 +129,11 @@ public class MahnlaufService { * @param workitem * @param spacePosMappings */ - public void mapInvoiceTextToSpace(ItemCollection workitem, Map> spacePosMappings) { + public void mapInvoiceTextToSpace(ItemCollection workitem, Map> spacePosMappings, + String positionNumber) { // Jezt noch das Space mapping // dazu kucken wir in alle spaces den config wert 'pos.mapping' - String text = workitem.getItemValueString("invoice.text"); + String text = positionNumber; // workitem.getItemValueString("invoice.text"); if (!text.isEmpty()) { boolean found = false; for (Map.Entry> entry : spacePosMappings.entrySet()) { 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 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java rename to src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java index c338a3f..ef8821e 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java +++ b/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java @@ -428,7 +428,8 @@ public class CargosoftXMLEAkteImportService { readXMLRows(doc, workitem); // Jetzt noch das Space mapping workitem.setItemValue("invoice.text", workitem.getItemValueString("invoice.positions")); - mahnlaufService.mapInvoiceTextToSpace(workitem, spacePosMappings); + mahnlaufService.mapInvoiceTextToSpace(workitem, spacePosMappings, + workitem.getItemValueString("invoice.positions")); // Finally we attache the pdf file and the XML content to the workitem. attacheFiles(doc, workitem); 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 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java rename to src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java index 6ae1d73..69ef91f 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java +++ b/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java @@ -482,7 +482,8 @@ public class CargosoftXMLInvoiceImportService { resolveATCNumbers(doc, workitem); // Jetzt noch das Space mapping - mahnlaufService.mapInvoiceTextToSpace(workitem, spacePosMappings); + mahnlaufService.mapInvoiceTextToSpace(workitem, spacePosMappings, + workitem.getItemValueString("invoice.text")); // Rückstellungen ignorieren if (isRueckStellung(workitem)) { 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 99% rename from office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoController.java rename to src/main/java/com/alexanderlogistics/zoho/ZohoController.java index fa0660a..a83dc16 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoController.java +++ b/src/main/java/com/alexanderlogistics/zoho/ZohoController.java @@ -36,7 +36,7 @@ import jakarta.inject.Named; /** * Der ZohoController ist für das Admin Interface um Access Tokens zu erzeugen. * - * @see admin/zoho.xhml + * @see zoho.xhml * * @author rsoika * 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/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/src/main/resources/build.properties b/src/main/resources/build.properties new file mode 100644 index 0000000..a9842bc --- /dev/null +++ b/src/main/resources/build.properties @@ -0,0 +1,7 @@ +# Build Information +build.version=${project.version} +build.timestamp=${org.imixs.build.timestamp} +build.office.version=${org.imixs.office.version} +build.marty.version=${org.imixs.marty.version} +build.workflow.version=${org.imixs.workflow.version} +build.name=${imixs-office.applicationname} \ No newline at end of file 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/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_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 90% 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 index c0857b6..a751b87 100644 --- 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 @@ -27,6 +27,7 @@ width: 100%; } +

@@ -40,7 +41,7 @@ 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 77% 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 index 7b100f9..31b93cd 100644 --- 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 @@ -41,23 +41,24 @@ margin-left: 20px; } +
- +
- +
- #{analyticController.getDescription(item.name)} + #{data.item['description']} - - + + 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/main/webapp/pages/workitems/forms/alexander/section_bp_dunnings.xhtml b/src/main/webapp/pages/workitems/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/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/sections/alexander/section_steuerbescheid_invoices.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml b/src/main/webapp/pages/workitems/sections/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/sections/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/sections/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/sections/alexander/sub_positionen_read.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/src/test/java/com/alexanderlogistics/EnvLoader.java b/src/test/java/com/alexanderlogistics/EnvLoader.java new file mode 100644 index 0000000..438b0a4 --- /dev/null +++ b/src/test/java/com/alexanderlogistics/EnvLoader.java @@ -0,0 +1,32 @@ +package com.alexanderlogistics; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +/** + * Helper class for junit tests to load secrets + * + * + */ +public class EnvLoader { + private EnvLoader() { + } + + public static void loadIfPresent(Path envFile) throws IOException { + if (!Files.exists(envFile)) { + return; + } + for (String line : Files.readAllLines(envFile)) { + if (line.isBlank() || line.startsWith("#")) { + continue; + } + String[] parts = line.split("=", 2); + if (parts.length == 2) { + // System.setProperty instead of env, since Java env vars are immutable at + // runtime + System.setProperty(parts[0].trim(), parts[1].trim()); + } + } + } +} 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 86% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java rename to src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java index 7db555d..0d25482 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java +++ b/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import java.io.IOException; +import java.nio.file.Path; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; @@ -13,6 +15,7 @@ import org.imixs.workflow.ItemCollection; import org.imixs.workflow.importer.DocumentImportService; import org.imixs.workflow.importer.mail.IMAPBasicAuthenticator; import org.imixs.workflow.importer.mail.IMAPOutlookAuthenticator; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -31,7 +34,18 @@ public class TestIMAPAuhtenticators { private final static Logger logger = Logger.getLogger(TestIMAPAuhtenticators.class.getName()); - private final static String secret = "0lG8Q~UigK0f7n-cR8SSiSXhVChkBD3Qm1CqvbID"; + private static String TENANT_ID = ""; + private static String CLIENT_ID = ""; + private static String CLIENT_SECRET = ""; + + @BeforeAll + public static void setUp() throws IOException { + // Loads local .env file + EnvLoader.loadIfPresent(Path.of("src/test/resources/.env")); + TENANT_ID = System.getProperty("TENANT_ID"); + CLIENT_SECRET = System.getProperty("CLIENT_SECRET"); + CLIENT_ID = System.getProperty("CLIENT_ID"); + } /** * Test IMAP connect via OAuth for email address imixs@alexander-logistics.com @@ -47,11 +61,11 @@ public class TestIMAPAuhtenticators { source.setItemValue(DocumentImportService.SOURCE_ITEM_SERVER, "outlook.office365.com"); source.setItemValue(DocumentImportService.SOURCE_ITEM_PORT, "993"); source.setItemValue(DocumentImportService.SOURCE_ITEM_USER, "imixs@alexander-logistics.com"); - source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, secret); + source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, CLIENT_SECRET); Properties sourceOptions = new Properties(); - sourceOptions.put("microsoft.tenantid", "51e2f038-0a96-41be-801d-bb4118aa018e"); - sourceOptions.put("microsoft.clientid", "39e9eec5-6939-47dc-9729-3438a9898e63"); + sourceOptions.put("microsoft.tenantid", TENANT_ID); + sourceOptions.put("microsoft.clientid", CLIENT_ID); logger.info("Connect started...."); try { Store store = auth.openMessageStore(source, sourceOptions); @@ -89,11 +103,11 @@ public class TestIMAPAuhtenticators { source.setItemValue(DocumentImportService.SOURCE_ITEM_PORT, "993"); source.setItemValue(DocumentImportService.SOURCE_ITEM_USER, "Imixsbhv@alexander-logistics.com"); - source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, secret); + source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, CLIENT_SECRET); Properties sourceOptions = new Properties(); - sourceOptions.put("microsoft.tenantid", "51e2f038-0a96-41be-801d-bb4118aa018e"); - sourceOptions.put("microsoft.clientid", "39e9eec5-6939-47dc-9729-3438a9898e63"); + sourceOptions.put("microsoft.tenantid", TENANT_ID); + sourceOptions.put("microsoft.clientid", CLIENT_ID); logger.info("Connect started...."); try { @@ -131,11 +145,11 @@ public class TestIMAPAuhtenticators { source.setItemValue(DocumentImportService.SOURCE_ITEM_PORT, "993"); source.setItemValue(DocumentImportService.SOURCE_ITEM_USER, "imixspl@alexander-logistics.com"); - source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, secret); + source.setItemValue(DocumentImportService.SOURCE_ITEM_PASSWORD, CLIENT_SECRET); Properties sourceOptions = new Properties(); - sourceOptions.put("microsoft.tenantid", "51e2f038-0a96-41be-801d-bb4118aa018e"); - sourceOptions.put("microsoft.clientid", "39e9eec5-6939-47dc-9729-3438a9898e63"); + sourceOptions.put("microsoft.tenantid", TENANT_ID); + sourceOptions.put("microsoft.clientid", CLIENT_ID); logger.info("Connect started...."); try { diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java similarity index 97% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java rename to src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java index 7c94d10..ca456bd 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java +++ b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -21,6 +22,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; import org.eclipse.angus.mail.imap.IMAPFolder; import org.imixs.workflow.importer.mail.IMAPImportHelper; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -49,12 +51,18 @@ import jakarta.mail.internet.MimeUtility; */ public class TestIMAPOutlookOAuth { - private static final String TENANT_ID = "51e2f038-0a96-41be-801d-bb4118aa018e"; - private static final String CLIENT_ID = "39e9eec5-6939-47dc-9729-3438a9898e63"; - // private static final String CLIENT_SECRET = - // "A6x8Q~EWVUyt~gfyTHtIJf4ig.F9tajUpEEXMaCL"; + private static String TENANT_ID = ""; + private static String CLIENT_ID = ""; + private static String CLIENT_SECRET = ""; - private static final String CLIENT_SECRET = "0lG8Q~UigK0f7n-cR8SSiSXhVChkBD3Qm1CqvbID"; + @BeforeAll + public static void setUp() throws IOException { + // Loads local .env file + EnvLoader.loadIfPresent(Path.of("src/test/resources/.env")); + TENANT_ID = System.getProperty("TENANT_ID"); + CLIENT_SECRET = System.getProperty("CLIENT_SECRET"); + CLIENT_ID = System.getProperty("CLIENT_ID"); + } /* * Neue Daten diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java similarity index 94% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java rename to src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java index 22a34dd..c974665 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java +++ b/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -31,6 +32,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; import org.imixs.workflow.importer.mail.IMAPImportHelper; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -45,9 +47,18 @@ import com.sun.mail.imap.IMAPFolder; */ public class TestIMAPOutlookOAuthDebug { - private static final String TENANT_ID = "xxxxxx"; - private static final String CLIENT_ID = "yyyyyyy"; - private static final String CLIENT_SECRET = "zzzzz"; + private static String TENANT_ID = ""; + private static String CLIENT_ID = ""; + private static String CLIENT_SECRET = ""; + + @BeforeAll + public static void setUp() throws IOException { + // Loads local .env file + EnvLoader.loadIfPresent(Path.of("src/test/resources/.env")); + TENANT_ID = System.getProperty("TENANT_ID"); + CLIENT_SECRET = System.getProperty("CLIENT_SECRET"); + CLIENT_ID = System.getProperty("CLIENT_ID"); + } @Test @Disabled 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 99% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java rename to src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java index 925a900..5eae5fe 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java +++ b/src/test/java/com/alexanderlogistics/migration/MigrationMahnerAusziffern.java @@ -31,7 +31,7 @@ public class MigrationMahnerAusziffern { WorkflowClient workflowCLient = null; String user = "archive"; - String ps = "archive4imixs"; + String ps = ""; // ARCHIVE_PASSWORD! String restAPI = "https://alexander-logistics.office-workflow.de/api"; int countProcessed = 0; int notFound = 0; 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 99% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java rename to src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java index 018034d..b89fa6b 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java +++ b/src/test/java/com/alexanderlogistics/migration/MigrationSpaceZuordnung.java @@ -29,7 +29,7 @@ public class MigrationSpaceZuordnung { WorkflowClient workflowCLient = null; String user = "archive"; - String ps = "archive4imixs"; + String ps = ""; // ARCHIVE_PASSWORD! String restAPI = "https://alexander-logistics.office-workflow.de/api"; int countProcessed = 0; int notFound = 0; 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 96% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/rest/TestDataClient.java rename to src/test/java/com/alexanderlogistics/rest/TestDataClient.java index dd93722..4613329 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/rest/TestDataClient.java +++ b/src/test/java/com/alexanderlogistics/rest/TestDataClient.java @@ -30,7 +30,7 @@ public class TestDataClient { Client rsClient = null; String restAPI = "https://alexander-logistics.office-workflow.de/api"; - String sessionID = "rMxsrGJwT2GOisKrjEcaI5kpny_DnWieEPbIUvH2.imixs-office-workflow-8c9795689-d62t5"; + String sessionID = "xxxxxxxxxxxxxxxxxx"; String reportName = "Steuerbescheide"; @BeforeEach 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 90% rename from office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java rename to src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java index 30a15d7..b927c2b 100644 --- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java +++ b/src/test/java/com/alexanderlogistics/zoho/TestUpdateTokens.java @@ -42,20 +42,9 @@ public class TestUpdateTokens { private String redirectURI = "https://alexander-logistics-dwc.office-workflow.de/api/zoho/grant"; - // private String clientID = "1000.GR5FTPZYB06HEWSFSSX4DJU3OBD4EJ"; - // private String clientSecret = "3f3e74c5212bbc924a7ebf77f887c6296db1106c47"; - - // forum - // private String clientID = "1000.ECQXCXYOTQ9LGLRK2V4PYU94OORJKR"; - // private String clientSecret = "ce93df3860fc3d804cd015a0bec9b92dcfcf6329b8"; - - // DWC - // private String clientID = "1000.MQE1SU8UGY6F2PBPASOXGTLWYQD1FS"; - // private String clientSecret = "1ca70e1ab803b3fed6b1b5e00858c316e2003d289b"; - // Atari - private String clientID = "1000.86O4P321HDYDRX0Q0N1G7YOJRJ9D5W"; - private String clientSecret = "2a67b6cfc364f5df27cc8eb33e9b0e4e8a0221ebc3"; + private String clientID = "1000.xxxxxxxxxxxxxxxxxxx"; + private String clientSecret = "2axxxxxxxxxxxxxxxxx"; // ROLES // ZohoBooks.contacts.ALL,ZohoBooks.invoices.ALL,ZohoBooks.bills.ALL @@ -82,7 +71,7 @@ public class TestUpdateTokens { logger.info("├── update Zoho tokens"); refreshToken = null; accessToken = null; - code = "1000.d2a4e3a9622fc4c5eebe1ae5ee1989b5.d6899d23da56e6d8f73125ebaa498a3e"; + code = "1000.xxxxxxxxxxx"; try { // String requestUrl = "https://accounts.zoho.eu/oauth/v2/token" + "?code=" @@ -147,7 +136,7 @@ public class TestUpdateTokens { public void testRefreshAccessToken() throws IOException { logger.info("├── refresh Zoho access token"); - refreshToken = "1000.cf458816e97f848df8134ce1c7e923a1.5b9dbdee317e35d7f0c619e7648d55ff"; + refreshToken = "1000.xxxxxxxxxxxxxxxx"; try { String requestUrl = "https://accounts.zoho.eu/oauth/v2/token" + "?refresh_token=" @@ -200,7 +189,7 @@ public class TestUpdateTokens { public void testGetOrganizations() throws IOException { logger.info("├── get Zoho organizations"); - accessToken = "1000.21912dc6af0906707f51d336fd98ab61.eb153952d0d86a828fcb7e18426c2c1a"; + accessToken = "1000.xxxxxxxxxxxxxxx"; try { String url = "https://www.zohoapis.eu/books/v3/organizations"; @@ -243,7 +232,7 @@ public class TestUpdateTokens { public void testGetInvoices() throws IOException { logger.info("├── get Zoho documents"); - accessToken = "1000.21912dc6af0906707f51d336fd98ab61.eb153952d0d86a828fcb7e18426c2c1a"; + accessToken = "1000.xxxxxxxxxxxx"; try { String url = "https://www.zohoapis.eu/books/v3/invoices?organization_id=20105697367"; 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..5eeb657 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-20T11:01:10.498746084Z + 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-20 + + + + + + + + + + + + 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..4e6ca8f 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-20T11:01:10.565274539Z + 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-20 + + + + 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..7c9b026 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-20T11:01:10.473274636Z + 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..fc83b7a 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-20T11:01:10.549495260Z + 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-20 + + + + + + + + + + + + 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..6c2836d 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-20T11:01:10.514998809Z + 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-20 + + + + + + + + + + + 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..e06a82e 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-20T11:01:10.586373483Z + 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-20 + + + + 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..5a1e0c4 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-20T11:01:10.574896691Z + 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-20 + + + + -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/workflow/ams/rechnungseingang-ams-1.1.0.bpmn b/workflow/ams/rechnungseingang-ams-1.1.0.bpmn new file mode 100644 index 0000000..6718ca6 --- /dev/null +++ b/workflow/ams/rechnungseingang-ams-1.1.0.bpmn @@ -0,0 +1,5099 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + StartEvent_1 + IntermediateCatchEvent_6 + IntermediateCatchEvent_40 + IntermediateThrowEvent_4 + IntermediateCatchEvent_19 + IntermediateThrowEvent_3 + IntermediateCatchEvent_31 + Task_14 + EventBasedGateway_3 + Task_13 + EndEvent_4 + IntermediateCatchEvent_3 + IntermediateCatchEvent_5000-20 + + DataObject_5 + TextAnnotation_4 + event_ceK05A + + + EndEvent_1 + Task_4 + IntermediateCatchEvent_25 + Task_5005 + IntermediateCatchEvent_5005-10 + IntermediateCatchEvent_55 + IntermediateCatchEvent_36 + IntermediateCatchEvent_32 + IntermediateCatchEvent_21 + EventBasedGateway_2 + IntermediateCatchEvent_5005-20 + IntermediateCatchEvent_26 + Task_12 + IntermediateCatchEvent_28 + ExclusiveGateway_10 + + ExclusiveGateway_3 + DataObject_1 + TextAnnotation_1 + event_pAR6FQ + event_FPc1AA + Task_8 + EndEvent_3 + IntermediateCatchEvent_7 + IntermediateCatchEvent_24 + + + Task_5000 + IntermediateCatchEvent_5000-10 + IntermediateCatchEvent_33 + IntermediateCatchEvent_38 + IntermediateCatchEvent_15 + EndEvent_6 + EventBasedGateway_4 + Task_16 + IntermediateCatchEvent_37 + IntermediateCatchEvent_16 + Task_9 + ExclusiveGateway_2 + IntermediateCatchEvent_29 + IntermediateCatchEvent_39 + IntermediateCatchEvent_20 + Task_3 + IntermediateCatchEvent_17 + IntermediateCatchEvent_35 + IntermediateThrowEvent_1 + IntermediateCatchEvent_58 + Task_5 + IntermediateCatchEvent_48 + IntermediateCatchEvent_8 + IntermediateCatchEvent_4 + IntermediateCatchEvent_14 + EndEvent_2 + Task_6 + IntermediateCatchEvent_23 + Task_19 + IntermediateCatchEvent_63 + IntermediateCatchEvent_41 + IntermediateCatchEvent_65 + IntermediateCatchEvent_66 + + TextAnnotation_5 + DataObject_3 + TextAnnotation_2 + IntermediateCatchEvent_62 + gateway_Al0gGg + event_l03qSg + task_HY50Wg + task_lvQc6Q + event_IqQ0Hw + gateway_ax47Qw + textAnnotation_8SjKMg + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_31 + SequenceFlow_1 + SequenceFlow_123 + SequenceFlow_32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home + + stop + false + + + start + false + +]]> + + + + + + + + + space.name]]> + + + false + + + + + + + SequenceFlow_46 + sequenceFlow_acNhxg + + + + sequenceFlow_Ny3V1A + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus +Zollkurse +]]> + SequenceFlow_38 + SequenceFlow_83 + SequenceFlow_104 + SequenceFlow_134 + SequenceFlow_37 + sequenceFlow_ZFDfeA + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +space.name + +cargosoft-export-1.0 +1000 +100 +(?!txtworkflowhistory)(^[a-zA-Z]|^_) + + + stop + false +]]> + + + + + + + + + + + + false + + + 0 && (a!=b) ) { + result.isValid=false; + result.errorMessage="Der Rechnungsbetrag " + a+ " stimmt nicht mit dem Positionsbetrag " + b + " überein."; +}]]> + + + + SequenceFlow_8 + + + DataOutput_1 + + + DataOutput_1 + + + sequenceFlow_0csSiA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_38 + + + + + + SequenceFlow_37 + SequenceFlow_8 + SequenceFlow_54 + + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_56 + SequenceFlow_24 + sequenceFlow_AajxSw + SequenceFlow_55 + SequenceFlow_50 + SequenceFlow_81 + SequenceFlow_88 + sequenceFlow_W0RBHg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + Association_10 + sequenceFlow_IZAXAQ + + + + + + + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_52 + SequenceFlow_90 + SequenceFlow_47 + sequenceFlow_9rYDHA + + + SequenceFlow_47 + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_55 + SequenceFlow_12 + + + + + + SequenceFlow_1 + SequenceFlow_68 + + sequenceFlow_0csSiA + + + + + + SequenceFlow_126 + + + + + + + + SequenceFlow_12 + SequenceFlow_53 + SequenceFlow_19 + SequenceFlow_25 + + + + + + sepa-export-manual-3.0 +1000 +payment.type +70 +20]]> + + + + + + + + + SequenceFlow_19 + SequenceFlow_23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Rechnungscontrolling]]> + + + + + + + + + + + + false + + + + + + sequenceFlow_Ny3V1A + sequenceFlow_UD0ZBA + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_59 + SequenceFlow_40 + sequenceFlow_k9vKFQ + + + SequenceFlow_40 + + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_23 + SequenceFlow_41 + sequenceFlow_8oj2QQ + SequenceFlow_14 + sequenceFlow_y2ISGw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + SequenceFlow_14 + sequenceFlow_neZW5g + + + + + + + + + + + + + + + + + + + payment.type ]]> + + + + sequenceFlow_y2ISGw + sequenceFlow_W0RBHg + + + + + + + + + + + + _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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_17 + SequenceFlow_60 + SequenceFlow_9 + + + SequenceFlow_9 + + + + + + + SequenceFlow_17 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich löschen? + + stop + false + +cancel]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_76 + SequenceFlow_48 + + + SequenceFlow_48 + + + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_2 + SequenceFlow_78 + SequenceFlow_89 + SequenceFlow_72 + SequenceFlow_86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_52 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_60 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_59 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + $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? +cancel]]> + + + + + + + + + + + + false + + + + + + + + SequenceFlow_61 + + sequenceFlow_k9vKFQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_62 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_56 + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_66 + sequenceFlow_Mz0rbQ + + + SequenceFlow_66 + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgcdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_74 + SequenceFlow_126 + SequenceFlow_46 + SequenceFlow_85 + sequenceFlow_UD0ZBA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Rechnungscontrolling +false +suggest]]> + + + + + + + + + + + + false + + + + + SequenceFlow_74 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +space.name +false]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_73 + SequenceFlow_75 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_78 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_84 + SequenceFlow_87 + SequenceFlow_82 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + 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? + + stop + false + +cancel]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_16 + SequenceFlow_13 + + + SequenceFlow_13 + + + + + + + + + + + SequenceFlow_85 + SequenceFlow_76 + SequenceFlow_16 + + sequenceFlow_GKmxwQ + + + + + + SequenceFlow_90 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_41 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /> + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_104 + + + + + + + + + + + + + + + + + + + + SequenceFlow_123 + + + DataOutput_3 + + + DataOutput_3 + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_68 + SequenceFlow_129 + SequenceFlow_133 + sequenceFlow_MxzvVQ + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + sequenceFlow_MxzvVQ + sequenceFlow_QzY8PA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_129 + + + + + + SequenceFlow_75 + SequenceFlow_134 + + sequenceFlow_acNhxg + + + + + + + + + + + + + + + + + SequenceFlow_24 + + + DataOutput_5 + + + DataOutput_5 + + + + + + + + + + + + + + + + + SequenceFlow_133 + + + DataOutput_6 + + + DataOutput_6 + + + + + + + + + Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden. + Ändern von IBAN und Fälligkeit ist hier möglich + + + + + + + + + + + + + + + + + Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt + + + + + + + + + + + + + + + + + + + + + + sequenceFlow_l7lJjQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false]]> + + + + + + + + + + + + false + + + + sequenceFlow_ZFDfeA + sequenceFlow_l7lJjQ + + + + + + + + + + + + + + + + + + + SequenceFlow_25 + sequenceFlow_9rYDHA + SequenceFlow_42 + sequenceFlow_QzY8PA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + suggest +false + + (^rechnungseingang-sachrechnung-[a-z]{2,3}-\d+(?:\.\d+)?$) + 5001 + 980 + +]]> + + + + + + + + + + + + false + + + + + + + + sequenceFlow_Mz0rbQ + sequenceFlow_GKmxwQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sequenceFlow_8oj2QQ + + + DataOutput_5 + + + DataOutput_5 + + + + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_41 + sequenceFlow_neZW5g + sequenceFlow_y2ISGw + sequenceFlow_ooIFAg + + + + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_41 + sequenceFlow_UPHBoA + sequenceFlow_y2ISGw + sequenceFlow_LeNDAw + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + sequenceFlow_LeNDAw + sequenceFlow_ooIFAg + SequenceFlow_42 + + + + + + + + + + sequenceFlow_IZAXAQ + sequenceFlow_UPHBoA + sequenceFlow_AajxSw + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/pl/rechnungsausgang-pl-1.1.4.bpmn b/workflow/pl/rechnungsausgang-pl-1.1.4.bpmn index a31398d..8cc44cb 100644 --- a/workflow/pl/rechnungsausgang-pl-1.1.4.bpmn +++ b/workflow/pl/rechnungsausgang-pl-1.1.4.bpmn @@ -677,9 +677,6 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - - - SequenceFlow_42 @@ -691,9 +688,6 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_12 - - - @@ -899,15 +893,6 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_13 SequenceFlow_5 - - - - - - - - - @@ -1669,6 +1654,7 @@ AGL Poland Team sequenceFlow_ATB00A sequenceFlow_nrxqhg sequenceFlow_0cMadw + sequenceFlow_eH5Hyg @@ -1925,12 +1911,6 @@ AGL Poland Team - - - - - - sequenceFlow_sNNdbA @@ -2358,7 +2338,7 @@ AGL Poland Team - + @@ -2410,7 +2390,8 @@ AGL Poland Team - ]]> + +home]]> @@ -2436,6 +2417,7 @@ if (workitem.getItemValueString('txtcomment') === '') { sequenceFlow_MdTuKA + sequenceFlow_eH5Hyg sequenceFlow_GvWQ4w @@ -2560,9 +2542,6 @@ if (workitem.getItemValueString('txtcomment') === '') { sequenceFlow_PTroSQ - - - @@ -2741,9 +2720,6 @@ if (workitem.getItemValueString('txtcomment') === '') { - - - sequenceFlow_Rl2AzA @@ -2938,6 +2914,36 @@ if (workitem.getItemValueString('txtcomment') === '') { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3722,6 +3728,14 @@ if (workitem.getItemValueString('txtcomment') === '') { + + + + + + + + diff --git a/workflow/posteingang-de-2.0.1_debug.bpmn b/workflow/posteingang-en-3.0.0.bpmn similarity index 89% rename from workflow/posteingang-de-2.0.1_debug.bpmn rename to workflow/posteingang-en-3.0.0.bpmn index ba15d21..4392778 100644 --- a/workflow/posteingang-de-2.0.1_debug.bpmn +++ b/workflow/posteingang-en-3.0.0.bpmn @@ -14,7 +14,6 @@ - @@ -33,7 +32,7 @@ - + true @@ -60,7 +59,6 @@ task_uB6BGQ textAnnotation_CtU05A task_PsBytg - dataObject_CRa7xA event_Zxhr0w dataObject_vVKXIg event_yQLmNA @@ -84,6 +82,8 @@ event_VEvZRQ event_Xk1mPA event_a1P5WQ + dataObject_UIvZkA + dataObject_BbVs7w @@ -183,7 +183,6 @@ Betrag: _amount (Brutto € _amount_brutto $workflowgroup - $workflowstatus]]> - SequenceFlow_9 sequenceFlow_4gpPgw sequenceFlow_CbkmwA @@ -240,11 +239,18 @@ Betrag: _amount (Brutto € _amount_brutto -X-Tika-OCRLanguage=eng+deu -X-Tika-PDFocrStrategy=OCR_ONLY -(PDF|pdf)$ -10 -Empfang]]> +Empfang + + + (pdf|PDF|eml|msg)$ + (pdf|PDF)$ + 10 + + + + true + +]]> @@ -260,7 +266,6 @@ Betrag: _amount (Brutto € _amount_brutto - SequenceFlow_9 SequenceFlow_2 @@ -272,9 +277,6 @@ Betrag: _amount (Brutto € _amount_brutto sequenceFlow_VlPVJg - - - @@ -323,9 +325,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - @@ -356,7 +355,6 @@ Betrag: _amount (Brutto € _amount_brutto - sequenceFlow_fN22Gg sequenceFlow_bh4DIw sequenceFlow_ofQKHg @@ -372,9 +370,6 @@ Assign invoice to process 'Front Desk']]> - - - @@ -407,27 +402,9 @@ Company: document.company
]]> sequenceFlow_JpNUKg - sequenceFlow_8SpIiA sequenceFlow_I8o4DA sequenceFlow_KKWo0w - - - - - - - - - - - - -]]> - - - - @@ -511,9 +488,9 @@ Company: document.company
]]> - https://llama.cpp.imixs.com/ + api.llama.cpp.imixs.com XML - false + true cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total @@ -533,7 +510,6 @@ Company: document.company
]]> DataOutput_2 - sequenceFlow_aC0skQ sequenceFlow_YMtfiw sequenceFlow_PWXjog @@ -563,56 +539,27 @@ Company: document.company
]]> sequenceFlow_JpNUKg sequenceFlow_lmU9IA - sequenceFlow_aC0skQ sequenceFlow_A62nqQ sequenceFlow_DdWK6A - - - - - - - + - {"n_predict": 4096, "temperature": 0 } - {"n_predict": 4096, "temperature": 0 } + invoice.summary + -[INST]Transfer the invoice data into an XML object with the following structure: +Note: +- The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number] ==> "invoice.positions" +- The posting period is the period of the invoice date [YYYYMM] ==> "invoice.period" - - ... - ... - 2024-12-31 - 2024-12-31 - 1234.00 - ... - ... - ... - - -Transfer the individual invoice data to the XML tags, taking into account the following suggestions for mapping: - - - Company name ==> "cdtr.name" (the name of the company that issued the invoice document, not the recipient) - - Invoice number ==> "invoice.number" - - Invoice Date ==> "invoice.date" - - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - - IBAN ==> "cdtr.iban" - - BIC or SWIFT ==> "cdtr.bic" - - Payment date / Due date ==> "invoice.duedate" - - The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number] ==> "invoice.positions" - -Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, invoice.duedate) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. <> -[/INST] +]]]]> + invoice.summary -]]]]> - ]]> @@ -702,9 +649,6 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t sequenceFlow_gpPDLg sequenceFlow_eccehA - - - @@ -771,7 +715,7 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t false - https://llama.cpp.imixs.com/ + api.llama.cpp.imixs.com XML Empfang @@ -789,19 +733,16 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t DataOutput_2 - sequenceFlow_fN22Gg sequenceFlow_naZnAA sequenceFlow_PgyOMw - + - {"n_predict": 512, "temperature": 0 } - ^.+\.([pP][dD][fF])$ + {"n_predict": 512, "temperature": 0 } + [INST] Assign the invoice to one of the following categories: +Assign the invoice to one of the following categories: - Cargo-Invoice - in case the invoice is about cargo and logistic services - Credit - in case of a credit note @@ -821,20 +762,14 @@ Output the infromation as one XML object that has the following structure: Note: Do not generate any other information instead of the XML object. Do not generate more than one XML Object. -[/INST] -]]]]> - + +]]]]> + (?i)^.+\.(eml|msg|pdf)$ ]]> - - - - - - @@ -900,7 +835,7 @@ Note: Do not generate any other information instead of the XML object. Do not ge - https://llama.cpp.imixs.com/ + api.llama.cpp.imixs.com invoice.summary false @@ -917,25 +852,14 @@ Note: Do not generate any other information instead of the XML object. Do not ge DataOutput_2 - sequenceFlow_8SpIiA sequenceFlow_A62nqQ sequenceFlow_Di4BQA - - - - - - - + - {"n_predict": 2048, "temperature": 0} - ^.+\.([pP][dD][fF])$ - -[INST] + {"n_predict": 2048, "temperature": 0} + + (?i)^.+\.(eml|msg|pdf)$ ]]> @@ -1091,9 +1014,6 @@ numbers that may appear on the invoice. sequenceFlow_DdWK6A - - - @@ -1104,20 +1024,11 @@ numbers that may appear on the invoice. sequenceFlow_Di4BQA - - - - - - sequenceFlow_PWXjog - - - sequenceFlow_naZnAA @@ -1205,9 +1116,6 @@ numbers that may appear on the invoice. - - - @@ -1218,14 +1126,7 @@ numbers that may appear on the invoice. sequenceFlow_bh4DIw sequenceFlow_d0zSHA - - - - - - - - + @@ -1258,9 +1159,6 @@ Possible ImageTypes are: sequenceFlow_eccehA sequenceFlow_p0asUQ - - - @@ -1294,11 +1192,126 @@ Possible ImageTypes are: + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + association_w5HwVg + + + + + {"n_predict": 4096, "temperature": 0 } + + ... + ... + 2024-12-31 + 2024-12-31 + 1234.00 + ... + ... + ... + + +Transfer the individual invoice data to the XML tags, taking into account the following suggestions for mapping: + + - Company name ==> "cdtr.name" (the name of the company that issued the invoice document, not the recipient) + - Invoice number ==> "invoice.number" + - Invoice Date ==> "invoice.date" + - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) + - IBAN ==> "cdtr.iban" + - BIC or SWIFT ==> "cdtr.bic" + - Payment date / Due date ==> "invoice.duedate" + - The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number] ==> "invoice.positions" + + +Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (type="date") into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. + + +<> + +]]]]> + invoice.summary + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + true @@ -1332,9 +1345,9 @@ Possible ImageTypes are: - + - + @@ -1347,29 +1360,34 @@ Possible ImageTypes are: - + - + - - - - - + + + + + + + + + + + + - - - - + + @@ -1393,8 +1411,8 @@ Possible ImageTypes are: - - + + @@ -1404,17 +1422,6 @@ Possible ImageTypes are: - - - - - - - - - - - @@ -1434,31 +1441,27 @@ Possible ImageTypes are: - + - + - - - - - + - + - - + + @@ -1473,9 +1476,9 @@ Possible ImageTypes are: - + - + @@ -1487,29 +1490,21 @@ Possible ImageTypes are: - - - - - - + + - + - + - + - - - - - + @@ -1521,8 +1516,8 @@ Possible ImageTypes are: - - + + @@ -1536,46 +1531,35 @@ Possible ImageTypes are: - - - - - - + - + - + - + - - - - + + - - - - + + - + - + - - - - + + @@ -1604,25 +1588,26 @@ Possible ImageTypes are: - + - + - + - - - - + + + + - - - - + + + + + @@ -1676,6 +1661,17 @@ Possible ImageTypes are: + + + + + + + + + + + diff --git a/workflow/rechnungseingang-de-1.2.48.bpmn b/workflow/rechnungseingang-de-1.2.48.bpmn index 2120444..b6ecfab 100644 --- a/workflow/rechnungseingang-de-1.2.48.bpmn +++ b/workflow/rechnungseingang-de-1.2.48.bpmn @@ -3822,7 +3822,8 @@ Betrag: _amount (Brutto € _amount_brutto - home]]> + home +false]]> @@ -3841,12 +3842,6 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_57 SequenceFlow_58 - - - - - - @@ -7086,6 +7081,12 @@ Betrag: invoice.total invoice.currency + + + + + + diff --git a/test.xml b/workflow/rechnungseingang-de-1.3.0.bpmn similarity index 58% rename from test.xml rename to workflow/rechnungseingang-de-1.3.0.bpmn index 3119169..ce42446 100644 --- a/test.xml +++ b/workflow/rechnungseingang-de-1.3.0.bpmn @@ -1,35 +1,34 @@ - - - + + - + - - - - - - - - - - - + + + + + + + + + + + - - + + - + - - + + @@ -38,137 +37,190 @@ - + + + true - + + + + - + + + + - + 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_49 IntermediateCatchEvent_19 IntermediateThrowEvent_3 + IntermediateCatchEvent_31 + IntermediateCatchEvent_13 + Task_14 + EventBasedGateway_3 + IntermediateCatchEvent_30 + Task_13 + EndEvent_4 + IntermediateCatchEvent_56 + IntermediateThrowEvent_9 + IntermediateCatchEvent_60 + IntermediateCatchEvent_3 + ExclusiveGateway_9 + IntermediateCatchEvent_5000-20 + + DataObject_5 + DataObject_2 + TextAnnotation_4 + textAnnotation_emMc1g - 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 - - + + Task_1 + IntermediateCatchEvent_9 IntermediateCatchEvent_10 IntermediateCatchEvent_11 IntermediateThrowEvent_5 IntermediateCatchEvent_1 - IntermediateCatchEvent_9 IntermediateCatchEvent_45 - Task_1 + IntermediateCatchEvent_61 + IntermediateCatchEvent_64 + DataObject_7 + event_GwjqFw + + + + Task_5005 + IntermediateCatchEvent_5005-20 + IntermediateCatchEvent_5005-30 + IntermediateCatchEvent_2 + IntermediateCatchEvent_36 + IntermediateCatchEvent_42 + IntermediateCatchEvent_55 + EventBasedGateway_2 + ExclusiveGateway_6 + ExclusiveGateway_4 + TextAnnotation_1 + TextAnnotation_3 + Task_4 + Task_12 + IntermediateCatchEvent_5005-10 + IntermediateCatchEvent_12 + EndEvent_1 + IntermediateCatchEvent_21 + IntermediateThrowEvent_2 + IntermediateCatchEvent_25 + IntermediateCatchEvent_26 + IntermediateCatchEvent_28 + IntermediateCatchEvent_32 + IntermediateThrowEvent_8 + ExclusiveGateway_7 + ExclusiveGateway_10 + event_bBR4QQ + event_NvdVrw + DataObject_1 + + + + IntermediateCatchEvent_44 + IntermediateCatchEvent_53 + IntermediateCatchEvent_54 + IntermediateThrowEvent_7 + IntermediateCatchEvent_50 + DataObject_6 + Task_17 + Task_18 + IntermediateCatchEvent_43 + IntermediateCatchEvent_47 + IntermediateCatchEvent_51 + IntermediateThrowEvent_6 + IntermediateCatchEvent_52 + ExclusiveGateway_3 + EventBasedGateway_5 + EventBasedGateway_6 + ExclusiveGateway_8 + task_sCjcjw + event_XFiUTg + event_9LrfcA + event_K9EFtg - 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 + ExclusiveGateway_2 IntermediateCatchEvent_29 + IntermediateCatchEvent_39 + IntermediateCatchEvent_20 + Task_3 + IntermediateCatchEvent_17 + ExclusiveGateway_5 + IntermediateCatchEvent_35 + IntermediateThrowEvent_1 + IntermediateCatchEvent_58 + IntermediateCatchEvent_22 + Task_5 + Task_15 + IntermediateCatchEvent_48 + Task_11 + IntermediateCatchEvent_4 + IntermediateCatchEvent_14 + IntermediateCatchEvent_57 + Task_7 + IntermediateCatchEvent_18 + EndEvent_2 + IntermediateCatchEvent_5 + Task_6 + IntermediateCatchEvent_46 + Task_19 + IntermediateCatchEvent_63 + IntermediateCatchEvent_34 + IntermediateCatchEvent_59 + IntermediateCatchEvent_41 + IntermediateCatchEvent_65 + IntermediateCatchEvent_66 + + event_TyXP5Q + DataObject_3 + IntermediateCatchEvent_62 + TextAnnotation_5 + TextAnnotation_2 + event_e0gqXQ + gateway_ApXfeg + event_WNNsfQ - + txtlastcomment @@ -204,6 +256,7 @@ $workflowgroup - $workflowstatus]]> SequenceFlow_31 SequenceFlow_1 + SequenceFlow_123 SequenceFlow_32 @@ -215,7 +268,7 @@ - + @@ -224,7 +277,7 @@ - + @@ -255,7 +308,7 @@ - + ]]> @@ -267,7 +320,7 @@ - + false @@ -276,7 +329,9 @@ SequenceFlow_31 - + + + @@ -323,10 +378,18 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + - home]]> + home + + stop + false + + + start + false +]]> @@ -360,23 +423,16 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! SequenceFlow_46 - SequenceFlow_24 + SequenceFlow_122 - - SequenceFlow_0 - SequenceFlow_15 - SequenceFlow_21 - SequenceFlow_33 - - - SequenceFlow_0 + + sequenceFlow_zymk0A - - + txtlastcomment]]> @@ -407,15 +463,27 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! - $workflowgroup - $workflowstatus]]> + $workflowgroup - $workflowstatus +Zollkurse +]]> SequenceFlow_38 - SequenceFlow_75 SequenceFlow_83 SequenceFlow_106 + SequenceFlow_104 + SequenceFlow_121 + SequenceFlow_134 SequenceFlow_37 SequenceFlow_10 + sequenceFlow_wq0Y0w - + + + @@ -465,7 +533,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home @@ -475,7 +543,11 @@ Betrag: _amount (Brutto € _amount_brutto1000 100 (?!txtworkflowhistory)(^[a-zA-Z]|^_) -]]> + + + stop + false +]]> @@ -524,7 +596,7 @@ var b= workitem.get("order.total")[0]; - + @@ -533,7 +605,7 @@ var b= workitem.get("order.total")[0]; - + @@ -559,7 +631,7 @@ var b= workitem.get("order.total")[0]; - + @@ -575,7 +647,7 @@ var b= workitem.get("order.total")[0]; - + false @@ -584,7 +656,9 @@ var b= workitem.get("order.total")[0]; SequenceFlow_38 - + + + @@ -594,7 +668,7 @@ var b= workitem.get("order.total")[0]; - + @@ -603,7 +677,7 @@ var b= workitem.get("order.total")[0]; - + @@ -631,11 +705,12 @@ var b= workitem.get("order.total")[0]; - + home space.name + false]]> @@ -666,14 +741,19 @@ result.isValid=true; SequenceFlow_97 SequenceFlow_110 - + SequenceFlow_37 SequenceFlow_8 SequenceFlow_54 SequenceFlow_96 + - - + + + + + + @@ -708,38 +788,40 @@ result.isValid=true; + + + $workflowgroup - $workflowstatus]]> - SequenceFlow_33 + SequenceFlow_95 SequenceFlow_49 SequenceFlow_20 + SequenceFlow_21 + SequenceFlow_125 - - - - - + + + + + + - - - - + + + + + + - - - - - - - - - - - + + + + + ]]> @@ -752,7 +834,7 @@ result.isValid=true; - + @@ -761,7 +843,7 @@ result.isValid=true; - + @@ -792,12 +874,16 @@ result.isValid=true; - + suggest -false]]> +false + + start + false +]]> @@ -820,7 +906,7 @@ result.isValid=true; - + txtlastcomment @@ -852,12 +938,14 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> - SequenceFlow_67 SequenceFlow_56 + SequenceFlow_15 + SequenceFlow_24 SequenceFlow_55 SequenceFlow_50 SequenceFlow_81 SequenceFlow_88 + sequenceFlow_dbshCw @@ -868,7 +956,7 @@ result.isValid=true; - + @@ -877,7 +965,7 @@ result.isValid=true; - + @@ -905,7 +993,7 @@ result.isValid=true; - + home @@ -934,14 +1022,15 @@ result.isValid=true; }]]> - + SequenceFlow_29 SequenceFlow_2 - + SequenceFlow_32 SequenceFlow_29 SequenceFlow_30 + @@ -992,7 +1081,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home]]> @@ -1009,15 +1098,24 @@ Betrag: _amount (Brutto € _amount_brutto false - + @@ -1026,13 +1124,19 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! SequenceFlow_72 SequenceFlow_67 - - - + + + + + + + + + - + txtlastcomment @@ -1045,7 +1149,7 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -1064,18 +1168,23 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! $workflowgroup - $workflowstatus]]> - SequenceFlow_25 SequenceFlow_44 - SequenceFlow_52 - SequenceFlow_58 SequenceFlow_90 SequenceFlow_47 + sequenceFlow_ucyuIw + sequenceFlow_SvEjiw + sequenceFlow_bBGlVA SequenceFlow_47 + - - + + + + + + @@ -1125,7 +1234,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home]]> @@ -1142,18 +1251,40 @@ Betrag: _amount (Brutto € _amount_brutto false + + + SequenceFlow_55 SequenceFlow_12 - - + + + + SequenceFlow_18 SequenceFlow_1 SequenceFlow_68 + - + + + @@ -1200,10 +1331,10 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + - + @@ -1212,42 +1343,53 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + false - + SequenceFlow_6 SequenceFlow_18 + - + SequenceFlow_51 SequenceFlow_6 + - + + + - SequenceFlow_15 + SequenceFlow_126 + - - - - - + + + + + + + SequenceFlow_12 SequenceFlow_53 SequenceFlow_19 SequenceFlow_25 - SequenceFlow_4 + - + - - + + sepa-export-manual-3.0 +1000 +payment.type +70 +20]]> @@ -1259,11 +1401,20 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_19 SequenceFlow_23 + + - - - - workitem['payment.type'][0]=="direct_debit" + + + + + + + + + @@ -1274,7 +1425,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1283,7 +1434,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1314,11 +1465,12 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + -Rechnungscontrolling]]> +Rechnungscontrolling +]]> @@ -1327,22 +1479,22 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + false + sequenceFlow_zymk0A SequenceFlow_21 - - + txtlastcomment]]> @@ -1354,7 +1506,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -1373,12 +1525,14 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com $workflowgroup - $workflowstatus]]> - SequenceFlow_24 SequenceFlow_26 SequenceFlow_11 SequenceFlow_118 + SequenceFlow_132 SequenceFlow_28 SequenceFlow_36 + SequenceFlow_127 + sequenceFlow_Dy0E0A @@ -1389,7 +1543,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1398,7 +1552,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1424,7 +1578,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1439,7 +1593,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + false @@ -1448,7 +1602,9 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_26 - + + + @@ -1498,11 +1654,19 @@ Betrag: _amount (Brutto € _amount_brutto - + home -space.name]]> +space.name + + stop + false + + + start + false +]]> @@ -1511,7 +1675,7 @@ Betrag: _amount (Brutto € _amount_brutto - + $owner]]> false @@ -1534,7 +1698,9 @@ result.isValid=true; SequenceFlow_28 SequenceFlow_105 - + + + @@ -1544,7 +1710,7 @@ result.isValid=true; - + @@ -1553,7 +1719,7 @@ result.isValid=true; - + @@ -1581,12 +1747,16 @@ result.isValid=true; - + home space.name -false]]> +false + + stop + false +]]> @@ -1598,7 +1768,7 @@ result.isValid=true; - false + true + + + + SequenceFlow_36 @@ -1618,17 +1792,23 @@ result.isValid=true; SequenceFlow_35 + - - + + + + + + SequenceFlow_39 + - + txtlastcomment]]> @@ -1665,9 +1845,14 @@ result.isValid=true; SequenceFlow_40 + - - + + + + + + @@ -1677,7 +1862,7 @@ result.isValid=true; - + @@ -1686,7 +1871,7 @@ result.isValid=true; - + @@ -1712,7 +1897,7 @@ result.isValid=true; - + @@ -1736,11 +1921,13 @@ result.isValid=true; SequenceFlow_11 - + + + - + txtlastcomment @@ -1753,7 +1940,7 @@ result.isValid=true; - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -1773,9 +1960,9 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_23 - SequenceFlow_45 SequenceFlow_41 SequenceFlow_14 + sequenceFlow_swRy5A @@ -1812,10 +1999,10 @@ result.isValid=true; - + - + @@ -1824,7 +2011,7 @@ result.isValid=true; - + @@ -1836,13 +2023,18 @@ result.isValid=true; SequenceFlow_14 SequenceFlow_42 + - - + + + + + + - + txtlastcomment @@ -1855,7 +2047,7 @@ result.isValid=true; - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -1869,7 +2061,7 @@ result.isValid=true; - + @@ -1880,7 +2072,6 @@ result.isValid=true; SequenceFlow_42 SequenceFlow_3 SequenceFlow_43 - SequenceFlow_27 @@ -1931,10 +2122,11 @@ Betrag: _amount (Brutto € _amount_brutto - + - home]]> + home +false]]> @@ -1954,23 +2146,13 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_5 SequenceFlow_44 - - - - - - - - - Wollen Sie den SEPA Export wirklich wiederholen?]]> - - - SequenceFlow_27 - SequenceFlow_45 - - - - + + + + + + + @@ -2019,7 +2201,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home]]> @@ -2052,9 +2234,14 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_50 SequenceFlow_53 + - - + + + + + + @@ -2102,7 +2289,7 @@ Betrag: invoice.total invoice.currency - + home @@ -2139,16 +2326,20 @@ result.isValid=true; SequenceFlow_7 - + + + SequenceFlow_63 + - + - - + + + @@ -2158,25 +2349,32 @@ result.isValid=true; - + + + - + + + + + + ]]> - + txtlastcomment @@ -2214,20 +2412,29 @@ result.isValid=true; SequenceFlow_9 + - + + + SequenceFlow_17 + - - + + + + SequenceFlow_20 SequenceFlow_65 SequenceFlow_71 SequenceFlow_22 + - + + + @@ -2237,7 +2444,7 @@ result.isValid=true; - + @@ -2246,7 +2453,7 @@ result.isValid=true; - + @@ -2274,12 +2481,17 @@ result.isValid=true; - + home false -Wollen Sie den Vorgang wirklich löschen?]]> +Wollen Sie den Vorgang wirklich löschen? + + stop + false + +cancel]]> @@ -2312,13 +2524,15 @@ result.isValid=true; SequenceFlow_48 + - - + + + - + txtlastcomment @@ -2328,7 +2542,7 @@ result.isValid=true; - + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> @@ -2358,7 +2572,9 @@ result.isValid=true; SequenceFlow_72 SequenceFlow_86 - + + + @@ -2368,7 +2584,7 @@ result.isValid=true; - + @@ -2377,7 +2593,7 @@ result.isValid=true; - + @@ -2408,7 +2624,7 @@ result.isValid=true; - + ]]> @@ -2420,7 +2636,7 @@ result.isValid=true; - + false @@ -2429,78 +2645,9 @@ result.isValid=true; SequenceFlow_3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - SequenceFlow_52 - - + + + @@ -2510,7 +2657,7 @@ result.isValid=true; - + @@ -2519,7 +2666,7 @@ result.isValid=true; - + @@ -2550,10 +2697,11 @@ result.isValid=true; - + - ]]> + home +false]]> @@ -2562,7 +2710,7 @@ result.isValid=true; - + false @@ -2580,7 +2728,7 @@ result.isValid=true; - + @@ -2589,7 +2737,7 @@ result.isValid=true; - + @@ -2620,10 +2768,11 @@ result.isValid=true; - + - ]]> + home +false]]> @@ -2632,7 +2781,7 @@ result.isValid=true; - + false @@ -2641,8 +2790,12 @@ result.isValid=true; SequenceFlow_59 - - + + + + + + @@ -2652,7 +2805,7 @@ result.isValid=true; - + @@ -2661,7 +2814,7 @@ result.isValid=true; - + @@ -2689,7 +2842,7 @@ result.isValid=true; - + suggest @@ -2713,7 +2866,7 @@ result.isValid=true; false - + @@ -2721,10 +2874,16 @@ result.isValid=true; SequenceFlow_69 - - - - workitem['payment.type'][0]=="credit" + + + + + + + + + @@ -2765,15 +2924,20 @@ result.isValid=true; SequenceFlow_69 SequenceFlow_70 - + + + SequenceFlow_70 + - + + + - + txtlastcomment @@ -2799,7 +2963,7 @@ result.isValid=true; - + @@ -2809,17 +2973,21 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_4 SequenceFlow_34 + SequenceFlow_119 SequenceFlow_5 - - workitem['payment.type'][0]=="no_sepa" + + + - - + + + + - + @@ -2829,7 +2997,7 @@ result.isValid=true; - + @@ -2837,9 +3005,17 @@ result.isValid=true; - - - + + + + + + + + + + + ]]> @@ -2847,7 +3023,7 @@ result.isValid=true; - + txtlastcomment]]> @@ -2884,7 +3060,9 @@ result.isValid=true; SequenceFlow_61 SequenceFlow_73 - + + + @@ -2932,12 +3110,13 @@ Betrag: invoice.total invoice.currency - + home false -Wollen Sie den Vorgang wirklich archivieren?]]> +Wollen Sie den Vorgang wirklich archivieren? +cancel]]> @@ -2952,7 +3131,7 @@ Betrag: invoice.total invoice.currencyfalse - + @@ -2961,7 +3140,9 @@ Betrag: invoice.total invoice.currencySequenceFlow_63 - + + + @@ -2971,7 +3152,7 @@ Betrag: invoice.total invoice.currency - + @@ -2980,7 +3161,7 @@ Betrag: invoice.total invoice.currency - + @@ -3006,7 +3187,7 @@ Betrag: invoice.total invoice.currency - + @@ -3021,7 +3202,7 @@ Betrag: invoice.total invoice.currency - + false @@ -3030,8 +3211,12 @@ Betrag: invoice.total invoice.currency SequenceFlow_62 - - + + + + + + @@ -3041,7 +3226,7 @@ Betrag: invoice.total invoice.currency - + @@ -3050,7 +3235,7 @@ Betrag: invoice.total invoice.currency - + @@ -3081,7 +3266,7 @@ Betrag: invoice.total invoice.currency - + ]]> @@ -3093,7 +3278,7 @@ Betrag: invoice.total invoice.currency - + false @@ -3102,7 +3287,9 @@ Betrag: invoice.total invoice.currency SequenceFlow_56 - + + + @@ -3112,7 +3299,7 @@ Betrag: invoice.total invoice.currency - + @@ -3121,7 +3308,7 @@ Betrag: invoice.total invoice.currency - + @@ -3149,16 +3336,17 @@ Betrag: invoice.total invoice.currency - + suggest false - + rechnungseingang-sachrechnung-de-1.0 - 5001 - 980 - ]]> + 5001 + 980 + +]]> @@ -3173,7 +3361,7 @@ Betrag: invoice.total invoice.currencyfalse - + @@ -3222,14 +3410,21 @@ Betrag: invoice.total invoice.currency SequenceFlow_66 + - - - + + + + + + + + + - + txtlastcomment]]> @@ -3241,7 +3436,7 @@ Betrag: invoice.total invoice.currency - cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgcdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -3264,6 +3459,7 @@ Betrag: invoice.total invoice.currency$workflowgroup - $workflowstatus]]> SequenceFlow_74 SequenceFlow_77 + SequenceFlow_126 SequenceFlow_46 SequenceFlow_85 @@ -3276,7 +3472,7 @@ Betrag: invoice.total invoice.currency - + @@ -3285,7 +3481,7 @@ Betrag: invoice.total invoice.currency - + @@ -3316,7 +3512,7 @@ Betrag: invoice.total invoice.currency - + ]]> @@ -3328,7 +3524,7 @@ Betrag: invoice.total invoice.currency - + false @@ -3338,11 +3534,18 @@ Betrag: invoice.total invoice.currency SequenceFlow_74 - - - - - + + + + + + + + + + + + @@ -3352,7 +3555,7 @@ Betrag: invoice.total invoice.currency - + @@ -3361,7 +3564,7 @@ Betrag: invoice.total invoice.currency - + @@ -3389,7 +3592,7 @@ Betrag: invoice.total invoice.currency - + home @@ -3423,9 +3626,15 @@ result.isValid=true; SequenceFlow_73 SequenceFlow_75 - - - + + + + + + + + + @@ -3435,7 +3644,7 @@ result.isValid=true; - + @@ -3444,7 +3653,7 @@ result.isValid=true; - + @@ -3475,7 +3684,7 @@ result.isValid=true; - + ]]> @@ -3487,7 +3696,7 @@ result.isValid=true; - + false @@ -3496,11 +3705,13 @@ result.isValid=true; SequenceFlow_78 - + + + - + txtlastcomment]]> @@ -3512,7 +3723,7 @@ result.isValid=true; - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> true @@ -3525,7 +3736,7 @@ result.isValid=true; - + @@ -3533,8 +3744,9 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> - SequenceFlow_68 SequenceFlow_79 + SequenceFlow_124 + SequenceFlow_131 SequenceFlow_57 @@ -3586,10 +3798,11 @@ Betrag: _amount (Brutto € _amount_brutto - + - home]]> + home +false]]> @@ -3608,8 +3821,12 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_57 SequenceFlow_58 - - + + + + + + @@ -3619,7 +3836,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -3628,7 +3845,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -3659,7 +3876,7 @@ Betrag: _amount (Brutto € _amount_brutto - + ]]> @@ -3671,7 +3888,7 @@ Betrag: _amount (Brutto € _amount_brutto - + false @@ -3680,7 +3897,9 @@ Betrag: _amount (Brutto € _amount_brutto SequenceFlow_79 - + + + @@ -3690,7 +3909,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -3699,7 +3918,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -3727,7 +3946,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home @@ -3764,16 +3983,22 @@ result.isValid=true; SequenceFlow_80 + - - + + + + + + SequenceFlow_82 + - + txtlastcomment @@ -3818,7 +4043,7 @@ result.isValid=true; - + @@ -3827,7 +4052,7 @@ result.isValid=true; - + @@ -3858,10 +4083,11 @@ result.isValid=true; - + - ]]> + home +false]]> @@ -3870,7 +4096,7 @@ result.isValid=true; - + false @@ -3879,8 +4105,12 @@ result.isValid=true; SequenceFlow_84 - - + + + + + + @@ -3890,7 +4120,7 @@ result.isValid=true; - + @@ -3899,7 +4129,7 @@ result.isValid=true; - + @@ -3927,7 +4157,7 @@ result.isValid=true; - + home @@ -3960,8 +4190,12 @@ result.isValid=true; SequenceFlow_86 SequenceFlow_87 - - + + + + + + @@ -3971,7 +4205,7 @@ result.isValid=true; - + @@ -3980,7 +4214,7 @@ result.isValid=true; - + @@ -4008,7 +4242,7 @@ result.isValid=true; - + home @@ -4037,12 +4271,16 @@ result.isValid=true; }]]> - + SequenceFlow_88 SequenceFlow_89 - - + + + + + + @@ -4052,7 +4290,7 @@ result.isValid=true; - + @@ -4061,7 +4299,7 @@ result.isValid=true; - + @@ -4089,12 +4327,12 @@ result.isValid=true; - + home false -]]> +]]> @@ -4122,7 +4360,9 @@ result.isValid=true; SequenceFlow_83 - + + + @@ -4132,7 +4372,7 @@ result.isValid=true; - + @@ -4141,7 +4381,7 @@ result.isValid=true; - + @@ -4169,12 +4409,17 @@ result.isValid=true; - + home false -Wollen Sie den Vorgang wirklich archivieren?]]> +Wollen Sie den Vorgang wirklich archivieren? + + stop + false + +cancel]]> @@ -4206,20 +4451,32 @@ result.isValid=true; SequenceFlow_13 + - - - + + + + + + + SequenceFlow_85 SequenceFlow_76 SequenceFlow_16 + SequenceFlow_116 + - + + + SequenceFlow_90 + - + + + @@ -4269,7 +4526,7 @@ Betrag: _amount (Brutto € _amount_brutto - + home @@ -4283,30 +4540,23 @@ Betrag: _amount (Brutto € _amount_brutto - sb.assist]]> + $owner]]> false - + - + SequenceFlow_96 - SequenceFlow_91 + SequenceFlow_120 - + txtlastcomment]]> @@ -4343,14 +4593,17 @@ result.isValid=true; SequenceFlow_92 SequenceFlow_94 SequenceFlow_117 + SequenceFlow_100 SequenceFlow_101 SequenceFlow_93 - - + + + + - + txtlastcomment]]> @@ -4397,7 +4650,7 @@ result.isValid=true; - + @@ -4406,7 +4659,7 @@ result.isValid=true; - + @@ -4432,7 +4685,7 @@ result.isValid=true; - + @@ -4447,7 +4700,7 @@ result.isValid=true; - + false @@ -4465,7 +4718,7 @@ result.isValid=true; - + @@ -4474,7 +4727,7 @@ result.isValid=true; - + @@ -4502,12 +4755,12 @@ result.isValid=true; - + home false -]]> +]]> @@ -4535,13 +4788,20 @@ result.isValid=true; SequenceFlow_92 - - - - + + + + + + + + + + SequenceFlow_101 SequenceFlow_98 SequenceFlow_111 + @@ -4590,7 +4850,7 @@ Betrag: invoice.total invoice.currency - + home @@ -4627,9 +4887,15 @@ result.isValid=true; SequenceFlow_102 - - - + + + + + + + + + @@ -4677,12 +4943,13 @@ Betrag: invoice.total invoice.currency - + home false -Wollen Sie den Vorgang wirklich archivieren?]]> +Wollen Sie den Vorgang wirklich archivieren? +cancel]]> @@ -4697,7 +4964,7 @@ Betrag: invoice.total invoice.currencyfalse - + @@ -4709,10 +4976,17 @@ Betrag: invoice.total invoice.currency SequenceFlow_108 + - - - + + + + + + + + + @@ -4722,7 +4996,7 @@ Betrag: invoice.total invoice.currency - + @@ -4731,7 +5005,7 @@ Betrag: invoice.total invoice.currency - + @@ -4759,7 +5033,7 @@ Betrag: invoice.total invoice.currency - + home @@ -4802,7 +5076,7 @@ result.isValid=true; - + @@ -4811,7 +5085,7 @@ result.isValid=true; - + @@ -4837,7 +5111,7 @@ result.isValid=true; - + @@ -4852,7 +5126,7 @@ result.isValid=true; - + false @@ -4861,9 +5135,15 @@ result.isValid=true; SequenceFlow_114 - - - + + + + + + + + + @@ -4873,7 +5153,7 @@ result.isValid=true; - + space.name)]]> @@ -4881,9 +5161,6 @@ result.isValid=true; - - - @@ -4910,10 +5187,10 @@ result.isValid=true; - + - + @@ -4922,13 +5199,13 @@ result.isValid=true; - + false - + @@ -4939,50 +5216,96 @@ result.isValid=true; + + + + + + + + + + + Message-Eskalation +]]> + + + + + + + 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 + - + + + @@ -4992,7 +5315,7 @@ result.isValid=true; - + @@ -5001,7 +5324,7 @@ result.isValid=true; - + @@ -5032,7 +5355,7 @@ result.isValid=true; - + ]]> @@ -5044,7 +5367,7 @@ result.isValid=true; - + false @@ -5053,7 +5376,9 @@ result.isValid=true; SequenceFlow_34 - + + + @@ -5063,7 +5388,7 @@ result.isValid=true; - + @@ -5072,7 +5397,7 @@ result.isValid=true; - + @@ -5103,7 +5428,7 @@ result.isValid=true; - + ]]> @@ -5115,7 +5440,7 @@ result.isValid=true; - + false @@ -5124,124 +5449,1721 @@ result.isValid=true; SequenceFlow_41 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + posteingang-de-2.0 + 120 + 1 +]]> + + + + + + + + + + + + false + + + SequenceFlow_95 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false +]]> + + + + + + + + + false + + + + + + + SequenceFlow_104 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + stop + false +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_116 + SequenceFlow_115 + + + SequenceFlow_115 + + + + + + + + + + + + + + + + + + + SequenceFlow_119 + + + DataOutput_2 + + + DataOutput_2 + + + + + + + + + SequenceFlow_120 + SequenceFlow_91 + SequenceFlow_121 + + + + + + + + + + + + + + SequenceFlow_67 + SequenceFlow_4 + SequenceFlow_15 + + + + + + + + + + + + + + + + + + SequenceFlow_123 + + + DataOutput_3 + + + DataOutput_3 + + + + + + + + + + + + + + + + + SequenceFlow_124 + + + DataOutput_4 + + + DataOutput_4 + + + + + + + + + SequenceFlow_125 + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +$editor +space.name + + stop + false + + + start + false +]]> + + + + + + + + + $owner]]> + + + true + + + + + + + + + + + SequenceFlow_127 + SequenceFlow_128 + + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_68 + SequenceFlow_129 + SequenceFlow_133 + SequenceFlow_130 + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_130 + SequenceFlow_131 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_129 + + + + + + + + + + + + SequenceFlow_122 + SequenceFlow_132 + SequenceFlow_135 + + + + + + + + + + SequenceFlow_75 + SequenceFlow_128 + SequenceFlow_136 + SequenceFlow_134 + + + + + + + + + sb.team]]> + + + + + + SequenceFlow_135 + SequenceFlow_136 + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_24 + + + DataOutput_5 + + + DataOutput_5 + + + + + + + + + + + + + + + + + SequenceFlow_133 + + + DataOutput_6 + + + DataOutput_6 + + + + + + + + + + Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden. - -Ändern von IBAN und Fälligkeit ist hier möglich + Ä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 + - - + + + + + + + + + + + + + + + + + Auslandszahlungen werden gleich ausgeführt + + + + + + + + + payment.type ]]> + + + + + + + + + + + + sequenceFlow_swRy5A + sequenceFlow_dbshCw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + + + + sequenceFlow_ucyuIw + + + + + + + + + + + + + + space.name)]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + Message-Eskalation +]]> + + + + + + + + + + + sequenceFlow_wq0Y0w + sequenceFlow_iH4SSA + + + + + + + + sequenceFlow_iH4SSA + + + + + + + + + + + + + + space.name)]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + Message-Eskalation +]]> + + + + + + + + + + + sequenceFlow_Dy0E0A + + + + + + + SequenceFlow_25 + sequenceFlow_SvEjiw + SequenceFlow_58 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cdtr.name invoice.number]]> + + + + + + + + + cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + sequenceFlow_bBGlVA + sequenceFlow_mbqiAg + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_114 + sequenceFlow_mbqiAg + sequenceFlow_eNnuzA + SequenceFlow_112 + sequenceFlow_PhWb2w + + + + + + + + + + + cdtr.name invoice.number]]> + + + + + + + + + cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich archivieren? +cancel]]> + + + + + + + + + + + + false + + + + + + + + sequenceFlow_PhWb2w + sequenceFlow_UHzpHQ + + + + + + sequenceFlow_UHzpHQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + sequenceFlow_eNnuzA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + space.name +Kreditor: cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + +application.urlindex.jsf?workitem=$uniqueid + +]]> + - - - - - - + + + - - - - - + + - - - - - + + - - - - - + + - - - - - + + - - - - - + + - - + + - + - - - - - + + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - + + + + + @@ -5249,1351 +7171,1687 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - - - + + - - + + - + - - + + - + - - - - - + + - - + + - + - - - + + + + + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - - + + + + + - - + + - + - - - - + + + + + + + - - - - - - + + - + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + - - + + - + - - + + - + - - - - - + + - - + + - + - - - - - + + - - + + - + - - - - - + + - - - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + - - + + - + - - + + - + - - - + + + + + - - + + - + - - + + - + - - - - - + + - - + + - + - - - - - - - - + + - + - - + + - + - + - - - - - + + - + - - - - - + + - - + + - + - - - - - + + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - - - - + + + + - - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + - - - - + + + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - + + + - - - - - - - - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - - + + + + - - - - + + + - - - - + + + - - - - - + + + + + - + - - - - + + + - - - - - - - - - - + + + + - - - - - - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - + + + - - - - - + + + - + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - + + + - - - - + + + - - - - - + + + + + - - - - + + + - - - - - + + + + + - - - - - + + + - - - - + + + - - - - - - - - - - - + + + - - - - + + + + - - - - + + + - - - - + + + + + - - - - + + + + + - + - - - - + + + + + + - - - - + + + - - - - + + + + - + - - - - + + + + - - - - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + + - - - - + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + - - - - + + + + + - - - - + + + - - - - + + + - - - - + + + + - - - - + + + + + - - - - - + + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + + + - - - - - + + + + + - - - - + + + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - + + + - - - - + + + - - - - + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - + + + - - - - + + + - - - - + + + - - - - - + + + - - - - + + + - - - - - + + + + + - - - - + + + - - - - + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file +