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 2021-11-10 14:38:44 +01:00
parent 509c7858cc
commit a3a308855c
6 changed files with 76 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
office-alexander-logistics-app/src/main/webapp/js/imixs-office.workitem.custom.js
View file

@ -54,7 +54,7 @@ $(document).ready(function() {
// clear input
$(this).val('');
});
});

4
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml
View file

@ -13,7 +13,7 @@
<ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item[name]}">
value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember"
items="#{space.itemList['space.assist']}">
@ -26,7 +26,7 @@
<ui:fragment rendered="#{!readonly}">
<h:outputText
value="#{userController.getUserName(workitem.item[name])}">
value="#{userController.getUserName(workitem.item['sb.assist'])}">
</h:outputText>
</ui:fragment>

2
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml
View file

@ -13,9 +13,7 @@
<h:selectOneMenu required="false" style="width:20em;"
value="#{workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>

3
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml
View file

@ -5,7 +5,6 @@
xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:fragment rendered="#{!readonly}">
<h:selectOneMenu style="width:20em;"
required="#{empty required?false:required}"
@ -18,7 +17,7 @@
itemValue="#{space.item['$UniqueID']}">
</f:selectItem>
</c:forEach>
<f:ajax render="imixs_workitem_form_id" />
<f:ajax render="#{formComponents.clientId}" execute="#{formComponents.clientId}" />
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">

3
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml
View file

@ -12,8 +12,7 @@
<c:if
test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}"
itemValue="#{dbtr.item['name']}" />
<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" />
</c:forEach>
<f:selectItem itemLabel="Manuelle Auslandszahlung"
itemValue="no_sepa" />

90
workflow/rechnungseingang-de-1.2.12.bpmn
View file

@ -169,7 +169,7 @@
<bpmn2:task id="Task_5000" imixs:processid="5300" name="Freigabe">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>
@ -377,7 +377,7 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]!
<bpmn2:task id="Task_5005" imixs:processid="5200" name="Sachprüfung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type_read|alexander/sub_responsible|alexander/sub_exchange_rate|alexander/sub_positionen]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -823,7 +823,7 @@ result.isValid=true;
<bpmn2:task id="Task_3" imixs:processid="5400" name="Freigegeben zur Bezahlung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></imixs:value>
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>
@ -1035,7 +1035,7 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]!
<bpmn2:task id="Task_5" imixs:processid="5900" name="Erledigt">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_payment_type_read|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></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>
@ -1514,7 +1514,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Verteilt zur Sachprüfung ⇨ <itemvalue>space.name</itemvalue> ]]></imixs:value>
<imixs:value><![CDATA[Verteilt zur Sachprüfung ⇨ <username>$owner</username>]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
@ -1743,7 +1743,7 @@ result.isValid=true;
<bpmn2:task id="Task_6" imixs:processid="5500" name="SEPA Lauf">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_payment_type_read|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></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>
@ -2172,7 +2172,12 @@ 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/azubi" label="Azubi:" />
<item name="" type="custom" path="alexander/exchangerate" required="true" label="Exchange Rate:" />
</imixs-form-section>
<imixs-form-section path="alexander/sub_positionen" />
</imixs-form>]]></bpmn2:documentation>
<bpmn2:dataState id="DataState_2"/>
</bpmn2:dataObject>
@ -2321,7 +2326,7 @@ result.isValid=true;
<bpmn2:task id="Task_9" imixs:processid="5350" name="Zahlung gesperrt">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></imixs:value>
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>
@ -2776,7 +2781,7 @@ result.isValid=true;
<bpmn2:task id="Task_11" imixs:processid="5510" name="Manuelle Auslandszahlung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_payment_type_read|alexander/sub_exchange_rate_read|alexander/sub_positionen_read]]></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>
@ -2841,9 +2846,13 @@ result.isValid=true;
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.number" type="text" readonly="true" required="true" label="Kreditorennummer:" />
<item name="invoice.period" type="text" readonly="true" required="true" label="Buchungsperiode (yyyymm):" />
<item name="cdtr.number" type="text" readonly="true" label="Kreditorennummer:" />
<item name="invoice.period" type="text" readonly="true" label="Buchungsperiode (yyyymm):" />
<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:"/>
<item name="" type="custom" path="alexander/exchangerate" readonly="true" label="Exchange Rate:" />
</imixs-form-section>
<imixs-form-section path="alexander/sub_positionen_read"></imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
<bpmn2:dataState id="DataState_3"/>
</bpmn2:dataObject>
@ -4309,7 +4318,7 @@ result.isValid=true;
<bpmn2:task id="Task_17" imixs:processid="5210" name="Sachprüfung Delegation">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type_read|alexander/sub_exchange_rate|alexander/sub_positionen]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -5260,6 +5269,36 @@ result.isValid=true;
<item name="" type="custom" path="alexander/azubi" label="Azubi:" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
</bpmn2:dataObject>
<bpmn2:dataObject id="DataObject_6" name="Form">
<bpmn2:documentation id="Documentation_65"><![CDATA[<?xml version="1.0"?>
<imixs-form>
<imixs-form-section columns="1" label="Rechnungsdaten">
<item name="cdtr.name" type="text" readonly="true" label="Kreditor:"/>
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.number" type="text" readonly="true" label="Rechnungsnummer:" />
<item name="invoice.date" type="date" readonly="false" label="Rechnungsdatum:" />
<item name="invoice.duedate" type="date" readonly="true" required="true" label="Fälligkeitsdatum:" />
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.total" type="currency" readonly="true" required="true" label="Rechnungsbetrag:" />
<item name="invoice.currency" readonly="true" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.iban" type="text" readonly="true" label="IBAN:" />
<item name="cdtr.bic" type="text" readonly="true" label="BIC:" />
</imixs-form-section>
<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):" />
</imixs-form-section>
<imixs-form-section path="alexander/sub_positionen"></imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
</bpmn2:dataObject>
<bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
@ -5287,6 +5326,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<bpmn2:association id="Association_6" sourceRef="TextAnnotation_3" targetRef="IntermediateCatchEvent_44"/>
<bpmn2:association id="Association_8" sourceRef="DataObject_5" targetRef="Task_14"/>
<bpmn2:association id="Association_9" sourceRef="DataObject_7" targetRef="Task_1"/>
<bpmn2:association id="Association_11" sourceRef="DataObject_6" targetRef="Task_17"/>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1">
@ -5599,9 +5639,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_2" bpmnElement="DataObject_1">
<dc:Bounds height="50.0" width="36.0" x="300.0" y="780.0"/>
<dc:Bounds height="50.0" width="36.0" x="300.0" y="798.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_52">
<dc:Bounds height="14.0" width="70.0" x="283.0" y="830.0"/>
<dc:Bounds height="14.0" width="70.0" x="283.0" y="848.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_Task_8" bpmnElement="Task_8">
@ -5699,9 +5739,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_3" bpmnElement="DataObject_3">
<dc:Bounds height="50.0" width="36.0" x="740.0" y="1678.0"/>
<dc:Bounds height="50.0" width="36.0" x="960.0" y="1460.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_27">
<dc:Bounds height="14.0" width="70.0" x="723.0" y="1728.0"/>
<dc:Bounds height="14.0" width="70.0" x="943.0" y="1510.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_Task_14" bpmnElement="Task_12">
@ -5996,6 +6036,12 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<dc:Bounds height="14.0" width="28.0" x="504.0" y="650.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_6" bpmnElement="DataObject_6">
<dc:Bounds height="50.0" width="36.0" x="630.0" y="1110.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_247">
<dc:Bounds height="14.0" width="28.0" x="634.0" y="1160.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"/>
@ -6259,7 +6305,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<bpmndi:BPMNLabel id="BPMNLabel_121"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_5" bpmnElement="Association_5" sourceElement="BPMNShape_DataObject_2" targetElement="BPMNShape_Task_2">
<di:waypoint xsi:type="dc:Point" x="318.0" y="830.0"/>
<di:waypoint xsi:type="dc:Point" x="318.0" y="848.0"/>
<di:waypoint xsi:type="dc:Point" x="318.0" y="897.0"/>
<di:waypoint xsi:type="dc:Point" x="347.0" y="897.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_70"/>
@ -6375,9 +6421,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<bpmndi:BPMNLabel id="BPMNLabel_26"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_7" bpmnElement="Association_7" sourceElement="BPMNShape_DataObject_3" targetElement="BPMNShape_Task_1">
<di:waypoint xsi:type="dc:Point" x="758.0" y="1678.0"/>
<di:waypoint xsi:type="dc:Point" x="758.0" y="1615.0"/>
<di:waypoint xsi:type="dc:Point" x="840.0" y="1615.0"/>
<di:waypoint xsi:type="dc:Point" x="978.0" y="1510.0"/>
<di:waypoint xsi:type="dc:Point" x="978.0" y="1606.0"/>
<di:waypoint xsi:type="dc:Point" x="950.0" y="1606.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_135"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="BPMNShape_IntermediateCatchEvent_24" targetElement="BPMNShape_Task_14">
@ -6766,6 +6812,12 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<di:waypoint xsi:type="dc:Point" x="455.0" y="543.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_245"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_11" bpmnElement="Association_11" sourceElement="BPMNShape_DataObject_6" targetElement="BPMNShape_Task_19">
<di:waypoint xsi:type="dc:Point" x="648.0" y="1160.0"/>
<di:waypoint xsi:type="dc:Point" x="648.0" y="1206.0"/>
<di:waypoint xsi:type="dc:Point" x="609.0" y="1206.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_248"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>