From d4da6a58697495b52ba0de030f719e5c885e803c Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Mon, 17 Jun 2024 15:51:58 +0200
Subject: [PATCH] update models

---
 workflow/rechnungseingang-dwc-1.0.0.bpmn |   2 +-
 workflow/sepa-export-manual-3.0.0.bpmn   | 101 ++++++++++++++++++++++-
 workflow/zahlungseingang-dwc-1.0.1.bpmn  |   2 +-
 3 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/workflow/rechnungseingang-dwc-1.0.0.bpmn b/workflow/rechnungseingang-dwc-1.0.0.bpmn
index 5e5aa04..fceede3 100644
--- a/workflow/rechnungseingang-dwc-1.0.0.bpmn
+++ b/workflow/rechnungseingang-dwc-1.0.0.bpmn
@@ -691,7 +691,7 @@ var b= workitem.get("order.total")[0];
 
   <imixs-form-section columns="3">
     <item name="invoice.total" type="currency"  required="true"   label="Invoice amount:" />
-    <item name="invoice.currency" type="selectOneMenu" required="true" options="DH;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD;PLN"   label="Currency:" />
+    <item name="invoice.currency" type="selectOneMenu" required="true" options="AED;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD;PLN"   label="Currency:" />
   </imixs-form-section>
   <imixs-form-section columns="2">
 
diff --git a/workflow/sepa-export-manual-3.0.0.bpmn b/workflow/sepa-export-manual-3.0.0.bpmn
index e5f71ac..b774774 100644
--- a/workflow/sepa-export-manual-3.0.0.bpmn
+++ b/workflow/sepa-export-manual-3.0.0.bpmn
@@ -83,6 +83,7 @@
         <bpmn2:flowNodeRef>gateway_WuKeqQ</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>gateway_6FAj9g</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>event_y4hmYg</bpmn2:flowNodeRef>
+        <bpmn2:flowNodeRef>event_WJfyAw</bpmn2:flowNodeRef>
       </bpmn2:lane>
     </bpmn2:laneSet>
     <bpmn2:task id="Task_2" imixs:processid="1900" name="Abgeschlossen">
@@ -156,6 +157,7 @@
       <bpmn2:documentation id="Documentation_33"><![CDATA[<textblock><itemvalue>$workflowgroup</itemvalue> - <itemvalue>$workflowstatus</itemvalue></textblock>]]></bpmn2:documentation>
       <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
+      <bpmn2:outgoing>sequenceFlow_3uz0ww</bpmn2:outgoing>
     </bpmn2:task>
     <bpmn2:sequenceFlow id="SequenceFlow_17" sourceRef="Task_6" targetRef="EndEvent_3">
       <bpmn2:documentation id="documentation_Ell3PQ"/>
@@ -524,6 +526,7 @@ result.isValid=true;
       <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+      <bpmn2:incoming>sequenceFlow_ANROcA</bpmn2:incoming>
     </bpmn2:task>
     <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_2" imixs:activityid="20" name="Ausführen">
       <bpmn2:extensionElements>
@@ -876,14 +879,93 @@ result.isValid=true;
     <bpmn2:association id="association_MJWNtQ" sourceRef="TextAnnotation_1" targetRef="IntermediateCatchEvent_1">
       <bpmn2:documentation id="documentation_LzaY0A"/>
     </bpmn2:association>
+    <bpmn2:intermediateCatchEvent id="event_WJfyAw" imixs:activityid="70" name="Zurück zur Bearbeitung">
+      <bpmn2:extensionElements>
+        <imixs:item name="keylogtimeformat" type="xs:string">
+          <imixs:value><![CDATA[2]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyarchive" type="xs:string">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtmailsubject" type="xs:string">
+          <imixs:value/>
+        </imixs:item>
+        <imixs:item name="keyaccessmode" type="xs:string">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyscheduledactivity" type="xs:string">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="rtfmailbody" type="xs:string">
+          <imixs:value/>
+        </imixs:item>
+        <imixs:item name="keyversion" type="xs:string">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyaddwritefields" type="xs:string"/>
+        <imixs:item name="numnextactivityid" type="xs:int">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyfollowup" type="xs:string">
+          <imixs:value><![CDATA[2]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keypublicresult" type="xs:string">
+          <imixs:value><![CDATA[1]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keylogdateformat" type="xs:string">
+          <imixs:value><![CDATA[2]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyownershipfields" type="xs:string"/>
+        <imixs:item name="numnextid" type="xs:int">
+          <imixs:value><![CDATA[5000]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtnextprocesstree" type="xs:string">
+          <imixs:value/>
+        </imixs:item>
+        <imixs:item name="txtactivityresult" type="xs:string">
+          <imixs:value><![CDATA[<item name="action">home</item>]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtname" type="xs:string">
+          <imixs:value><![CDATA[Speichern]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyownershipmode" type="xs:string">
+          <imixs:value><![CDATA[0]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="rtfresultlog" type="xs:string">
+          <imixs:value><![CDATA[Stornierung aufgehoben]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="keyupdateacl" type="xs:boolean">
+          <imixs:value>false</imixs:value>
+        </imixs:item>
+        <imixs:item name="txtbusinessrule" type="CDATA">
+          <imixs:value><![CDATA[var result={};
+ var refField="txtcomment"; 
+result.isValid=true;
+
+ if (  ( workitem.get(refField) == null || ''==workitem.get(refField)[0])   ) {
+     result.isValid=false;
+     result.errorMessage='Bitte geben Sie einen Kommentar ein.';
+  }]]></imixs:value>
+        </imixs:item>
+      </bpmn2:extensionElements>
+      <bpmn2:documentation id="documentation_CLKOLA"><![CDATA[Stornierung aufheben]]></bpmn2:documentation>
+      <bpmn2:incoming>sequenceFlow_3uz0ww</bpmn2:incoming>
+      <bpmn2:outgoing>sequenceFlow_ANROcA</bpmn2:outgoing>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="sequenceFlow_3uz0ww" sourceRef="Task_6" targetRef="event_WJfyAw">
+      <bpmn2:documentation id="documentation_Jg7E2Q"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_ANROcA" sourceRef="event_WJfyAw" targetRef="Task_1">
+      <bpmn2:documentation id="documentation_3U9nAw"/>
+    </bpmn2:sequenceFlow>
   </bpmn2:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1" name="Default Process Diagram">
     <bpmndi:BPMNPlane bpmnElement="Collaboration_1" id="BPMNPlane_1">
       <bpmndi:BPMNShape bpmnElement="Participant_1" id="BPMNShape_Participant_1" isHorizontal="true">
-        <dc:Bounds height="500.0" width="1510.0" x="100.0" y="150.0"/>
+        <dc:Bounds height="590.0" width="1510.0" x="100.0" y="150.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="Lane_1" id="BPMNShape_Lane_1" isHorizontal="true">
-        <dc:Bounds height="500.0" width="1480.0" x="130.0" y="150.0"/>
+        <dc:Bounds height="590.0" width="1480.0" x="130.0" y="150.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="Task_6" id="BPMNShape_Task_6">
         <dc:Bounds height="50.0" width="110.0" x="1310.0" y="540.0"/>
@@ -1126,6 +1208,21 @@ result.isValid=true;
         <di:waypoint x="526.0" y="515.0"/>
         <di:waypoint x="547.0" y="515.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape bpmnElement="event_WJfyAw" id="BPMNShape_syReeQ">
+        <dc:Bounds height="36.0" width="36.0" x="1347.0" y="637.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_mN0bdw">
+          <dc:Bounds height="20.0" width="100.0" x="1320.5" y="677.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sequenceFlow_3uz0ww" id="BPMNEdge_7ATSvw" sourceElement="BPMNShape_Task_6" targetElement="BPMNShape_syReeQ">
+        <di:waypoint x="1365.0" y="590.0"/>
+        <di:waypoint x="1365.0" y="637.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sequenceFlow_ANROcA" id="BPMNEdge_EZ21vA" sourceElement="BPMNShape_syReeQ" targetElement="BPMNShape_Task_1">
+        <di:waypoint x="1347.0" y="655.0"/>
+        <di:waypoint x="936.0" y="655.0"/>
+        <di:waypoint x="936.0" y="460.0"/>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
     <bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
       <dc:Font name="arial" size="9.0"/>
diff --git a/workflow/zahlungseingang-dwc-1.0.1.bpmn b/workflow/zahlungseingang-dwc-1.0.1.bpmn
index 4960697..35a4c75 100644
--- a/workflow/zahlungseingang-dwc-1.0.1.bpmn
+++ b/workflow/zahlungseingang-dwc-1.0.1.bpmn
@@ -428,7 +428,7 @@ result.isValid=true;
   <imixs-form-section columns="3" >
     <item name="payment.amount" type="currency"  required="true"   label="Zahlbetrag:" />
     <item name="payment.difference" type="currency"  required="false"   label="Differenzbetrag:" />
-    <item name="payment.currency" type="selectOneMenu" required="true" options="EUR;USD"   label="Währung:" />
+    <item name="payment.currency" type="selectOneMenu" required="true" options="AED;USD;EUR"   label="Währung:" />
   </imixs-form-section>
  
   <imixs-form-section label="Offene Posten" path="alexander/section_opliste" readonly="false" />