diff --git a/ayanova/src/api/biz-role-rights.js b/ayanova/src/api/biz-role-rights.js
index 13915bd4..883cfd53 100644
--- a/ayanova/src/api/biz-role-rights.js
+++ b/ayanova/src/api/biz-role-rights.js
@@ -77,6 +77,7 @@ export default {
     ReadFullRecord: 65541,
     Select: 131071
   },
+  QuoteStatus: { Change: 32778, ReadFullRecord: 131071, Select: 131071 },
   Global: { Change: 2, ReadFullRecord: 1, Select: 0 },
   GlobalOps: { Change: 16384, ReadFullRecord: 8192, Select: 0 },
   User: { Change: 2, ReadFullRecord: 1, Select: 131071 },
diff --git a/ayanova/src/components/quote-header.vue b/ayanova/src/components/quote-header.vue
index 7b0eaa7c..50b6642c 100644
--- a/ayanova/src/components/quote-header.vue
+++ b/ayanova/src/components/quote-header.vue
@@ -391,8 +391,7 @@
         ></v-checkbox>
       </v-col>
 
-
- <v-col
+      <v-col
         v-if="
           form().showMe(this, 'CopyWiki') &&
             !(
@@ -416,7 +415,7 @@
         ></v-checkbox>
       </v-col>
 
-       <v-col
+      <v-col
         v-if="
           form().showMe(this, 'CopyAttachments') &&
             !(
@@ -440,7 +439,6 @@
         ></v-checkbox>
       </v-col>
 
-
       <v-col
         v-if="
           form().showMe(this, 'Tags') &&
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index e89a1f07..cd736794 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -412,6 +412,22 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-quote.vue")
     },
+
+    {
+      path: "/svc-quote-status",
+      name: "svc-quote-status",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-status.vue")
+    },
+    {
+      path: "/svc-quote-status/:recordid",
+      name: "svc-quote-status-edit",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-status-edit.vue"
+        )
+    },
+
     {
       path: "/svc-pm-list",
       name: "svc-pm-list",
diff --git a/ayanova/src/views/svc-quote-status-edit.vue b/ayanova/src/views/svc-quote-status-edit.vue
new file mode 100644
index 00000000..d3b102e2
--- /dev/null
+++ b/ayanova/src/views/svc-quote-status-edit.vue
@@ -0,0 +1,533 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <div v-if="formState.ready">
+      <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
+      <v-form ref="form">
+        <v-row>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-text-field
+              v-model="obj.name"
+              :readonly="formState.readOnly"
+              :label="$ay.t('StatusName')"
+              :rules="[form().required(this, 'name')]"
+              :error-messages="form().serverErrors(this, 'name')"
+              ref="name"
+              data-cy="name"
+              @input="fieldValueChanged('name')"
+            ></v-text-field>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.completed"
+              :readonly="formState.readOnly"
+              :label="$ay.t('StatusCompleted')"
+              ref="completed"
+              data-cy="completed"
+              :error-messages="form().serverErrors(this, 'completed')"
+              @change="fieldValueChanged('completed')"
+            ></v-checkbox>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.locked"
+              :readonly="formState.readOnly"
+              :label="$ay.t('StatusLocked')"
+              ref="locked"
+              data-cy="locked"
+              :error-messages="form().serverErrors(this, 'locked')"
+              @change="fieldValueChanged('locked')"
+            ></v-checkbox>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-role-picker
+              :label="$ay.t('SelectRoles')"
+              v-model="obj.selectRoles"
+              :readonly="formState.readOnly"
+              ref="selectRoles"
+              data-cy="selectRoles"
+              :error-messages="form().serverErrors(this, 'selectRoles')"
+              @input="fieldValueChanged('selectRoles')"
+              limit-selection-to="inside"
+            ></gz-role-picker>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-role-picker
+              :label="$ay.t('RemoveRoles')"
+              v-model="obj.removeRoles"
+              :readonly="formState.readOnly"
+              ref="removeRoles"
+              data-cy="removeRoles"
+              :error-messages="form().serverErrors(this, 'removeRoles')"
+              @input="fieldValueChanged('removeRoles')"
+              limit-selection-to="inside"
+            ></gz-role-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <span class="text-caption">
+              {{ $ay.t("StatusColor") }}
+            </span>
+            <v-color-picker
+              v-model="obj.color"
+              :readonly="formState.readOnly"
+              hide-mode-switch
+              mode="hexa"
+              :error-messages="form().serverErrors(this, 'color')"
+              ref="color"
+              @input="fieldValueChanged('color')"
+            ></v-color-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
+
+          <!------------------------------------->
+          <v-col v-if="form().showMe(this, 'StatusNotes')" cols="12">
+            <v-textarea
+              v-model="obj.notes"
+              :readonly="formState.readOnly"
+              :label="$ay.t('StatusNotes')"
+              :error-messages="form().serverErrors(this, 'notes')"
+              ref="notes"
+              data-cy="notes"
+              @input="fieldValueChanged('notes')"
+              auto-grow
+            ></v-textarea>
+          </v-col>
+        </v-row>
+      </v-form>
+    </div>
+    <template v-if="!formState.ready">
+      <v-progress-circular
+        indeterminate
+        color="primary"
+        :size="60"
+      ></v-progress-circular>
+    </template>
+  </div>
+</template>
+
+<script>
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+const FORM_KEY = "svc-quote-status-edit";
+const API_BASE_URL = "quote-status/";
+const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderStatus"; //<-- Should always be CoreBizObject AyaType name here where possible
+
+export default {
+  async created() {
+    let vm = this;
+
+    try {
+      await initForm(vm);
+
+      vm.rights = window.$gz.role.getRights(window.$gz.type.WorkOrderStatus);
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+
+      //id 0 means create or duplicate to new
+      if (vm.$route.params.recordid != 0) {
+        //is there already an obj from a prior operation?
+        if (this.$route.params.obj) {
+          //yes, no need to fetch it
+          this.obj = this.$route.params.obj;
+          window.$gz.form.setFormState({
+            vm: vm,
+            loading: false
+          });
+        } else {
+          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        }
+      } else {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+      window.$gz.form.setFormState({
+        vm: vm,
+        dirty: false,
+        valid: true
+      });
+
+      generateMenu(vm);
+    } catch (error) {
+      window.$gz.errorHandler.handleFormError(error, vm);
+    } finally {
+      vm.formState.ready = true;
+    }
+  },
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty || JUST_DELETED) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
+      next();
+    } else {
+      next(false);
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        color: "#ffffff", //if no previously set value then control will respond with a big object with all color system values in place, this prevents that
+        selectRoles: 1290,
+        removeRoles: 1290,
+        completed: false,
+        locked: false
+      },
+      formState: {
+        ready: false,
+        dirty: false,
+        valid: true,
+        readOnly: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      },
+      rights: window.$gz.role.defaultRightsObject(),
+      ayaType: window.$gz.type.WorkOrderStatus
+    };
+  },
+  //WATCHERS
+  watch: {
+    formState: {
+      handler: function(val) {
+        //,oldval is available here too if necessary
+        if (this.formState.loading) {
+          return;
+        }
+
+        //enable / disable save button
+        if (val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
+        } else {
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+        }
+
+        //enable / disable duplicate / new button
+        if (!val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit(
+            "menu-enable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
+        } else {
+          window.$gz.eventBus.$emit(
+            "menu-disable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    canSave: function() {
+      return this.formState.valid && this.formState.dirty;
+    },
+    canDuplicate: function() {
+      return this.formState.valid && !this.formState.dirty;
+    },
+
+    form() {
+      return window.$gz.form;
+    },
+    fieldValueChanged(ref) {
+      if (
+        this.formState.ready &&
+        !this.formState.loading &&
+        !this.formState.readOnly
+      ) {
+        //This was necessary because for some reason the color control was triggering field value changed *before* the form reference was set
+        //which is strange but this resolve it
+        if (this.$refs.form) {
+          window.$gz.form.fieldValueChanged(this, ref);
+        }
+      }
+    },
+    async getDataFromApi(recordId) {
+      let vm = this;
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
+      if (!recordId) {
+        throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
+      }
+      let url = API_BASE_URL + recordId;
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+
+        let res = await window.$gz.api.get(url);
+
+        if (res.error) {
+          //Not found?
+          if (res.error.code == "2010") {
+            window.$gz.form.handleObjectNotFound(vm);
+          }
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          vm.obj = res.data;
+          //modify the menu as necessary
+          generateMenu(vm);
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true,
+            loading: false
+          });
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async submit() {
+      let vm = this;
+      if (vm.canSave == false) {
+        return;
+      }
+
+      try {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
+        let url = API_BASE_URL; // + vm.$route.params.recordid;
+        //clear any errors vm might be around from previous submit
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+
+        let res = await window.$gz.api.upsert(url, vm.obj);
+
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
+          if (res.data.id) {
+            //POST - whole new object returned
+            vm.obj = res.data;
+            //Change URL to new record
+            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
+
+            this.$router.replace({
+              name: "svc-quote-status-edit",
+              params: {
+                recordid: res.data.id,
+                obj: res.data // Pass data object to new form
+              }
+            });
+          } else {
+            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
+            //Handle "put" of an existing record (UPDATE)
+            vm.obj.concurrency = res.data.concurrency;
+          }
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async remove() {
+      let vm = this;
+      try {
+        let dialogResult = await window.$gz.dialog.confirmDelete();
+        if (dialogResult != true) {
+          return;
+        }
+
+        //do the delete
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
+        //No need to delete a new record, just abandon it...
+        if (vm.$route.params.recordid == 0) {
+          //this should not get offered for delete but to be safe and clear just in case:
+          JUST_DELETED = true;
+          // navigate backwards
+          vm.$router.go(-1);
+        } else {
+          let url = API_BASE_URL + vm.$route.params.recordid;
+
+          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          let res = await window.$gz.api.remove(url);
+          if (res.error) {
+            vm.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(vm);
+          } else {
+            //workaround to prevent warning about leaving dirty record
+            //For some reason I couldn't just reset isdirty in formstate
+            JUST_DELETED = true;
+            // navigate backwards
+            vm.$router.go(-1);
+          }
+        }
+      } catch (error) {
+        //Update the form status
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
+    }
+    //end methods
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "save":
+        m.vm.submit();
+        break;
+      case "delete":
+        m.vm.remove();
+        break;
+      case "list":
+        m.vm.$router.push({
+          name: "svc-quote-status"
+        });
+        break;
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: false,
+    readOnly: vm.formState.readOnly,
+    icon: "$ayiFlag",
+    title: "WorkOrderStatus",
+    helpUrl: "svc-quote-status",
+    formData: {
+      ayaType: window.$gz.type.WorkOrderStatus,
+      recordId: vm.$route.params.recordid,
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      recordName: vm.obj.name
+    },
+    menuItems: []
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "Save",
+      icon: "$ayiSave",
+      surface: true,
+      key: FORM_KEY + ":save",
+      vm: vm
+    });
+  }
+
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+  menuOptions.menuItems.push({
+    title: "WorkOrderStatusList",
+    icon: "$ayiFlag",
+    key: FORM_KEY + ":statuslist",
+    vm: vm
+  });
+  menuOptions.menuItems.push({ divider: true, inset: false });
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+
+let JUST_DELETED = false;
+
+/////////////////////////////////
+//
+//
+async function initForm(vm) {
+  await fetchTranslatedText();
+  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
+}
+
+//////////////////////////////////////////////////////////
+//
+// Ensures UI translated text is available
+//
+async function fetchTranslatedText() {
+  await window.$gz.translation.cacheTranslations([
+    "QuoteStatus",
+    "StatusName",
+    "StatusCompleted",
+    "StatusLocked",
+    "SelectRoles",
+    "RemoveRoles",
+    "StatusColor",
+    "StatusNotes"
+  ]);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index 44a06ed0..7453c8fe 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -1935,7 +1935,7 @@ async function fetchTranslatedText(vm) {
     "AddressLongitude",
     "SelectAlternateAddress",
     "WorkOrderItemStatusList",
-    "WorkOrderStatusList",
+    "QuoteStatusList",
     "WorkOrderItemPriorityList",
     "WorkOrderItemUnitList",
     "WorkOrderItemUnitNotes",
diff --git a/ayanova/src/views/svc-work-order-status-edit.vue b/ayanova/src/views/svc-work-order-status-edit.vue
index 72a5f70b..ca626209 100644
--- a/ayanova/src/views/svc-work-order-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-status-edit.vue
@@ -9,7 +9,7 @@
             <v-text-field
               v-model="obj.name"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderStatusName')"
+              :label="$ay.t('StatusName')"
               :rules="[form().required(this, 'name')]"
               :error-messages="form().serverErrors(this, 'name')"
               ref="name"
@@ -22,7 +22,7 @@
             <v-checkbox
               v-model="obj.completed"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderStatusCompleted')"
+              :label="$ay.t('StatusCompleted')"
               ref="completed"
               data-cy="completed"
               :error-messages="form().serverErrors(this, 'completed')"
@@ -34,7 +34,7 @@
             <v-checkbox
               v-model="obj.locked"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderStatusLocked')"
+              :label="$ay.t('StatusLocked')"
               ref="locked"
               data-cy="locked"
               :error-messages="form().serverErrors(this, 'locked')"
@@ -69,7 +69,7 @@
           </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
             <span class="text-caption">
-              {{ $ay.t("WorkOrderStatusColor") }}
+              {{ $ay.t("StatusColor") }}
             </span>
             <v-color-picker
               v-model="obj.color"
@@ -94,11 +94,11 @@
           </v-col>
 
           <!------------------------------------->
-          <v-col v-if="form().showMe(this, 'WorkOrderStatusNotes')" cols="12">
+          <v-col v-if="form().showMe(this, 'StatusNotes')" cols="12">
             <v-textarea
               v-model="obj.notes"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderStatusNotes')"
+              :label="$ay.t('StatusNotes')"
               :error-messages="form().serverErrors(this, 'notes')"
               ref="notes"
               data-cy="notes"
@@ -521,13 +521,13 @@ async function initForm(vm) {
 async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "WorkOrderStatus",
-    "WorkOrderStatusName",
-    "WorkOrderStatusCompleted",
-    "WorkOrderStatusLocked",
+    "StatusName",
+    "StatusCompleted",
+    "StatusLocked",
     "SelectRoles",
     "RemoveRoles",
-    "WorkOrderStatusColor",
-    "WorkOrderStatusNotes"
+    "StatusColor",
+    "StatusNotes"
   ]);
 }
 </script>