User: alex clicked save for manage-procurement/procurement/vendor-invoice-management/invoice-approval/cc-invoice-approval-process-v2.bpmn

manage-procurement/procurement/vendor-invoice-management/invoice-approval/cc-invoice-approval-process-v2.bpmn

@@ -29,7 +29,6 @@
         <bpmn:flowNodeRef>Gateway_validation_successful_question_mark</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1usbnt0</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0lhkxwc</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0fq1nb4</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>SubProcess_Data_validation_rules</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_invoice_validation_failed</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_0wk5se9</bpmn:flowNodeRef>
@@ -65,6 +64,7 @@
         <bpmn:flowNodeRef>Activity_1864qj2</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Waku_Message_Pending_Payment</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_169on0z</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0fq1nb4</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1b7abal" name="Project Lead">
         <bpmn:flowNodeRef>Activity_1t8wi0r</bpmn:flowNodeRef>
@@ -110,7 +110,7 @@
     <bpmn:sequenceFlow id="Flow_00kky3k" name="No" sourceRef="Gateway_1ytq6m7" targetRef="Gateway_1l4tz4i">
       <bpmn:conditionExpression>not(isInvoiceApproved)</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_0h96w9j" name="Yes" sourceRef="Gateway_1ytq6m7" targetRef="Event_0lhkxwc" />
+    <bpmn:sequenceFlow id="Flow_0h96w9j" name="Yes" sourceRef="Gateway_1ytq6m7" targetRef="Activity_0fq1nb4" />
     <bpmn:sequenceFlow id="Flow_0a9w301" sourceRef="Gateway_1717c0p" targetRef="Delete_File" />
     <bpmn:sequenceFlow id="Flow_15pzvrr" sourceRef="Activity_0faln91" targetRef="Gateway_1l4tz4i" />
     <bpmn:sequenceFlow id="Flow_04fl87d" sourceRef="Activity_0gkpa9s" targetRef="Event_15y55nw" />
@@ -963,7 +963,7 @@ invoice["invoiceCurrency"] = "AUD"</bpmn:script>
     <bpmn:dataObjectReference id="DataObjectReference_0br9o6c" name="wr_invoicePayPend" dataObjectRef="wr_invoicePayPend" />
     <bpmn:dataObject id="wr_invoicePayPend" />
     <bpmn:intermediateThrowEvent id="Event_0lhkxwc" name="Approved and Awaiting Payment">
-      <bpmn:incoming>Flow_0h96w9j</bpmn:incoming>
+      <bpmn:incoming>Flow_1cwebky</bpmn:incoming>
       <bpmn:outgoing>Flow_1fvtcqt</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
     <bpmn:intermediateCatchEvent id="Event_1lh7308" name="Temp Fix">
@@ -1029,23 +1029,6 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       <bpmn:sequenceFlow id="Flow_1buk0a2" sourceRef="waku_payment_pending" targetRef="Event_0fbz176" />
       <bpmn:sequenceFlow id="Flow_1j5eznh" sourceRef="Event_13cibxi" targetRef="Get_Waku_Messages_Message" />
     </bpmn:subProcess>
-    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="xero/CreateInvoice" resultVariable="resp_xeroCreateInvoice">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="access_token" type="any" value="&#34;secret:xero/OAuth&#34;" />
-            <spiffworkflow:parameter id="amount" type="str" value="str(invoice_amount)" />
-            <spiffworkflow:parameter id="contact_email" type="str" value="current_user_extras[&#34;email&#34;]" />
-            <spiffworkflow:parameter id="contact_name" type="str" value="current_user_extras[&#34;full_name&#34;]" />
-            <spiffworkflow:parameter id="description" type="str" value="&#34;Test for now&#34;" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-        <spiffworkflow:preScript />
-      </bpmn:extensionElements>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_076hmxy">
-        <bpmn:targetRef>DataObjectReference_1g4gzsx</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-    </bpmn:serviceTask>
     <bpmn:dataObjectReference id="DataObjectReference_1g4gzsx" name="resp_xeroCreateInvoice" dataObjectRef="resp_xeroCreateInvoice" />
     <bpmn:dataObject id="resp_xeroCreateInvoice" />
     <bpmn:userTask id="Activity_06b32ar" name="Approve Invoice - Project Lead">
@@ -1078,6 +1061,26 @@ ___
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">timedelta(minutes=3)</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:boundaryEvent>
+    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="xero/CreateInvoice" resultVariable="resp_xeroCreateInvoice">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="access_token" type="any" value="&#34;secret:xero/OAuth&#34;" />
+            <spiffworkflow:parameter id="amount" type="str" value="str(invoice_amount)" />
+            <spiffworkflow:parameter id="contact_email" type="str" value="current_user_extras[&#34;email&#34;]" />
+            <spiffworkflow:parameter id="contact_name" type="str" value="current_user_extras[&#34;full_name&#34;]" />
+            <spiffworkflow:parameter id="description" type="str" value="&#34;Test for now&#34;" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+        <spiffworkflow:preScript />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0h96w9j</bpmn:incoming>
+      <bpmn:outgoing>Flow_1cwebky</bpmn:outgoing>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_076hmxy">
+        <bpmn:targetRef>DataObjectReference_1g4gzsx</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="Flow_1cwebky" sourceRef="Activity_0fq1nb4" targetRef="Event_0lhkxwc" />
   </bpmn:process>
   <bpmn:process id="Process_cc_invoice_approval_process_v2_c" isExecutable="false" />
   <bpmn:process id="Process_cc_invoice_approval_process_v2_d" isExecutable="false" />
@@ -1124,6 +1127,9 @@ ___
           <dc:Bounds x="1520" y="567" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
+        <dc:Bounds x="4620" y="570" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0z13hw3_di" bpmnElement="SubProcess_Data_validation_rules">
         <dc:Bounds x="1350" y="492" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1335,9 +1341,6 @@ ___
         <dc:Bounds x="4960" y="570" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
-        <dc:Bounds x="4620" y="650" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_1g4gzsx_di" bpmnElement="DataObjectReference_1g4gzsx">
         <dc:Bounds x="4772" y="705" width="36" height="50" />
         <bpmndi:BPMNLabel>
@@ -1488,7 +1491,7 @@ ___
         <di:waypoint x="4385" y="1080" />
         <di:waypoint x="4500" y="1080" />
         <di:waypoint x="4500" y="610" />
-        <di:waypoint x="4812" y="610" />
+        <di:waypoint x="4620" y="610" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="4428" y="1063" width="18" height="14" />
         </bpmndi:BPMNLabel>
@@ -1591,6 +1594,10 @@ ___
         <di:waypoint x="4190" y="1080" />
         <di:waypoint x="4262" y="1080" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1cwebky_di" bpmnElement="Flow_1cwebky">
+        <di:waypoint x="4720" y="610" />
+        <di:waypoint x="4812" y="610" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Participant_0a8arrz_di" bpmnElement="Participant_0a8arrz" isHorizontal="true">
         <dc:Bounds x="2540" y="1290" width="830" height="80" />
       </bpmndi:BPMNShape>
@@ -1628,8 +1635,8 @@ ___
         <di:waypoint x="4944" y="715" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_076hmxy_di" bpmnElement="DataOutputAssociation_076hmxy">
-        <di:waypoint x="4720" y="707" />
+        <di:waypoint x="4710" y="650" />
-        <di:waypoint x="4772" y="725" />
+        <di:waypoint x="4772" y="713" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="1086" y="-70" />
@@ -1648,7 +1655,7 @@ ___
         <di:waypoint x="3090" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p0bc5u_di" bpmnElement="Flow_0p0bc5u">
-        <di:waypoint x="4670" y="730" />
+        <di:waypoint x="4670" y="650" />
         <di:waypoint x="4670" y="1170" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1getkzr_di" bpmnElement="Flow_1getkzr">

manage-procurement/procurement/vendor-invoice-management/invoice-approval/process_model.json

@@ -1,6 +1,6 @@
 {
-    "description": "Invoice Approval",
+    "description": "Vendor Invoice Approval",
-    "display_name": "Invoice Approval",
+    "display_name": "Vendor Invoice Approval",
     "display_order": 0,
     "exception_notification_addresses": [],
     "fault_or_suspend_on_exception": "fault",

misc/test/TC-1.0/process_model.json

@@ -6,6 +6,6 @@
     "fault_or_suspend_on_exception": "fault",
     "files": [],
     "is_review": false,
-    "primary_file_name": "Sub process.bpmn",
+    "primary_file_name": "testing Data Objects.bpmn",
-    "primary_process_id": "Proccess_qjooo"
+    "primary_process_id": "Process_o1psfct"
 }

misc/test/TC-1.0/testing Data Objects.bpmn

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
+  <bpmn:process id="Process_o1psfct" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1" />
+    <bpmn:dataObject id="1" />
+    <bpmn:dataObjectReference id="DataObjectReference_1bjhd7z" name="1" dataObjectRef="1" />
+    <bpmn:dataObject id="1" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_o1psfct">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_1bjhd7z_di" bpmnElement="DataObjectReference_1bjhd7z">
+        <dc:Bounds x="452" y="95" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="466" y="148" width="7" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>