diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 22cba2d..21b79ea 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,9 +3,15 @@ ### 1.2.16 (Development) - Upgrade Imixs-Archive auf 2.4.2 - verbesserter IMAP Import + - Upgarde Imixs-Adapters 2.3.3-SNAPSHOT - Umstellung auf neue Imixs-Archive Backup Technik - - Neuer manueller SEPA Lauf mit version rechnungseingang-de-1.2.35, rechnungseingang_sachrechnung-de-1.0.21, rechungseingang-sachrechnung-pl-1.0.1 + - Neuer manueller SEPA Lauf mit version: + - rechnungseingang-de-1.2.35, + - rechnungseingang_sachrechnung-de-1.0.21, + - rechungseingang-sachrechnung-pl-1.0.1 + - sepa-export-manual-3.0.0 + - sepa-export-manual-pl-3.0.1 **Achtung**: Kubernetes Deploymets müssen angepasst werden (siehe AGL Polen) diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml index c71a3c7..5a40849 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export_manual.xhtml @@ -55,7 +55,7 @@ - #{invoice.item['cdtr.name.cargosoft']} + #{invoice.item['cdtr.name']} diff --git a/pom.xml b/pom.xml index 35edd74..f402373 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.2.3 4.6.2-SNAPSHOT - 2.3.2 + 2.3.3-SNAPSHOT 2.4.2-SNAPSHOT 1.0.22 diff --git a/reports/sepa/result_sepa01.xml b/reports/sepa/result_sepa01.xml index 0cee055..eb56545 100644 --- a/reports/sepa/result_sepa01.xml +++ b/reports/sepa/result_sepa01.xml @@ -6,7 +6,7 @@ a8a5a0fa48bd49d4987dbda597c66055 - 2024-02-19T13:36:17 + 2024-02-23T10:02:34 2 136.87 @@ -23,7 +23,7 @@ SEPA - 2024-02-19 + 2024-02-23 Muster AG diff --git a/reports/sepa/result_sepa02.xml b/reports/sepa/result_sepa02.xml index fb95693..32e6124 100644 --- a/reports/sepa/result_sepa02.xml +++ b/reports/sepa/result_sepa02.xml @@ -6,7 +6,7 @@ a8a5a0fa48bd49d4987dbda597c66055 - 2024-02-19T13:58:23 + 2024-02-23T10:02:34 2 136.87 @@ -23,7 +23,7 @@ SEPA - 2024-02-19 + 2024-02-23 Muster AG @@ -34,7 +34,7 @@ - OOBADEFFXXX + OOBADEFFXXX SHAR @@ -47,7 +47,7 @@ - XXXADEMM + XXXADEMM @@ -71,7 +71,7 @@ - XXXADEMM + XXXADEMM diff --git a/reports/sepa/sepa-2.0.5.imixs-report b/reports/sepa/sepa-2.0.5.imixs-report index b8d427d..c768e3b 100644 --- a/reports/sepa/sepa-2.0.5.imixs-report +++ b/reports/sepa/sepa-2.0.5.imixs-report @@ -1 +1,6 @@ -$uniqueid$modelversion$workflowgroup$taskid$workflowsummaryinvoice.numberinvoice.dateinvoice.totalinvoice.currencycdtr.namecdtr.ibancdtr.bicdbtr.namedbtr.ibandbtr.bicpayment.typenumsequencenumberUTF-8SEPA export executed by the SepaScheduler. See the XSL definition for details. sepatype:"workitem" AND $taskid:5500 <?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[starts-with(normalize-space(item[@name = '$modelversion']/value),'rechnungseingang')]/item[@name='$uniqueid']/value)" /> <!-- compute total amount --> <xsl:variable name="totalsum" select="xs:decimal(sum(/data/document[starts-with(normalize-space(item[@name = '$modelversion']/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> <!-- 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="replace($exportWorkitem/item[@name='dbtr.bic']/value, ' ', '')" /> </BIC> </FinInstnId> </DbtrAgt> <ChrgBr>SLEV</ChrgBr> <!-- generate CdtTrfTxInf for each invoice --> <xsl:apply-templates select="/data/document[starts-with(normalize-space(item[@name = '$modelversion']/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[starts-with(normalize-space(item[@name = '$modelversion']/value),'rechnungseingang')]"> <!-- round to 2 digits - geht nur mit sum funktion --> <xsl:variable name="wert1" select="xs:decimal(sum(item[@name='invoice.total']/value))" /> <xsl:variable name="wert2" select="xs:decimal(round-half-to-even($wert1,2))" /> <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> <!-- round to 2 digits --> <xsl:value-of select="$wert2" /> </InstdAmt> </Amt> <CdtrAgt> <FinInstnId> <BIC> <xsl:value-of select="replace(item[@name='cdtr.bic']/value, ' ', '')" /> </BIC> </FinInstnId> </CdtrAgt> <Cdtr> <!-- MAX70 --> <Nm> <xsl:value-of select="substring(item[@name='cdtr.name']/value, 1, 70)" /> </Nm> </Cdtr> <CdtrAcct> <Id> <IBAN> <xsl:value-of select="replace(item[@name='cdtr.iban']/value, ' ', '')" /> </IBAN> </Id> </CdtrAcct> <RmtInf> <!-- Max140Text --> <Ustrd> <xsl:choose> <xsl:when test="string-length(item[@name='numsequencenumber']/value) > 0"> <!-- neues format buchungsnummer / rechn.nr --> <xsl:value-of select="item[@name='numsequencenumber']/value" /><xsl:text> / </xsl:text><xsl:value-of select="item[@name='invoice.number']/value" /> </xsl:when> <xsl:otherwise> <!-- fallback --> <xsl:value-of select="substring(item[@name='$workflowsummary']/value, 1, 140)" /> </xsl:otherwise> </xsl:choose> </Ustrd> </RmtInf> </CdtTrfTxInf> </xsl:template></xsl:stylesheet>/office-alexander-logistics/reports/sepa/sepa-2.0.5.xsl \ No newline at end of file + + + ReportEntity + +$uniqueid +$modelversion$workflowgroup$taskid$workflowsummaryinvoice.numberinvoice.dateinvoice.totalinvoice.currencycdtr.namecdtr.ibancdtr.bicdbtr.namedbtr.ibandbtr.bicpayment.typenumsequencenumberUTF-8SEPA export executed by the SepaScheduler. See the XSL definition for details. sepatype:"workitem" AND $taskid:5500 <?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[starts-with(normalize-space(item[@name = '$modelversion']/value),'rechnungseingang')]/item[@name='$uniqueid']/value)" /> <!-- compute total amount --> <xsl:variable name="totalsum" select="xs:decimal(sum(/data/document[starts-with(normalize-space(item[@name = '$modelversion']/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> <!-- 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="replace($exportWorkitem/item[@name='dbtr.bic']/value, ' ', '')" /> </BIC> </FinInstnId> </DbtrAgt> <ChrgBr>SLEV</ChrgBr> <!-- generate CdtTrfTxInf for each invoice --> <xsl:apply-templates select="/data/document[starts-with(normalize-space(item[@name = '$modelversion']/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[starts-with(normalize-space(item[@name = '$modelversion']/value),'rechnungseingang')]"> <!-- round to 2 digits - geht nur mit sum funktion --> <xsl:variable name="wert1" select="xs:decimal(sum(item[@name='invoice.total']/value))" /> <xsl:variable name="wert2" select="xs:decimal(round-half-to-even($wert1,2))" /> <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> <!-- round to 2 digits --> <xsl:value-of select="$wert2" /> </InstdAmt> </Amt> <CdtrAgt> <FinInstnId> <BIC> <xsl:value-of select="replace(item[@name='cdtr.bic']/value, ' ', '')" /> </BIC> </FinInstnId> </CdtrAgt> <Cdtr> <!-- MAX70 --> <Nm> <xsl:value-of select="substring(item[@name='cdtr.name']/value, 1, 70)" /> </Nm> </Cdtr> <CdtrAcct> <Id> <IBAN> <xsl:value-of select="replace(item[@name='cdtr.iban']/value, ' ', '')" /> </IBAN> </Id> </CdtrAcct> <RmtInf> <!-- Max140Text --> <Ustrd> <xsl:choose> <xsl:when test="string-length(item[@name='numsequencenumber']/value) > 0"> <!-- neues format buchungsnummer / rechn.nr --> <xsl:value-of select="item[@name='numsequencenumber']/value" /><xsl:text> / </xsl:text><xsl:value-of select="item[@name='invoice.number']/value" /> </xsl:when> <xsl:otherwise> <!-- fallback --> <xsl:value-of select="substring(item[@name='$workflowsummary']/value, 1, 140)" /> </xsl:otherwise> </xsl:choose> </Ustrd> </RmtInf> </CdtTrfTxInf> </xsl:template></xsl:stylesheet>/office-alexander-logistics/reports/sepa/sepa-2.0.5.xsl diff --git a/workflow/rechnungseingang-de-1.2.35.bpmn b/workflow/rechnungseingang-de-1.2.35.bpmn index cf905fc..1ea586a 100644 --- a/workflow/rechnungseingang-de-1.2.35.bpmn +++ b/workflow/rechnungseingang-de-1.2.35.bpmn @@ -40,12 +40,15 @@ + + + @@ -172,7 +175,6 @@ Task_15 IntermediateCatchEvent_48 Task_11 - IntermediateCatchEvent_8 IntermediateCatchEvent_4 IntermediateCatchEvent_14 IntermediateCatchEvent_57 @@ -1371,7 +1373,9 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com sepa-export-manual-3.0 1000 -payment.type ]]> +payment.type +70 +20]]> @@ -1940,7 +1944,6 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_23 - SequenceFlow_45 SequenceFlow_41 SequenceFlow_14 sequenceFlow_swRy5A @@ -2053,7 +2056,6 @@ result.isValid=true; SequenceFlow_42 SequenceFlow_3 SequenceFlow_43 - SequenceFlow_27 @@ -2133,32 +2135,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - Wollen Sie den SEPA Export wirklich wiederholen? -sepa-export-manual-3.0 -1000 -payment.type ]]> - - - - - - SequenceFlow_27 - SequenceFlow_45 - - - - - - - - - @@ -2965,7 +2941,8 @@ result.isValid=true; - workitem['payment.type'][0]=="credit" + + workitem['payment.type'][0]=="credit" @@ -3060,7 +3037,8 @@ result.isValid=true; SequenceFlow_5 - workitem['payment.type'][0]=="no_sepa" + + workitem['payment.type'][0]=="no_sepa" @@ -5336,7 +5314,8 @@ result.isValid=true; - workitem['sb.assist'] && ( workitem['sb.assist'][0]!="-" && workitem['sb.assist'][0]!="") + workitem['sb.assist'] + && ( workitem['sb.assist'][0]!="-" && workitem['sb.assist'][0]!="") @@ -6373,7 +6352,8 @@ Betrag: _amount (Brutto € _amount_brutto - workitem['sb.team'] && ( workitem['sb.team'][0]!="-" && workitem['sb.team'][0]!="") + workitem['sb.team'] + && ( workitem['sb.team'][0]!="-" && workitem['sb.team'][0]!="") @@ -6433,17 +6413,16 @@ Betrag: _amount (Brutto € _amount_brutto 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. + Datenübergabe an Cargosoft. -Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' + Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' @@ -6513,8 +6492,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - @@ -6799,12 +6776,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - - - - @@ -7580,19 +7551,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - - - - - - - - - - - diff --git a/workflow/rechnungseingang-pl-1.0.1.bpmn b/workflow/rechnungseingang-pl-1.0.1.bpmn index 1a34800..c4714c3 100644 --- a/workflow/rechnungseingang-pl-1.0.1.bpmn +++ b/workflow/rechnungseingang-pl-1.0.1.bpmn @@ -40,6 +40,7 @@ + @@ -1261,7 +1262,9 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com sepa-export-manual-pl-3.0 1000 -payment.type ]]> +payment.type +70 +20]]> diff --git a/workflow/rechnungseingang-sachrechnung-de-1.0.21.bpmn b/workflow/rechnungseingang-sachrechnung-de-1.0.21.bpmn index e1a6e69..94c9ec9 100644 --- a/workflow/rechnungseingang-sachrechnung-de-1.0.21.bpmn +++ b/workflow/rechnungseingang-sachrechnung-de-1.0.21.bpmn @@ -39,10 +39,13 @@ + + + @@ -98,7 +101,6 @@ IntermediateCatchEvent_23 IntermediateCatchEvent_28 IntermediateCatchEvent_18 - IntermediateCatchEvent_30 IntermediateCatchEvent_14 Task_1 IntermediateCatchEvent_26 @@ -2116,7 +2118,8 @@ Betrag: _amount (Brutto € _amount_brutto - workitem['payment.type'][0]=="direct_debit" + + workitem['payment.type'][0]=="direct_debit" @@ -2127,6 +2130,13 @@ Betrag: _amount (Brutto € _amount_brutto + + sepa-export-manual-3.0 +1000 +payment.type +70 +20]]> + SequenceFlow_5 SequenceFlow_50 @@ -2169,7 +2179,6 @@ Betrag: _amount (Brutto € _amount_brutto $workflowgroup - $workflowstatus]]> SequenceFlow_50 - SequenceFlow_14 SequenceFlow_81 SequenceFlow_51 sequenceFlow_0Js6mQ @@ -2242,19 +2251,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - Wollen Sie den SEPA Export wirklich wiederholen?]]> - - - SequenceFlow_52 - SequenceFlow_14 - - @@ -2294,7 +2290,6 @@ Betrag: _amount (Brutto € _amount_brutto$workflowgroup - $workflowstatus]]> SequenceFlow_53 SequenceFlow_13 - SequenceFlow_52 SequenceFlow_36 @@ -2367,9 +2362,6 @@ Betrag: _amount (Brutto € _amount_brutto SequenceFlow_53 - - - @@ -2423,7 +2415,8 @@ Betrag: _amount (Brutto € _amount_brutto - workitem['payment.type'][0]=="no_sepa" + + workitem['payment.type'][0]=="no_sepa" @@ -2504,9 +2497,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - @@ -3757,7 +3747,8 @@ Betrag: _amount (Brutto € _amount_brutto - workitem['payment.type'][0]=="credit" + + workitem['payment.type'][0]=="credit" @@ -4321,6 +4312,9 @@ Betrag: _amount (Brutto € _amount_brutto + + payment.type ]]> + @@ -4338,8 +4332,6 @@ Betrag: _amount (Brutto € _amount_brutto - - @@ -4636,12 +4628,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - @@ -5118,12 +5104,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - @@ -5168,12 +5148,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - @@ -5440,7 +5414,7 @@ Betrag: _amount (Brutto € _amount_brutto - + diff --git a/workflow/rechnungseingang-sachrechnung-pl-1.0.0.bpmn b/workflow/rechnungseingang-sachrechnung-pl-1.0.0.bpmn index 7fd741d..740e47b 100644 --- a/workflow/rechnungseingang-sachrechnung-pl-1.0.0.bpmn +++ b/workflow/rechnungseingang-sachrechnung-pl-1.0.0.bpmn @@ -39,6 +39,7 @@ + @@ -98,7 +99,6 @@ IntermediateCatchEvent_23 IntermediateCatchEvent_28 IntermediateCatchEvent_18 - IntermediateCatchEvent_30 IntermediateCatchEvent_14 Task_1 IntermediateCatchEvent_26 @@ -2130,6 +2130,13 @@ Betrag: _amount (Brutto € _amount_brutto + + sepa-export-manual-pl-3.0 +1000 +payment.type +70 +20]]> + SequenceFlow_5 SequenceFlow_50 @@ -2172,7 +2179,6 @@ Betrag: _amount (Brutto € _amount_brutto $workflowgroup - $workflowstatus]]> SequenceFlow_50 - SequenceFlow_14 SequenceFlow_81 SequenceFlow_51 sequenceFlow_z0r1uQ @@ -2244,19 +2250,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - Wollen Sie den SEPA Export wirklich wiederholen?]]> - - - SequenceFlow_52 - SequenceFlow_14 - - @@ -2296,7 +2289,6 @@ Betrag: _amount (Brutto € _amount_brutto$workflowgroup - $workflowstatus]]> SequenceFlow_53 SequenceFlow_13 - SequenceFlow_52 SequenceFlow_36 @@ -2369,9 +2361,6 @@ Betrag: _amount (Brutto € _amount_brutto SequenceFlow_53 - - - @@ -2506,9 +2495,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - @@ -4623,15 +4609,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - - - - - - - + @@ -5103,13 +5083,7 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - + @@ -5153,16 +5127,10 @@ Betrag: _amount (Brutto € _amount_brutto - + - - - - - - diff --git a/workflow/sepa-export-manual-3.0.0.bpmn b/workflow/sepa-export-manual-3.0.0.bpmn index be4601a..1d4577d 100644 --- a/workflow/sepa-export-manual-3.0.0.bpmn +++ b/workflow/sepa-export-manual-3.0.0.bpmn @@ -1,5 +1,13 @@ - + + @@ -30,10 +38,12 @@ + true - + + - application.urlindex.jsf?workitem=$uniqueid @@ -48,21 +58,15 @@ - + - + - - The linked invoice workitem will be added to thhe $workitemref - - - - - - + - + IntermediateCatchEvent_6 @@ -80,8 +84,14 @@ EndEvent_3 IntermediateCatchEvent_4 IntermediateCatchEvent_5 - + textAnnotation_Ku1gIw + TextAnnotation_2 + TextAnnotation_3 + TextAnnotation_1 + gateway_WuKeqQ + gateway_6FAj9g + event_y4hmYg @@ -92,9 +102,9 @@ true - - - + + + @@ -117,12 +127,12 @@ SequenceFlow_10 - + SequenceFlow_10 SequenceFlow_17 - + @@ -132,9 +142,9 @@ true - - - + + + @@ -153,17 +163,18 @@ $workflowgroup - $workflowstatus]]> - SequenceFlow_19 SequenceFlow_17 + SequenceFlow_19 - + SequenceFlow_28 SequenceFlow_18 SequenceFlow_1 - + + sequenceFlow_0QFTlw @@ -179,7 +190,7 @@ - + @@ -211,15 +222,16 @@ SequenceFlow_28 - + - + - + Rechnungscontrolling]]> @@ -229,12 +241,13 @@ SequenceFlow_7 - + - + - + @@ -243,7 +256,7 @@ - + @@ -252,7 +265,7 @@ - + @@ -272,16 +285,20 @@ - + - + home -]]> + + (^rechnungseingang) + 5500 + 300 +]]> @@ -294,14 +311,16 @@ - SequenceFlow_4 SequenceFlow_2 - + + + sequenceFlow_rhKXDQ - + - + @@ -310,7 +329,7 @@ - + @@ -319,12 +338,12 @@ - + - + @@ -337,12 +356,12 @@ - + - + @@ -355,7 +374,7 @@ - + false @@ -365,37 +384,39 @@ SequenceFlow_12 - + SequenceFlow_6 - + - + - + - + - + SequenceFlow_8 - + - + - + @@ -404,7 +425,7 @@ - + @@ -413,12 +434,12 @@ - + - + @@ -431,12 +452,12 @@ - + - + home]]> @@ -465,15 +486,15 @@ result.isValid=true; - SequenceFlow_18 - SequenceFlow_5 SequenceFlow_19 + sequenceFlow_nyv4vw - - + + - + @@ -507,10 +528,10 @@ result.isValid=true; - + - + $workflowgroup - $workflowstatus]]> @@ -518,9 +539,9 @@ result.isValid=true; SequenceFlow_11 SequenceFlow_9 SequenceFlow_4 - SequenceFlow_5 - + @@ -556,16 +577,16 @@ result.isValid=true; - + - + - + @@ -574,58 +595,61 @@ result.isValid=true; - + - + - + - + - + - + - + SEPA-Body]]> + + + SequenceFlow_1 SequenceFlow_3 - + DataOutput_2 DataOutput_2 - + + sequenceFlow_ePZrvQ - - + + - + - - + + - - - - + @@ -660,15 +684,15 @@ result.isValid=true; - + - + - + @@ -693,13 +717,13 @@ result.isValid=true; }]]> - + - + - + SEPA-Body]]> @@ -710,312 +734,463 @@ result.isValid=true; SequenceFlow_11 - + DataOutput_1 DataOutput_1 - + - + - + - + - + SequenceFlow_9 - + - + - The SEPA Export holds a list of referncees to all invoices in the item '$workitemref' + The SEPA Export holds a list of referncees to all invoices in the item + '$workitemref' -Instances are created grouped by the item 'dbtr.IBAN' + Instances are created grouped by the item 'dbtr.IBAN' -The SEPA Export process runs on a scheduled basis (e.g. once a day) - + The SEPA Export process runs on a scheduled basis (e.g. once a day) + Contains Report Definition - + - - + + - + - - + + + + + The linked invoice workitem will be added to thhe $workitemref + + + + + SequenceFlow_18 + sequenceFlow_yVyNRw + sequenceFlow_nyv4vw + + + + SequenceFlow_4 + sequenceFlow_rhKXDQ + sequenceFlow_yVyNRw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + sequenceFlow_0QFTlw + + sequenceFlow_ePZrvQ + + + + + + + + + - - - - + - - - - + - - - - + - + - + - + - - + + - + - + - + - - - - + - + - + - - + + - + - - - - + - - + + - + - - - - + - - + + - + - + - + - - + + - + - - + + - + - + - - + + - + - - - - + - - + + - + - - + + - + - - - - - + + + + - - - - - - + + + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + \ No newline at end of file diff --git a/workflow/sepa-export-manual-pl-3.0.1.bpmn b/workflow/sepa-export-manual-pl-3.0.1.bpmn index 264ec0e..96065f4 100644 --- a/workflow/sepa-export-manual-pl-3.0.1.bpmn +++ b/workflow/sepa-export-manual-pl-3.0.1.bpmn @@ -30,8 +30,10 @@ + + IntermediateCatchEvent_5 textAnnotation_Ku1gIw + TextAnnotation_2 + TextAnnotation_3 @@ -278,6 +282,11 @@ home + + (^rechnungseingang) + 5500 + 300 + ]]> @@ -294,6 +303,7 @@ SequenceFlow_4 SequenceFlow_2 + @@ -740,11 +750,12 @@ result.isValid=true; - The SEPA Export holds a list of referncees to all invoices in the item '$workitemref' + The SEPA Export holds a list of referncees to all invoices in the item + '$workitemref' -Instances are created grouped by the item 'dbtr.IBAN' + Instances are created grouped by the item 'dbtr.IBAN' -The SEPA Export process runs on a scheduled basis (e.g. once a day) + The SEPA Export process runs on a scheduled basis (e.g. once a day) @@ -765,22 +776,13 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - - - - + - - - - + - - - @@ -792,9 +794,9 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - + - + @@ -823,9 +825,6 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - - - @@ -835,9 +834,6 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - - - @@ -874,9 +870,6 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - - - @@ -911,7 +904,8 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - + + @@ -973,7 +967,7 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - + @@ -1007,7 +1001,7 @@ The SEPA Export process runs on a scheduled basis (e.g. once a day) - +