diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 509f333f..48c286e0 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -13,7 +13,8 @@
 		missing wo link on csr page when it's been accepted already (viz)
 		can't accept to new - weird error
 		can't accept to existing - no wo picklist implemented yet
-
+		return link from woitem to csr??
+		Test all wo/quote/pm, including duplicate, copy to etc as moving fromcsrid may have caused fuckery
 	Customer UI 
 
 		CSR techs ui accept to wo etc
diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index 049e3828..62f33d39 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -512,205 +512,4 @@ export default {
     }
   }
 };
-
-/*
-l.Add(new FormField { TKey = "PMPreparedByID", FieldKey = "PMPreparedByID" });
-l.Add(new FormField { TKey = "PMIntroduction", FieldKey = "PMIntroduction" });
-l.Add(new FormField { TKey = "PMPMRequestDate", FieldKey = "PMPMRequestDate" });
-l.Add(new FormField { TKey = "PMValidUntilDate", FieldKey = "PMValidUntilDate" });
-l.Add(new FormField { TKey = "PMDateSubmitted", FieldKey = "PMDateSubmitted" });
-l.Add(new FormField { TKey = "PMDateApproved", FieldKey = "PMDateApproved" });
-l.Add(new FormField { TKey = "CopyWiki", FieldKey = "CopyWiki" });
-l.Add(new FormField { TKey = "CopyAttachments", FieldKey = "CopyAttachments" });
-
-Example workorder
-{
-    id: 10,
-    concurrency: 7728489,
-    serial: 10,
-    notes: "Quae officia placeat aliquid ducimus consequatur quia.",
-    wiki: null,
-    customFields: null,
-    tags: ["green", "zone6"],
-    customerId: 12,
-    projectId: null,
-    internalReferenceNumber: "irf-3339",
-    customerReferenceNumber: "crf-1889",
-    customerContactName: "contact name here",
-    fromPMId: null,
-    fromPMId: null,
-    fromCSRId: null,
-    serviceDate: "2021-05-29T21:25:31.421011Z",
-    completeByDate: "2021-06-03T21:25:31.421011Z",
-    invoiceNumber: null,
-    customerSignature: null,
-    customerSignatureName: null,
-    customerSignatureCaptured: "0001-01-01T00:00:00Z",
-    postAddress: null,
-    postCity: null,
-    postRegion: null,
-    postCountry: null,
-    postCode: null,
-    address: null,
-    city: null,
-    region: null,
-    country: null,
-    latitude: null,
-    longitude: null,
-    items: [
-      {
-        id: 21,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        pmId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 41,
-            concurrency: 7728489,
-            userId: 15,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            pmItemId: 21
-          },
-          {
-            id: 42,
-            concurrency: 7728489,
-            userId: 22,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            pmItemId: 21
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      },
-      {
-        id: 22,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        pmId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 43,
-            concurrency: 7728489,
-            userId: 24,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            pmItemId: 22
-          },
-          {
-            id: 44,
-            concurrency: 7728489,
-            userId: 40,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            pmItemId: 22
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      }
-    ],
-    states: [
-      {
-        id: 37,
-        concurrency: 7728489,
-        pmId: 10,
-        workOrderStatusId: 2,
-        created: "2021-05-29T21:30:31.421011Z",
-        userId: 37,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 38,
-        concurrency: 7728489,
-        pmId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T22:25:31.421011Z",
-        userId: 10,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 39,
-        concurrency: 7728489,
-        pmId: 10,
-        workOrderStatusId: 1,
-        created: "2021-05-29T22:30:31.421011Z",
-        userId: 31,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 40,
-        concurrency: 7728489,
-        pmId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T23:25:31.421011Z",
-        userId: 2,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 41,
-        concurrency: 7728489,
-        pmId: 10,
-        workOrderStatusId: 9,
-        created: "2021-04-06T00:10:44.636Z",
-        userId: 1,
-        isDirty: false,
-        workOrderStatus: null
-      }
-    ],
-    isDirty: false,
-    isLockedAtServer: false
-  };
-
-
-*/
 </script>
diff --git a/ayanova/src/components/quote-header.vue b/ayanova/src/components/quote-header.vue
index 7c54f3bd..f90b55dd 100644
--- a/ayanova/src/components/quote-header.vue
+++ b/ayanova/src/components/quote-header.vue
@@ -523,205 +523,4 @@ export default {
     }
   }
 };
-
-/*
-l.Add(new FormField { TKey = "QuotePreparedByID", FieldKey = "QuotePreparedByID" });
-l.Add(new FormField { TKey = "QuoteIntroduction", FieldKey = "QuoteIntroduction" });
-l.Add(new FormField { TKey = "QuoteQuoteRequestDate", FieldKey = "QuoteQuoteRequestDate" });
-l.Add(new FormField { TKey = "QuoteValidUntilDate", FieldKey = "QuoteValidUntilDate" });
-l.Add(new FormField { TKey = "QuoteDateSubmitted", FieldKey = "QuoteDateSubmitted" });
-l.Add(new FormField { TKey = "QuoteDateApproved", FieldKey = "QuoteDateApproved" });
-l.Add(new FormField { TKey = "CopyWiki", FieldKey = "CopyWiki" });
-l.Add(new FormField { TKey = "CopyAttachments", FieldKey = "CopyAttachments" });
-
-Example workorder
-{
-    id: 10,
-    concurrency: 7728489,
-    serial: 10,
-    notes: "Quae officia placeat aliquid ducimus consequatur quia.",
-    wiki: null,
-    customFields: null,
-    tags: ["green", "zone6"],
-    customerId: 12,
-    projectId: null,
-    internalReferenceNumber: "irf-3339",
-    customerReferenceNumber: "crf-1889",
-    customerContactName: "contact name here",
-    fromQuoteId: null,
-    fromPMId: null,
-    fromCSRId: null,
-    serviceDate: "2021-05-29T21:25:31.421011Z",
-    completeByDate: "2021-06-03T21:25:31.421011Z",
-    invoiceNumber: null,
-    customerSignature: null,
-    customerSignatureName: null,
-    customerSignatureCaptured: "0001-01-01T00:00:00Z",
-    postAddress: null,
-    postCity: null,
-    postRegion: null,
-    postCountry: null,
-    postCode: null,
-    address: null,
-    city: null,
-    region: null,
-    country: null,
-    latitude: null,
-    longitude: null,
-    items: [
-      {
-        id: 21,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        quoteId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 41,
-            concurrency: 7728489,
-            userId: 15,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            quoteItemId: 21
-          },
-          {
-            id: 42,
-            concurrency: 7728489,
-            userId: 22,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            quoteItemId: 21
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      },
-      {
-        id: 22,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        quoteId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 43,
-            concurrency: 7728489,
-            userId: 24,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            quoteItemId: 22
-          },
-          {
-            id: 44,
-            concurrency: 7728489,
-            userId: 40,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            quoteItemId: 22
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      }
-    ],
-    states: [
-      {
-        id: 37,
-        concurrency: 7728489,
-        quoteId: 10,
-        workOrderStatusId: 2,
-        created: "2021-05-29T21:30:31.421011Z",
-        userId: 37,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 38,
-        concurrency: 7728489,
-        quoteId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T22:25:31.421011Z",
-        userId: 10,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 39,
-        concurrency: 7728489,
-        quoteId: 10,
-        workOrderStatusId: 1,
-        created: "2021-05-29T22:30:31.421011Z",
-        userId: 31,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 40,
-        concurrency: 7728489,
-        quoteId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T23:25:31.421011Z",
-        userId: 2,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 41,
-        concurrency: 7728489,
-        quoteId: 10,
-        workOrderStatusId: 9,
-        created: "2021-04-06T00:10:44.636Z",
-        userId: 1,
-        isDirty: false,
-        workOrderStatus: null
-      }
-    ],
-    isDirty: false,
-    isLockedAtServer: false
-  };
-
-
-*/
 </script>
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 78b1247c..5056f936 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -499,196 +499,4 @@ export default {
     }
   }
 };
-
-/*
-Example workorder
-{
-    id: 10,
-    concurrency: 7728489,
-    serial: 10,
-    notes: "Quae officia placeat aliquid ducimus consequatur quia.",
-    wiki: null,
-    customFields: null,
-    tags: ["green", "zone6"],
-    customerId: 12,
-    projectId: null,
-    internalReferenceNumber: "irf-3339",
-    customerReferenceNumber: "crf-1889",
-    customerContactName: "contact name here",
-    fromQuoteId: null,
-    fromPMId: null,
-    fromCSRId: null,
-    serviceDate: "2021-05-29T21:25:31.421011Z",
-    completeByDate: "2021-06-03T21:25:31.421011Z",
-    invoiceNumber: null,
-    customerSignature: null,
-    customerSignatureName: null,
-    customerSignatureCaptured: "0001-01-01T00:00:00Z",
-    postAddress: null,
-    postCity: null,
-    postRegion: null,
-    postCountry: null,
-    postCode: null,
-    address: null,
-    city: null,
-    region: null,
-    country: null,
-    latitude: null,
-    longitude: null,
-    items: [
-      {
-        id: 21,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        workOrderId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 41,
-            concurrency: 7728489,
-            userId: 15,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            workOrderItemId: 21
-          },
-          {
-            id: 42,
-            concurrency: 7728489,
-            userId: 22,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            workOrderItemId: 21
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      },
-      {
-        id: 22,
-        concurrency: 7728489,
-        notes: "itemnotes",
-        wiki: null,
-        customFields: null,
-        tags: [],
-        workOrderId: 10,
-        techNotes: "technotes",
-        workOrderItemStatusId: null,
-        workOrderItemPriorityId: null,
-        requestDate: "2021-05-29T21:25:31.421011Z",
-        warrantyService: false,
-        isDirty: false,
-        expenses: [],
-        labors: [],
-        loans: [],
-        parts: [],
-        partRequests: [],
-        scheduledUsers: [
-          {
-            id: 43,
-            concurrency: 7728489,
-            userId: 24,
-            estimatedQuantity: 1.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            workOrderItemId: 22
-          },
-          {
-            id: 44,
-            concurrency: 7728489,
-            userId: 40,
-            estimatedQuantity: 2.0,
-            startDate: null,
-            stopDate: null,
-            serviceRateId: null,
-            isDirty: false,
-            workOrderItemId: 22
-          }
-        ],
-        tasks: [],
-        travels: [],
-        units: [],
-        outsideServices: []
-      }
-    ],
-    states: [
-      {
-        id: 37,
-        concurrency: 7728489,
-        workOrderId: 10,
-        workOrderStatusId: 2,
-        created: "2021-05-29T21:30:31.421011Z",
-        userId: 37,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 38,
-        concurrency: 7728489,
-        workOrderId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T22:25:31.421011Z",
-        userId: 10,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 39,
-        concurrency: 7728489,
-        workOrderId: 10,
-        workOrderStatusId: 1,
-        created: "2021-05-29T22:30:31.421011Z",
-        userId: 31,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 40,
-        concurrency: 7728489,
-        workOrderId: 10,
-        workOrderStatusId: 3,
-        created: "2021-05-29T23:25:31.421011Z",
-        userId: 2,
-        isDirty: false,
-        workOrderStatus: null
-      },
-      {
-        id: 41,
-        concurrency: 7728489,
-        workOrderId: 10,
-        workOrderStatusId: 9,
-        created: "2021-04-06T00:10:44.636Z",
-        userId: 1,
-        isDirty: false,
-        workOrderStatus: null
-      }
-    ],
-    isDirty: false,
-    isLockedAtServer: false
-  };
-
-
-*/
 </script>
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index fbb73ad0..acfbb873 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -975,6 +975,7 @@ export default {
         customFields: "{}",
         tags: [],
         workOrderId: this.value.id,
+        fromCSRId: null,
         techNotes: null,
         workOrderItemStatusId: null,
         workOrderItemPriorityId: null,
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index a1780efa..da9fd8d5 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -644,7 +644,6 @@ export default {
         customerContactName: this.obj.requestedByUserViz,
         fromQuoteId: null,
         fromPMId: null,
-        fromCSRId: this.obj.id,
         serviceDate: null,
         completeByDate: null,
         durationToCompleted: "00:00:00",
@@ -677,6 +676,7 @@ export default {
       let wi = {
         id: 0,
         concurrency: 0,
+        fromCSRId: this.obj.id,
         notes: this.obj.name,
         wiki: null,
         customFields: "{}",
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index 3e7e8613..f45b304c 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -1766,12 +1766,7 @@ async function clickHandler(menuItem) {
           id: m.vm.obj.fromPMId
         });
         break;
-      case "csr":
-        window.$gz.eventBus.$emit("openobject", {
-          type: window.$gz.type.CustomerServiceRequest,
-          id: m.vm.obj.fromCSRId
-        });
-        break;
+
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index e141e5cb..4e3d1a3d 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -210,7 +210,6 @@ export default {
         customerContactName: null,
         fromQuoteId: null,
         fromPMId: null,
-        fromCSRId: null,
         serviceDate: null,
         completeByDate: null,
         durationToCompleted: "00:00:00",