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:
gaby 2021-02-24 17:28:17 +01:00
parent 82a843cc1a
commit d8e711d532
3 changed files with 17 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,11 +27,13 @@
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="true" <h:selectOneMenu style="width:20em;" required="true"
value="#{workflowController.workitem.item['payment.type']}"> value="#{workflowController.workitem.item['payment.type']}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr"> <c:if test="#{workflowController.workitem.item['$workflowgroup'] eq 'Rechnungseingang'}" >
<f:selectItem itemLabel="#{dbtr.item['name']}" <c:forEach items="#{sepaController.dbtrList}" var="dbtr">
itemValue="#{dbtr.item['name']}" /> <f:selectItem itemLabel="#{dbtr.item['name']}"
</c:forEach> itemValue="#{dbtr.item['name']}" />
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" /> </c:forEach>
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
</c:if>
<f:selectItem itemLabel="Gutschrift" itemValue="credit" /> <f:selectItem itemLabel="Gutschrift" itemValue="credit" />
</h:selectOneMenu> </h:selectOneMenu>
</dd> </dd>

40
workflow/gutschriftabgleich-de-1.0.0.bpmn
View file

@ -48,7 +48,7 @@
</bpmn2:collaboration> </bpmn2:collaboration>
<bpmn2:process id="Process_1" name="Gutschrift Abgleich" definitionalCollaborationRef="Collaboration_1" isExecutable="false"> <bpmn2:process id="Process_1" name="Gutschrift Abgleich" definitionalCollaborationRef="Collaboration_1" isExecutable="false">
<bpmn2:laneSet id="LaneSet_1" name="Lane Set 1"> <bpmn2:laneSet id="LaneSet_1" name="Lane Set 1">
<bpmn2:lane id="Lane_1" name="Ersteller"> <bpmn2:lane id="Lane_1" name="Buchhaltung">
<bpmn2:flowNodeRef>Task_2</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>Task_2</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>ExclusiveGateway_1</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>ExclusiveGateway_1</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>StartEvent_1</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>StartEvent_1</bpmn2:flowNodeRef>
@ -383,13 +383,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:item name="txtactivityresult" type="xs:string"> <imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<item name="action">home</item> <imixs:value><![CDATA[<item name="action">home</item>
<item name="space.lastname"><itemvalue>space.name</itemvalue></item> <item name="space.lastname"><itemvalue>space.name</itemvalue></item>
<item name="subprocess_create">
<modelversion>cargosoft-export-1.0</modelversion>
<task>1000</task>
<event>100</event>
<items>(?!txtworkflowhistory)(^[a-zA-Z]|^_)</items>
</item>
]]></imixs:value> ]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txtname" type="xs:string"> <imixs:item name="txtname" type="xs:string">
@ -399,7 +392,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[0]]></imixs:value> <imixs:value><![CDATA[0]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="rtfresultlog" type="xs:string"> <imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Sachlich geprüft und freigegeben, Datenübergabe an Cargosoft]]></imixs:value> <imixs:value><![CDATA[Sachlich geprüft und freigegeben.]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value> <imixs:value>false</imixs:value>
@ -421,7 +414,6 @@ var b= workitem.get("order.total")[0];
<bpmn2:incoming>SequenceFlow_8</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_51</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_51</bpmn2:outgoing>
<bpmn2:outputSet id="OutputSet_2" name="Output Set 2"/> <bpmn2:outputSet id="OutputSet_2" name="Output Set 2"/>
<bpmn2:signalEventDefinition id="SignalEventDefinition_3"/>
</bpmn2:intermediateCatchEvent> </bpmn2:intermediateCatchEvent>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5005-10" imixs:activityid="10" name="Speichern"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5005-10" imixs:activityid="10" name="Speichern">
<bpmn2:extensionElements> <bpmn2:extensionElements>
@ -785,7 +777,7 @@ result.isValid=true;
</bpmn2:intermediateCatchEvent> </bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_15" sourceRef="IntermediateCatchEvent_3" targetRef="ExclusiveGateway_1"/> <bpmn2:sequenceFlow id="SequenceFlow_15" sourceRef="IntermediateCatchEvent_3" targetRef="ExclusiveGateway_1"/>
<bpmn2:sequenceFlow id="SequenceFlow_24" sourceRef="IntermediateCatchEvent_5000-20" targetRef="ExclusiveGateway_4"/> <bpmn2:sequenceFlow id="SequenceFlow_24" sourceRef="IntermediateCatchEvent_5000-20" targetRef="ExclusiveGateway_4"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_6" imixs:activityid="980" name="[Übertrag - Anfrage]"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_6" imixs:activityid="980" name="[Übertrag - Rechungseingang]">
<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>
@ -1316,7 +1308,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[0]]></imixs:value> <imixs:value><![CDATA[0]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="rtfresultlog" type="xs:string"> <imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Ausgangsrechnung erstellt]]></imixs:value> <imixs:value><![CDATA[Ausgangsrechnung erstellt.]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value> <imixs:value>false</imixs:value>
@ -1341,7 +1333,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[0]]></imixs:value> <imixs:value><![CDATA[0]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="rtfmailbody" type="xs:string"> <imixs:item name="rtfmailbody" type="xs:string">
<imixs:value><![CDATA[Folgende Rechnung ist nicht in Ordnung: <imixs:value><![CDATA[Folgende Gutschrift ist nicht in Ordnung:
Kreditor: <itemvalue>cdtr.name</itemvalue> Kreditor: <itemvalue>cdtr.name</itemvalue>
Rechnungsnummer: <itemvalue>invoice.number</itemvalue> Rechnungsnummer: <itemvalue>invoice.number</itemvalue>
@ -1800,12 +1792,6 @@ result.isValid=true;
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="ExclusiveGateway_6" targetRef="Task_5000"/> <bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="ExclusiveGateway_6" targetRef="Task_5000"/>
<bpmn2:sequenceFlow id="SequenceFlow_5" sourceRef="Task_5000" targetRef="IntermediateCatchEvent_18"/> <bpmn2:sequenceFlow id="SequenceFlow_5" sourceRef="Task_5000" targetRef="IntermediateCatchEvent_18"/>
<bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/> <bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
<bpmn2:textAnnotation id="TextAnnotation_1">
<bpmn2:text>Datenübergabe an Cargosoft.
Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</bpmn2:text>
</bpmn2:textAnnotation>
<bpmn2:association id="Association_1" sourceRef="TextAnnotation_1" targetRef="IntermediateCatchEvent_5005-20"/>
<bpmn2:association id="Association_5" sourceRef="DataObject_1" targetRef="Task_5005"/> <bpmn2:association id="Association_5" sourceRef="DataObject_1" targetRef="Task_5005"/>
<bpmn2:textAnnotation id="TextAnnotation_4"> <bpmn2:textAnnotation id="TextAnnotation_4">
<bpmn2:text>Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt</bpmn2:text> <bpmn2:text>Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt</bpmn2:text>
@ -1823,7 +1809,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<bpmndi:BPMNShape id="BPMNShape_Lane_1" bpmnElement="Lane_1" isHorizontal="true"> <bpmndi:BPMNShape id="BPMNShape_Lane_1" bpmnElement="Lane_1" isHorizontal="true">
<dc:Bounds height="391.0" width="1321.0" x="80.0" y="50.0"/> <dc:Bounds height="391.0" width="1321.0" x="80.0" y="50.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_24" labelStyle="BPMNLabelStyle_1"> <bpmndi:BPMNLabel id="BPMNLabel_24" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="45.0" width="14.0" x="86.0" y="223.0"/> <dc:Bounds height="69.0" width="14.0" x="86.0" y="211.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_Lane_2" bpmnElement="Lane_2" isHorizontal="true"> <bpmndi:BPMNShape id="BPMNShape_Lane_2" bpmnElement="Lane_2" isHorizontal="true">
@ -1949,7 +1935,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_11" bpmnElement="IntermediateCatchEvent_6"> <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_11" bpmnElement="IntermediateCatchEvent_6">
<dc:Bounds height="36.0" width="36.0" x="119.0" y="97.0"/> <dc:Bounds height="36.0" width="36.0" x="119.0" y="97.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_57" labelStyle="BPMNLabelStyle_1"> <bpmndi:BPMNLabel id="BPMNLabel_57" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="28.0" width="66.0" x="104.0" y="133.0"/> <dc:Bounds height="42.0" width="104.0" x="85.0" y="133.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_Task_3" bpmnElement="Task_1"> <bpmndi:BPMNShape id="BPMNShape_Task_3" bpmnElement="Task_1">
@ -2012,12 +1998,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<dc:Bounds height="14.0" width="42.0" x="987.0" y="766.0"/> <dc:Bounds height="14.0" width="42.0" x="987.0" y="766.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_TextAnnotation_4" bpmnElement="TextAnnotation_1">
<dc:Bounds height="69.0" width="334.0" x="720.0" y="557.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_107">
<dc:Bounds height="63.0" width="322.0" x="726.0" y="557.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_21"> <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_21">
<dc:Bounds height="36.0" width="36.0" x="590.0" y="814.0"/> <dc:Bounds height="36.0" width="36.0" x="590.0" y="814.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_120" labelStyle="BPMNLabelStyle_1"> <bpmndi:BPMNLabel id="BPMNLabel_120" labelStyle="BPMNLabelStyle_1">
@ -2254,12 +2234,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<di:waypoint xsi:type="dc:Point" x="1120.0" y="748.0"/> <di:waypoint xsi:type="dc:Point" x="1120.0" y="748.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_102"/> <bpmndi:BPMNLabel id="BPMNLabel_102"/>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_1" bpmnElement="Association_1" sourceElement="BPMNShape_TextAnnotation_4" targetElement="BPMNShape_IntermediateCatchEvent_7">
<di:waypoint xsi:type="dc:Point" x="720.0" y="591.0"/>
<di:waypoint xsi:type="dc:Point" x="608.0" y="591.0"/>
<di:waypoint xsi:type="dc:Point" x="608.0" y="730.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_108"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_55" bpmnElement="SequenceFlow_54" sourceElement="BPMNShape_EventBasedGateway_2" targetElement="BPMNShape_IntermediateCatchEvent_24"> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_55" bpmnElement="SequenceFlow_54" sourceElement="BPMNShape_EventBasedGateway_2" targetElement="BPMNShape_IntermediateCatchEvent_24">
<di:waypoint xsi:type="dc:Point" x="489.0" y="773.0"/> <di:waypoint xsi:type="dc:Point" x="489.0" y="773.0"/>
<di:waypoint xsi:type="dc:Point" x="489.0" y="832.0"/> <di:waypoint xsi:type="dc:Point" x="489.0" y="832.0"/>

8
workflow/rechnungseingang-de-1.0.6.bpmn
View file

@ -2671,13 +2671,11 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
</imixs:item> </imixs:item>
<imixs:item name="txtactivityresult" type="xs:string"> <imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<validation name="required">false</validation> <imixs:value><![CDATA[<validation name="required">false</validation>
<item name="subprocess_create"> <model>
<modelversion>gutschriftabgleich-de-1.0</modelversion> <version>gutschriftabgleich-de-1.0</version>
<task>5000</task> <task>5000</task>
<event>980</event> <event>980</event>
<items>$file,_childitems,(^request.|^ml.)</items> </model>]]></imixs:value>
<action>/pages/workitems/workitem.jsf?id=<itemvalue>$uniqueid</itemvalue></action>
</item>]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txtname" type="xs:string"> <imixs:item name="txtname" type="xs:string">
<imixs:value><![CDATA[Anweisen]]></imixs:value> <imixs:value><![CDATA[Anweisen]]></imixs:value>