Merge branch 'master' of ssh://git@git.imixs.com/git/office-alexander-logistics

This commit is contained in:
Ralph Soika 2021-02-08 11:38:34 +01:00
commit 14f75ad67b
2 changed files with 15 additions and 4 deletions

View file

@ -974,7 +974,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmn2:sequenceFlow id="SequenceFlow_47" sourceRef="Task_5" targetRef="EndEvent_2"/> <bpmn2:sequenceFlow id="SequenceFlow_47" sourceRef="Task_5" targetRef="EndEvent_2"/>
<bpmn2:sequenceFlow id="SequenceFlow_51" sourceRef="IntermediateCatchEvent_5005-20" targetRef="ExclusiveGateway_6"/> <bpmn2:sequenceFlow id="SequenceFlow_51" sourceRef="IntermediateCatchEvent_5005-20" targetRef="ExclusiveGateway_6"/>
<bpmn2:sequenceFlow id="SequenceFlow_52" sourceRef="IntermediateCatchEvent_15" targetRef="IntermediateThrowEvent_1"/> <bpmn2:sequenceFlow id="SequenceFlow_52" sourceRef="IntermediateCatchEvent_15" targetRef="IntermediateThrowEvent_1"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_17" imixs:activityid="20" name="Sofort Abschließen"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_17" imixs:activityid="20" name="Sofort ausführen">
<bpmn2:extensionElements> <bpmn2:extensionElements>
<imixs:item name="keylogtimeformat" type="xs:string"> <imixs:item name="keylogtimeformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value> <imixs:value><![CDATA[2]]></imixs:value>
@ -1041,6 +1041,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value>false</imixs:value> <imixs:value>false</imixs:value>
</imixs:item> </imixs:item>
</bpmn2:extensionElements> </bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_13"><![CDATA[Rechnung wird direkt in den SEPA Lauf gegeben]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_55</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_55</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent> </bpmn2:intermediateCatchEvent>
@ -1890,7 +1891,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmn2:sequenceFlow id="SequenceFlow_27" sourceRef="Task_7" targetRef="IntermediateCatchEvent_8"/> <bpmn2:sequenceFlow id="SequenceFlow_27" sourceRef="Task_7" targetRef="IntermediateCatchEvent_8"/>
<bpmn2:sequenceFlow id="SequenceFlow_45" sourceRef="IntermediateCatchEvent_8" targetRef="Task_6"/> <bpmn2:sequenceFlow id="SequenceFlow_45" sourceRef="IntermediateCatchEvent_8" targetRef="Task_6"/>
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="ExclusiveGateway_5" targetRef="Task_3"/> <bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="ExclusiveGateway_5" targetRef="Task_3"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_20" imixs:activityid="50" name="Fälligkeit"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_20" imixs:activityid="50" name="[Fälligkeit]">
<bpmn2:extensionElements> <bpmn2:extensionElements>
<imixs:item name="keylogtimeformat" type="xs:string"> <imixs:item name="keylogtimeformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value> <imixs:value><![CDATA[2]]></imixs:value>
@ -2412,7 +2413,7 @@ und invoice.total >0 (keine Gutschriften)</bpmn2:text>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_27" bpmnElement="IntermediateCatchEvent_17"> <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_27" bpmnElement="IntermediateCatchEvent_17">
<dc:Bounds height="36.0" width="36.0" x="1329.0" y="1151.0"/> <dc:Bounds height="36.0" width="36.0" x="1329.0" y="1151.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_116" labelStyle="BPMNLabelStyle_1"> <bpmndi:BPMNLabel id="BPMNLabel_116" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="28.0" width="68.0" x="1313.0" y="1187.0"/> <dc:Bounds height="28.0" width="56.0" x="1319.0" y="1187.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_ExclusiveGateway_4" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true"> <bpmndi:BPMNShape id="BPMNShape_ExclusiveGateway_4" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
@ -2574,7 +2575,7 @@ und invoice.total >0 (keine Gutschriften)</bpmn2:text>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_23" bpmnElement="IntermediateCatchEvent_20"> <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_23" bpmnElement="IntermediateCatchEvent_20">
<dc:Bounds height="36.0" width="36.0" x="1329.0" y="1090.0"/> <dc:Bounds height="36.0" width="36.0" x="1329.0" y="1090.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_112"> <bpmndi:BPMNLabel id="BPMNLabel_112">
<dc:Bounds height="14.0" width="49.0" x="1323.0" y="1126.0"/> <dc:Bounds height="14.0" width="55.0" x="1320.0" y="1126.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_21"> <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_21">

View file

@ -140,6 +140,16 @@ Please check the process:
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value> <imixs:value>false</imixs:value>
</imixs:item> </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:extensionElements>
<bpmn2:documentation id="Documentation_2"><![CDATA[SEPA von <username>$editor</username>]]></bpmn2:documentation> <bpmn2:documentation id="Documentation_2"><![CDATA[SEPA von <username>$editor</username>]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_13</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>