diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index d212a9cf..3b70004c 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -14,20 +14,14 @@
 # Schedule form
 		
 	
-	todo: svc-schedule once had time to test out personal schedule (give it a few days then move on to this)
+	todo: #1 client / server items below
 
-	CASES
+	todo: svc-schedule once had time to test out personal schedule (give it a few days then move on to this)
+	SVC-SCHEDULE CASES
 		3766 - view schedule filtered by customer so can see at a glance all past and future for a single customer (more data table filter similarity)
 			"show all " but on a schedule to view that way instead of a data table
 		3697 - arbitrarily order schedule by user instead of built in by lastname
-		3698 - hide unassigned tech slot (or case 3697 above would take care of that too)
-		
-
-
-
-//..........
-	cases to do
-		
+		3698 - hide unassigned tech slot (or case 3697 above would take care of that too)	
 
 	Customer work order form / view / open???
 	Customer CSR form has a bunch of todo in the template, WTF?
@@ -100,15 +94,6 @@ Coded by importance
  | |____| |____ _| |_| |____| |\  |  | |   
   \_____|______|_____|______|_| \_|  |_|   
                                            
-                                           
-- 1 refactoring let to const
-	remove all these: 
-	
-
-
- 
- 
- 
  
  
 
@@ -289,7 +274,7 @@ todo: 3 Schedule form reporting?
 todo: 1 Reviews need to be removed when corebiz are deleted (any reviewable object)
 	see customer delete for example, probably need to move this to a static function in Review since it will be called from everywhere 
 	should be a bizobject built int?
-todo: boot complete server open message to console should include server version number
+todo: 1 boot complete server open message to console should include server version number
 todo:1 update to latest postgres portable and document how to do it as well or a link to how to do it
 todo: 1 if a customer type logs in, does Auth check to see that customer or headoffice is active?
 	because if it isn't the user shouldn't be allowed to login either
diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue
index ea34e6c9..fc1fc629 100644
--- a/ayanova/src/components/attachment-control.vue
+++ b/ayanova/src/components/attachment-control.vue
@@ -233,21 +233,20 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         if ((await window.$gz.dialog.confirmDelete()) !== true) {
           return;
         }
 
-        const res = await window.$gz.api.remove("attachment/" + vm.editId);
+        const res = await window.$gz.api.remove("attachment/" + this.editId);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
-          vm.editMenu = false;
-          vm.editName = null;
-          vm.editNotes = null;
-          vm.editId = null;
-          vm.getList();
+          this.editMenu = false;
+          this.editName = null;
+          this.editNotes = null;
+          this.editId = null;
+          this.getList();
         }
       } catch (error) {
         window.$gz.errorHandler.handleFormError(error);
diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue
index b8c6d569..7d258a66 100644
--- a/ayanova/src/views/acc-service-rate.vue
+++ b/ayanova/src/views/acc-service-rate.vue
@@ -426,7 +426,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -434,34 +433,35 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //workaround to prevent warning about leaving dirty record
 
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index e058c921..bb719b3a 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -388,7 +388,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -396,36 +395,37 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          const url = API_BASE_URL + vm.$route.params.recordid;
+          const url = API_BASE_URL + this.$route.params.recordid;
 
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(url);
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //workaround to prevent warning about leaving dirty record
 
             JUST_DELETED = true;
 
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue
index 77f9ddba..3a4c10ca 100644
--- a/ayanova/src/views/acc-travel-rate.vue
+++ b/ayanova/src/views/acc-travel-rate.vue
@@ -414,41 +414,41 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //workaround to prevent warning about leaving dirty record
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index 20553124..5fdba996 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -300,7 +300,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       if (
         (await window.$gz.dialog.confirmGeneric(
           "ResetToDefault",
@@ -310,24 +309,27 @@ export default {
         return;
       }
       try {
-        vm.formState.loading = true;
-        if (vm.templateId && vm.templateId != 0) {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
-          const res = await window.$gz.api.remove(API_BASE_URL + vm.templateId);
+        this.formState.loading = true;
+        if (this.templateId && this.templateId != 0) {
+          window.$gz.form.deleteAllErrorBoxErrors(this);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + this.templateId
+          );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //trigger reload of form
             this.getDataFromApi();
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index 74e32d4f..c66f77aa 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -382,33 +382,32 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-        vm.formState.loading = true;
-        if (vm.$route.params.recordid == 0) {
+        this.formState.loading = true;
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       } finally {
-        vm.formState.loading = false;
+        this.formState.loading = false;
       }
     },
     async duplicate() {
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 956ac9d2..9d45f738 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -683,33 +683,32 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-        vm.formState.loading = true;
-        if (vm.$route.params.recordid == 0) {
+        this.formState.loading = true;
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       } finally {
-        vm.formState.loading = false;
+        this.formState.loading = false;
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 514ad9b3..30e85f37 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -815,38 +815,38 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            "report/" + vm.$route.params.recordid
+            "report/" + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/cust-customer-note.vue b/ayanova/src/views/cust-customer-note.vue
index 79248ef0..6774a01a 100644
--- a/ayanova/src/views/cust-customer-note.vue
+++ b/ayanova/src/views/cust-customer-note.vue
@@ -276,38 +276,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index 2160fc52..cd6348c7 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -1007,38 +1007,39 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
+
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 9e94dfe3..615d76d5 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -917,38 +917,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 244cb125..12b914ec 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -683,33 +683,32 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-        vm.formState.loading = true;
-        if (vm.$route.params.recordid == 0) {
+        this.formState.loading = true;
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       } finally {
-        vm.formState.loading = false;
+        this.formState.loading = false;
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/customer-csr-edit.vue b/ayanova/src/views/customer-csr-edit.vue
index baae942f..6594f4a3 100644
--- a/ayanova/src/views/customer-csr-edit.vue
+++ b/ayanova/src/views/customer-csr-edit.vue
@@ -514,38 +514,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     async reject() {
diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue
index 8a7e9d85..3fc0d9d9 100644
--- a/ayanova/src/views/home-memo.vue
+++ b/ayanova/src/views/home-memo.vue
@@ -414,38 +414,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           LEAVE_OK = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             LEAVE_OK = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     replyForward(forward) {
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 32176329..cdf976de 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -510,33 +510,32 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-        vm.formState.loading = true;
-        if (vm.$route.params.recordid == 0) {
+        this.formState.loading = true;
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       } finally {
-        vm.formState.loading = false;
+        this.formState.loading = false;
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index 3b98ceb9..22eec621 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -396,11 +396,12 @@ export default {
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
           vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, this);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 68122e45..8d0d1925 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -441,38 +441,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index 49126311..64d14560 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -531,37 +531,37 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          const url = API_BASE_URL + vm.$route.params.recordid;
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          const url = API_BASE_URL + this.$route.params.recordid;
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(url);
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/inv-part-warehouse.vue b/ayanova/src/views/inv-part-warehouse.vue
index 94f70231..cb79cb4c 100644
--- a/ayanova/src/views/inv-part-warehouse.vue
+++ b/ayanova/src/views/inv-part-warehouse.vue
@@ -318,38 +318,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/inv-part.vue b/ayanova/src/views/inv-part.vue
index fe72b610..6feb881c 100644
--- a/ayanova/src/views/inv-part.vue
+++ b/ayanova/src/views/inv-part.vue
@@ -536,38 +536,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 94369136..2651b5cd 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -1663,39 +1663,39 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index cba5db40..7dcecd9e 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -1698,40 +1698,40 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
 
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 62e63154..4d0c4b4a 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -492,38 +492,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     async reject() {
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index 37fb3009..47737199 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -659,38 +659,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index bcdf32e5..a85c4e50 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -523,7 +523,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         let dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -531,36 +530,37 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
+          let url = API_BASE_URL + this.$route.params.recordid;
 
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           let res = await window.$gz.api.remove(url);
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //workaround to prevent warning about leaving dirty record
 
             JUST_DELETED = true;
 
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicateHandler() {
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index a4fcf6d5..6c240d07 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -399,40 +399,40 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/svc-quote-status-edit.vue b/ayanova/src/views/svc-quote-status-edit.vue
index 2a0fb117..52730d39 100644
--- a/ayanova/src/views/svc-quote-status-edit.vue
+++ b/ayanova/src/views/svc-quote-status-edit.vue
@@ -334,40 +334,40 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index 6d7e5998..aa755321 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -555,7 +555,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -563,33 +562,34 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicateHandler() {
diff --git a/ayanova/src/views/svc-task-group.vue b/ayanova/src/views/svc-task-group.vue
index f3c52f4b..bf4a4157 100644
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -461,7 +461,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -469,33 +468,34 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   },
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index 2d02d7ab..980052bd 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -488,39 +488,39 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index f54d1882..55379586 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -1021,40 +1021,40 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {
diff --git a/ayanova/src/views/svc-work-order-item-priorities-edit.vue b/ayanova/src/views/svc-work-order-item-priorities-edit.vue
index 884e03a2..c864b3eb 100644
--- a/ayanova/src/views/svc-work-order-item-priorities-edit.vue
+++ b/ayanova/src/views/svc-work-order-item-priorities-edit.vue
@@ -277,7 +277,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -285,34 +284,34 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form priority
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/svc-work-order-item-status-edit.vue b/ayanova/src/views/svc-work-order-item-status-edit.vue
index 3691f16d..7dc29bfa 100644
--- a/ayanova/src/views/svc-work-order-item-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-item-status-edit.vue
@@ -291,38 +291,38 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/svc-work-order-status-edit.vue b/ayanova/src/views/svc-work-order-status-edit.vue
index e8d9fc76..11b4b06f 100644
--- a/ayanova/src/views/svc-work-order-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-status-edit.vue
@@ -334,39 +334,39 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
   }
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 8f3336e6..edbf658b 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -632,7 +632,6 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
@@ -640,33 +639,34 @@ export default {
         }
 
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicateHandler() {
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index a89a359f..743c011a 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -822,40 +822,40 @@ export default {
       }
     },
     async remove() {
-      const vm = this;
       try {
         const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
 
-        if (vm.$route.params.recordid == 0) {
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
 
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
           const res = await window.$gz.api.remove(
-            API_BASE_URL + vm.$route.params.recordid
+            API_BASE_URL + this.$route.params.recordid
           );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             JUST_DELETED = true;
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
     duplicate() {