From b2e7da155654846403c8de5faffcab3d8d83fae6 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Thu, 11 Nov 2021 14:19:06 +0100
Subject: [PATCH] update

---
 .../pages/workitems/forms/sepa_export.xhtml   |   2 +-
 workflow/gutschriftabgleich-de-1.0.5.bpmn     |   3 +-
 workflow/rechnungseingang-de-1.2.12.bpmn      | 192 +++++++++++++++++-
 3 files changed, 193 insertions(+), 4 deletions(-)

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 5391915..3ed45dc 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
@@ -73,7 +73,7 @@
 
 			<tr style="border-top: 1px solid #ccc;">
 				<td />
-				<td />
+				<td /><td />
 				<td><strong>Summary</strong></td>
 				<td style="text-align: right;"><strong><h:outputText
 							value="#{sepaController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
diff --git a/workflow/gutschriftabgleich-de-1.0.5.bpmn b/workflow/gutschriftabgleich-de-1.0.5.bpmn
index 6382150..f3eb51a 100644
--- a/workflow/gutschriftabgleich-de-1.0.5.bpmn
+++ b/workflow/gutschriftabgleich-de-1.0.5.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- origin at X=0.0 Y=0.0 -->
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:ext="http://org.eclipse.bpmn2/ext" xmlns:imixs="http://www.imixs.org/bpmn2" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="Definitions_1" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.2.SNAPSHOT-v20200602-1600-B1" targetNamespace="http://www.imixs.org/bpmn2">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:ext="http://org.eclipse.bpmn2/ext" xmlns:imixs="http://www.imixs.org/bpmn2" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="Definitions_1" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.3.Final-v20210519-2007-B1" targetNamespace="http://www.imixs.org/bpmn2">
   <bpmn2:extensionElements>
     <imixs:item name="txtworkflowmodelversion" type="xs:string">
       <imixs:value><![CDATA[gutschriftabgleich-de-1.0]]></imixs:value>
@@ -1962,6 +1962,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
 
 	<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:" />
 	<item name="" type="custom" path="alexander/spaceref" label="Bereich:" />
+	<item name="" type="custom" path="alexander/sachbearbeiter" label="Sachbearbeiter:" />
    </imixs-form-section>
 </imixs-form>]]></bpmn2:documentation>
       <bpmn2:dataState id="DataState_3"/>
diff --git a/workflow/rechnungseingang-de-1.2.12.bpmn b/workflow/rechnungseingang-de-1.2.12.bpmn
index 1cc5400..16b66fa 100644
--- a/workflow/rechnungseingang-de-1.2.12.bpmn
+++ b/workflow/rechnungseingang-de-1.2.12.bpmn
@@ -96,6 +96,7 @@
         <bpmn2:flowNodeRef>IntermediateCatchEvent_36</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>IntermediateCatchEvent_5005-10</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>ExclusiveGateway_7</bpmn2:flowNodeRef>
+        <bpmn2:flowNodeRef>IntermediateCatchEvent_55</bpmn2:flowNodeRef>
       </bpmn2:lane>
       <bpmn2:lane id="Lane_4" name="Auszubildende / Bereich Assist">
         <bpmn2:flowNodeRef>ExclusiveGateway_3</bpmn2:flowNodeRef>
@@ -113,6 +114,7 @@
         <bpmn2:flowNodeRef>IntermediateThrowEvent_7</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>ExclusiveGateway_8</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>IntermediateCatchEvent_52</bpmn2:flowNodeRef>
+        <bpmn2:flowNodeRef>IntermediateCatchEvent_50</bpmn2:flowNodeRef>
       </bpmn2:lane>
       <bpmn2:lane id="Lane_6" name="Bereich Manager">
         <bpmn2:flowNodeRef>IntermediateCatchEvent_10</bpmn2:flowNodeRef>
@@ -413,6 +415,7 @@ if (workitem['payment.type'][0]!="direct_debit"  && workitem['payment.type'][0]!
       <bpmn2:incoming>SequenceFlow_75</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_83</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_106</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_104</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
     </bpmn2:task>
@@ -2859,7 +2862,7 @@ result.isValid=true;
     <bpmn2:task id="Task_12" imixs:processid="5250" name="Reklamiert">
       <bpmn2:extensionElements>
         <imixs:item name="txteditorid" type="xs:string">
-          <imixs:value><![CDATA[]]></imixs:value>
+          <imixs:value><![CDATA[alexander/form_basic_read]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowabstract" type="xs:string">
           <imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@@ -4355,6 +4358,7 @@ result.isValid=true;
       <bpmn2:incoming>SequenceFlow_92</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_94</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_117</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_100</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_101</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_93</bpmn2:outgoing>
     </bpmn2:task>
@@ -4362,7 +4366,7 @@ result.isValid=true;
     <bpmn2:task id="Task_18" imixs:processid="5260" name="Reklamiert">
       <bpmn2:extensionElements>
         <imixs:item name="txteditorid" type="xs:string">
-          <imixs:value><![CDATA[]]></imixs:value>
+          <imixs:value><![CDATA[alexander/form_basic_read]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowabstract" type="xs:string">
           <imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@@ -5296,11 +5300,170 @@ result.isValid=true;
   <imixs-form-section columns="2">
     <item name="cdtr.number" type="text"  required="true"   label="Kreditorennummer:" />
     <item name="invoice.period" type="text"  required="true"   label="Buchungsperiode (yyyymm):" />
+    <item name="" type="custom" path="alexander/exchangerate"  required="true" label="Exchange Rate:" />
    </imixs-form-section>
 
     <imixs-form-section path="alexander/sub_positionen"></imixs-form-section>
 </imixs-form>]]></bpmn2:documentation>
     </bpmn2:dataObject>
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_50" imixs:activityid="96" name="Sofort Überweisung">
+      <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><![CDATA[]]></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><![CDATA[]]></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:value><![CDATA[process.team]]></imixs:value>
+          <imixs:value><![CDATA[process.manager]]></imixs:value>
+        </imixs:item>
+        <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:value><![CDATA[process.team]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="numnextid" type="xs:int">
+          <imixs:value><![CDATA[5020]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtnextprocesstree" type="xs:string">
+          <imixs:value><![CDATA[]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtactivityresult" type="xs:string">
+          <imixs:value><![CDATA[<validation name="required">false</validation>
+<item name="_img"><img src="/layout/icons/icon009.png"></item>]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtname" type="xs:string">
+          <imixs:value><![CDATA[Anweisen]]></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[Rechnung wurde gemahnt.]]></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_62"><![CDATA[Rechnung sofort überweisen]]></bpmn2:documentation>
+      <bpmn2:outgoing>SequenceFlow_100</bpmn2:outgoing>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_100" sourceRef="IntermediateCatchEvent_50" targetRef="Task_17"/>
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_55" imixs:activityid="96" name="Sofort Überweisung">
+      <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><![CDATA[]]></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><![CDATA[]]></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:value><![CDATA[process.team]]></imixs:value>
+          <imixs:value><![CDATA[process.manager]]></imixs:value>
+        </imixs:item>
+        <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:value><![CDATA[process.team]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="numnextid" type="xs:int">
+          <imixs:value><![CDATA[5020]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtnextprocesstree" type="xs:string">
+          <imixs:value><![CDATA[]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtactivityresult" type="xs:string">
+          <imixs:value><![CDATA[<validation name="required">false</validation>
+<item name="_img"><img src="/layout/icons/icon009.png"></item>]]></imixs:value>
+        </imixs:item>
+        <imixs:item name="txtname" type="xs:string">
+          <imixs:value><![CDATA[Anweisen]]></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[Rechnung wurde gemahnt.]]></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_70"><![CDATA[Rechnung sofort überweisen]]></bpmn2:documentation>
+      <bpmn2:outgoing>SequenceFlow_104</bpmn2:outgoing>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_104" sourceRef="IntermediateCatchEvent_55" targetRef="Task_5005"/>
     <bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
     <bpmn2:textAnnotation id="TextAnnotation_2">
       <bpmn2:text>Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden.
@@ -6042,6 +6205,18 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
           <dc:Bounds height="14.0" width="28.0" x="634.0" y="1160.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_55" bpmnElement="IntermediateCatchEvent_50">
+        <dc:Bounds height="36.0" width="36.0" x="420.0" y="1110.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_246">
+          <dc:Bounds height="28.0" width="73.0" x="402.0" y="1146.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_60" bpmnElement="IntermediateCatchEvent_55">
+        <dc:Bounds height="36.0" width="36.0" x="347.0" y="976.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_250">
+          <dc:Bounds height="28.0" width="73.0" x="329.0" y="1012.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_0" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_1">
         <di:waypoint xsi:type="dc:Point" x="155.0" y="205.0"/>
         <di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/>
@@ -6818,6 +6993,19 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
         <di:waypoint xsi:type="dc:Point" x="609.0" y="1206.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_248"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_101" bpmnElement="SequenceFlow_100" sourceElement="BPMNShape_IntermediateCatchEvent_55" targetElement="BPMNShape_Task_19">
+        <di:waypoint xsi:type="dc:Point" x="438.0" y="1146.0"/>
+        <di:waypoint xsi:type="dc:Point" x="438.0" y="1202.0"/>
+        <di:waypoint xsi:type="dc:Point" x="499.0" y="1202.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_249"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_105" bpmnElement="SequenceFlow_104" sourceElement="BPMNShape_IntermediateCatchEvent_60" targetElement="BPMNShape_Task_2">
+        <di:waypoint xsi:type="dc:Point" x="365.0" y="976.0"/>
+        <di:waypoint xsi:type="dc:Point" x="365.0" y="956.0"/>
+        <di:waypoint xsi:type="dc:Point" x="383.0" y="956.0"/>
+        <di:waypoint xsi:type="dc:Point" x="383.0" y="935.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_251"/>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
     <bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
       <dc:Font name="arial" size="9.0"/>