update forms
This commit is contained in:
parent
f474be940c
commit
719d86468e
1 changed files with 57 additions and 54 deletions
|
|
@ -47,12 +47,12 @@
|
|||
<bpmn2:signal id="Signal_5" name="org.imixs.ml.workflow.MLAdapter"/>
|
||||
<bpmn2:signal id="Signal_1" name="com.alexanderlogistics.ZahlungsavisAppendAdapter"/>
|
||||
<bpmn2:collaboration id="Collaboration_1">
|
||||
<bpmn2:participant id="Participant_1" name="Rechnungseingang" processRef="Process_1">
|
||||
<bpmn2:participant id="Participant_1" name="Invoice receipt" processRef="Process_1">
|
||||
<bpmn2:documentation id="documentation_3sHy9A"/>
|
||||
</bpmn2:participant>
|
||||
<bpmn2:participant id="participant_9PUChg" name="Default Process" processRef="process_2"/>
|
||||
</bpmn2:collaboration>
|
||||
<bpmn2:process definitionalCollaborationRef="Collaboration_1" id="Process_1" isExecutable="false" name="Rechnungseingang">
|
||||
<bpmn2:process definitionalCollaborationRef="Collaboration_1" id="Process_1" isExecutable="false" name="Invoice receipt">
|
||||
<bpmn2:laneSet id="LaneSet_1" name="Lane Set 1">
|
||||
<bpmn2:lane id="Lane_1" name="Ersteller">
|
||||
<bpmn2:flowNodeRef>Task_2</bpmn2:flowNodeRef>
|
||||
|
|
@ -111,6 +111,7 @@
|
|||
<bpmn2:flowNodeRef>ExclusiveGateway_3</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>DataObject_1</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>TextAnnotation_1</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>TextAnnotation_3</bpmn2:flowNodeRef>
|
||||
</bpmn2:lane>
|
||||
<bpmn2:lane id="Lane_5" name="Buchhaltung">
|
||||
<bpmn2:flowNodeRef>EndEvent_3</bpmn2:flowNodeRef>
|
||||
|
|
@ -675,18 +676,18 @@ var b= workitem.get("order.total")[0];
|
|||
<bpmn2:dataObject id="DataObject_2" name="Invoice Form">
|
||||
<bpmn2:documentation id="Documentation_8"><![CDATA[<?xml version="1.0"?>
|
||||
<imixs-form>
|
||||
<imixs-form-section columns="1" label="Rechnungsdaten">
|
||||
<item name="cdtr.name" type="text" label="Kreditor:"/>
|
||||
<imixs-form-section columns="1" label="Invoice data">
|
||||
<item name="cdtr.name" type="text" label="Vendor:"/>
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.number" type="text" label="Rechnungsnummer:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Rechnungsdatum:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Fälligkeitsdatum:" />
|
||||
<item name="invoice.number" type="text" label="Invoice number:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Due date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.total" type="currency" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -1838,30 +1839,30 @@ result.isValid=true;
|
|||
<bpmn2:dataObject id="DataObject_1" name="Invoice Form">
|
||||
<bpmn2:documentation id="Documentation_11"><![CDATA[<?xml version="1.0"?>
|
||||
<imixs-form>
|
||||
<imixs-form-section columns="2" label="Rechnungsdaten">
|
||||
<item name="cdtr.name" type="text" readonly="true" label="Kreditor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" />
|
||||
<imixs-form-section columns="2" label="Invoice data">
|
||||
<item name="cdtr.name" type="text" readonly="true" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Vendor number:" />
|
||||
</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:" />
|
||||
<item name="invoice.number" type="text" readonly="true" label="Invoice number:" />
|
||||
<item name="invoice.date" type="date" readonly="false" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="date" readonly="true" required="true" label="Due date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</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:" />
|
||||
|
||||
<item type="custom" path="alexander/zahlungsart" label="Zahlungsart:" readonly="true"/>
|
||||
<item type="custom" path="alexander/zahlungsart" label="Payment type:" readonly="true"/>
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.period" type="text" required="true" label="Buchungsperiode (yyyymm):" />
|
||||
<item name="invoice.period" type="text" required="true" label="Posting period (yyyymm):" />
|
||||
<item type="custom" path="alexander/exchangerate" required="true" label="Exchange Rate:" />
|
||||
|
||||
</imixs-form-section>
|
||||
|
|
@ -2562,19 +2563,19 @@ result.isValid=true;
|
|||
<bpmn2:dataObject id="DataObject_3" name="Invoice Form">
|
||||
<bpmn2:documentation id="Documentation_36"><![CDATA[<?xml version="1.0"?>
|
||||
<imixs-form>
|
||||
<imixs-form-section columns="2" label="Rechnungsdaten">
|
||||
<item name="cdtr.name" type="text" readonly="true" label="Kreditor:"/>
|
||||
<imixs-form-section columns="2" label="Invoice data">
|
||||
<item name="cdtr.name" type="text" readonly="true" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" readonly="true" label="Kreditorennummer:" />
|
||||
</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="true" label="Rechnungsdatum:" />
|
||||
<item name="invoice.duedate" type="date" readonly="false" required="true" label="Fälligkeitsdatum:" />
|
||||
<item name="invoice.number" type="text" readonly="true" label="Invoice number:" />
|
||||
<item name="invoice.date" type="date" readonly="true" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="date" readonly="false" required="true" label="Due date:" />
|
||||
</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="false" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" readonly="false" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -2583,8 +2584,8 @@ result.isValid=true;
|
|||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.period" type="text" readonly="true" label="Buchungsperiode (yyyymm):" />
|
||||
<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:"/>
|
||||
<item name="invoice.period" type="text" readonly="true" label="Posting period (yyyymm):" />
|
||||
<item name="" type="custom" path="alexander/zahlungsart" label="Payment type:"/>
|
||||
<item name="" type="custom" path="alexander/exchangerate" readonly="true" label="Exchange Rate:" />
|
||||
</imixs-form-section>
|
||||
|
||||
|
|
@ -4277,19 +4278,19 @@ result.isValid=true;
|
|||
<bpmn2:dataObject id="DataObject_5" name="Form">
|
||||
<bpmn2:documentation id="Documentation_67"><![CDATA[<?xml version="1.0"?>
|
||||
<imixs-form>
|
||||
<imixs-form-section columns="2" label="Rechnungsdaten">
|
||||
<item name="cdtr.name" type="text" label="Kreditor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" />
|
||||
<imixs-form-section columns="2" label="Invoice data">
|
||||
<item name="cdtr.name" type="text" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Vendor number:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.number" type="text" label="Rechnungsnummer:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Rechnungsdatum:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Fälligkeitsdatum:" />
|
||||
<item name="invoice.number" type="text" label="Invoice number:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Due date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.total" type="currency" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -4298,10 +4299,10 @@ result.isValid=true;
|
|||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.period" type="text" required="false" label="Buchungsperiode (yyyymm):" />
|
||||
<item name="invoice.period" type="text" required="false" label="Posting period (yyyymm):" />
|
||||
|
||||
<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:"/>
|
||||
<item name="" type="custom" path="alexander/spaceref" label="Bereich:" />
|
||||
<item name="" type="custom" path="alexander/zahlungsart" label="Payment type:"/>
|
||||
<item name="" type="custom" path="alexander/spaceref" label="Section:" />
|
||||
<item name="" type="custom" path="alexander/sachbearbeiter" label="Sachbearbeiter:" hide="#{!teamController.isManagerOf(workflowController.workitem.item['process.ref'])}" />
|
||||
|
||||
</imixs-form-section>
|
||||
|
|
@ -4890,13 +4891,13 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<dc:Bounds height="2130.0" width="2661.0" x="50.0" y="50.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Lane_1" id="BPMNShape_Lane_1" isHorizontal="true">
|
||||
<dc:Bounds height="721.6666666666666" width="2631.0" x="80.0" y="50.0"/>
|
||||
<dc:Bounds height="721.6666870117188" width="2631.0" x="80.0" y="50.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Lane_2" id="BPMNShape_Lane_2" isHorizontal="true">
|
||||
<dc:Bounds height="661.6666666666666" width="2631.0" x="80.0" y="771.6666666666666"/>
|
||||
<dc:Bounds height="661.6666870117188" width="2631.0" x="80.0" y="771.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Lane_5" id="BPMNShape_Lane_5" isHorizontal="true">
|
||||
<dc:Bounds height="746.6666666666666" width="2631.0" x="80.0" y="1433.3333333333333"/>
|
||||
<dc:Bounds height="746.6666259765625" width="2631.0" x="80.0" y="1432.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="StartEvent_1" id="BPMNShape_StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="119.0" y="187.0"/>
|
||||
|
|
@ -4956,9 +4957,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<dc:Bounds height="50.0" width="110.0" x="308.0" y="180.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_2" id="BPMNShape_DataObject_1">
|
||||
<dc:Bounds height="50.0" width="36.0" x="283.0" y="90.0"/>
|
||||
<dc:Bounds height="50.0" width="35.0" x="280.0" y="90.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_85">
|
||||
<dc:Bounds height="20.0" width="100.0" x="251.0" y="140.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="248.0" y="140.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_13" id="BPMNShape_IntermediateCatchEvent_13">
|
||||
|
|
@ -5109,9 +5110,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_1" id="BPMNShape_DataObject_2">
|
||||
<dc:Bounds height="50.0" width="36.0" x="311.0" y="928.0"/>
|
||||
<dc:Bounds height="50.0" width="35.0" x="310.0" y="930.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_52">
|
||||
<dc:Bounds height="20.0" width="100.0" x="279.0" y="978.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="278.0" y="980.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Task_8" id="BPMNShape_Task_8">
|
||||
|
|
@ -5370,9 +5371,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_5" id="BPMNShape_DataObject_4">
|
||||
<dc:Bounds height="50.0" width="36.0" x="758.0" y="349.0"/>
|
||||
<dc:Bounds height="50.0" width="35.0" x="780.0" y="370.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_242">
|
||||
<dc:Bounds height="20.0" width="100.0" x="726.0" y="399.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="748.0" y="420.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_55" id="BPMNShape_IntermediateCatchEvent_60">
|
||||
|
|
@ -5683,9 +5684,10 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="Association_5" id="BPMNEdge_Association_5" sourceElement="BPMNShape_DataObject_2" targetElement="BPMNShape_Task_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_70"/>
|
||||
<di:waypoint x="329.0" y="978.0"/>
|
||||
<di:waypoint x="329.0" y="1025.0"/>
|
||||
<di:waypoint x="347.0" y="1025.0"/>
|
||||
<di:waypoint x="327.5" y="980.0"/>
|
||||
<di:waypoint x="327.5" y="997.5"/>
|
||||
<di:waypoint x="402.0" y="997.5"/>
|
||||
<di:waypoint x="402.0" y="1015.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_9" id="BPMNEdge_SequenceFlow_11" sourceElement="BPMNShape_Task_8" targetElement="BPMNShape_EndEvent_3">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_73"/>
|
||||
|
|
@ -6033,9 +6035,10 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="Association_8" id="BPMNEdge_Association_8" sourceElement="BPMNShape_DataObject_4" targetElement="BPMNShape_Task_16">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_243"/>
|
||||
<di:waypoint x="776.0" y="349.0"/>
|
||||
<di:waypoint x="776.0" y="300.0"/>
|
||||
<di:waypoint x="759.0" y="300.0"/>
|
||||
<di:waypoint x="780.0" y="385.0"/>
|
||||
<di:waypoint x="769.5" y="385.0"/>
|
||||
<di:waypoint x="769.5" y="292.0"/>
|
||||
<di:waypoint x="759.0" y="292.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_104" id="BPMNEdge_SequenceFlow_105" sourceElement="BPMNShape_IntermediateCatchEvent_60" targetElement="BPMNShape_Task_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_251"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue