diff --git a/Dockerfile b/Dockerfile index c373a7a..65a81b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,7 @@ -FROM imixs/imixs-office-workflow:5.1.1-wildfly-27.0.1.Final-jdk17 -#FROM imixs/imixs-office-workflow:5.1.0 - -# Setup debug configuration -# COPY ./docker/configuration/standalone-debug.xml /opt/jboss/wildfly/standalone/configuration/ - -COPY ./docker/lucene-core-7.7.3.jar /opt/jboss/ +FROM imixs/imixs-office-workflow:5.1.5-wildfly-29.0.1.Final-jdk17 # Deploy artefact RUN rm -r /opt/jboss/wildfly/standalone/deployments/* -COPY ./*-app/target/*.war /opt/jboss/wildfly/standalone/deployments/ +# Deploy artefact +COPY ./target/*.war /opt/jboss/wildfly/standalone/deployments/ + diff --git a/Dockerfile-wildfly-debug b/Dockerfile-wildfly-debug index 3915c1e..b81c28c 100644 --- a/Dockerfile-wildfly-debug +++ b/Dockerfile-wildfly-debug @@ -1,10 +1,8 @@ -FROM imixs/imixs-office-workflow:5.1.1-wildfly-27.0.1.Final-jdk17 -#FROM imixs/imixs-office-workflow:5.1.0 +FROM imixs/imixs-office-workflow:5.1.5-wildfly-29.0.1.Final-jdk17 # Deploy artefact RUN rm -r /opt/jboss/wildfly/standalone/deployments/* -COPY ./*-app/target/*.war /opt/jboss/wildfly/standalone/deployments/ +COPY ./target/*.war /opt/jboss/wildfly/standalone/deployments/ # Run in Debug Mode CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "--debug", "*:8787"] - diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0ad1114..c982dd2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,7 +3,7 @@ ## 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. + der Adapter `com.alexanderlogistics.AGLAIInvoiceAdapter` muss künftig in das Import Event der Rechnungseingangs Modelle. Dieser Adapter Findet den Space und den Mandanten. Neue Modelle: diff --git a/devi b/devi index beda5f3..a208d58 100755 --- a/devi +++ b/devi @@ -59,7 +59,7 @@ fi if [[ "$(strip_dash $1)" == "deploy" ]]; then echo " Deploy to Imixs-Cloud..." - mvn clean install -Pkubernetes -DskipTests + mvn clean install -Pimixs-cloud -DskipTests fi diff --git a/docker/lucene-core-7.7.3.jar b/docker/lucene-core-7.7.3.jar deleted file mode 100644 index 463f757..0000000 Binary files a/docker/lucene-core-7.7.3.jar and /dev/null differ diff --git a/src/test/resources/ksef/output/invoice-eu-service-np.xml b/src/test/resources/ksef/output/invoice-eu-service-np.xml index 5eeb657..d4cb759 100644 --- a/src/test/resources/ksef/output/invoice-eu-service-np.xml +++ b/src/test/resources/ksef/output/invoice-eu-service-np.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.498746084Z + 2026-08-20T21:54:15.008412928Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/invoice-mixed-rates.xml b/src/test/resources/ksef/output/invoice-mixed-rates.xml index 4e6ca8f..83a8014 100644 --- a/src/test/resources/ksef/output/invoice-mixed-rates.xml +++ b/src/test/resources/ksef/output/invoice-mixed-rates.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.565274539Z + 2026-08-20T21:54:15.058655095Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml b/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml index 7c9b026..85fa682 100644 --- a/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml +++ b/src/test/resources/ksef/output/invoice-multiple-zero-rate-codes.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.473274636Z + 2026-08-20T21:54:14.990608361Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/invoice-np.xml b/src/test/resources/ksef/output/invoice-np.xml index fc83b7a..d37d9a4 100644 --- a/src/test/resources/ksef/output/invoice-np.xml +++ b/src/test/resources/ksef/output/invoice-np.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.549495260Z + 2026-08-20T21:54:15.043150699Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/invoice-npt.xml b/src/test/resources/ksef/output/invoice-npt.xml index 6c2836d..8d0af25 100644 --- a/src/test/resources/ksef/output/invoice-npt.xml +++ b/src/test/resources/ksef/output/invoice-npt.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.514998809Z + 2026-08-20T21:54:15.020009542Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/invoice-simple.xml b/src/test/resources/ksef/output/invoice-simple.xml index e06a82e..339c2ba 100644 --- a/src/test/resources/ksef/output/invoice-simple.xml +++ b/src/test/resources/ksef/output/invoice-simple.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.586373483Z + 2026-08-20T21:54:15.084962950Z Imixs eInvoice diff --git a/src/test/resources/ksef/output/test-korrekturrechnung.xml b/src/test/resources/ksef/output/test-korrekturrechnung.xml index 5a1e0c4..c4f219f 100644 --- a/src/test/resources/ksef/output/test-korrekturrechnung.xml +++ b/src/test/resources/ksef/output/test-korrekturrechnung.xml @@ -7,7 +7,7 @@ 3 - 2026-08-20T11:01:10.574896691Z + 2026-08-20T21:54:15.066882675Z Imixs eInvoice diff --git a/workflow/br/rechnungseingang-br-1.0.0.bpmn b/workflow/br/rechnungseingang-br-1.0.0.bpmn index 355ef9d..ab8b83e 100644 --- a/workflow/br/rechnungseingang-br-1.0.0.bpmn +++ b/workflow/br/rechnungseingang-br-1.0.0.bpmn @@ -1189,6 +1189,7 @@ workitem.getItemValueString('payment.type')=="credit"]]> SequenceFlow_0 + SequenceFlow_39 @@ -4611,6 +4612,7 @@ if (workitem.getItemValueString('txtcomment')=='') { + diff --git a/workflow/posteingang-de-3.0.0.bpmn b/workflow/posteingang-de-3.0.0.bpmn new file mode 100644 index 0000000..ccb4579 --- /dev/null +++ b/workflow/posteingang-de-3.0.0.bpmn @@ -0,0 +1,1679 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + BoundaryEvent_1 + Task_4 + IntermediateCatchEvent_2 + Task_2 + IntermediateCatchEvent_3 + StartEvent_1 + EndEvent_1 + + dataObject_FS1r0Q + task_uB6BGQ + textAnnotation_CtU05A + task_PsBytg + event_Zxhr0w + dataObject_vVKXIg + event_yQLmNA + task_0YaQ2w + dataObject_HHM58Q + event_xOeBKg + event_pDFoXg + dataObject_ZhBiZg + event_4DNGzg + dataObject_KPUiiw + event_wmNwPA + event_tFxV0w + event_88sCAA + event_T901Jg + event_7rbeVA + gateway_qDAhHw + event_9mJrhQ + gateway_gd9zQQ + TextAnnotation_1 + gateway_MgL04w + event_VEvZRQ + event_Xk1mPA + event_a1P5WQ + dataObject_UIvZkA + dataObject_BbVs7w + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + home +Empfang +]]> + + + + + + + + + + + + false + + + + sequenceFlow_fRPOrw + sequenceFlow_4gpPgw + + + + sequenceFlow_fRPOrw + + + + + + + + + + + + + + + + + true + + + + + + + + $workflowgroup - $workflowstatus]]> + sequenceFlow_4gpPgw + sequenceFlow_CbkmwA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (pdf|PDF|eml|msg)$ + (pdf|PDF)$ + 10 + + + + true + +]]> + + + + + + + + + + + + false + + + + SequenceFlow_2 + + + DataOutput_1 + + + DataOutput_1 + + + sequenceFlow_VlPVJg + + + + + txtlastcomment]]> + + + + + + + + + + + + + + + + + + + + + + + + cdtr.name (invoice.language)]]> + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_12 + sequenceFlow_gXJm0w + + + SequenceFlow_12 + + + + + + + SequenceFlow_2 + + 1000 + + + + + + + +]]> + + + + + + + + + + + + + + + + + true + + + + + + + + + sequenceFlow_bh4DIw + sequenceFlow_ofQKHg + + + + + + + + + + + + + + + + + + + + + + + + + + + document.type ⇒ document.company (Import: document.import.type - Language: document.language) ]]> + + + true + + + + + + + + document.type
+Company: document.company
]]> + + + + sequenceFlow_JpNUKg + sequenceFlow_I8o4DA + sequenceFlow_KKWo0w + + + + + sequenceFlow_3YcMGQ + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + api.llama.cpp.imixs.com + XML + true + + + cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total + ON + +false + +]]> + + + + + + DataOutput_2 + + + DataOutput_2 + + + sequenceFlow_YMtfiw + sequenceFlow_PWXjog + + + + + + + + + + + + + + document.type ⇒ document.company (Import: document.import.type - Language: document.language) ]]> + + + true + + + + + + + + + sequenceFlow_JpNUKg + sequenceFlow_lmU9IA + sequenceFlow_A62nqQ + sequenceFlow_DdWK6A + + + + + {"n_predict": 4096, "temperature": 0 } + + +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" + + +<> + +]]]]> + invoice.summary + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + (^rechnungseingang-[a-z]{2,3}-\d+(?:\.\d+)?$) + 5000 + 990 + +]]> + + + + + + DataOutput_2 + + + DataOutput_2 + + sequenceFlow_gXJm0w + sequenceFlow_gpPDLg + sequenceFlow_eccehA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + api.llama.cpp.imixs.com + XML + + + + +]]> + + + + + + DataOutput_2 + + + DataOutput_2 + + + sequenceFlow_naZnAA + sequenceFlow_PgyOMw + + + + + {"n_predict": 512, "temperature": 0 } + + Type + Kraxi GmbH + German + + +Note: Do not generate any other information instead of the XML object. Do not generate more than one XML Object. + + +]]]]> + (?i)^.+\.(eml|msg|pdf)$ + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + api.llama.cpp.imixs.com + invoice.summary + false + +false +]]> + + + + + + DataOutput_2 + + + DataOutput_2 + + + sequenceFlow_A62nqQ + sequenceFlow_Di4BQA + + + + + {"n_predict": 2048, "temperature": 0} + + + (?i)^.+\.(eml|msg|pdf)$ + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + sequenceFlow_3YcMGQ + sequenceFlow_p0asUQ + + + + + + sequenceFlow_DdWK6A + + + + + sequenceFlow_PgyOMw + + + + + sequenceFlow_Di4BQA + + + + + sequenceFlow_PWXjog + + + + sequenceFlow_naZnAA + sequenceFlow_tcjWAA + sequenceFlow_I8o4DA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + adapter.error_code: adapter.error_message]]> + + + false + + + + + + DataOutput_2 + + + DataOutput_2 + + sequenceFlow_tcjWAA + sequenceFlow_gpPDLg + sequenceFlow_d0zSHA + + + + + + + + + + + + sequenceFlow_I8o4DA + sequenceFlow_VlPVJg + sequenceFlow_bh4DIw + sequenceFlow_d0zSHA + + + + + + For the OCR Adapter the following minimal options should be set: + + * X-Tika-PDFocrStrategy=OCR_AND_TEXT_EXTRACTION + * X-Tika-OCRLanguage=eng+deu + +These options allow OCR and text extraction suporting English and German language. + +Additional Tika Options can be set but are NOT needed in most cases: + + * X-Tika-PDFOcrImageType=RGB (setting the RGB color mode) + * X-Tika-PDFOcrDPI=400 (setting DPI) + +Setting the OcrDPI is only recommended if the DPI is know! + +Possible ImageTypes are: + + * ARGB Alpha, Red, Green, Blue + * BINARY Black or white. + * GRAY Shades of gray + * RGB Red, Green, Blue + + + + + + sequenceFlow_YMtfiw + sequenceFlow_eccehA + sequenceFlow_p0asUQ + + + + + + + + + + + + + + sequenceFlow_KKWo0w + + + + + + + + sequenceFlow_ofQKHg + + + + + + + + sequenceFlow_CbkmwA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/posteingang-en-3.0.0.bpmn b/workflow/posteingang-en-3.0.0.bpmn index 4392778..f5fb771 100644 --- a/workflow/posteingang-en-3.0.0.bpmn +++ b/workflow/posteingang-en-3.0.0.bpmn @@ -135,7 +135,7 @@ Betrag: _amount (Brutto € _amount_brutto home -Empfang +Front Desk ]]> @@ -239,7 +239,6 @@ Betrag: _amount (Brutto € _amount_brutto -Empfang (pdf|PDF|eml|msg)$ @@ -718,7 +717,6 @@ Note: api.llama.cpp.imixs.com XML -Empfang ]]> @@ -1490,8 +1488,8 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t - - + +