From 9511d7fd95d96a0b7595b1e7fbc9f5ac4ef5f276 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 28 Apr 2025 12:36:11 +0200 Subject: [PATCH] minor fixes --- RELEASENOTES.md | 64 +- .../BusinessPartnerController.java | 29 +- .../ZahlungseingangSaldoAdapter.java | 2 +- .../dwc/rechnungsausgang-dwc-1.0.3-draft.bpmn | 100 +- ...seingang-sachrechnung-dwc-1.0.3-draft.bpmn | 5542 +++++++++++++++++ .../dwc/zahlungseingang-dwc-1.0.3-draft.bpmn | 181 +- 6 files changed, 5615 insertions(+), 303 deletions(-) create mode 100644 workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.3-draft.bpmn diff --git a/RELEASENOTES.md b/RELEASENOTES.md index aaa5304..04f8e3f 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,53 +1,57 @@ # Versionen -### 1.3.4 (Development) +## 1.3.4 (Development) -- Finalizierung Business Partner Interface +- Finalisierung Business Partner Interface |- Neue Plugin Logik (Aktualisierung der BP Nummer und Aktivierung von BP Objekten falls diese archiviert waren) - Zoho Schnittstelle -#### Migration +### Migration -- Encoding für CSV Impoort aus cargosoft muss auf `encoding=UTF-8` stehen! +- Encoding für CSV Import aus cargosoft muss auf `encoding=UTF-8` stehen! - Neues Businesspartner BPMN Modell einspielen + +#### Daten Synchronisation + - Erstmal nach Dubletten suchen: - https://alexander-logistics-dwc.office-workflow.de/api/cargosoft/remove-dubletten?maxcount=5000 ACHTUNG kann sehr lange laufen (1 Stunde) -- Jetzt die Daten synchen +- Jetzt die Daten syncen - https://alexander-logistics-dwc.office-workflow.de/api/cargosoft/bp-sync?maxcount=25000 ACHTUNG kann sehr sehr sehr!! lange laufen (3 Stunde) kann aber auch dann mehrfach aufgerufen werden so dass sich das alles zum guten wendet -- Modelle Anpassen +#### Modelle Anpassen in verschiedenen müssen die alten form parts `alexander/cdtreingabe` und `alexander/dbtreingabe` mit dem neuen `alexander/businesspartner_search` ausgetauscht werden. Der `BusinessPartnerController` bzw. das `InvoicePlugin` bzw. `InvoiceOutgoingPlugin` kümmert sich automatisch um die Migration Betroffen sind: -- reingsungseingang -- rechnungsausgang -- zahlungseingang -- Analyse-debitor +- rechnungseingang-\* +- rechnugnseingang-sachrechnung\* +- rechnungsausgang-\* +- zahlungseingang-\* +- Analyse-debitor-\* -### 1.3.3 +## 1.3.3 -- Imixs-Archive 3.1.1. Compactor Sevrvice +- Imixs-Archive 3.1.1. Compactor Service Migration: set ARCHIVE_SNAPSHOT_GRACE_PERIOD= 5 set ARCHIVE_SNAPSHOT_COMPACTOR= enabled -### 1.3.2 +## 1.3.2 - Posteingang Worklfow - timeout logic - added lucene client to docker image - added optional oidc profile -### 1.3.1 +## 1.3.1 - Imixs-Office-Workflow 5.0.4 - Mulit Currecy Feature für Ausgangsrechnungen @@ -55,7 +59,7 @@ set ARCHIVE_SNAPSHOT_COMPACTOR= enabled - Neue SOA - Neues Mahnwesen -### 1.3.0 +## 1.3.0 - Migration auf Imixs-Office-Workflow 5.0.2 - Upgrade Imixs-Workflow 6.7 @@ -81,7 +85,7 @@ set ARCHIVE_SNAPSHOT_COMPACTOR= enabled 3. Alle Workflow Modelle erneuern -### 1.2.21 (Draft) +## 1.2.21 (Draft) - Beim XML Invoice Import wird nun auch die Sprache für das Mahnwesen ermittelt (fehlte) - Währungsunabhängigkeit @@ -100,27 +104,27 @@ set ARCHIVE_SNAPSHOT_COMPACTOR= enabled 3. Alle Workflow Modelle erneuern -### 1.2.20 (Development) +## 1.2.20 (Development) - Optimierung OP-Liste nach KW - Fix Fälligkeit in maske - Fix XML Schnittstelle Cargosoft Sammelgutschrift -### 1.2.19 +## 1.2.19 - Neue XML Invoice Schnittstelle - Mahnwesen englisch -### 1.2.18 +## 1.2.18 - Fix in Archiv Suche CustomSearchController.java - requestscoped -### 1.2.17 +## 1.2.17 - neue Archive suche - invoice.exchangerate Input ersetzt nun . durch , und locale='de' damit der Wert richtig gespeichert wird!! -### 1.2.16 +## 1.2.16 - Upgrade Imixs-Archive auf 2.4.2 - verbesserter IMAP Import - Upgarde Imixs-Adapters 2.3.3-SNAPSHOT @@ -135,7 +139,7 @@ set ARCHIVE_SNAPSHOT_COMPACTOR= enabled **Achtung**: Kubernetes Deploymets müssen angepasst werden (siehe AGL Polen) -### 1.2.15 +## 1.2.15 - kleinere Layout Anpassungen in den Formualren und input Feldern (Positionstabelle, Sachbearbeiter Auswahl...) - invoice.exchangerate Input ersetzt nun , durch . damit der Wert richtig gespeichert wird. @@ -144,28 +148,28 @@ set ARCHIVE_SNAPSHOT_COMPACTOR= enabled https://alexander-logistics.office-workflow.de/api/cargosoft/fix/100 -### 1.2.14 +## 1.2.14 - Internationalisierung -### 1.2.13 +## 1.2.13 - Payment Statistik - Neue Indexfelder 'invoice.date' 'payment.date' **WICHTIG:** Es muss nach dem Update einmal der Index neu berechnet werden. -### 1.2.12 +## 1.2.12 - Neue Debitoren/Kreditoren Verwaltung - Zusätzliche E-Mail Realisiert über neue Custom Feld 'textlist' - validierung e-mail erfolgt über Adapter und Workflow Rule -### 1.2.10 +## 1.2.10 Inkasso Workflow -### 1.2.8 +## 1.2.8 Neue KI Version @@ -173,18 +177,18 @@ Rechnungasausgangsworkflow + Mahnwesen + OP Zalungsavis für SEPA Rechnungen freigeschaltet -### 1.2.7 +## 1.2.7 Erweiterte Kreditoren Verwaltung. Es können bis zu 4 IBAN/BIC Kombinationen pro Kreditor erfasst werden. Wenn vom Benutezr bei der Rechnungserfassugn eine Kombination eingegeben wird die noch nicht gespeichert war, wird diese aufgenomen und die anderen rutschen nach unten. -### 1.2.6 +## 1.2.6 Übernahme von IBAN BIC aus kreditoren verwaltung -### 1.1.1 +## 1.1.1 - Cargosoft Splitbuchungen - Es können zu einer Rechnung mehrere Cargosoft Exporte erzeugt werden. Die Sub Rechnungsnummern stehen im Feld numsequencenumber_sub - Neue Modellversion rechnungseingnag-de-1.2.0 und posteingang-de-1.0.4 diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java index 9ff3a76..8dabd7e 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java @@ -249,6 +249,19 @@ public class BusinessPartnerController implements Serializable { } } + if (workitem.getModelVersion().startsWith("zahlungseingang-")) { + // resolve partner.id and partner.name + if (workitem.getItemValueString("partner.id").isEmpty()) { + // try to resolve the data + ItemCollection bpWorkitem = getBusinessPartnerByID( + InvoiceUtil.buildBPID(workitem.getItemValueString("dbtr.number"))); + if (bpWorkitem != null) { + workitem.setItemValue("partner.id", bpWorkitem.getItemValueString("partner.id")); + workitem.setItemValue("partner.name", bpWorkitem.getItemValueString("partner.name")); + } + } + } + } /** @@ -339,8 +352,8 @@ public class BusinessPartnerController implements Serializable { businessPartner.getItemValueString("cdtr.number")); workflowController.getWorkitem().setItemValue("cdtr.name", businessPartner.getItemValueString("partner.name")); - workflowController.getWorkitem().setItemValue("cdtr.email", - businessPartner.getItemValue("cdtr.email")); + workflowController.getWorkitem().setItemValue("cdtr.mail", + businessPartner.getItemValue("cdtr.mail")); } // Ausgangsrechnung @@ -349,8 +362,8 @@ public class BusinessPartnerController implements Serializable { businessPartner.getItemValueString("dbtr.number")); workflowController.getWorkitem().setItemValue("dbtr.name", businessPartner.getItemValueString("partner.name")); - workflowController.getWorkitem().setItemValue("dbtr.email", - businessPartner.getItemValue("dbtr.email")); + workflowController.getWorkitem().setItemValue("dbtr.mail", + businessPartner.getItemValue("dbtr.mail")); } // Zahlungseingang @@ -359,8 +372,8 @@ public class BusinessPartnerController implements Serializable { businessPartner.getItemValueString("dbtr.number")); workflowController.getWorkitem().setItemValue("dbtr.name", businessPartner.getItemValueString("partner.name")); - workflowController.getWorkitem().setItemValue("dbtr.email", - businessPartner.getItemValue("dbtr.email")); + workflowController.getWorkitem().setItemValue("dbtr.mail", + businessPartner.getItemValue("dbtr.mail")); } // Analyse Debitor @@ -369,8 +382,8 @@ public class BusinessPartnerController implements Serializable { businessPartner.getItemValueString("dbtr.number")); workflowController.getWorkitem().setItemValue("dbtr.name", businessPartner.getItemValueString("partner.name")); - workflowController.getWorkitem().setItemValue("dbtr.email", - businessPartner.getItemValue("dbtr.email")); + workflowController.getWorkitem().setItemValue("dbtr.mail", + businessPartner.getItemValue("dbtr.mail")); } } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java index 685f237..cf049d3 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java @@ -64,7 +64,7 @@ public class ZahlungseingangSaldoAdapter implements SignalAdapter { String bpid = InvoiceUtil.buildBPID(document.getItemValueString("dbtr.number")); ItemCollection dbtrItemCol = businessPartnerService.getBusinessPartnerByID(bpid); if (dbtrItemCol != null) { - document.setItemValue(MahnlaufService.ITEM_DBTR_EMAIL, dbtrItemCol.getItemValue("dbtr.email")); + document.setItemValue(MahnlaufService.ITEM_DBTR_EMAIL, dbtrItemCol.getItemValue("dbtr.mail")); } return document; diff --git a/workflow/dwc/rechnungsausgang-dwc-1.0.3-draft.bpmn b/workflow/dwc/rechnungsausgang-dwc-1.0.3-draft.bpmn index 36990a6..681047d 100644 --- a/workflow/dwc/rechnungsausgang-dwc-1.0.3-draft.bpmn +++ b/workflow/dwc/rechnungsausgang-dwc-1.0.3-draft.bpmn @@ -130,7 +130,6 @@ th { font-weight: bold;} event_Rou0Sw event_0zodvw textAnnotation_QBZ00w - event_EO54Yg event_iUSXSg @@ -284,7 +283,6 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_14 SequenceFlow_39 SequenceFlow_22 - sequenceFlow_tjoqtg sequenceFlow_OttgXA @@ -1246,7 +1244,6 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht SequenceFlow_22 sequenceFlow_m0aH7g sequenceFlow_di0Bhg - sequenceFlow_6HEChQ SequenceFlow_21 @@ -1371,83 +1368,6 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - false - - - - sequenceFlow_tjoqtg - sequenceFlow_6HEChQ - - - - - - - @@ -1484,7 +1404,7 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + @@ -2055,24 +1975,6 @@ result.isValid=true; - - - - - - - - - - - - - - - - - - diff --git a/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.3-draft.bpmn b/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.3-draft.bpmn new file mode 100644 index 0000000..8341aeb --- /dev/null +++ b/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.3-draft.bpmn @@ -0,0 +1,5542 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + Task_2 + ExclusiveGateway_1 + StartEvent_1 + IntermediateCatchEvent_3 + IntermediateCatchEvent_13 + IntermediateCatchEvent_6 + IntermediateCatchEvent_24 + IntermediateCatchEvent_7 + EndEvent_3 + Task_8 + IntermediateCatchEvent_19 + IntermediateThrowEvent_3 + IntermediateCatchEvent_5000-20 + EventBasedGateway_1 + IntermediateCatchEvent_36 + IntermediateThrowEvent_6 + IntermediateCatchEvent_40 + IntermediateThrowEvent_7 + + DataObject_2 + + + + Task_5005 + Task_4 + Task_3 + IntermediateCatchEvent_5005-20 + IntermediateCatchEvent_5005-10 + EndEvent_1 + IntermediateCatchEvent_21 + IntermediateCatchEvent_25 + IntermediateCatchEvent_2 + IntermediateCatchEvent_4 + IntermediateCatchEvent_8 + IntermediateThrowEvent_2 + IntermediateThrowEvent_4 + IntermediateCatchEvent_27 + IntermediateCatchEvent_32 + IntermediateCatchEvent_33 + EventBasedGateway_2 + ExclusiveGateway_3 + EventBasedGateway_3 + DataObject_1 + + + + Task_9 + Task_14 + Task_15 + Task_5 + Task_6 + IntermediateCatchEvent_1 + IntermediateCatchEvent_11 + IntermediateCatchEvent_28 + IntermediateCatchEvent_29 + IntermediateCatchEvent_31 + IntermediateCatchEvent_5 + IntermediateCatchEvent_9 + IntermediateCatchEvent_14 + IntermediateThrowEvent_1 + IntermediateCatchEvent_18 + EndEvent_4 + IntermediateCatchEvent_20 + IntermediateCatchEvent_22 + IntermediateCatchEvent_38 + IntermediateCatchEvent_39 + event_AQYumg + Task_1 + Task_7 + Task_10 + Task_11 + Task_12 + IntermediateCatchEvent_10 + IntermediateCatchEvent_12 + IntermediateCatchEvent_15 + IntermediateCatchEvent_16 + IntermediateCatchEvent_17 + EndEvent_2 + IntermediateCatchEvent_23 + IntermediateThrowEvent_5 + IntermediateCatchEvent_26 + IntermediateCatchEvent_34 + IntermediateCatchEvent_35 + IntermediateCatchEvent_37 + IntermediateCatchEvent_41 + IntermediateCatchEvent_42 + EventBasedGateway_4 + ExclusiveGateway_2 + ExclusiveGateway_4 + DataObject_3 + event_CdMKxg + gateway_3c48vQ + gateway_qxWQdw + event_F7ChuQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home + + stop + false + +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_46 + SequenceFlow_1 + + + SequenceFlow_0 + SequenceFlow_15 + SequenceFlow_21 + SequenceFlow_33 + + + + + + + SequenceFlow_0 + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_38 + SequenceFlow_42 + SequenceFlow_63 + SequenceFlow_71 + SequenceFlow_37 + SequenceFlow_66 + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +space.name +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_8 + + sequenceFlow_ee55Sw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_38 + + + + + + SequenceFlow_37 + SequenceFlow_8 + SequenceFlow_54 + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgcdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_33 + SequenceFlow_20 + SequenceFlow_22 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + + SequenceFlow_20 + + + + + + SequenceFlow_15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + start + false +]]> + + + + + + + + + + + + false + + + + SequenceFlow_21 + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_59 + SequenceFlow_7 + SequenceFlow_40 + + + SequenceFlow_40 + + + + + + + + + + + + cdtr.name invoice.number]]> + + + + + + + + + cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + + + + SequenceFlow_54 + SequenceFlow_6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_17 + SequenceFlow_60 + SequenceFlow_9 + + + SequenceFlow_9 + + + + + + + SequenceFlow_17 + + + + + + + + SequenceFlow_22 + SequenceFlow_46 + SequenceFlow_49 + SequenceFlow_78 + SequenceFlow_83 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich löschen? + + stop + false + +cancel]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_49 + SequenceFlow_48 + + + SequenceFlow_48 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_60 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_59 + + + + + + + + + + + + + + cdtr.name invoice.number]]> + + + + + + + + + cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich archivieren?]]> + + + + + + + + + + + + false + + + + + + + + SequenceFlow_68 + SequenceFlow_7 + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_3 + SequenceFlow_6 + SequenceFlow_2 + SequenceFlow_39 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_4 + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_4 + SequenceFlow_75 + SequenceFlow_23 + SequenceFlow_47 + sequenceFlow_c8O3Og + + + + + + SequenceFlow_23 + SequenceFlow_18 + SequenceFlow_19 + SequenceFlow_64 + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_19 + SequenceFlow_12 + SequenceFlow_27 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_18 + SequenceFlow_28 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_24 + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_24 + SequenceFlow_31 + SequenceFlow_56 + SequenceFlow_26 + SequenceFlow_61 + sequenceFlow_0sm1Bw + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_28 + SequenceFlow_43 + SequenceFlow_12 + SequenceFlow_57 + sequenceFlow_dWbH6w + + + + + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_31 + SequenceFlow_29 + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + + + + + + + + + SequenceFlow_56 + SequenceFlow_30 + + + + + SequenceFlow_29 + SequenceFlow_30 + SequenceFlow_35 + SequenceFlow_5 + SequenceFlow_10 + + + + + + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_34 + SequenceFlow_79 + SequenceFlow_32 + sequenceFlow_nl8KTw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_34 + + + SequenceFlow_32 + + + + + + + + + + workitem['payment.type'][0]=="direct_debit" + + + + + + + + + + + + sepa-export-manual-dwc-3.0 +1000 +payment.type +70 +20]]> + + + SequenceFlow_5 + SequenceFlow_50 + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_50 + SequenceFlow_81 + SequenceFlow_51 + sequenceFlow_z0r1uQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + SequenceFlow_51 + SequenceFlow_13 + + + + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_53 + SequenceFlow_13 + SequenceFlow_36 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_53 + + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_10 + SequenceFlow_80 + SequenceFlow_11 + + + + + + workitem['payment.type'][0]=="no_sepa" + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + SequenceFlow_11 + SequenceFlow_36 + SequenceFlow_16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +space.name +false]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_39 + SequenceFlow_41 + + + + + + SequenceFlow_1 + SequenceFlow_41 + SequenceFlow_42 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_43 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich löschen?]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_26 + SequenceFlow_25 + + + SequenceFlow_25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + SequenceFlow_44 + + + + + + + + txtlastcomment +numsequencenumber_sub]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_44 + SequenceFlow_58 + SequenceFlow_45 + + + SequenceFlow_45 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_57 + SequenceFlow_58 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_61 + SequenceFlow_62 + + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_47 + SequenceFlow_63 + + + + + + + + + SequenceFlow_70 + + + + + SequenceFlow_67 + + + + + SequenceFlow_65 + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_64 + SequenceFlow_65 + + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home + + start + false +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_66 + SequenceFlow_67 + + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_69 + SequenceFlow_70 + + + SequenceFlow_2 + SequenceFlow_68 + SequenceFlow_69 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_71 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_72 + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_72 + SequenceFlow_85 + SequenceFlow_73 + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + SequenceFlow_73 + SequenceFlow_74 + + + + + + + + + + + + + SequenceFlow_75 + SequenceFlow_76 + + sequenceFlow_ee55Sw + + + + + + + + + + SequenceFlow_77 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich archivieren? + + stop + false + +cancel]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_78 + SequenceFlow_77 + + + + + + + + + SequenceFlow_79 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_80 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_81 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + stop + false + + + rechnungseingang-dwc-1.0 + 5000 + 990 + ]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_83 + SequenceFlow_82 + + + SequenceFlow_82 + + + + + + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_76 + SequenceFlow_86 + SequenceFlow_84 + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_84 + SequenceFlow_85 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_86 + + + + + + + + + + + + + + + + + + + + + + + payment.type ]]> + + + + + + sequenceFlow_z0r1uQ + sequenceFlow_00jhXg + + + + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $uniqueid + 60000 + + ftp.target.path + \.pdf$ + +]]> + + + + + + + + + + + + false + + + + + + + + + SequenceFlow_27 + sequenceFlow_0sm1Bw + + + + + + + + + + SequenceFlow_62 + sequenceFlow_dWbH6w + sequenceFlow_00jhXg + + + + + + + SequenceFlow_35 + sequenceFlow_nl8KTw + SequenceFlow_16 + SequenceFlow_74 + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $uniqueid + 60000 + + ftp.target.path + \.pdf$ + +]]> + + + + + + + + + + + + false + + + + + + + + + sequenceFlow_c8O3Og + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/dwc/zahlungseingang-dwc-1.0.3-draft.bpmn b/workflow/dwc/zahlungseingang-dwc-1.0.3-draft.bpmn index da0b891..e43d524 100644 --- a/workflow/dwc/zahlungseingang-dwc-1.0.3-draft.bpmn +++ b/workflow/dwc/zahlungseingang-dwc-1.0.3-draft.bpmn @@ -8,6 +8,7 @@ + @@ -171,13 +172,10 @@ DataObject_1 - Task_3 - IntermediateCatchEvent_2 Task_2 IntermediateCatchEvent_6 DataObject_2 - event_qz0fZQ event_OJtddA @@ -289,7 +287,6 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_6 - SequenceFlow_7 SequenceFlow_10 SequenceFlow_3 sequenceFlow_HyzQdw @@ -624,7 +621,7 @@ result.isValid=true; - + @@ -638,128 +635,13 @@ result.isValid=true; ]]> - - - - payment.date - payment.amount payment.currency (dbtr.number - dbtr.name)]]> - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - $workflowgroup - $workflowstatus]]> - SequenceFlow_2 - sequenceFlow_WiUf3A - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - SequenceFlow_2 - SequenceFlow_7 - - - - - - - - - - - - - sequenceFlow_WiUf3A - - - - - + @@ -851,20 +733,24 @@ result.isValid=true; false - - + - + + + + + + - + sequenceFlow_HyzQdw @@ -918,10 +804,10 @@ th { font-weight: bold;} - + - + @@ -993,18 +879,9 @@ th { font-weight: bold;} - + - - - - - - - - - - + @@ -1069,36 +946,10 @@ th { font-weight: bold;} - + - - - - - - - - - - - - - - - - - - - - - - - - - -