diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index a5d25027..32d5c23b 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -27,6 +27,17 @@
Submit_the_invoice
Gateway_validation_successful_question_mark
+ Event_15y55nw
+ Gateway_1lbghql
+ Event_0x83ruk
+ Event_0m3ri6v
+ Gateway_1l4tz4i
+ Activity_0fq1nb4
+ Event_1usbnt0
+ Event_0lhkxwc
+ Event_1b58a3z
+ Activity_0faln91
+ Event_0rwxlca
Activity_07oyzdx
Gateway_05ov5p5
Activity_0p88elm
@@ -34,16 +45,9 @@
Activity_104xpp8
Activity_175j3o7
Event_176ch98
- Event_0x83ruk
- Event_0m3ri6v
- Gateway_1l4tz4i
Delete_File
- Activity_0fq1nb4
- Event_1usbnt0
- Event_0lhkxwc
- Event_1b58a3z
- Activity_0faln91
- Event_0rwxlca
+ Gateway_0dqj39f
+ Event_1vi3um1
SubProcess_Data_validation_rules
Event_invoice_validation_failed
Gateway_0wk5se9
@@ -52,19 +56,15 @@
Activity_1colhao
Activity_1u89kok
Event_1r3yh2k
+ Activity_1864qj2
Activity_0rae8g6
Activity_1ucvkk4
Activity_1kgaqpf
Waku_Message_Pending_Payment
- Gateway_0dqj39f
- Event_169on0z
- Event_1vi3um1
- Activity_1864qj2
- Activity_10p5t0r
Activity_0gkpa9s
- Event_15y55nw
Activity_0gkejaj
- Gateway_1lbghql
+ Event_169on0z
+ Activity_10p5t0r
Activity_06b32ar
@@ -79,7 +79,7 @@
Event_1lh7308
-
+
not(svc_is_invoice_submit_pass)
@@ -308,74 +308,75 @@ isCurrentUser = True
-
-
- _**Submitted by:**_ {{ invoice.contributorName }}
-_**Submitter Id:**_ {{ invoice.contributorId }}
-_**Invoice Id:**_ {{ invoice.invoiceId }}
-_**Amount:**_ {{ invoice.invoiceAmount_str }}
-_**Submitted on:**_ {{ invoiceDate }}
-_**Due Date:**_ {{ invoice.dueDate}}
-
-__________________________________________________________________________
-
-Thank you for your invoice submission.
-Updates on the progress of your submission will.be sent to you in your Status app.
-
-Please click Submit below to return to your Home page.
-
-__________________________________________________________________________
-
-
- Flow_1x4rtop
- Flow_0z51hpb
-
-
- Flow_14glsqd
- Flow_0hev3yn
- Flow_1s2as7o
-
-
-
-
-
-
-
-
-
-
-
-
-
- Flow_0hyvwku
- Flow_0o94g4u
-
-
- Flow_02o270g
- Flow_0o94g4u
- Flow_0a9w301
-
-
- Flow_1s2as7o
- Flow_0hyvwku
- invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"
-
-
-
-
-
-
-
-
-
-
- Flow_0hev3yn
- Flow_02o270g
-
-
- Flow_0dhpy0v
- Flow_14glsqd
+
+
+
+
+ Flow_0pwvb62
+
+
+
+
+
+
+
+
+
+ Flow_0pwvb62
+ Flow_0z8ory2
+
+
+
+ Flow_0z8ory2
+ Flow_1hebd4s
+ invoice = {}
+
+# no numbers in contributor name validation
+if " Number in contributor name" in ValidationChoices:
+ invoice["contributorName"] = "Harmee5 Singh"
+else:
+ invoice["contributorName"] = "Harmeet Singh"
+
+# Invoice amount number of decimals validation
+if " Too many decimals in invoice amount" in ValidationChoices:
+ if scenarioChoices == "Correct invoice amount":
+ invoice["invoiceAmount"] = 10000.001
+ else:
+ invoice["invoiceAmount"] = 10001.001
+else:
+ if scenarioChoices == "Correct invoice amount":
+ invoice["invoiceAmount"] = 10000.00
+ else:
+ invoice["invoiceAmount"] = 10001.00
+
+# Due date validation
+if " Due date before today's date" in ValidationChoices:
+ invoice["dueDate"] = "2021-12-12"
+else:
+ invoice["dueDate"] = "2022-12-12"
+
+# Set remainder of form fields
+invoice["contributorId"] = 12
+invoice["invoiceId"] = 1234
+invoice["invoiceCurrency"] = "AUD"
+
+
+ Flow_1hebd4s
+
+
+
+
+
+
+ Process milestone should update the process metadata field “milestone reached”
+ Flow_04fl87d
+ Flow_1ex5hfx
+
+ Flow_1c5u447
+ Flow_1gohkts
+ Flow_16bw9hx
+
Flow_16bw9hx
Flow_0kngdw4
@@ -440,11 +441,6 @@ isApprovalTimer = True
Flow_09r1s5r
Flow_1qf14hx
-
- Flow_0a9w301
- Flow_0cj1m0h
- del(filesAccept)
-
@@ -530,6 +526,91 @@ else:
timedelta(seconds=1)
+
+
+ _**Submitted by:**_ {{ invoice.contributorName }}
+_**Submitter Id:**_ {{ invoice.contributorId }}
+_**Invoice Id:**_ {{ invoice.invoiceId }}
+_**Amount:**_ {{ invoice.invoiceAmount_str }}
+_**Submitted on:**_ {{ invoiceDate }}
+_**Due Date:**_ {{ invoice.dueDate}}
+
+__________________________________________________________________________
+
+Thank you for your invoice submission.
+Updates on the progress of your submission will.be sent to you in your Status app.
+
+Please click Submit below to return to your Home page.
+
+__________________________________________________________________________
+
+
+ Flow_06amgv2
+ Flow_0z51hpb
+
+
+ Flow_14glsqd
+ Flow_0hev3yn
+ Flow_1s2as7o
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Flow_0hyvwku
+ Flow_0o94g4u
+
+
+ Flow_02o270g
+ Flow_0o94g4u
+ Flow_0a9w301
+
+
+ Flow_1s2as7o
+ Flow_0hyvwku
+ invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"
+
+
+
+
+
+
+
+
+
+
+ Flow_0hev3yn
+ Flow_02o270g
+
+
+ Flow_0dhpy0v
+ Flow_14glsqd
+
+
+ Flow_0a9w301
+ Flow_0cj1m0h
+ del(filesAccept)
+
+
+ Flow_0z51hpb
+ Flow_06mfxze
+ Flow_1xvt99y
+
+
+ Flow_1xvt99y
+ Flow_0dhpy0v
+
+ timedelta(seconds=1)
+
+
Flow_0bfs2xe
Flow_0c0c9mw
@@ -850,97 +931,6 @@ isSetMessage = True
-
- Flow_1v8dszb
-
- timedelta(minutes=3)
-
-
-
- Flow_0z51hpb
- Flow_06mfxze
- Flow_1xvt99y
-
-
-
- Flow_06mfxze
-
- timedelta(seconds=1000)
-
-
-
-
- Flow_1xvt99y
- Flow_0dhpy0v
-
- timedelta(seconds=1)
-
-
-
-
- Flow_0pwvb62
-
-
-
-
-
-
-
-
-
- Flow_0pwvb62
- Flow_0z8ory2
-
-
-
- Flow_0z8ory2
- Flow_1hebd4s
- invoice = {}
-
-# no numbers in contributor name validation
-if " Number in contributor name" in ValidationChoices:
- invoice["contributorName"] = "Harmee5 Singh"
-else:
- invoice["contributorName"] = "Harmeet Singh"
-
-# Invoice amount number of decimals validation
-if " Too many decimals in invoice amount" in ValidationChoices:
- if scenarioChoices == "Correct invoice amount":
- invoice["invoiceAmount"] = 10000.001
- else:
- invoice["invoiceAmount"] = 10001.001
-else:
- if scenarioChoices == "Correct invoice amount":
- invoice["invoiceAmount"] = 10000.00
- else:
- invoice["invoiceAmount"] = 10001.00
-
-# Due date validation
-if " Due date before today's date" in ValidationChoices:
- invoice["dueDate"] = "2021-12-12"
-else:
- invoice["dueDate"] = "2022-12-12"
-
-# Set remainder of form fields
-invoice["contributorId"] = 12
-invoice["invoiceId"] = 1234
-invoice["invoiceCurrency"] = "AUD"
-
-
- Flow_1hebd4s
-
-
-
-
-
-
- curCode = invoice.invoiceCurrency
-curAmount = invoice.invoiceAmount
-isCurTest = False
- invoice.invoiceAmount_str = curAmount_str
-
-
-
@@ -994,11 +984,6 @@ time_format = current_user_extras["date_format"]
-
- Process milestone should update the process metadata field “milestone reached”
- Flow_04fl87d
- Flow_1ex5hfx
-
Flow_1ex5hfx
Flow_1c5u447
@@ -1057,11 +1042,29 @@ annual_salary = float(annual_salary_str)
Flow_02g4qn2
-
- Flow_1c5u447
- Flow_1gohkts
- Flow_16bw9hx
-
+
+ Flow_06mfxze
+
+ timedelta(seconds=1000)
+
+
+
+ Flow_1v8dszb
+
+ timedelta(minutes=3)
+
+
+
+
+
+ curCode = invoice.invoiceCurrency
+curAmount = invoice.invoiceAmount
+isCurTest = False
+ invoice.invoiceAmount_str = curAmount_str
+
+ Flow_1x4rtop
+ Flow_06amgv2
+
@@ -1082,20 +1085,20 @@ annual_salary = float(annual_salary_str)
-
+
-
+
-
+
-
+
-
+
@@ -1113,22 +1116,165 @@ annual_salary = float(annual_salary_str)
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1165,187 +1311,44 @@ annual_salary = float(annual_salary_str)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1356,46 +1359,46 @@ annual_salary = float(annual_salary_str)
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
@@ -1415,24 +1418,24 @@ annual_salary = float(annual_salary_str)
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -1443,71 +1446,71 @@ annual_salary = float(annual_salary_str)
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -1519,72 +1522,76 @@ annual_salary = float(annual_salary_str)
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
+
-
+
-
+
@@ -1598,56 +1605,56 @@ annual_salary = float(annual_salary_str)
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+