Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Ralph Soika 2020-12-10 11:56:44 +01:00
parent f4522a126d
commit bfbf3d7f08
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml
View file

@ -5,14 +5,7 @@
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"> xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
<div class="imixs-form-section-3">
<dl>
<dt>Kreditorennummer</dt>
<dd>
<h:inputText value="#{workflowController.workitem.item['cdtr.number']}" />
</dd>
</dl>
</div>
<h:panelGroup layout="block" styleClass="imixs-form-section" <h:panelGroup layout="block" styleClass="imixs-form-section"
id="oderlist" binding="#{orderlistContainer}"> id="oderlist" binding="#{orderlistContainer}">

25
workflow/rechnungseingang-de-1.0.1.bpmn
View file

@ -638,7 +638,9 @@ result.isValid=true;
<item name="cdtr.bic" type="text" label="BIC:" /> <item name="cdtr.bic" type="text" label="BIC:" />
</imixs-form-section> </imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation> </imixs-form>]]></bpmn2:documentation>
<bpmn2:dataState id="DataState_1"/> <bpmn2:dataState id="DataState_1"/>
</bpmn2:dataObject> </bpmn2:dataObject>
@ -1166,11 +1168,16 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
<bpmn2:signalEventDefinition id="SignalEventDefinition_1"/> <bpmn2:signalEventDefinition id="SignalEventDefinition_1"/>
</bpmn2:intermediateCatchEvent> </bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_19" name="payment.type = sepa_transfer" sourceRef="ExclusiveGateway_2" targetRef="IntermediateCatchEvent_4"> <bpmn2:sequenceFlow id="SequenceFlow_19" name="payment.type = sepa_transfer" sourceRef="ExclusiveGateway_2" targetRef="IntermediateCatchEvent_4">
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">workitem['payment.type'] &amp;&amp; workitem['payment.type'][0]!=&quot;direct_debit&quot;</bpmn2:conditionExpression> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">var a=workitem.get(&quot;invoice.total&quot;)[0];
workitem['payment.type'] &amp;&amp; workitem['payment.type'][0]!=&quot;direct_debit&quot; &amp;&amp; a>0</bpmn2:conditionExpression>
</bpmn2:sequenceFlow> </bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_23" sourceRef="IntermediateCatchEvent_4" targetRef="Task_6"/> <bpmn2:sequenceFlow id="SequenceFlow_23" sourceRef="IntermediateCatchEvent_4" targetRef="Task_6"/>
<bpmn2:sequenceFlow id="SequenceFlow_25" sourceRef="ExclusiveGateway_2" targetRef="Task_5"> <bpmn2:sequenceFlow id="SequenceFlow_25" sourceRef="ExclusiveGateway_2" targetRef="Task_5">
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">!workitem['payment.type'] || workitem['payment.type'][0]==&quot;direct_debit&quot;</bpmn2:conditionExpression> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">var a=workitem.get(&quot;invoice.total&quot;)[0];
!(workitem['payment.type'] &amp;&amp; workitem['payment.type'][0]!=&quot;direct_debit&quot; &amp;&amp; a>0)
</bpmn2:conditionExpression>
</bpmn2:sequenceFlow> </bpmn2:sequenceFlow>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_6" imixs:activityid="990" name="[OCR/ML Import]"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_6" imixs:activityid="990" name="[OCR/ML Import]">
<bpmn2:extensionElements> <bpmn2:extensionElements>
@ -2044,6 +2051,12 @@ result.isValid=true;
Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</bpmn2:text> Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</bpmn2:text>
</bpmn2:textAnnotation> </bpmn2:textAnnotation>
<bpmn2:association id="Association_1" sourceRef="TextAnnotation_1" targetRef="IntermediateCatchEvent_5005-20"/> <bpmn2:association id="Association_1" sourceRef="TextAnnotation_1" targetRef="IntermediateCatchEvent_5005-20"/>
<bpmn2:textAnnotation id="TextAnnotation_4">
<bpmn2:documentation id="Documentation_4"><![CDATA[Payment = Sepa
und invioce.total >0 (keine Gutschriften)]]></bpmn2:documentation>
<bpmn2:text>Payment = Sepa
und invoice.total >0 (keine Gutschriften)</bpmn2:text>
</bpmn2:textAnnotation>
</bpmn2:process> </bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1"> <bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1">
@ -2377,6 +2390,12 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<dc:Bounds height="14.0" width="59.0" x="675.0" y="811.0"/> <dc:Bounds height="14.0" width="59.0" x="675.0" y="811.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_TextAnnotation_5" bpmnElement="TextAnnotation_4">
<dc:Bounds height="50.0" width="171.0" x="1480.0" y="1080.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_18">
<dc:Bounds height="44.0" width="159.0" x="1486.0" y="1080.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_0" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_1"> <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="155.0" y="205.0"/>
<di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/> <di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/>