diff --git a/Dockerfile-wildfly-debug b/Dockerfile-wildfly-debug new file mode 100644 index 0000000..0966404 --- /dev/null +++ b/Dockerfile-wildfly-debug @@ -0,0 +1,8 @@ +FROM imixs/imixs-office-workflow:4.4.0 + +# Deploy artefact +RUN rm -r /opt/jboss/wildfly/standalone/deployments/* +COPY ./*-app/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/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml index 9a15745..bb92887 100644 --- a/office-alexander-logistics-app/pom.xml +++ b/office-alexander-logistics-app/pom.xml @@ -45,41 +45,7 @@ - docker-build - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - install - - - - - - - - - - - - - run - - - - - - - - - - - - docker-push + docker-wildfly-debug @@ -93,18 +59,11 @@ + + - - - - - - - - - - - + + @@ -118,7 +77,7 @@ - + kubernetes @@ -296,5 +255,20 @@ compile + + + net.sf.saxon + Saxon-HE + 9.9.1-4 + + + + + + commons-net + commons-net + 3.6 + + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml b/office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml index c5d2675..06ecc67 100644 --- a/office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml @@ -5,10 +5,8 @@ - + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml index 0f3a699..e859173 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml @@ -53,7 +53,7 @@
+ value="#{sepaController.configuration.item['dbtr.name']}">
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml index 2bf4d90..ad62a28 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/pom.xml b/pom.xml index eb826eb..ff0bc13 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.2.54.1.84.4.0 - 2.2.3 + 2.2.4-SNAPSHOT2.2.71.0.191.0.1 @@ -78,14 +78,6 @@ docker - - docker-build - - - - docker-push - - kubernetes diff --git a/reports/sepa/sepa-2.0.1.imixs-report b/reports/sepa/sepa-2.0.1.imixs-report index 9ee7c17..9c122bd 100644 --- a/reports/sepa/sepa-2.0.1.imixs-report +++ b/reports/sepa/sepa-2.0.1.imixs-report @@ -1 +1 @@ -$uniqueid$workflowgroup$processid$workflowsummaryinvoice.numberinvoice.dateinvoice.totalinvoice.currencycdtr.namecdtr.ibancdtr.bicdbtr.namedbtr.ibandbtr.bicUTF-8SEPA export executed by the SepaScheduler. See the XSL definition for details. sepatype:"sepa" AND $taskid:210 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0"> <xsl:strip-space elements="*" /> <xsl:output method="xml" indent="yes" encoding="UTF-8" standalone="yes" /> <xsl:template match="/"> <xsl:variable name="now" select="current-dateTime()" /> <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03 pain.001.003.03.xsd"> <CstmrCdtTrfInitn> <!-- generate header info --> <!-- compute count of invoices --> <xsl:variable name="count" select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='$uniqueid']/value)" /> <!-- compute total amount --> <xsl:variable name="totalsum" select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='invoice.total']/value))" /> <!-- round to 2 digits --> <xsl:variable name="total" select="xs:decimal(round-half-to-even($totalsum, 2))" /> <!-- shortcut for the sepa export document --> <xsl:variable name="exportWorkitem" select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Export']" /> <GrpHdr> <MsgId> <xsl:value-of select="replace($exportWorkitem/item[@name='$uniqueid']/value, '-', '')" /> </MsgId> <CreDtTm><xsl:value-of select="format-dateTime($now, '[Y0001]-[M01]-[D01]T[H01]:[m01]:[s01]')" /></CreDtTm> <NbOfTxs> <xsl:value-of select="$count" /> </NbOfTxs> <CtrlSum> <xsl:value-of select="$total" /> </CtrlSum> <InitgPty> <Nm> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.name']/value" /> </Nm> </InitgPty> </GrpHdr> <PmtInf> <PmtInfId> <xsl:value-of select="replace($exportWorkitem/item[@name='$uniqueid']/value, '-', '')" /><xsl:text>-1</xsl:text> </PmtInfId> <PmtMtd>TRF</PmtMtd> <NbOfTxs> <xsl:value-of select="$count" /> </NbOfTxs> <CtrlSum> <xsl:value-of select="$total" /> </CtrlSum> <PmtTpInf> <SvcLvl> <Cd>SEPA</Cd> </SvcLvl> </PmtTpInf> <ReqdExctnDt><xsl:value-of select="format-dateTime($now, '[Y0001]-[M01]-[D01]')" /></ReqdExctnDt> <Dbtr> <Nm> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.name']/value" /> </Nm> </Dbtr> <DbtrAcct> <Id> <IBAN> <xsl:value-of select="replace($exportWorkitem/item[@name='dbtr.iban']/value, ' ', '')" /> </IBAN> </Id> </DbtrAcct> <DbtrAgt> <FinInstnId> <BIC> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.bic']/value" /> </BIC> </FinInstnId> </DbtrAgt> <ChrgBr>SLEV</ChrgBr> <!-- generate CdtTrfTxInf for each invoice --> <xsl:apply-templates select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']" /> </PmtInf> </CstmrCdtTrfInitn> </Document> </xsl:template> <!-- This template builds sepa header info --> <xsl:template match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Export']"> <!-- not in use --> </xsl:template> <!-- This template builds sepa payment info for each invoice --> <xsl:template match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']"> <CdtTrfTxInf xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03"> <PmtId> <EndToEndId>NOTPROVIDED</EndToEndId> </PmtId> <Amt> <InstdAmt> <xsl:attribute name="Ccy"><xsl:value-of select="item[@name='invoice.currency']/value" /></xsl:attribute> <xsl:value-of select="item[@name='invoice.total']/value" /> </InstdAmt> </Amt> <CdtrAgt> <FinInstnId> <BIC> <xsl:value-of select="item[@name='cdtr.bic']/value" /> </BIC> </FinInstnId> </CdtrAgt> <Cdtr> <Nm> <xsl:value-of select="item[@name='cdtr.name']/value" /> </Nm> </Cdtr> <CdtrAcct> <Id> <IBAN> <xsl:value-of select="replace(item[@name='cdtr.iban']/value, ' ', '')" /> </IBAN> </Id> </CdtrAcct> <RmtInf> <Ustrd> <xsl:value-of select="item[@name='$workflowsummary']/value" /> </Ustrd> </RmtInf> </CdtTrfTxInf> </xsl:template></xsl:stylesheet>/imixs-adapters-sepa/src/reports/sepa-2.0.1.xsl \ No newline at end of file +$uniqueid$workflowgroup$taskid$workflowsummaryinvoice.numberinvoice.dateinvoice.totalinvoice.currencycdtr.namecdtr.ibancdtr.bicdbtr.namedbtr.ibandbtr.bicUTF-8SEPA export executed by the SepaScheduler. See the XSL definition for details. sepatype:"sepa" AND $taskid:210 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0"> <xsl:strip-space elements="*" /> <xsl:output method="xml" indent="yes" encoding="UTF-8" standalone="yes" /> <xsl:template match="/"> <xsl:variable name="now" select="current-dateTime()" /> <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03 pain.001.003.03.xsd"> <CstmrCdtTrfInitn> <!-- generate header info --> <!-- compute count of invoices --> <xsl:variable name="count" select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='$uniqueid']/value)" /> <!-- compute total amount --> <xsl:variable name="totalsum" select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='invoice.total']/value))" /> <!-- round to 2 digits --> <xsl:variable name="total" select="xs:decimal(round-half-to-even($totalsum, 2))" /> <!-- shortcut for the sepa export document --> <xsl:variable name="exportWorkitem" select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Export']" /> <GrpHdr> <MsgId> <xsl:value-of select="replace($exportWorkitem/item[@name='$uniqueid']/value, '-', '')" /> </MsgId> <CreDtTm><xsl:value-of select="format-dateTime($now, '[Y0001]-[M01]-[D01]T[H01]:[m01]:[s01]')" /></CreDtTm> <NbOfTxs> <xsl:value-of select="$count" /> </NbOfTxs> <CtrlSum> <!-- round to 2 digits --> <xsl:value-of select="$total" /> </CtrlSum> <InitgPty> <Nm> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.name']/value" /> </Nm> </InitgPty> </GrpHdr> <PmtInf> <PmtInfId> <xsl:value-of select="replace($exportWorkitem/item[@name='$uniqueid']/value, '-', '')" /><xsl:text>-1</xsl:text> </PmtInfId> <PmtMtd>TRF</PmtMtd> <NbOfTxs> <xsl:value-of select="$count" /> </NbOfTxs> <CtrlSum> <!-- round to 2 digits --> <xsl:value-of select="$total" /> </CtrlSum> <PmtTpInf> <SvcLvl> <Cd>SEPA</Cd> </SvcLvl> </PmtTpInf> <ReqdExctnDt><xsl:value-of select="format-dateTime($now, '[Y0001]-[M01]-[D01]')" /></ReqdExctnDt> <Dbtr> <Nm> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.name']/value" /> </Nm> </Dbtr> <DbtrAcct> <Id> <IBAN> <xsl:value-of select="replace($exportWorkitem/item[@name='dbtr.iban']/value, ' ', '')" /> </IBAN> </Id> </DbtrAcct> <DbtrAgt> <FinInstnId> <BIC> <xsl:value-of select="$exportWorkitem/item[@name='dbtr.bic']/value" /> </BIC> </FinInstnId> </DbtrAgt> <ChrgBr>SLEV</ChrgBr> <!-- generate CdtTrfTxInf for each invoice --> <xsl:apply-templates select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']" /> </PmtInf> </CstmrCdtTrfInitn> </Document> </xsl:template> <!-- This template builds sepa header info --> <xsl:template match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Export']"> <!-- not in use --> </xsl:template> <!-- This template builds sepa payment info for each invoice --> <xsl:template match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']"> <CdtTrfTxInf xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03"> <PmtId> <EndToEndId>NOTPROVIDED</EndToEndId> </PmtId> <Amt> <InstdAmt> <xsl:attribute name="Ccy"><xsl:value-of select="item[@name='invoice.currency']/value" /></xsl:attribute> <xsl:value-of select="item[@name='invoice.total']/value" /> </InstdAmt> </Amt> <CdtrAgt> <FinInstnId> <BIC> <xsl:value-of select="item[@name='cdtr.bic']/value" /> </BIC> </FinInstnId> </CdtrAgt> <Cdtr> <Nm> <xsl:value-of select="item[@name='cdtr.name']/value" /> </Nm> </Cdtr> <CdtrAcct> <Id> <IBAN> <xsl:value-of select="replace(item[@name='cdtr.iban']/value, ' ', '')" /> </IBAN> </Id> </CdtrAcct> <RmtInf> <Ustrd> <xsl:value-of select="item[@name='$workflowsummary']/value" /> </Ustrd> </RmtInf> </CdtTrfTxInf> </xsl:template></xsl:stylesheet>/imixs-adapters-sepa/src/reports/sepa-2.0.1.xsl \ No newline at end of file diff --git a/reports/sepa/sepa-2.0.1.xsl b/reports/sepa/sepa-2.0.1.xsl index a405ea1..9f45a9a 100644 --- a/reports/sepa/sepa-2.0.1.xsl +++ b/reports/sepa/sepa-2.0.1.xsl @@ -20,10 +20,10 @@ + select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='$uniqueid']/value)" /> + select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='invoice.total']/value))" /> @@ -43,6 +43,7 @@ + @@ -63,6 +64,7 @@ + @@ -100,7 +102,7 @@ + select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']" /> @@ -123,7 +125,7 @@ + match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']"> @@ -164,11 +166,6 @@ - - - - - \ No newline at end of file diff --git a/workflow/sepa-export-3.0.1.bpmn b/workflow/sepa-export-3.0.1.bpmn index 8362e86..73f199e 100644 --- a/workflow/sepa-export-3.0.1.bpmn +++ b/workflow/sepa-export-3.0.1.bpmn @@ -86,6 +86,7 @@ Please check the process: IntermediateCatchEvent_4 IntermediateCatchEvent_1 IntermediateCatchEvent_18 + IntermediateCatchEvent_9 @@ -175,7 +176,7 @@ Please check the process: - + @@ -265,7 +266,7 @@ Please check the process: $created (_dbtr_name)]]> - + @@ -320,7 +321,7 @@ Please check the process: - + @@ -366,7 +367,7 @@ Please check the process: - + @@ -383,6 +384,7 @@ Please check the process: SEPA_Export_success]]> SequenceFlow_11 + SequenceFlow_19 SequenceFlow_28 SequenceFlow_13 @@ -426,11 +428,11 @@ Please check the process: Rechnungscontrolling - + (^sepa-export) 210 300 -]]> +]]> SequenceFlow_5 @@ -502,6 +504,10 @@ Please check the process: SequenceFlow_2 + + SequenceFlow_19 + + @@ -542,7 +548,7 @@ Please check the process: - $created]]> + cdtr.iban invoice.number]]> @@ -586,7 +592,7 @@ Please check the process: - $created]]> + cdtr.iban invoice.number]]> true @@ -622,7 +628,7 @@ Please check the process: - $created]]> + cdtr.iban invoice.number]]> true @@ -977,6 +983,12 @@ Please check the process: + + + + + + @@ -1135,6 +1147,12 @@ Please check the process: + + + + + +
#{custom.creditor_name}#{custom.invoicenumber}#{custom.invoicedate}#{custom.amount}#{message['form.company']}#{message['form.invoicenumber']}#{message['form.date']}#{message['form.amount']} IBAN BIC