diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
index 4355956a..51e04388 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
@@ -207,10 +207,11 @@ class UpdatePerfexCRMProcessor
                 $taskReference = $tasks[$count]['reference'];
                 $taskOnTaskCompletion = $tasks[$count]['on_task_completion'];
                 $taskIsAllowMultiple = $tasks[$count]['is_allow_multiple'];
+                $taskIsOnTaskCompletionUpdate = $tasks[$count]['is_on_task_completion_update'];
                 if($updatePerfexCRMObject->getInvoiceId() != 0 && $taskIsAllowMultiple){
                     $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
                     $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
-                    if($taskOnTaskCompletion){
+                    if($taskOnTaskCompletion && $taskIsOnTaskCompletionUpdate){
                         $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
                     }
                 }
diff --git a/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php b/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php
index c0bc66d7..1d26c9d3 100644
--- a/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php
+++ b/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php
@@ -14,7 +14,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::COMPLETED,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
     public const TASK_1_DAY_TRANSFER_1 = [
@@ -29,7 +30,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1_DAY_TRANSFER_2 = [
         'name' => 'Approve Payment',
@@ -50,7 +52,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_1_DAY_TRANSFER_3 = [
         'name' => 'Issue Exchange Autocount Invoince',
@@ -69,7 +72,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1_DAY_TRANSFER_3_1 = [
         'name' => 'Issue Exchange Autocount OR',
@@ -81,7 +85,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1_DAY_TRANSFER_4 = [
         'name' => 'Knockoff Invoice',
@@ -100,7 +105,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1_DAY_TRANSFER_5 = [
         'name' => 'Order Placed in White Form',
@@ -121,7 +127,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_1_DAY_TRANSFER_6 = [
         'name' => 'Upload China Bank Slip',
@@ -140,7 +147,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
 
     public const TASK_3_DAY_TRANSFER_1 = [
@@ -160,7 +168,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_3_DAY_TRANSFER_2 = [
         'name' => 'Approve Payment',
@@ -174,7 +183,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_3_DAY_TRANSFER_3 = [
         'name' => 'Issue Exchange Autocount Invoince',
@@ -193,7 +203,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_3_DAY_TRANSFER_3_1 = [
         'name' => 'Issue Exchange Autocount OR',
@@ -205,7 +216,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_3_DAY_TRANSFER_4 = [
         'name' => 'Knockoff Invoice',
@@ -224,7 +236,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_3_DAY_TRANSFER_5 = [
         'name' => 'Order Placed in White Form',
@@ -245,7 +258,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_3_DAY_TRANSFER_6 = [
         'name' => 'Upload China Bank Slip',
@@ -264,7 +278,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
 
 
@@ -286,7 +301,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_2 = [
         'name' => 'Approve Payment',
@@ -307,7 +323,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_3 = [
         'name' => 'Issue Exchange Autocount Invoice',
@@ -326,7 +343,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_3_1 = [
         'name' => 'Issue Exchange Autocount OR',
@@ -339,7 +357,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_4 = [
         'name' => 'Knockoff Invoice',
@@ -358,7 +377,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_5 = [
         'name' => 'Order Placed in White Form',
@@ -378,7 +398,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_6 = [
         'name' => 'Send White Form to Operation Department',
@@ -397,7 +418,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_7 = [
         'name' => 'Authorize Customer\'s 1688 Account',
@@ -418,7 +440,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_1688_PAYMENT_8 = [
         'name' => 'Make Payment for Customer 1688 Order',
@@ -434,7 +457,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_1688_PAYMENT_9 = [
         'name' => 'Upload China Bank Slip',
@@ -447,7 +471,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => true
     ];
     public const TASK_1688_PAYMENT_10 = [
         'name' => 'Upload 1688 Purchase Order PDF',
@@ -460,7 +485,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
         'duedate' => 1,
-        'is_allow_multiple' => true
+        'is_allow_multiple' => true,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_11 = [
         'name' => 'Fill Up Purchase Order',
@@ -473,7 +499,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::LOW,
         'duedate' => 7,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_12 = [
         'name' => 'Approve Purchase Order',
@@ -486,7 +513,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::LOW,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_1688_PAYMENT_13 = [
         'name' => 'Complete Order bookkeeping',
@@ -505,7 +533,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
 
@@ -527,7 +556,8 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::LOW,
         'duedate' => 1,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
     public const TASK_PURCHASE_ORDER_2 = [
@@ -541,7 +571,8 @@ class PerfexCRMTasks
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
 
@@ -562,6 +593,7 @@ class PerfexCRMTasks
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
         'duedate' => 0,
-        'is_allow_multiple' => false
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 }