update model
This commit is contained in:
parent
4fb35d252b
commit
c2c3b6e798
1 changed files with 78 additions and 34 deletions
|
|
@ -167,6 +167,7 @@
|
|||
<bpmn2:flowNodeRef>DataObject_3</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>TextAnnotation_2</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_62</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>dataObject_nmZfRw</bpmn2:flowNodeRef>
|
||||
</bpmn2:lane>
|
||||
</bpmn2:laneSet>
|
||||
<bpmn2:task id="Task_5000" imixs:processid="5300" name="Approval">
|
||||
|
|
@ -524,17 +525,17 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
<imixs:item name="keyupdateacl" type="xs:boolean">
|
||||
<imixs:value>false</imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtbusinessrule" type="CDATA">
|
||||
<imixs:item name="txtbusinessrule" type="xs:string">
|
||||
<imixs:value><![CDATA[var result={};
|
||||
result.isValid=true;
|
||||
|
||||
var a=workitem.get("invoice.total")[0];
|
||||
var b= workitem.get("order.total")[0];
|
||||
var a=workitem.getItemValueString('invoice.total');
|
||||
var b=workitem.getItemValueString('order.total');
|
||||
|
||||
if ( b>0 && (parseFloat(a)!=parseFloat(b)) ) {
|
||||
if ( b>0 && (parseFloat(a)!=parseFloat(b)) ) {
|
||||
result.isValid=false;
|
||||
result.errorMessage="Der Rechnungsbetrag " + a+ " stimmt nicht mit dem Positionsbetrag " + b + " überein.";
|
||||
}]]></imixs:value>
|
||||
result.errorMessage="The invoice total " + a+ " does not match the position total " + b + " .";
|
||||
}]]></imixs:value>
|
||||
</imixs:item>
|
||||
</bpmn2:extensionElements>
|
||||
<bpmn2:documentation id="Documentation_23"><![CDATA[Invoice checked, forward to accounting]]></bpmn2:documentation>
|
||||
|
|
@ -5008,8 +5009,48 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
<bpmn2:sequenceFlow id="sequenceFlow_96OeGA" sourceRef="event_t00kZQ" targetRef="Task_2">
|
||||
<bpmn2:documentation id="documentation_R2aeIQ"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:association id="association_0NqVIw" sourceRef="DataObject_3" targetRef="Task_9">
|
||||
<bpmn2:documentation id="documentation_Yvsl5g"/>
|
||||
<bpmn2:dataObject id="dataObject_nmZfRw" imixs:datatype="form-data" name="Invoice Form">
|
||||
<bpmn2:documentation id="documentation_bUcYnQ"><![CDATA[<?xml version="1.0"?>
|
||||
<imixs-form>
|
||||
<imixs-form-section columns="2" label="Invoice data">
|
||||
<item name="cdtr.name" type="text" readonly="true" label="Vendor:"/>
|
||||
<item name="partner.id" type="custom" path="alexander/businesspartner_search" requred="true" readonly="true" label="Vendor number:"/>
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
<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:" />
|
||||
<item name="invoice.servicedate" type="date" required="false" label="Service date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="custom" required="true" path="alexander/currency_in" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
<item name="cdtr.iban" type="text" readonly="false" label="Account#/IBAN:" />
|
||||
<item name="cdtr.bic" type="text" readonly="false" label="Route#/BIC:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<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>
|
||||
|
||||
<imixs-form-section path="alexander/sub_positionen_read"></imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="1">
|
||||
<item name="" readonly="true" type="custom" path="workitemref_external" options="($workflowgroup:Payment.*)" label="Payments:" />
|
||||
</imixs-form-section>
|
||||
|
||||
|
||||
</imixs-form>]]></bpmn2:documentation>
|
||||
<bpmn2:dataState id="dataState_lfubjw"/>
|
||||
</bpmn2:dataObject>
|
||||
<bpmn2:association id="association_hjoqig" sourceRef="dataObject_nmZfRw" targetRef="Task_6">
|
||||
<bpmn2:documentation id="documentation_343qjg"/>
|
||||
</bpmn2:association>
|
||||
</bpmn2:process>
|
||||
<bpmn2:process id="process_2" name="Invoice receipt" processType="Public">
|
||||
|
|
@ -5151,7 +5192,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="TextAnnotation_2" id="BPMNShape_TextAnnotation_2">
|
||||
<dc:Bounds height="102.0" width="221.0" x="445.0" y="1723.0"/>
|
||||
<dc:Bounds height="102.0" width="221.0" x="410.0" y="1740.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_2" id="BPMNShape_ExclusiveGateway_2" isMarkerVisible="true">
|
||||
<dc:Bounds height="50.0" width="50.0" x="1750.0" y="1780.0"/>
|
||||
|
|
@ -5304,9 +5345,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
<dc:Bounds height="50.0" width="110.0" x="2140.0" y="2040.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_3" id="BPMNShape_DataObject_3">
|
||||
<dc:Bounds height="50.0" width="35.0" x="960.0" y="1650.0"/>
|
||||
<dc:Bounds height="50.0" width="35.0" x="790.0" y="1670.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_27">
|
||||
<dc:Bounds height="20.0" width="100.0" x="928.0" y="1700.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="758.0" y="1720.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Task_12" id="BPMNShape_Task_14">
|
||||
|
|
@ -5382,9 +5423,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_35" id="BPMNShape_IntermediateCatchEvent_40">
|
||||
<dc:Bounds height="36.0" width="36.0" x="1537.0" y="1877.0"/>
|
||||
<dc:Bounds height="36.0" width="36.0" x="1547.0" y="1877.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_173" labelStyle="BPMNLabelStyle_1">
|
||||
<dc:Bounds height="20.0" width="100.0" x="1508.5" y="1911.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="1518.5" y="1911.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateThrowEvent_1" id="BPMNShape_IntermediateThrowEvent_1">
|
||||
|
|
@ -5648,9 +5689,10 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="Association_3" id="BPMNEdge_Association_3" sourceElement="BPMNShape_TextAnnotation_2" targetElement="BPMNShape_Task_1">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_68"/>
|
||||
<di:waypoint x="666.0" y="1774.0"/>
|
||||
<di:waypoint x="876.0" y="1774.0"/>
|
||||
<di:waypoint x="876.0" y="1780.0"/>
|
||||
<di:waypoint x="631.0" y="1791.0"/>
|
||||
<di:waypoint x="736.0" y="1791.0"/>
|
||||
<di:waypoint x="736.0" y="1805.0"/>
|
||||
<di:waypoint x="840.0" y="1805.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_12" id="BPMNEdge_SequenceFlow_13" sourceElement="BPMNShape_IntermediateCatchEvent_27" targetElement="BPMNShape_ExclusiveGateway_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_31"/>
|
||||
|
|
@ -5844,9 +5886,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="Association_7" id="BPMNEdge_Association_7" sourceElement="BPMNShape_DataObject_3" targetElement="BPMNShape_Task_1">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_135"/>
|
||||
<di:waypoint x="978.0" y="1700.0"/>
|
||||
<di:waypoint x="978.0" y="1796.0"/>
|
||||
<di:waypoint x="950.0" y="1796.0"/>
|
||||
<di:waypoint x="825.0" y="1695.0"/>
|
||||
<di:waypoint x="855.0" y="1695.0"/>
|
||||
<di:waypoint x="855.0" y="1780.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_7" id="BPMNEdge_SequenceFlow_8" sourceElement="BPMNShape_IntermediateCatchEvent_24" targetElement="BPMNShape_Task_14">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_137"/>
|
||||
|
|
@ -5966,16 +6008,14 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_80" id="BPMNEdge_SequenceFlow_81" sourceElement="BPMNShape_IntermediateCatchEvent_40" targetElement="BPMNShape_IntermediateThrowEvent_1">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_175"/>
|
||||
<di:waypoint x="1573.0" y="1895.0"/>
|
||||
<di:waypoint x="1583.0" y="1895.0"/>
|
||||
<di:waypoint x="1627.0" y="1895.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_81" id="BPMNEdge_SequenceFlow_82" sourceElement="BPMNShape_Task_9" targetElement="BPMNShape_IntermediateCatchEvent_40">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_176"/>
|
||||
<di:waypoint x="1505.0" y="1830.0"/>
|
||||
<di:waypoint x="1505.0" y="1854.0"/>
|
||||
<di:waypoint x="1531.0" y="1854.0"/>
|
||||
<di:waypoint x="1531.0" y="1830.0"/>
|
||||
<di:waypoint x="1531.0" y="1895.0"/>
|
||||
<di:waypoint x="1537.0" y="1895.0"/>
|
||||
<di:waypoint x="1547.0" y="1895.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_82" id="BPMNEdge_SequenceFlow_83" sourceElement="BPMNShape_Task_18" targetElement="BPMNShape_EndEvent_6">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_180"/>
|
||||
|
|
@ -6003,11 +6043,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_88" id="BPMNEdge_SequenceFlow_89" sourceElement="BPMNShape_Task_9" targetElement="BPMNShape_IntermediateCatchEvent_44">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_187"/>
|
||||
<di:waypoint x="1505.0" y="1830.0"/>
|
||||
<di:waypoint x="1505.0" y="1855.0"/>
|
||||
<di:waypoint x="1500.0" y="1855.0"/>
|
||||
<di:waypoint x="1500.0" y="1893.0"/>
|
||||
<di:waypoint x="1473.0" y="1893.0"/>
|
||||
<di:waypoint x="1486.0" y="1830.0"/>
|
||||
<di:waypoint x="1486.0" y="1895.0"/>
|
||||
<di:waypoint x="1473.0" y="1895.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_89" id="BPMNEdge_SequenceFlow_90" sourceElement="BPMNShape_IntermediateCatchEvent_44" targetElement="BPMNShape_Task_10">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_188"/>
|
||||
|
|
@ -6245,11 +6283,17 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]><
|
|||
<di:waypoint x="365.0" y="249.0"/>
|
||||
<di:waypoint x="365.0" y="230.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="association_0NqVIw" id="BPMNEdge_4NTIPg" sourceElement="BPMNShape_DataObject_3" targetElement="BPMNShape_Task_10">
|
||||
<di:waypoint x="995.0" y="1675.0"/>
|
||||
<di:waypoint x="1083.0" y="1675.0"/>
|
||||
<di:waypoint x="1083.0" y="1895.0"/>
|
||||
<di:waypoint x="1170.0" y="1895.0"/>
|
||||
<bpmndi:BPMNShape bpmnElement="dataObject_nmZfRw" id="BPMNShape_19aIzA">
|
||||
<dc:Bounds height="50.0" width="35.0" x="2290.0" y="1950.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_g06GMA">
|
||||
<dc:Bounds height="20.0" width="100.0" x="2257.5" y="2005.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge bpmnElement="association_hjoqig" id="BPMNEdge_PZQ5zA" sourceElement="BPMNShape_19aIzA" targetElement="BPMNShape_Task_6">
|
||||
<di:waypoint x="2290.0" y="1975.0"/>
|
||||
<di:waypoint x="2270.0" y="1975.0"/>
|
||||
<di:waypoint x="2270.0" y="1905.0"/>
|
||||
<di:waypoint x="2250.0" y="1905.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
|
||||
|
|
|
|||
Loading…
Reference in a new issue